aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-10 23:57:26 -0700
committerMcCabe Maxsted2010-09-10 23:57:26 -0700
commita1307555f61252d373b976334df8ea5385a44e97 (patch)
tree47be810cc0109792bdb4281a8caf6acf74188a82 /linden
parentUpdated artwork package to include dark and gemini skins (also updated window... (diff)
downloadmeta-impy-a1307555f61252d373b976334df8ea5385a44e97.zip
meta-impy-a1307555f61252d373b976334df8ea5385a44e97.tar.gz
meta-impy-a1307555f61252d373b976334df8ea5385a44e97.tar.bz2
meta-impy-a1307555f61252d373b976334df8ea5385a44e97.tar.xz
Added the dark and gemini skins to the skins panel (note: revert before skin selection is merged in)
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llpanelskins.cpp18
-rw-r--r--linden/indra/newview/llpanelskins.h2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml41
3 files changed, 55 insertions, 6 deletions
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()
60 60
61 getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this); 61 getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this);
62 getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this); 62 getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this);
63 getChild<LLButton>("dark_preview")->setClickedCallback(onClickDark, this);
64 getChild<LLButton>("gemini_preview")->setClickedCallback(onClickGemini, this);
63 65
64 refresh(); 66 refresh();
65 return TRUE; 67 return TRUE;
@@ -108,3 +110,19 @@ void LLPanelSkins::onClickSilver(void* data)
108 gSavedSettings.setString("SkinCurrent", "silver"); 110 gSavedSettings.setString("SkinCurrent", "silver");
109 self->getChild<LLRadioGroup>("skin_selection")->setValue("silver"); 111 self->getChild<LLRadioGroup>("skin_selection")->setValue("silver");
110} 112}
113
114//static
115void LLPanelSkins::onClickDark(void* data)
116{
117 LLPanelSkins* self = (LLPanelSkins*)data;
118 gSavedSettings.setString("SkinCurrent", "dark");
119 self->getChild<LLRadioGroup>("skin_selection")->setValue("dark");
120}
121
122//static
123void LLPanelSkins::onClickGemini(void* data)
124{
125 LLPanelSkins* self = (LLPanelSkins*)data;
126 gSavedSettings.setString("SkinCurrent", "gemini");
127 self->getChild<LLRadioGroup>("skin_selection")->setValue("gemini");
128}
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:
51 static void onSelectSkin(LLUICtrl* ctrl, void* data); 51 static void onSelectSkin(LLUICtrl* ctrl, void* data);
52 static void onClickClassic(void* data); 52 static void onClickClassic(void* data);
53 static void onClickSilver(void* data); 53 static void onClickSilver(void* data);
54 static void onClickDark(void* data);
55 static void onClickGemini(void* data);
54 56
55private: 57private:
56 std::string mSkin; 58 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 @@
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Skins" left="102" mouse_opaque="true" 3 height="408" label="Skins" left="102" mouse_opaque="true"
4 name="Skins panel" width="517"> 4 name="Skins panel" width="517">
5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" 6 bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
7 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 7 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
8 mouse_opaque="true" name="muting_text" v_pad="0" width="400"> 8 mouse_opaque="true" name="muting_text" v_pad="0" width="400">
9 Select a Skin (Requires Restart): 9 Select a skin (requires restart).
10 </text> 10 </text>
11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12" 11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
12 name="skin_selection" width="480"> 12 name="skin_selection" width="480">
13 <radio_item bottom="-20" height="20" left="0" name="default" width="480"> 13 <radio_item bottom="-20" height="20" left="0" name="default" width="480">
14 Default 14 Default
15 </radio_item> 15 </radio_item>
16 <radio_item bottom="-180" height="20" left="0" name="silver" width="480"> 16 <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480">
17 Silver 17 Silver
18 </radio_item> 18 </radio_item>
19 <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
20 Dark
21 </radio_item>
22 <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
23 Gemini
24 </radio_item>
19 </radio_group> 25 </radio_group>
20 <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"/> 26
21 <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"/> 27 <button left="130" bottom="-125" width="216" height="95" name="classic_preview"
28 scale_image="true" label="" image_selected="skin_thumbnail_default.png"
29 image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png"
30 image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
31 <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview"
32 scale_image="true" label="" image_selected="skin_thumbnail_silver.png"
33 image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png"
34 image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
35 <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
36 scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
37 image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
38 image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
39 <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview"
40 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png"
41 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png"
42 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
43
44 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
45 bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
46 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="90"
47 mouse_opaque="true" name="muting_text" v_pad="0" width="400">
48 (Please see the skin folders for information and credits)
49 </text>
22</panel> 50</panel>
51
generated by cgit v1.1 at 2025-03-28 04:41:21 +0000