From fb20a7281d8e5107f83e7439df054ccd3733d0c4 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 10 Nov 2009 17:12:07 -0800 Subject: EXT-2338 Move button tooltips to strings the viewer translation tool can parse. Also moved mSpeakBtn from llnearbychatbar to llbottomtray, because the bottom tray is its parent. --- indra/newview/llspeakbutton.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llspeakbutton.h') diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h index e213c562dd..02c8ab3890 100644 --- a/indra/newview/llspeakbutton.h +++ b/indra/newview/llspeakbutton.h @@ -62,6 +62,11 @@ public: /*virtual*/ ~LLSpeakButton(); /*virtual*/ void draw(); + // *HACK: Need to put tooltips in a translatable location, + // the panel that contains this button. + void setSpeakToolTip(const std::string& msg); + void setShowToolTip(const std::string& msg); + protected: friend class LLUICtrlFactory; LLSpeakButton(const Params& p); -- cgit v1.2.3 From 91fdbd92c8e93e1676ba501bbc91ee56d38255c3 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 20 Nov 2009 14:39:27 +0200 Subject: Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when width of window is 800px) - updated resize behavior to shrink Snapshot button: only speaker is shown in this case. - updated LLSpeakButton to hide/show its labels - updated talk_button widget (talk_button.xml) to have correct follows attributes - also fixed bug with calculating necessary updates for children while extending bottom tray --HG-- branch : product-engine --- indra/newview/llspeakbutton.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/llspeakbutton.h') diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h index 02c8ab3890..424ee5357a 100644 --- a/indra/newview/llspeakbutton.h +++ b/indra/newview/llspeakbutton.h @@ -67,6 +67,18 @@ public: void setSpeakToolTip(const std::string& msg); void setShowToolTip(const std::string& msg); + /** + * Sets visibility of speak button's label according to passed parameter. + * + * It removes label/selected label if "visible" is false and restores otherwise. + * + * @param visible if true - show label and selected label. + * + * @see mSpeakBtn + * @see LLBottomTray::processShrinkButtons() + */ + void setLabelVisible(bool visible); + protected: friend class LLUICtrlFactory; LLSpeakButton(const Params& p); -- cgit v1.2.3