From 30f1038351734b946be9a6f910e4e0eca82be1d4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 3 Jun 2020 16:12:11 +0300
Subject: [PATCH] SL-13359 #3 UI changes for panel object
---
indra/newview/llpanelobject.cpp | 12 ++---
indra/newview/llpanelobject.h | 6 +--
.../icons/ClipboardSmallMenu_Disabled.png | Bin 0 -> 218 bytes
.../textures/icons/ClipboardSmallMenu_Off.png | Bin 0 -> 217 bytes
.../icons/ClipboardSmallMenu_Press.png | Bin 0 -> 215 bytes
.../skins/default/textures/textures.xml | 4 ++
.../skins/default/xui/en/floater_tools.xml | 48 +++++++++++-------
7 files changed, 42 insertions(+), 28 deletions(-)
create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png
create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png
create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index e6bbac82474..6fa2da7bacd 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -120,7 +120,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Phantom Checkbox Ctrl",onCommitPhantom,this);
// Position
- mMenuPastePos = getChild<LLMenuButton>("paste_pos_btn");
+ mMenuClipboardPos = getChild<LLMenuButton>("clipboard_pos_btn");
mLabelPosition = getChild<LLTextBox>("label position");
mCtrlPosX = getChild<LLSpinCtrl>("Pos X");
childSetCommitCallback("Pos X",onCommitPosition,this);
@@ -130,7 +130,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Pos Z",onCommitPosition,this);
// Scale
- mMenuPasteSize = getChild<LLMenuButton>("paste_size_btn");
+ mMenuClipboardSize = getChild<LLMenuButton>("clipboard_size_btn");
mLabelSize = getChild<LLTextBox>("label size");
mCtrlScaleX = getChild<LLSpinCtrl>("Scale X");
childSetCommitCallback("Scale X",onCommitScale,this);
@@ -144,7 +144,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Scale Z",onCommitScale,this);
// Rotation
- mMenuPasteRot = getChild<LLMenuButton>("paste_rot_btn");
+ mMenuClipboardRot = getChild<LLMenuButton>("clipboard_rot_btn");
mLabelRotation = getChild<LLTextBox>("label rotation");
mCtrlRotX = getChild<LLSpinCtrl>("Rot X");
childSetCommitCallback("Rot X",onCommitRotation,this);
@@ -382,7 +382,7 @@ void LLPanelObject::getState( )
calcp->clearVar(LLCalc::Z_POS);
}
- mMenuPastePos->setEnabled(enable_move);
+ mMenuClipboardPos->setEnabled(enable_move);
mLabelPosition->setEnabled( enable_move );
mCtrlPosX->setEnabled(enable_move);
mCtrlPosY->setEnabled(enable_move);
@@ -408,7 +408,7 @@ void LLPanelObject::getState( )
calcp->setVar(LLCalc::Z_SCALE, 0.f);
}
- mMenuPasteSize->setEnabled(enable_scale);
+ mMenuClipboardSize->setEnabled(enable_scale);
mLabelSize->setEnabled( enable_scale );
mCtrlScaleX->setEnabled( enable_scale );
mCtrlScaleY->setEnabled( enable_scale );
@@ -440,7 +440,7 @@ void LLPanelObject::getState( )
calcp->clearVar(LLCalc::Z_ROT);
}
- mMenuPasteRot->setEnabled(enable_rotate);
+ mMenuClipboardRot->setEnabled(enable_rotate);
mLabelRotation->setEnabled( enable_rotate );
mCtrlRotX->setEnabled( enable_rotate );
mCtrlRotY->setEnabled( enable_rotate );
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index e8f8d0eb9ae..764c0d8af47 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -141,20 +141,20 @@ class LLPanelObject : public LLPanel
LLTextBox* mLabelRevolutions;
LLSpinCtrl* mSpinRevolutions;
- LLMenuButton* mMenuPastePos;
+ LLMenuButton* mMenuClipboardPos;
LLTextBox* mLabelPosition;
LLSpinCtrl* mCtrlPosX;
LLSpinCtrl* mCtrlPosY;
LLSpinCtrl* mCtrlPosZ;
- LLMenuButton* mMenuPasteSize;
+ LLMenuButton* mMenuClipboardSize;
LLTextBox* mLabelSize;
LLSpinCtrl* mCtrlScaleX;
LLSpinCtrl* mCtrlScaleY;
LLSpinCtrl* mCtrlScaleZ;
BOOL mSizeChanged;
- LLMenuButton* mMenuPasteRot;
+ LLMenuButton* mMenuClipboardRot;
LLTextBox* mLabelRotation;
LLSpinCtrl* mCtrlRotX;
LLSpinCtrl* mCtrlRotY;
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..63b4bd212739ec9a9c54b782beb31a7b70a63c73
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T;!3HGfUfpH|q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I6fP(p+E{-7<{!1q@avf0MaJ`$iG5gKG^c$vD
zZ6DjaJlBQsyLeV*lo%LuPHzcPS=M;QTkhn8X*Rm8Jku3Us$Kpkabm+O_nu#3b(?x_
z^h;|zo$`o(uX)Y+u#^MbYvZOePF+#r&E~^Wmdg9_^0$nzlZvZKy%QykKd*HHTFv0;
L>gTe~DWM4fkS9z8
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4200182b0cec4c7ff7aea2bf60232207640aad9f
GIT binary patch
literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T;!3HGfUfpH|q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I6fP#6RE{-7<{zoTX<UF9j<8rz0qN%a_^^)Eh
z&2D^#OD^@x?dg~^$FOTA>njtc>Tliw7A<Gr229~NX~n(&$%jiWPl}8}|6TaG#yW^y
z{EWt})$=xfny!43&v>SMqv37;!~~Yc`}PW=hw|F%Q`!D;ca~f$Xt9ipnQsTQnZeW5
K&t;ucLK6VPRZMmO
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png
new file mode 100644
index 0000000000000000000000000000000000000000..e12887f4891a587ad029d994844bb9c0ac766022
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T;!3HGfUfpH|q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I6fPy)mE{-7<{!1ruavf0MVaffUA)hHPxjR)k
zP-j_T!d^*}iVhE@nSpu7cvHfPHnO+wjsJCmE010CxYU`q|BN!i+V5_fEdGbtt4XNm
zq~OgpZSSL8*w$?5U2L>KXlmX`2jRxp$m2gU(@Xq+sx9SOFEZ(Af-TDmpuG&9u6{1-
HoD!M<Ygb3X
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7325d836d28..b7fa1e72f8e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -438,6 +438,10 @@ with the same filename but different name
<texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
<texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Disabled" file_name="icons/ClipboardSmallMenu_Disabled.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Off" file_name="icons/ClipboardSmallMenu_Off.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Press" file_name="icons/ClipboardSmallMenu_Press.png" preload="false" />
+
<texture name="OutboxStatus_Success" file_name="green_checkmark.png" preload="false" />
<texture name="OutboxStatus_Warning" file_name="icons/pop_up_caution.png" preload="false" />
<texture name="OutboxStatus_Error" file_name="red_x.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2397be6b610..7768f894b85 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1430,19 +1430,29 @@ even though the user gets a free copy.
tool_tip="Causes object to not collide with other objects or avatars"
top_pad="0"
width="123" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left_delta="0"
+ name="lod_tab_border"
+ top_pad="10"
+ width="95" />
<menu_button
menu_filename="menu_copy_paste_pos.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
- top_pad="10"
- name="paste_pos_btn"
+ left_delta="0"
+ top_pad="13"
+ name="clipboard_pos_btn"
tool_tip="Paste options"
width="19"/>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -1468,7 +1478,7 @@ even though the user gets a free copy.
min_val="-256"
name="Pos X"
text_enabled_color="1 0 0.3 .7"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
follows="left|top"
@@ -1503,13 +1513,13 @@ even though the user gets a free copy.
menu_filename="menu_copy_paste_size.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
left_delta="0"
- top_pad="10"
- name="paste_size_btn"
+ top_pad="13"
+ name="clipboard_size_btn"
tool_tip="Paste options"
width="19"/>
<text
@@ -1538,7 +1548,7 @@ even though the user gets a free copy.
min_val="0.01"
name="Scale X"
text_enabled_color="1 1 1 1"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
follows="left|top"
@@ -1574,13 +1584,13 @@ even though the user gets a free copy.
menu_filename="menu_copy_paste_rot.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
left_delta="0"
- top_pad="10"
- name="paste_rot_btn"
+ top_pad="13"
+ name="clipboard_rot_btn"
tool_tip="Paste options"
width="19"/>
<text
@@ -1610,7 +1620,7 @@ even though the user gets a free copy.
min_val="-9999"
name="Rot X"
text_enabled_color="1 1 1 1"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
decimal_digits="2"
--
GitLab