From 5f237f8559da76d3c2fd6251b324360fcf25515f Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 18 Dec 2009 14:01:18 +0200 Subject: Implemented major sub-task EXT-3525 (Context menu for Notifications well) --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 736b1b9fb4..5f2c2ba501 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -147,6 +147,9 @@ public: // Operating with items void addItem(LLSysWellItem::Params p); + // Closes all notifications and removes them from the Notification Well + void closeAll(); + protected: /*virtual*/ const std::string& getAnchorViewName() { return NOTIFICATION_WELL_ANCHOR_NAME; } -- cgit v1.2.3 From f3a92bfc17762c7f0ade6b93f27d7a499031e463 Mon Sep 17 00:00:00 2001 From: Dmitry Oleshko Date: Fri, 18 Dec 2009 15:58:37 +0200 Subject: implemented major task (EXT-3354) Add "unread message" counters for IM sessions in the IM well window - IM Well Window's chiclets now have counters and count IMs from 1 to "99+" - IM Well Window's items can resize on appearance of chiclet's counter or speaker indicator --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 5f2c2ba501..0b95c8decd 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -223,6 +223,8 @@ private: void onMouseLeave(S32 x, S32 y, MASK mask); BOOL handleMouseDown(S32 x, S32 y, MASK mask); private: + static const S32 CHICLET_HPAD = 10; + void onChicletSizeChanged(LLChiclet* ctrl, const LLSD& param); void onClosePanel(); public: LLIMChiclet* mChiclet; -- cgit v1.2.3 From 216726dd23ef925f5bd6cccbdeb09cfca5400a7a Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 18 Dec 2009 18:41:14 +0200 Subject: Implemented major sub-task EXT-3524 (Context menu for IM well) --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 0b95c8decd..6cfa25b84d 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -199,6 +199,8 @@ public: void addIMRow(const LLUUID& session_id); bool hasIMRow(const LLUUID& session_id); + void closeAll(); + protected: /*virtual*/ const std::string& getAnchorViewName() { return IM_WELL_ANCHOR_NAME; } @@ -208,7 +210,8 @@ private: void addIMRow(const LLUUID& sessionId, S32 chicletCounter, const std::string& name, const LLUUID& otherParticipantId); void delIMRow(const LLUUID& sessionId); - + bool confirmCloseAll(const LLSD& notification, const LLSD& response); + void closeAllImpl(); /** * Scrolling row panel. -- cgit v1.2.3 From eb4f026181c83dfd2106cce3ab1fde6a3fe60ec3 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Mon, 21 Dec 2009 15:18:48 +0200 Subject: implemented EXT-3594 IM Chiclet should be created for voice calls also --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 6cfa25b84d..7030f4b427 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -191,8 +191,6 @@ public: /*virtual*/ void sessionRemoved(const LLUUID& session_id); /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); - void onNewIM(const LLSD& data); - void addObjectRow(const LLUUID& object_id, bool new_message = false); void removeObjectRow(const LLUUID& object_id); -- cgit v1.2.3 From 5f44b76e22162ce37c714519a3d0c96b0ce24bf3 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 28 Dec 2009 15:56:52 +0200 Subject: =?UTF-8?q?fixed=20EXT-3428=20=E2=80=9CUndocked=20IM=20well=20clos?= =?UTF-8?q?es=20after=20click=20on=20game=20area=E2=80=9D,=20made=20LLIMWe?= =?UTF-8?q?llWindow=20and=20LLNotificationWellWindow=20as=20dockable=20tra?= =?UTF-8?q?nsient=20floaters;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 7030f4b427..d21d095d1a 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -35,7 +35,7 @@ #include "llsyswellitem.h" -#include "lldockablefloater.h" +#include "lltransientdockablefloater.h" #include "llbutton.h" #include "llscreenchannel.h" #include "llscrollcontainer.h" @@ -50,7 +50,7 @@ class LLScriptChiclet; class LLSysWellChiclet; -class LLSysWellWindow : public LLDockableFloater +class LLSysWellWindow : public LLTransientDockableFloater { public: LLSysWellWindow(const LLSD& key); @@ -72,11 +72,6 @@ public: // override LLFloater's minimization according to EXT-1216 /*virtual*/ void setMinimized(BOOL minimize); - /** - * Hides window when user clicks away from it (EXT-3084) - */ - /*virtual*/ void onFocusLost(); - void onStartUpToastClick(S32 x, S32 y, MASK mask); void setSysWellChiclet(LLSysWellChiclet* chiclet) { mSysWellChiclet = chiclet; } -- cgit v1.2.3 From 8da7889400a9dfeeefc5b9d7f9fb72aa093ae029 Mon Sep 17 00:00:00 2001 From: Denis Serdjuk Date: Wed, 30 Dec 2009 17:37:45 +0200 Subject: fixed bug EXT-3722 New IM & Notification buttons can be clicked on, even when there's nothing to see Note: It was decided to handle an enabling of buttons from syswellwindow according to his empty state --HG-- branch : product-engine --- indra/newview/llsyswellwindow.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llsyswellwindow.h') diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index d21d095d1a..833e4dd504 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -62,7 +62,6 @@ public: bool isWindowEmpty(); // Operating with items - void clear( void ); void removeItemByID(const LLUUID& id); // Operating with outfit @@ -74,7 +73,7 @@ public: void onStartUpToastClick(S32 x, S32 y, MASK mask); - void setSysWellChiclet(LLSysWellChiclet* chiclet) { mSysWellChiclet = chiclet; } + void setSysWellChiclet(LLSysWellChiclet* chiclet); // size constants for the window and for its elements static const S32 MAX_WINDOW_HEIGHT = 200; -- cgit v1.2.3