remove Old GUI checkbox option. It no longer works, and we will only be using/supporting the new UI.

This commit is contained in:
slapshot5
2011-12-27 02:16:43 +00:00
parent 08cea388dc
commit 0d301c9a7c
5 changed files with 1 additions and 47 deletions

View File

@@ -100,14 +100,6 @@ public class ControlSettings {
} }
}); });
this.view.getCbOldUI().addActionListener(new ActionListener() {
@Override
public void actionPerformed(final ActionEvent arg0) {
prefs.setOldGui(ControlSettings.this.view.getCbOldUI().isSelected());
try { prefs.save(); } catch (Exception e) { e.printStackTrace(); }
}
});
this.view.getCbUploadDraft().addActionListener(new ActionListener() { this.view.getCbUploadDraft().addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent arg0) { public void actionPerformed(final ActionEvent arg0) {

View File

@@ -37,9 +37,6 @@ import java.util.Map;
*/ */
public class ForgePreferences extends Preferences { public class ForgePreferences extends Preferences {
/** Old gui checkbox toggle. */
private boolean oldGui;
/** Play for ante checkbox toggle. */ /** Play for ante checkbox toggle. */
private boolean playForAnte; private boolean playForAnte;
@@ -146,7 +143,6 @@ public class ForgePreferences extends Preferences {
throw new Exception("Error reading \"" + fileName + "\".", ex); throw new Exception("Error reading \"" + fileName + "\".", ex);
} }
this.oldGui = this.getBoolean("gui.old", true);
this.setPlayForAnte(this.getBoolean("play.for.ante", false)); this.setPlayForAnte(this.getBoolean("play.for.ante", false));
this.setUILayout(this.get("gui.layout", "")); this.setUILayout(this.get("gui.layout", ""));
this.setStackAiLand(this.getBoolean("AI.stack.land", false)); this.setStackAiLand(this.getBoolean("AI.stack.land", false));
@@ -223,7 +219,6 @@ public class ForgePreferences extends Preferences {
*/ */
public final void save() throws Exception { public final void save() throws Exception {
this.set("gui.layout", this.getUILayout()); this.set("gui.layout", this.getUILayout());
this.set("gui.old", this.oldGui);
this.set("gui.skin", this.getSkin()); this.set("gui.skin", this.getSkin());
this.set("play.for.ante", this.isPlayForAnte()); this.set("play.for.ante", this.isPlayForAnte());
@@ -330,25 +325,6 @@ public class ForgePreferences extends Preferences {
this.stackAiLand = b0; this.stackAiLand = b0;
} }
/**
* Checks if old gui is to be used.
*
* @return boolean
*/
public boolean isOldGui() {
return this.oldGui;
}
/**
* Sets if old gui is to be used.
*
* @param b0
*   boolean
*/
public void setOldGui(final boolean b0) {
this.oldGui = b0;
}
/** /**
* Checks if we are playing for ante. * Checks if we are playing for ante.
* *

View File

@@ -37,8 +37,7 @@ public class ViewSettings extends JScrollPane {
private String spacer; private String spacer;
private JCheckBox cbAnte, cbScaleLarger, cbDevMode, cbRemoveSmall, cbRemoveArtifacts, private JCheckBox cbAnte, cbScaleLarger, cbDevMode, cbRemoveSmall, cbRemoveArtifacts,
cbOldUI, cbUploadDraft, cbStackLand, cbRandomFoil, cbTextMana, cbUploadDraft, cbStackLand, cbRandomFoil, cbTextMana, cbSingletons;
cbSingletons;
//private JRadioButton radStack3, radStack4, radStack5, radStack6, radStack7, //private JRadioButton radStack3, radStack4, radStack5, radStack6, radStack7,
// radStack8, radStack9, radStack10, radStack11, radStack12; // radStack8, radStack9, radStack10, radStack11, radStack12;
@@ -104,12 +103,6 @@ public class ViewSettings extends JScrollPane {
lblTitleUI.setForeground(skin.getColor("text")); lblTitleUI.setForeground(skin.getColor("text"));
viewport.add(lblTitleUI, constraints2); viewport.add(lblTitleUI, constraints2);
cbOldUI = new OptionsCheckBox("Old UI");
cbOldUI.setSelected(Singletons.getModel().getPreferences().isOldGui());
JLabel lblOldUI = new NoteLabel("Use the user interface from Beta 1.1.9.");
viewport.add(cbOldUI, constraints);
viewport.add(lblOldUI, constraints2);
cbAnte = new OptionsCheckBox("Play for Ante"); cbAnte = new OptionsCheckBox("Play for Ante");
cbAnte.setSelected(Singletons.getModel().getPreferences().isPlayForAnte()); cbAnte.setSelected(Singletons.getModel().getPreferences().isPlayForAnte());
NoteLabel lblAnte = new NoteLabel("Determines whether or not the game is played for ante."); NoteLabel lblAnte = new NoteLabel("Determines whether or not the game is played for ante.");
@@ -432,11 +425,6 @@ public class ViewSettings extends JScrollPane {
return cbRemoveArtifacts; return cbRemoveArtifacts;
} }
/** @return JCheckBox */
public JCheckBox getCbOldUI() {
return cbOldUI;
}
/** @return JCheckBox */ /** @return JCheckBox */
public JCheckBox getCbUploadDraft() { public JCheckBox getCbUploadDraft() {
return cbUploadDraft; return cbUploadDraft;

View File

@@ -116,7 +116,6 @@ public class ApplicationView implements FView {
final ForgePreferences preferences = model.getPreferences(); final ForgePreferences preferences = model.getPreferences();
OldGuiNewGame.getOldGuiCheckBox().setSelected(preferences.isOldGui());
OldGuiNewGame.getSmoothLandCheckBox().setSelected(preferences.isStackAiLand()); OldGuiNewGame.getSmoothLandCheckBox().setSelected(preferences.isStackAiLand());
OldGuiNewGame.getDevModeCheckBox().setSelected(preferences.isDeveloperMode()); OldGuiNewGame.getDevModeCheckBox().setSelected(preferences.isDeveloperMode());
OldGuiNewGame.getCardOverlay().setSelected(preferences.isCardOverlay()); OldGuiNewGame.getCardOverlay().setSelected(preferences.isCardOverlay());

View File

@@ -1625,7 +1625,6 @@ public class OldGuiNewGame extends JFrame {
try { try {
final ForgePreferences preferences = Singletons.getModel().getPreferences(); final ForgePreferences preferences = Singletons.getModel().getPreferences();
preferences.setSkin(AllZone.getSkin().getName()); preferences.setSkin(AllZone.getSkin().getName());
preferences.setOldGui(OldGuiNewGame.oldGuiCheckBox.isSelected());
preferences.setStackAiLand(OldGuiNewGame.getSmoothLandCheckBox().isSelected()); preferences.setStackAiLand(OldGuiNewGame.getSmoothLandCheckBox().isSelected());
preferences.setMillingLossCondition(Constant.Runtime.MILL[0]); preferences.setMillingLossCondition(Constant.Runtime.MILL[0]);
preferences.setDeveloperMode(Constant.Runtime.DEV_MODE[0]); preferences.setDeveloperMode(Constant.Runtime.DEV_MODE[0]);