From dd91eb2c6609ebb491f7841085b843e01fecdd09 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Thu, 16 Feb 2012 05:38:15 +0000
Subject: [PATCH] "Pretty names" for skin names in settings submenu.

---
 .../forge/control/home/ControlSettings.java   |  2 ++
 .../java/forge/view/home/ViewSettings.java    | 20 +++++++++++++++----
 src/main/java/forge/view/toolbox/FSkin.java   |  4 +++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/control/home/ControlSettings.java b/src/main/java/forge/control/home/ControlSettings.java
index 1263f2d3817..fdb78affcbb 100644
--- a/src/main/java/forge/control/home/ControlSettings.java
+++ b/src/main/java/forge/control/home/ControlSettings.java
@@ -40,6 +40,8 @@ public class ControlSettings {
      */
     public ControlSettings(ViewSettings v0) {
         this.view = v0;
+        view.updateSkinNames();
+
         addListeners();
         prefs = Singletons.getModel().getPreferences();
 
diff --git a/src/main/java/forge/view/home/ViewSettings.java b/src/main/java/forge/view/home/ViewSettings.java
index f1a4b608b7f..370b04d02c4 100644
--- a/src/main/java/forge/view/home/ViewSettings.java
+++ b/src/main/java/forge/view/home/ViewSettings.java
@@ -27,6 +27,7 @@ import javax.swing.border.MatteBorder;
 import net.miginfocom.swing.MigLayout;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.WordUtils;
 
 import forge.PlayerType;
 import forge.Singletons;
@@ -130,6 +131,20 @@ public class ViewSettings extends JPanel {
         showPrefsTab();
     }
 
+    /** */
+    public void updateSkinNames() {
+        String[] uglyNames = FSkin.getSkins().toArray(new String[0]);
+        String[] prettyNames = new String[uglyNames.length];
+
+        for (int i = 0; i < uglyNames.length; i++) {
+            prettyNames[i] = WordUtils.capitalize(uglyNames[i].replace('_', ' '));
+        }
+
+        lstChooseSkin.setListData(prettyNames);
+        lstChooseSkin.setSelectedValue(Singletons.getModel().getPreferences().getPref(FPref.UI_SKIN), true);
+        lstChooseSkin.ensureIndexIsVisible(lstChooseSkin.getSelectedIndex());
+    }
+
     private void populateTabber() {
         tabPrefs.setToolTipText("Global preference options");
         tabAvatars.setToolTipText("Human and AI avatar select");
@@ -181,10 +196,7 @@ public class ViewSettings extends JPanel {
 
         pnlPrefs.add(lblTitleSkin, regularConstraints);
         pnlPrefs.add(new NoteLabel("Various user-created themes for Forge backgrounds, fonts, and colors."), regularConstraints);
-        pnlPrefs.add(new FScrollPane(lstChooseSkin), "h 60px!, w 150px!, gap 10% 0 0 2%, wrap");
-        lstChooseSkin.setListData(FSkin.getSkins().toArray(new String[0]));
-        lstChooseSkin.setSelectedValue(Singletons.getModel().getPreferences().getPref(FPref.UI_SKIN), true);
-        lstChooseSkin.ensureIndexIsVisible(lstChooseSkin.getSelectedIndex());
+        pnlPrefs.add(new FScrollPane(lstChooseSkin), "h 120px!, w 150px!, gap 10% 0 0 2%, wrap");
 
         pnlPrefs.add(new FLabel.Builder().text("Card Size").fontStyle(Font.BOLD).build(), regularConstraints);
         pnlPrefs.add(new NoteLabel("Size of cards in hand and playing field, when possible"), regularConstraints);
diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java
index 0858de24f00..f2b523f58ec 100644
--- a/src/main/java/forge/view/toolbox/FSkin.java
+++ b/src/main/java/forge/view/toolbox/FSkin.java
@@ -353,7 +353,7 @@ public enum FSkin {
         GuiUtils.checkEDT("FSkin$constructor", false);
 
         // Non-default (preferred) skin name and dir.
-        FSkin.preferredName = skinName;
+        FSkin.preferredName = skinName.toLowerCase().replace(' ', '_');
         FSkin.preferredDir = FILE_SKINS_DIR + preferredName + "/";
 
         if (FSkin.icons != null) { FSkin.icons.clear(); }
@@ -763,6 +763,8 @@ public enum FSkin {
         h0 = tempCoords[3];
 
         BufferedImage img = testPreferredSprite(s0);
+
+        if (s0 == Backgrounds.BG_TEXTURE) { System.out.println("asdf found it"); }
         FSkin.icons.put(s0, new ImageIcon(img.getSubimage(x0, y0, w0, h0)));
     }