mirror of
https://github.com/magefree/mage.git
synced 2025-12-21 11:02:00 -08:00
added preferences option to disable image check at startup
This commit is contained in:
parent
f67aaf80cf
commit
c207060611
3 changed files with 30 additions and 4 deletions
|
|
@ -287,7 +287,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
|
||||||
SwingUtilities.invokeLater(new Runnable() {
|
SwingUtilities.invokeLater(new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
disableButtons();
|
disableButtons();
|
||||||
checkForNewImages();
|
if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_CHECK, "true").equals("true"))
|
||||||
|
checkForNewImages();
|
||||||
if (autoConnect())
|
if (autoConnect())
|
||||||
enableButtons();
|
enableButtons();
|
||||||
else {
|
else {
|
||||||
|
|
@ -431,7 +432,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
|
||||||
List<Card> notImplemented = CardsStorage.getNotImplementedCards();
|
List<Card> notImplemented = CardsStorage.getNotImplementedCards();
|
||||||
cards.addAll(notImplemented);
|
cards.addAll(notImplemented);
|
||||||
if (Plugins.getInstance().newImage(cards)) {
|
if (Plugins.getInstance().newImage(cards)) {
|
||||||
if (JOptionPane.showConfirmDialog(null, "New cards are available. Do you want to download the images?") == JOptionPane.OK_OPTION) {
|
if (JOptionPane.showConfirmDialog(null, "New cards are available. Do you want to download the images?", "New images available", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
|
||||||
Plugins.getInstance().downloadImage(cards);
|
Plugins.getInstance().downloadImage(cards);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -417,6 +417,10 @@
|
||||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
<Component id="browseButton" min="-2" max="-2" attributes="0"/>
|
<Component id="browseButton" min="-2" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
|
<Group type="102" alignment="0" attributes="0">
|
||||||
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
|
<Component id="checkForNewImages" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace pref="19" max="32767" attributes="0"/>
|
<EmptySpace pref="19" max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -432,7 +436,9 @@
|
||||||
<Component id="imageFolderPath" alignment="3" min="-2" max="-2" attributes="0"/>
|
<Component id="imageFolderPath" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="browseButton" alignment="3" min="-2" max="-2" attributes="0"/>
|
<Component id="browseButton" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace pref="75" max="32767" attributes="0"/>
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Component id="checkForNewImages" min="-2" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace pref="45" max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</DimensionLayout>
|
</DimensionLayout>
|
||||||
|
|
@ -456,6 +462,11 @@
|
||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="browseButtonActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="browseButtonActionPerformed"/>
|
||||||
</Events>
|
</Events>
|
||||||
</Component>
|
</Component>
|
||||||
|
<Component class="javax.swing.JCheckBox" name="checkForNewImages">
|
||||||
|
<Properties>
|
||||||
|
<Property name="text" type="java.lang.String" value="check for new images on startup"/>
|
||||||
|
</Properties>
|
||||||
|
</Component>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Container>
|
</Container>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
public static final String KEY_PERMANENTS_IN_ONE_PILE = "nonLandPermanentsInOnePile";
|
public static final String KEY_PERMANENTS_IN_ONE_PILE = "nonLandPermanentsInOnePile";
|
||||||
public static final String KEY_CARD_IMAGES_USE_DEFAULT = "cardImagesUseDefault";
|
public static final String KEY_CARD_IMAGES_USE_DEFAULT = "cardImagesUseDefault";
|
||||||
public static final String KEY_CARD_IMAGES_PATH = "cardImagesPath";
|
public static final String KEY_CARD_IMAGES_PATH = "cardImagesPath";
|
||||||
|
public static final String KEY_CARD_IMAGES_CHECK = "cardImagesCheck";
|
||||||
|
|
||||||
private static Map<String, String> cache = new HashMap<String, String>();
|
private static Map<String, String> cache = new HashMap<String, String>();
|
||||||
private static final Boolean UPDATE_CACHE_POLICY = Boolean.TRUE;
|
private static final Boolean UPDATE_CACHE_POLICY = Boolean.TRUE;
|
||||||
|
|
@ -121,6 +122,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
useDefaultImageFolder = new javax.swing.JCheckBox();
|
useDefaultImageFolder = new javax.swing.JCheckBox();
|
||||||
imageFolderPath = new javax.swing.JTextField();
|
imageFolderPath = new javax.swing.JTextField();
|
||||||
browseButton = new javax.swing.JButton();
|
browseButton = new javax.swing.JButton();
|
||||||
|
checkForNewImages = new javax.swing.JCheckBox();
|
||||||
saveButton = new javax.swing.JButton();
|
saveButton = new javax.swing.JButton();
|
||||||
exitButton = new javax.swing.JButton();
|
exitButton = new javax.swing.JButton();
|
||||||
|
|
||||||
|
|
@ -350,6 +352,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
checkForNewImages.setText("check for new images on startup");
|
||||||
|
|
||||||
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
|
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
|
||||||
jPanel5.setLayout(jPanel5Layout);
|
jPanel5.setLayout(jPanel5Layout);
|
||||||
jPanel5Layout.setHorizontalGroup(
|
jPanel5Layout.setHorizontalGroup(
|
||||||
|
|
@ -363,7 +367,10 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
.addGap(19, 19, 19)
|
.addGap(19, 19, 19)
|
||||||
.addComponent(imageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, 284, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(imageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, 284, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(browseButton)))
|
.addComponent(browseButton))
|
||||||
|
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||||
|
.addContainerGap()
|
||||||
|
.addComponent(checkForNewImages)))
|
||||||
.addContainerGap(19, Short.MAX_VALUE))
|
.addContainerGap(19, Short.MAX_VALUE))
|
||||||
);
|
);
|
||||||
jPanel5Layout.setVerticalGroup(
|
jPanel5Layout.setVerticalGroup(
|
||||||
|
|
@ -375,6 +382,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(imageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(imageFolderPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addComponent(browseButton))
|
.addComponent(browseButton))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addComponent(checkForNewImages)
|
||||||
.addContainerGap(75, Short.MAX_VALUE))
|
.addContainerGap(75, Short.MAX_VALUE))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -558,6 +567,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
dialog.imageFolderPath.setText(path);
|
dialog.imageFolderPath.setText(path);
|
||||||
updateCache(KEY_CARD_IMAGES_PATH, path);
|
updateCache(KEY_CARD_IMAGES_PATH, path);
|
||||||
}
|
}
|
||||||
|
dialog.checkForNewImages.setSelected(Boolean.parseBoolean(prefs.get(KEY_CARD_IMAGES_CHECK, "true")));
|
||||||
|
updateCache(KEY_CARD_IMAGES_CHECK, Boolean.toString(dialog.checkForNewImages.isSelected()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void saveImagesPath(Preferences prefs) {
|
private static void saveImagesPath(Preferences prefs) {
|
||||||
|
|
@ -571,6 +582,8 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
prefs.put(KEY_CARD_IMAGES_PATH, path);
|
prefs.put(KEY_CARD_IMAGES_PATH, path);
|
||||||
updateCache(KEY_CARD_IMAGES_PATH, path);
|
updateCache(KEY_CARD_IMAGES_PATH, path);
|
||||||
}
|
}
|
||||||
|
prefs.put(KEY_CARD_IMAGES_CHECK, Boolean.toString(dialog.checkForNewImages.isSelected()));
|
||||||
|
updateCache(KEY_CARD_IMAGES_CHECK, Boolean.toString(dialog.checkForNewImages.isSelected()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void load(Preferences prefs, JCheckBox checkBox, String propName, String yesValue) {
|
private static void load(Preferences prefs, JCheckBox checkBox, String propName, String yesValue) {
|
||||||
|
|
@ -629,6 +642,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
|
||||||
private javax.swing.JCheckBox checkBoxMainYou;
|
private javax.swing.JCheckBox checkBoxMainYou;
|
||||||
private javax.swing.JCheckBox checkBoxUpkeepOthers;
|
private javax.swing.JCheckBox checkBoxUpkeepOthers;
|
||||||
private javax.swing.JCheckBox checkBoxUpkeepYou;
|
private javax.swing.JCheckBox checkBoxUpkeepYou;
|
||||||
|
private javax.swing.JCheckBox checkForNewImages;
|
||||||
private javax.swing.JCheckBox displayBigCardsInHand;
|
private javax.swing.JCheckBox displayBigCardsInHand;
|
||||||
private javax.swing.JButton exitButton;
|
private javax.swing.JButton exitButton;
|
||||||
private javax.swing.JTextField imageFolderPath;
|
private javax.swing.JTextField imageFolderPath;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue