From a1307555f61252d373b976334df8ea5385a44e97 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 10 Sep 2010 23:57:26 -0700
Subject: Added the dark and gemini skins to the skins panel (note: revert
 before skin selection is merged in)

---
 linden/indra/newview/llpanelskins.cpp              | 18 ++++++++++
 linden/indra/newview/llpanelskins.h                |  2 ++
 .../default/xui/en-us/panel_preferences_skins.xml  | 41 ++++++++++++++++++----
 3 files changed, 55 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index 26de356..831adc8 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -60,6 +60,8 @@ BOOL LLPanelSkins::postBuild()
 
 	getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this);
 	getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this);
+	getChild<LLButton>("dark_preview")->setClickedCallback(onClickDark, this);
+	getChild<LLButton>("gemini_preview")->setClickedCallback(onClickGemini, this);
 
 	refresh();
 	return TRUE;
@@ -108,3 +110,19 @@ void LLPanelSkins::onClickSilver(void* data)
 	gSavedSettings.setString("SkinCurrent", "silver");
 	self->getChild<LLRadioGroup>("skin_selection")->setValue("silver");
 }
+
+//static 
+void LLPanelSkins::onClickDark(void* data)
+{
+	LLPanelSkins* self = (LLPanelSkins*)data;
+	gSavedSettings.setString("SkinCurrent", "dark");
+	self->getChild<LLRadioGroup>("skin_selection")->setValue("dark");
+}
+
+//static 
+void LLPanelSkins::onClickGemini(void* data)
+{
+	LLPanelSkins* self = (LLPanelSkins*)data;
+	gSavedSettings.setString("SkinCurrent", "gemini");
+	self->getChild<LLRadioGroup>("skin_selection")->setValue("gemini");
+}
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
index 8fd282f..8dbd556 100644
--- a/linden/indra/newview/llpanelskins.h
+++ b/linden/indra/newview/llpanelskins.h
@@ -51,6 +51,8 @@ private:
 	static void onSelectSkin(LLUICtrl* ctrl, void* data);
 	static void onClickClassic(void* data);
 	static void onClickSilver(void* data);
+	static void onClickDark(void* data);
+	static void onClickGemini(void* data);
 
 private:
 	std::string mSkin;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index f0b789e..0611ce3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -2,21 +2,50 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Skins" left="102" mouse_opaque="true"
      name="Skins panel" width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="muting_text" v_pad="0" width="400">
-		Select a Skin (Requires Restart):
-	</text>
+    Select a skin (requires restart).
+  </text>
   <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
 	     name="skin_selection" width="480">
     <radio_item bottom="-20" height="20" left="0" name="default" width="480">
       Default
     </radio_item>
-    <radio_item bottom="-180" height="20" left="0" name="silver" width="480">
+    <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480">
       Silver
     </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
+      Dark
+    </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
+      Gemini
+    </radio_item>
   </radio_group>
-  <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/>
-  <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/>
+  
+  <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
+          image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png"
+          image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_silver.png" 
+          image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" 
+          image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
+          image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
+          image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
+          image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
+          image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="90"
+	     mouse_opaque="true" name="muting_text" v_pad="0" width="400">
+    (Please see the skin folders for information and credits)
+  </text>
 </panel>
+
-- 
cgit v1.1