From fbabf867decdaffdbbeb56c23533a1bf7ddfe68c Mon Sep 17 00:00:00 2001
From: Wolf Posdorfer <mordredd666@gmail.com>
Date: Thu, 12 May 2011 07:41:01 +0000
Subject: [PATCH] configurable default look and feel for mac default is
 SystemLookAndFeel

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12373 b35dd754-fafc-0310-a699-88a17e54d16e
---
 src/java/org/jivesoftware/Spark.java          | 27 +++++++++++++------
 .../org/jivesoftware/resource/Default.java    |  1 +
 .../jivesoftware/resource/default.properties  |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/java/org/jivesoftware/Spark.java b/src/java/org/jivesoftware/Spark.java
index daddca8a..956664e2 100644
--- a/src/java/org/jivesoftware/Spark.java
+++ b/src/java/org/jivesoftware/Spark.java
@@ -221,19 +221,30 @@ public final class Spark {
         }
     }
 
+    private String getLookandFeel(LocalPreferences preferences) {
+	String result = "";
+
+	String whereToLook = isMac() ? Default.DEFAULT_LOOK_AND_FEEL_MAC
+		: Default.DEFAULT_LOOK_AND_FEEL;
+
+	if (!Default.getBoolean("LOOK_AND_FEEL_DISABLED")) {
+	    result = preferences.getLookAndFeel();
+	} else if (Default.getString(whereToLook).length() > 0) {
+	    result = Default.getString(whereToLook);
+	} else {
+	    result = UIManager.getSystemLookAndFeelClassName();
+	}
+
+	return result;
+
+    }
+    
     /**
      * Handles the Loading of the Look And Feel
      */
     private void loadLookAndFeel() {
 	final LocalPreferences preferences = SettingsManager.getLocalPreferences();
-	final String laf;
-	if (!Default.getBoolean("LOOK_AND_FEEL_DISABLED")) {
-	    laf = preferences.getLookAndFeel();
-	} else if (Default.getString(Default.DEFAULT_LOOK_AND_FEEL).length() > 0) {
-	    laf = Default.getString(Default.DEFAULT_LOOK_AND_FEEL);
-	} else {
-	    laf = UIManager.getSystemLookAndFeelClassName();
-	}
+	final String laf = getLookandFeel(preferences);
        
 	try {
 	    if (laf.toLowerCase().contains("substance")) {
diff --git a/src/java/org/jivesoftware/resource/Default.java b/src/java/org/jivesoftware/resource/Default.java
index cf33b849..3b2f32c2 100644
--- a/src/java/org/jivesoftware/resource/Default.java
+++ b/src/java/org/jivesoftware/resource/Default.java
@@ -62,6 +62,7 @@ public class Default {
     public static final String FRAME_IMAGE = "FRAME_IMAGE";
     public static final String LOOK_AND_FEEL_DISABLED = "LOOK_AND_FEEL_DISABLED";
     public static final String DEFAULT_LOOK_AND_FEEL = "DEFAULT_LOOK_AND_FEEL";
+    public static final String DEFAULT_LOOK_AND_FEEL_MAC = "DEFAULT_LOOK_AND_FEEL_MAC";
     public static final String INSTALL_PLUGINS_DISABLED = "INSTALL_PLUGINS_DISABLED";
     public static final String DEINSTALL_PLUGINS_DISABLED = "DEINSTALL_PLUGINS_DISABLED";
     public static final String ADVANCED_DISABLED = "ADVANCED_DISABLED";
diff --git a/src/java/org/jivesoftware/resource/default.properties b/src/java/org/jivesoftware/resource/default.properties
index ae41ce8d..7a936341 100644
--- a/src/java/org/jivesoftware/resource/default.properties
+++ b/src/java/org/jivesoftware/resource/default.properties
@@ -124,6 +124,7 @@ CHANGE_COLORS_DISABLED =
 # Default Spark skin is com.jtattoo.plaf.luna.LunaLookAndFeel
 # other nice skin is org.jvnet.substance.skin.SubstanceBusinessBlueSteelLookAndFeel
 DEFAULT_LOOK_AND_FEEL = com.jtattoo.plaf.luna.LunaLookAndFeel
+DEFAULT_LOOK_AND_FEEL_MAC = 
 # in JTatto Menubars can have Texts, default is empty
 MENUBAR_TEXT =