From 0a50de9b67973f88f608b3d4013a8453c73b8c77 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 24 Jun 2010 13:12:40 +0300
Subject: EXT-8007 FIXED updated heights and pads (wearables panel on panel
 outfit edit)

Reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/645/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 4abd7dceac..fde48d6ba3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -318,13 +318,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="442"
+             height="449"
              layout="topleft"
              left="0"
              mouse_opaque="false"
              name="folder_view"
-             top_pad="5"
-             width="310"
+             top_pad="0"
+             width="313"
              visible="false"/>
             <panel
              name="filtered_wearables_panel"
@@ -346,7 +346,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  layout="topleft"
                  follows="all"
                  multi_select="true"
-                 width="310"
+                 width="313"
                  height="449"
                  left="0"
                  top="0"/>
-- 
cgit v1.2.3


From c99bfaf6ed7bf280a3355c10630a66f5c5affbc1 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 24 Jun 2010 13:16:35 +0300
Subject: EXT-7961 FIXED Added possibility to show label on the back button in
 Edit Wearables panel.

Implemented behavior:
 * Normally Back button appears narrow without label
 * When wearable is changed - "Save" label is set and button gets wide. Left Border of Title is moved to the right.
   Note: "Save" label is shown without truncation in all languages, Title can be truncated with dots.
 * When changes are saved/reverted - label is removed, button shrinks, Title left border is moved to the its default place.
 * Added consistent tooltip for title (the same as a title).
 * Added tooltip for button: "Save changes if necessary and return back"

Details:
 * added getter for button's font
 * implemented derived from LLButton class for Back button to enable setting necessary label's padding in xml

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/636/

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml          |  6 +++---
 indra/newview/skins/default/xui/en/panel_edit_wearable.xml | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cf632c085f..043077db13 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -68,9 +68,9 @@ with the same filename but different name
 
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
 
-  <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" />
-  <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" />
-  <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" />
+  <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
+  <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
+  <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index fc1caca9e9..484617df34 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -131,19 +131,25 @@
      name="tattoo_desc_text">
         Tattoo:
     </string>
-    <button
+    <!-- Default width of the button should be to show it without label.
+     Button will be extedned in code to show whole label when wearable is being changed.
+    -->
+    <labeled_back_button
      follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
+     label="Save"
      left="11"
      name="back_btn"
+     pad_left="24"
+     tool_tip="Return to Edit Outfit"
      top="3"
      width="30" />
     <text
-     follows="top|left"
+     follows="top|left|right"
      font="SansSerifHugeBold"
      height="22"
      layout="topleft"
@@ -152,7 +158,8 @@
      text_color="white"
      top="3"
      value="Editing Shape"
-     width="270" />
+     use_ellipses="true"
+     width="274" />
     <panel
      background_opaque="true"
      background_visible="true"
-- 
cgit v1.2.3


From a0cb8a35dc1419ed18ae031dfb201c68a6b14f4b Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 24 Jun 2010 14:33:56 +0300
Subject: EXT-7962 FIXED Background color was Changed to back for layout panel
 "add_button_and_combobox".

Reviewed by Neal Orman https://codereview.productengine.com/secondlife/r/639/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index fde48d6ba3..10dea659af 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -190,7 +190,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                 <layout_panel
                  auto_resize="true" 
                  background_visible="true"
-                 bg_alpha_color="DkGray2"
+                 bg_alpha_color="Black"
                  layout="topleft"
                  height="154"
                  name="add_button_and_combobox"
-- 
cgit v1.2.3


From 259b033d6aca0333566f5dd5f6e03d9b954d1955 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 24 Jun 2010 14:59:49 +0300
Subject:  EXT-7905 FIX xml fix

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/632/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index e894fc8fb8..2fbe4510e1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -96,6 +96,7 @@ background_visible="true"
        follows="all"
        layout="topleft"
        auto_resize="true"
+       height="513"
        width="313">
    <accordion
      left="0"
@@ -105,6 +106,7 @@ background_visible="true"
      follows="all"
      layout="topleft"
      name="groups_accordion"
+     height="513"
      width="313">
          <accordion_tab
             expanded="true"
@@ -182,6 +184,7 @@ background_visible="true"
          top_pad="0"
    name="button_row"
    follows="bottom|left"
+   height="23"
    width="313">
    <button
     follows="bottom|left"
-- 
cgit v1.2.3


From f261af07b6b4e9381d9b7d652897d0965c6a426e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 24 Jun 2010 18:43:13 +0300
Subject: EXT-8046 FIXED changed background image of Shop btn (panel outfit
 edit)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/651/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 10dea659af..362fdd606a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -382,20 +382,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Right_Off"
+         image_name="Toolbar_Middle_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="246" />
+         width="250" />
         <button
          follows="bottom|right"
          height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
+         image_hover_unselected="Toolbar_Right_Over"
          image_overlay="Shop"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
+         image_selected="Toolbar_Right_Selected"
+         image_unselected="Toolbar_Right_Off"
          layout="topleft"
-         left_pad="0"
+         left_pad="1"
          name="shop_btn_1"
          top="1"
          width="31" />
@@ -468,21 +468,21 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Right_Off"
+         image_name="Toolbar_Middle_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="153" >
+         width="154" >
         </icon>
         <button
          follows="bottom|right"
          height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
+         image_hover_unselected="Toolbar_Right_Over"
          image_overlay="Shop"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
+         image_selected="Toolbar_Right_Selected"
+         image_unselected="Toolbar_Right_Off"
          layout="topleft"
-         left_pad="0"
+         left_pad="1"
          name="shop_btn_2"
          top="1"
          width="31" />
-- 
cgit v1.2.3