From e367e2efc23321d94ec4a4ae0264f885b4f0333b Mon Sep 17 00:00:00 2001 From: angela Date: Mon, 23 Nov 2009 13:52:40 +0800 Subject: EXT-2159 Create Vertical Slider to use for zoom in / out controls in view --- indra/llui/llsliderctrl.cpp | 3 ++- indra/llui/llsliderctrl.h | 4 +++- .../newview/skins/default/xui/en/floater_test_slider.xml | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index ed22c0a47f..ac35bc7992 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -122,7 +122,8 @@ LLSliderCtrl::LLSliderCtrl(const LLSliderCtrl::Params& p) slider_p.min_value.setIfNotProvided(p.min_value); slider_p.max_value.setIfNotProvided(p.max_value); slider_p.increment.setIfNotProvided(p.increment); - + slider_p.orientation.setIfNotProvided(p.orientation); + slider_p.commit_callback.function(&LLSliderCtrl::onSliderCommit); slider_p.control_name(p.control_name); slider_p.mouse_down_callback( p.mouse_down_callback ); diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h index 4a1574d502..c425849782 100644 --- a/indra/llui/llsliderctrl.h +++ b/indra/llui/llsliderctrl.h @@ -46,6 +46,7 @@ class LLSliderCtrl : public LLF32UICtrl public: struct Params : public LLInitParam::Block { + Optional orientation; Optional label_width; Optional text_width; Optional show_text; @@ -78,7 +79,8 @@ public: value_text("value_text"), slider_label("slider_label"), mouse_down_callback("mouse_down_callback"), - mouse_up_callback("mouse_up_callback") + mouse_up_callback("mouse_up_callback"), + orientation("orientation", std::string ("horizontal")) {} }; protected: diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 86ff82e01f..85d8bb2bb1 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -2,7 +2,7 @@ + -- cgit v1.2.3 From dd9b1f819de025f1a6caa37cfbd4fd3394f9fa9e Mon Sep 17 00:00:00 2001 From: angela Date: Mon, 23 Nov 2009 17:33:03 +0800 Subject: EXT-2297 Functionality Loss - Ability to copy (control+c) residents name from their profile & local chat --- indra/newview/llchathistory.cpp | 3 ++- indra/newview/llpanelprofileview.cpp | 3 ++- .../skins/default/xui/en/panel_chat_header.xml | 23 +++++++++++----------- .../skins/default/xui/en/panel_profile_view.xml | 7 ++++--- 4 files changed, 20 insertions(+), 16 deletions(-) (limited to 'indra') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 4ce3b50ed5..a95234099c 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -34,6 +34,7 @@ #include "llchathistory.h" #include "llpanel.h" #include "lltextbox.h" +#include "lltexteditor.h" #include "lluictrlfactory.h" #include "llscrollcontainer.h" #include "llavatariconctrl.h" @@ -185,7 +186,7 @@ public: mSourceType = CHAT_SOURCE_SYSTEM; } - LLTextBox* userName = getChild("user_name"); + LLTextEditor* userName = getChild("user_name"); LLUIColor color = style_params.color; userName->setReadOnlyColor(color); diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index d4ab5013f9..c7c2484be3 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -43,6 +43,7 @@ #include "llpanelpicks.h" #include "llpanelprofile.h" #include "llsidetraypanelcontainer.h" +#include "lltexteditor.h" static LLRegisterPanelClassWrapper t_panel_target_profile("panel_profile_view"); @@ -190,7 +191,7 @@ void LLPanelProfileView::processOnlineStatus(bool online) void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group) { llassert(getAvatarId() == id); - getChild("user_name", FALSE)->setValue(first_name + " " + last_name); + getChild("user_name", FALSE)->setValue(first_name + " " + last_name); } void LLPanelProfileView::togglePanel(LLPanel* panel) diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 7a3eae35a9..da175a75cd 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -1,15 +1,15 @@ - - + top="5" + use_ellipses="true" + value="Erica Vader" /> - Date: Mon, 23 Nov 2009 10:15:00 -0800 Subject: Allow large paramblocks by converting mEnclosingBlockOffset to U16, needed for location_input.xml --- indra/llxuixml/llinitparam.cpp | 2 +- indra/llxuixml/llinitparam.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 318a0348a2..4c050844f8 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -46,7 +46,7 @@ namespace LLInitParam { const U8* my_addr = reinterpret_cast(this); const U8* block_addr = reinterpret_cast(enclosing_block); - mEnclosingBlockOffset = (S16)(block_addr - my_addr); + mEnclosingBlockOffset = (U16)(my_addr - block_addr); } // diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 9fb464ca7b..b563c6fe51 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -300,14 +300,14 @@ namespace LLInitParam const U8* my_addr = reinterpret_cast(this); // get address of enclosing BLOCK class using stored offset to enclosing BaseBlock class return *const_cast( - reinterpret_cast(my_addr + (ptrdiff_t)mEnclosingBlockOffset)); + reinterpret_cast(my_addr - (ptrdiff_t)mEnclosingBlockOffset)); } private: friend class BaseBlock; bool mIsProvided; - S16 mEnclosingBlockOffset; + U16 mEnclosingBlockOffset; }; // various callbacks and constraints associated with an individual param -- cgit v1.2.3 From dc6216e77e84369450d3a9e2269bf4d03436a23d Mon Sep 17 00:00:00 2001 From: "Justin C. Rounds (Chuck)" Date: Mon, 23 Nov 2009 13:56:01 -0500 Subject: "Fit and finish" issues with bottom bar. See comments in JIRAs for details. http://jira.secondlife.com/browse/EXT-2537 http://jira.secondlife.com/browse/EXT-2352 --- .../default/textures/bottomtray/Notices_Unread.png | Bin 333 -> 331 bytes indra/newview/skins/default/textures/textures.xml | 11 ++++- .../default/textures/widgets/Arrow_Small_Left.png | Bin 0 -> 223 bytes .../default/textures/widgets/Arrow_Small_Right.png | Bin 0 -> 217 bytes .../default/textures/widgets/Arrow_Small_Up.png | Bin 0 -> 382 bytes .../widgets/ComboButton_Up_On_Selected.png | Bin 0 -> 482 bytes .../skins/default/xui/en/panel_bottomtray.xml | 53 ++++++++++++++------- .../skins/default/xui/en/panel_nearby_chat_bar.xml | 12 +++-- .../default/xui/en/widgets/gesture_combo_box.xml | 4 +- .../skins/default/xui/en/widgets/talk_button.xml | 11 ++++- 10 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png create mode 100644 indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png (limited to 'indra') diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png index 98f1f04b9a..aa3898ca99 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png and b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f4a239be62..8469cf9e2d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -50,8 +50,12 @@ with the same filename but different name - - + + + + + + @@ -120,6 +124,7 @@ with the same filename but different name + @@ -439,6 +444,7 @@ with the same filename but different name + @@ -453,6 +459,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png new file mode 100644 index 0000000000..2d624c3779 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png differ diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png new file mode 100644 index 0000000000..91c03c426e Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png differ diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png new file mode 100644 index 0000000000..38aac0e5ca Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png new file mode 100644 index 0000000000..fd1d11dd0b Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png differ diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 00711a29e0..a8e659259e 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -46,7 +46,7 @@ left="0" min_height="23" width="310" - top="0" + top="4" min_width="192" name="chat_bar" user_resize="false" @@ -58,9 +58,9 @@ height="28" layout="topleft" min_height="28" - width="104" + width="100" top_delta="0" - min_width="104" + min_width="100" name="speak_panel" user_resize="false">