From bf3f77a3f092189b9756c9997eefcb8d46888064 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 1 Aug 2014 20:16:31 +0200
Subject: [PATCH] STORM-2052: Changed: Preview expand/hide buttons look and
overlay image to match the conversation floater style.
---
.../skins/default/xui/en/floater_snapshot.xml | 78 ++++++++++---------
.../xui/en/panel_postcard_settings.xml | 6 +-
.../xui/en/panel_snapshot_inventory.xml | 10 +--
.../default/xui/en/panel_snapshot_local.xml | 10 +--
.../default/xui/en/panel_snapshot_options.xml | 2 +-
.../xui/en/panel_snapshot_postcard.xml | 6 +-
.../default/xui/en/panel_snapshot_profile.xml | 8 +-
7 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 07bc9a199d9..bc4bf8fd8f3 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -80,28 +80,59 @@
</string>
<button
follows="left|top"
- height="18"
+ height="25"
image_overlay="Refresh_Off"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
image_overlay_alignment="left"
imgoverlay_label_space="5"
pad_bottom="0"
halign="left"
- image_selected="transparent.j2c"
- image_unselected="transparent.j2c"
layout="topleft"
- left="5"
+ left="10"
label="REFRESH"
name="new_snapshot_btn"
top_pad="26"
- width="195" />
+ width="167" />
+ <button
+ follows="left|top"
+ control_name="AdvanceSnapshot"
+ invisibility_control="AdvanceSnapshot"
+ height="25"
+ is_toggle="true"
+ layout="topleft"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_selected="Toolbar_Middle_Off"
+ image_unselected="Toolbar_Middle_Off"
+ image_overlay="Conv_toolbar_collapse"
+ name="retract_btn"
+ left_pad="1"
+ top_delta="0"
+ width="31" />
+ <button
+ follows="left|top"
+ control_name="AdvanceSnapshot"
+ visibility_control="AdvanceSnapshot"
+ height="25"
+ is_toggle="true"
+ layout="topleft"
+ image_overlay="Conv_toolbar_expand"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_selected="Toolbar_Middle_Off"
+ image_unselected="Toolbar_Middle_Off"
+ name="extend_btn"
+ left_delta="0"
+ top_delta="0"
+ width="31" />
<panel
height="154"
layout="topleft"
follows="top|left"
left="0"
name="advanced_options_panel"
- top_pad="0"
- width="200">
+ top_pad="-6"
+ width="210">
<view_border
bevel_style="in"
follows="left|top|right"
@@ -219,7 +250,7 @@
name="panel_container"
default_panel_name="panel_snapshot_options"
top_pad="10"
- width="205">
+ width="215">
<panel
class="llpanelsnapshotoptions"
filename="panel_snapshot_options.xml"
@@ -260,7 +291,7 @@
left="10"
layout="topleft"
name="status_hr"
- width="189"
+ width="199"
top_pad="-16"/>
<panel
background_visible="true"
@@ -273,7 +304,7 @@
left="10"
length="1"
name="succeeded_panel"
- width="188"
+ width="198"
top_pad="1"
type="string"
visible="false">
@@ -305,7 +336,7 @@
left="10"
length="1"
name="failed_panel"
- width="188"
+ width="198"
top_delta="0"
type="string"
visible="false">
@@ -413,29 +444,4 @@
width="50">
[SIZE] KB
</text>
- <button
- follows="left|top"
- control_name="AdvanceSnapshot"
- invisibility_control="AdvanceSnapshot"
- height="420"
- is_toggle="true"
- layout="topleft"
- image_overlay="Arrow_Right"
- name="retract_btn"
- left="203"
- top="25"
- width="8" />
- <button
- follows="left|top"
- control_name="AdvanceSnapshot"
- visibility_control="AdvanceSnapshot"
- height="420"
- is_toggle="true"
- layout="topleft"
- image_overlay="Arrow_Left"
- image_selected="PushButton_Off"
- name="extend_btn"
- left_delta="0"
- top_delta="0"
- width="8" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 907751280fb..525149d7eee 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -41,14 +41,14 @@
height="20"
increment="32"
label="Width x Height"
- label_width="80"
+ label_width="90"
layout="topleft"
left="5"
max_val="6016"
min_val="32"
name="postcard_snapshot_width"
top_pad="5"
- width="132" />
+ width="144" />
<spinner
allow_text_entry="false"
decimal_digits="0"
@@ -63,7 +63,7 @@
min_val="32"
name="postcard_snapshot_height"
top_delta="0"
- width="54" />
+ width="52" />
<check_box
top_pad="12"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index ea135340b09..5782ba7d047 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -75,14 +75,14 @@
height="20"
increment="32"
label="Width x Height"
- label_width="80"
+ label_width="90"
layout="topleft"
left="10"
max_val="6016"
min_val="32"
name="inventory_snapshot_width"
top_pad="7"
- width="134" />
+ width="144" />
<spinner
allow_text_entry="false"
decimal_digits="0"
@@ -115,7 +115,7 @@
length="1"
name="hint_lbl"
top_pad="6"
- width="190"
+ width="200"
type="string"
word_wrap="true">
Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
@@ -128,7 +128,7 @@
name="cancel_btn"
right="-5"
top="337"
- width="90">
+ width="97">
<button.commit_callback
function="Inventory.Cancel" />
</button>
@@ -140,7 +140,7 @@
left="10"
name="save_btn"
top_delta="0"
- width="95">
+ width="97">
<button.commit_callback
function="Inventory.Save" />
</button>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 4cc20a8b5a4..188c9f87078 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -86,14 +86,14 @@
height="20"
increment="32"
label="Width x Height"
- label_width="80"
+ label_width="90"
layout="topleft"
left="10"
max_val="6016"
min_val="32"
name="local_snapshot_width"
top_pad="7"
- width="134" />
+ width="144" />
<spinner
allow_text_entry="false"
decimal_digits="0"
@@ -164,7 +164,7 @@
max_val="100"
name="image_quality_slider"
top_pad="6"
- width="195" />
+ width="203" />
<button
follows="right|bottom"
height="23"
@@ -173,7 +173,7 @@
name="cancel_btn"
right="-5"
top="337"
- width="90">
+ width="97">
<button.commit_callback
function="Local.Cancel" />
</button>
@@ -186,7 +186,7 @@
name="save_btn"
tool_tip="Save image to a file"
top_delta="0"
- width="95">
+ width="97">
<flyout_button.item
label="Save"
name="save_item"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 2b26ee19c14..265217ef605 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -4,7 +4,7 @@
height="240"
layout="topleft"
name="panel_snapshot_options"
- width="198">
+ width="208">
<button
follows="left|top"
font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 01265523ea6..975b08be053 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -53,7 +53,7 @@
<tab_container
name="postcard_tabs"
tab_group="1"
- tab_min_width="92"
+ tab_min_width="97"
tab_height="21"
tab_position="top"
top_pad="7"
@@ -84,7 +84,7 @@
name="cancel_btn"
right="-6"
bottom="-20"
- width="90">
+ width="97">
<button.commit_callback
function="Postcard.Cancel" />
</button>
@@ -96,7 +96,7 @@
left="10"
name="send_btn"
top_delta="0"
- width="95">
+ width="97">
<button.commit_callback
function="Postcard.Send" />
</button>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 1b718e68269..d86cb929810 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -76,14 +76,14 @@
height="20"
increment="32"
label="Width x Height"
- label_width="80"
+ label_width="90"
layout="topleft"
left="10"
max_val="6016"
min_val="32"
name="profile_snapshot_width"
top_pad="7"
- width="134" />
+ width="144" />
<spinner
allow_text_entry="false"
decimal_digits="0"
@@ -148,7 +148,7 @@
name="cancel_btn"
right="-5"
top="337"
- width="90">
+ width="97">
<button.commit_callback
function="PostToProfile.Cancel" />
</button>
@@ -160,7 +160,7 @@
left="10"
name="post_btn"
top_delta="0"
- width="95">
+ width="97">
<button.commit_callback
function="PostToProfile.Send" />
</button>
--
GitLab