From a457ff539d383bbfa5300de6b25974a4fa953af6 Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 29 Nov 2013 04:51:51 +0000 Subject: [PATCH] Convert hide prompt header setting into compact prompt setting that also controls font size --- .../gui/home/settings/CSubmenuPreferences.java | 2 +- .../gui/home/settings/VSubmenuPreferences.java | 16 ++++++++-------- .../java/forge/gui/match/views/VMessage.java | 17 ++++++----------- .../java/forge/properties/ForgePreferences.java | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java index 01ac1c6190c..9b81acc661f 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java @@ -82,8 +82,8 @@ public enum CSubmenuPreferences implements ICDoc { lstControls.add(Pair.of(view.getCbCompactMainMenu(), FPref.UI_COMPACT_MAIN_MENU)); lstControls.add(Pair.of(view.getCbUseThemes(), FPref.UI_THEMED_COMBOBOX)); lstControls.add(Pair.of(view.getCbPromptFreeBlocks(), FPref.MATCHPREF_PROMPT_FREE_BLOCKS)); + lstControls.add(Pair.of(view.getCbCompactPrompt(), FPref.UI_COMPACT_PROMPT)); lstControls.add(Pair.of(view.getCbStackCardView(), FPref.UI_STACK_CARD_VIEW)); - lstControls.add(Pair.of(view.getCbHidePromptHeader(), FPref.UI_HIDE_PROMPT_HEADER)); lstControls.add(Pair.of(view.getCbHideReminderText(), FPref.UI_HIDE_REMINDER_TEXT)); for(final Pair kv : lstControls) { diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index 72e8dcd07cd..b74b7c82d0a 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -84,8 +84,8 @@ public enum VSubmenuPreferences implements IVSubmenu { private final JCheckBox cbCompactMainMenu = new OptionsCheckBox("Use Compact Main Sidebar Menu"); private final JCheckBox cbUseThemes = new OptionsCheckBox("Enable Themes"); private final JCheckBox cbPromptFreeBlocks = new OptionsCheckBox("Free Block Handling"); + private final JCheckBox cbCompactPrompt = new OptionsCheckBox("Compact Prompt"); private final JCheckBox cbStackCardView = new OptionsCheckBox("Card View for Stack"); - private final JCheckBox cbHidePromptHeader = new OptionsCheckBox("Hide Prompt Header"); private final JCheckBox cbHideReminderText = new OptionsCheckBox("Hide Reminder Text"); private final Map shortcutFields = new HashMap(); @@ -197,12 +197,12 @@ public enum VSubmenuPreferences implements IVSubmenu { pnlPrefs.add(cbUiForTouchScreen, regularConstraints); pnlPrefs.add(new NoteLabel("Increases some UI elements to provide a better experience on touchscreen devices. (Needs restart)"), regularConstraints); + pnlPrefs.add(cbCompactPrompt, regularConstraints); + pnlPrefs.add(new NoteLabel("Hide header and use smaller font in Prompt pane to make it more compact."), regularConstraints); + pnlPrefs.add(cbStackCardView, regularConstraints); pnlPrefs.add(new NoteLabel("Show cards and abilities on Stack in card view rather than list view."), regularConstraints); - pnlPrefs.add(cbHidePromptHeader, regularConstraints); - pnlPrefs.add(new NoteLabel("Hide header in Prompt pane that shows the current game and turn."), regularConstraints); - pnlPrefs.add(cbHideReminderText, regularConstraints); pnlPrefs.add(new NoteLabel("Hide reminder text in Card Detail pane."), regularConstraints); @@ -496,12 +496,12 @@ public enum VSubmenuPreferences implements IVSubmenu { return cbUiForTouchScreen; } - public final JCheckBox getCbStackCardView() { - return cbStackCardView; + public final JCheckBox getCbCompactPrompt() { + return cbCompactPrompt; } - public final JCheckBox getCbHidePromptHeader() { - return cbHidePromptHeader; + public final JCheckBox getCbStackCardView() { + return cbStackCardView; } public final JCheckBox getCbHideReminderText() { diff --git a/forge-gui/src/main/java/forge/gui/match/views/VMessage.java b/forge-gui/src/main/java/forge/gui/match/views/VMessage.java index b3aa0ea66d4..ae63221581e 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VMessage.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VMessage.java @@ -25,8 +25,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; -import javax.swing.text.DefaultCaret; - import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.framework.DragCell; @@ -39,7 +37,6 @@ import forge.gui.toolbox.FHtmlViewer; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPanel; import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FSkin.JTextComponentSkin; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; @@ -73,14 +70,8 @@ public enum VMessage implements IVDoc { .opaque() .build(); - JTextComponentSkin tarMessageSkin = FSkin.get(tarMessage); - tarMessageSkin.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - tarMessageSkin.setFont(FSkin.getFont(12)); + FSkin.get(tarMessage).setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tarMessage.setMargin(new Insets(3, 3, 3, 3)); - - // Prevent scroll-bar from automatically scrolling to bottom of JTextArea. - DefaultCaret caret = (DefaultCaret)tarMessage.getCaret(); - caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE); } //========== Overridden methods @@ -95,8 +86,12 @@ public enum VMessage implements IVDoc { // wrap : 2 columns required for btnOk and btnCancel. container.setLayout(new MigLayout("wrap 2, gap 0px!, insets 1px 1px 3px 1px")); - if (!prefs.getPrefBoolean(FPref.UI_HIDE_PROMPT_HEADER)) { + if (prefs.getPrefBoolean(FPref.UI_COMPACT_PROMPT)) { //hide header and use smaller font if compact prompt + FSkin.get(tarMessage).setFont(FSkin.getFont(12)); + } + else { container.add(lblGames, "span 2, w 10:100%, h 22px!"); + FSkin.get(tarMessage).setFont(FSkin.getFont(14)); } lblGames.setText("Game Setup"); diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java index f9b8271996f..46d4ed8d875 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java @@ -55,9 +55,9 @@ public class ForgePreferences extends PreferencesStore { UI_OVERLAY_CARD_MANA_COST ("true"), UI_OVERLAY_CARD_ID ("true"), UI_HIDE_REMINDER_TEXT ("false"), - UI_HIDE_PROMPT_HEADER ("false"), UI_UPLOAD_DRAFT ("false"), UI_SCALE_LARGER ("true"), + UI_COMPACT_PROMPT ("false"), UI_MAX_STACK ("3"), UI_STACK_OFFSET ("tiny"), UI_STACK_CARD_VIEW ("false"),