From 9108354e9d39d93dadbad34ff5ba7ecb7abc7bf9 Mon Sep 17 00:00:00 2001 From: Cho Date: Thu, 5 Dec 2013 00:28:28 +0000 Subject: Renamed floater_social to floater_facebook for ACME-1205 --- indra/newview/llfloaterfacebook.h | 167 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 indra/newview/llfloaterfacebook.h (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h new file mode 100644 index 0000000000..ab6420264b --- /dev/null +++ b/indra/newview/llfloaterfacebook.h @@ -0,0 +1,167 @@ +/** +* @file llfloaterfacebook.h +* @brief Header file for llfloaterfacebook +* @author Gilbert@lindenlab.com +* +* $LicenseInfo:firstyear=2013&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2013, Linden Research, Inc. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; +* version 2.1 of the License only. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* +* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA +* $/LicenseInfo$ +*/ +#ifndef LL_LLFLOATERFACEBOOK_H +#define LL_LLFLOATERFACEBOOK_H + +#include "llfloater.h" +#include "lltextbox.h" +#include "llviewertexture.h" + +class LLIconCtrl; +class LLCheckBoxCtrl; +class LLSnapshotLivePreview; + +class LLFacebookStatusPanel : public LLPanel +{ +public: + LLFacebookStatusPanel(); + BOOL postBuild(); + void draw(); + void onSend(); + bool onFacebookConnectStateChange(const LLSD& data); + + void sendStatus(); + void clearAndClose(); + +private: + LLUICtrl* mMessageTextEditor; + LLUICtrl* mPostButton; + LLUICtrl* mCancelButton; +}; + +class LLFacebookPhotoPanel : public LLPanel +{ +public: + LLFacebookPhotoPanel(); + ~LLFacebookPhotoPanel(); + + BOOL postBuild(); + void draw(); + + LLSnapshotLivePreview* getPreviewView(); + void onVisibilityChange(const LLSD& new_visibility); + void onClickNewSnapshot(); + void onSend(); + bool onFacebookConnectStateChange(const LLSD& data); + + void sendPhoto(); + void clearAndClose(); + + void updateControls(); + void updateResolution(BOOL do_update); + void checkAspectRatio(S32 index); + LLUICtrl* getRefreshBtn(); + +private: + LLHandle mPreviewHandle; + + LLUICtrl * mSnapshotPanel; + LLUICtrl * mResolutionComboBox; + LLUICtrl * mRefreshBtn; + LLUICtrl * mWorkingLabel; + LLUICtrl * mThumbnailPlaceholder; + LLUICtrl * mCaptionTextBox; + LLUICtrl * mLocationCheckbox; + LLUICtrl * mPostButton; + LLUICtrl* mCancelButton; +}; + +class LLFacebookCheckinPanel : public LLPanel +{ +public: + LLFacebookCheckinPanel(); + BOOL postBuild(); + void draw(); + void onSend(); + bool onFacebookConnectStateChange(const LLSD& data); + + void sendCheckin(); + void clearAndClose(); + +private: + std::string mMapUrl; + LLPointer mMapTexture; + LLUICtrl* mPostButton; + LLUICtrl* mCancelButton; + LLUICtrl* mMessageTextEditor; + LLUICtrl* mMapLoadingIndicator; + LLIconCtrl* mMapPlaceholder; + LLIconCtrl* mMapDefault; + LLCheckBoxCtrl* mMapCheckBox; + bool mReloadingMapTexture; +}; + +class LLFacebookAccountPanel : public LLPanel +{ +public: + LLFacebookAccountPanel(); + BOOL postBuild(); + void draw(); + +private: + void onVisibilityChange(const LLSD& new_visibility); + bool onFacebookConnectStateChange(const LLSD& data); + bool onFacebookConnectInfoChange(); + void onConnect(); + void onUseAnotherAccount(); + void onDisconnect(); + + void showConnectButton(); + void hideConnectButton(); + void showDisconnectedLayout(); + void showConnectedLayout(); + + LLTextBox * mAccountCaptionLabel; + LLTextBox * mAccountNameLabel; + LLUICtrl * mPanelButtons; + LLUICtrl * mConnectButton; + LLUICtrl * mDisconnectButton; +}; + + +class LLFloaterFacebook : public LLFloater +{ +public: + LLFloaterFacebook(const LLSD& key); + BOOL postBuild(); + void draw(); + void onCancel(); + + void showPhotoPanel(); + + static void preUpdate(); + static void postUpdate(); + +private: + LLFacebookPhotoPanel* mFacebookPhotoPanel; + LLTextBox* mStatusErrorText; + LLTextBox* mStatusLoadingText; + LLUICtrl* mStatusLoadingIndicator; +}; + +#endif // LL_LLFLOATERFACEBOOK_H + -- cgit v1.2.3 From 26a6668fb23ce289b67154ba3e3ac35f25a54978 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 11 Dec 2013 21:46:17 -0800 Subject: ACME-1233 : Set the quality for jpeg images send to Facebook correctly --- indra/newview/llfloaterfacebook.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index ab6420264b..0776f24034 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -88,6 +88,8 @@ private: LLUICtrl * mLocationCheckbox; LLUICtrl * mPostButton; LLUICtrl* mCancelButton; + + S32 mQuality; // Compression quality }; class LLFacebookCheckinPanel : public LLPanel -- cgit v1.2.3 From f7a90c680a007775efe0f8556c6712a08e489aab Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 28 Jan 2014 19:00:46 -0800 Subject: ACME-1275 : Implemented filters to the Twitter and Facebook panels --- indra/newview/llfloaterfacebook.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 0776f24034..04d9971332 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -81,6 +81,7 @@ private: LLUICtrl * mSnapshotPanel; LLUICtrl * mResolutionComboBox; + LLUICtrl * mFilterComboBox; LLUICtrl * mRefreshBtn; LLUICtrl * mWorkingLabel; LLUICtrl * mThumbnailPlaceholder; -- cgit v1.2.3 From e970fa7f1ce9190b8a26e72bebbcceed04fb7494 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 30 Jan 2014 18:53:05 -0800 Subject: ACME-1293 : Use notification to signal from the snapshot panel to its container rather than grabbing global instances, use unique control_name for widgets, fix Post button visibility on Twitter --- indra/newview/llfloaterfacebook.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 04d9971332..4361dfa628 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -66,6 +66,7 @@ public: void onVisibilityChange(const LLSD& new_visibility); void onClickNewSnapshot(); void onSend(); + S32 notify(const LLSD& info); bool onFacebookConnectStateChange(const LLSD& data); void sendPhoto(); @@ -156,9 +157,6 @@ public: void showPhotoPanel(); - static void preUpdate(); - static void postUpdate(); - private: LLFacebookPhotoPanel* mFacebookPhotoPanel; LLTextBox* mStatusErrorText; -- cgit v1.2.3 From ac9cf045ecc14f8c650773f3fff7bc338fa468d0 Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 21 Feb 2014 02:06:03 +0000 Subject: Added Friends tab to Facebook floater for ACME-1325 --- indra/newview/llfloaterfacebook.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 4361dfa628..20c401d0c1 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -34,6 +34,7 @@ class LLIconCtrl; class LLCheckBoxCtrl; class LLSnapshotLivePreview; +class LLAvatarList; class LLFacebookStatusPanel : public LLPanel { @@ -119,6 +120,20 @@ private: bool mReloadingMapTexture; }; +class LLFacebookFriendsPanel : public LLPanel +{ +public: + LLFacebookFriendsPanel(); + BOOL postBuild(); + +private: + bool updateSuggestedFriendList(); + void updateFacebookList(bool visible); + bool onConnectedToFacebook(const LLSD& data); + + LLAvatarList* mSuggestedFriends; +}; + class LLFacebookAccountPanel : public LLPanel { public: @@ -146,7 +161,6 @@ private: LLUICtrl * mDisconnectButton; }; - class LLFloaterFacebook : public LLFloater { public: -- cgit v1.2.3 From 279e9b0743dfd86f9b40f693349aae9fc1268d35 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 27 Feb 2014 13:04:23 -0800 Subject: ACME-1327 : Implemented preview in all SL Share panels, switch ownership of preview to focused SL Share photo panel --- indra/newview/llfloaterfacebook.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 20c401d0c1..08c5f24e4d 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -35,6 +35,7 @@ class LLIconCtrl; class LLCheckBoxCtrl; class LLSnapshotLivePreview; class LLAvatarList; +class LLFloaterBigPreview; class LLFacebookStatusPanel : public LLPanel { @@ -65,6 +66,7 @@ public: LLSnapshotLivePreview* getPreviewView(); void onVisibilityChange(const LLSD& new_visibility); + void onClickBigPreview(); void onClickNewSnapshot(); void onSend(); S32 notify(const LLSD& info); @@ -79,6 +81,9 @@ public: LLUICtrl* getRefreshBtn(); private: + bool isPreviewVisible(); + void attachPreview(); + LLHandle mPreviewHandle; LLUICtrl * mSnapshotPanel; @@ -90,7 +95,10 @@ private: LLUICtrl * mCaptionTextBox; LLUICtrl * mLocationCheckbox; LLUICtrl * mPostButton; - LLUICtrl* mCancelButton; + LLUICtrl * mCancelButton; + LLButton * mBtnPreview; + + LLFloaterBigPreview * mBigPreviewFloater; S32 mQuality; // Compression quality }; @@ -167,6 +175,7 @@ public: LLFloaterFacebook(const LLSD& key); BOOL postBuild(); void draw(); + void onClose(bool app_quitting); void onCancel(); void showPhotoPanel(); -- cgit v1.2.3 From df26597c0d2ddfcc259dd1b8e838164cbd9ff02a Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 28 Feb 2014 01:49:58 +0000 Subject: Added FB+SL friends list to Friends tab in Facebook floater for ACME-1334 --- indra/newview/llfloaterfacebook.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 08c5f24e4d..c13d64a86a 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -139,6 +139,7 @@ private: void updateFacebookList(bool visible); bool onConnectedToFacebook(const LLSD& data); + LLAvatarList* mSecondLifeFriends; LLAvatarList* mSuggestedFriends; }; -- cgit v1.2.3 From 261e728327ce72bc582f41cbb231035f0ee1f9b1 Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 28 Feb 2014 02:08:29 +0000 Subject: Made lists only visible when populated in Friends tab in Facebook floater for ACME-1334 --- indra/newview/llfloaterfacebook.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index c13d64a86a..16c9e97ff0 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -136,6 +136,7 @@ public: private: bool updateSuggestedFriendList(); + void showFriendsAccordionsIfNeeded(); void updateFacebookList(bool visible); bool onConnectedToFacebook(const LLSD& data); -- cgit v1.2.3 From 209ed601dd6cf9af66eb44d71ab0d28ec94fb81e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 28 Feb 2014 13:54:22 -0800 Subject: ACME-1332 : Update the friends lists in the FB Friends panel when friend status (add/remove) changes --- indra/newview/llfloaterfacebook.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 16c9e97ff0..39264c8bff 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -27,6 +27,7 @@ #ifndef LL_LLFLOATERFACEBOOK_H #define LL_LLFLOATERFACEBOOK_H +#include "llcallingcard.h" #include "llfloater.h" #include "lltextbox.h" #include "llviewertexture.h" @@ -128,11 +129,13 @@ private: bool mReloadingMapTexture; }; -class LLFacebookFriendsPanel : public LLPanel +class LLFacebookFriendsPanel : public LLPanel, public LLFriendObserver { public: LLFacebookFriendsPanel(); + ~LLFacebookFriendsPanel(); BOOL postBuild(); + virtual void changed(U32 mask); private: bool updateSuggestedFriendList(); -- cgit v1.2.3 From 0fb59172f7c8c2ad2d3f4f77e14108fc16accdc7 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 28 Feb 2014 16:10:27 -0800 Subject: ACME-1335, ACME-1336 : Add info text to the Friends tab in Facebook when no friends are visible --- indra/newview/llfloaterfacebook.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 39264c8bff..8eff46412d 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -143,6 +143,7 @@ private: void updateFacebookList(bool visible); bool onConnectedToFacebook(const LLSD& data); + LLTextBox * mFriendsStatusCaption; LLAvatarList* mSecondLifeFriends; LLAvatarList* mSuggestedFriends; }; -- cgit v1.2.3 From 265822ef20d90b0eb84e5b4c9a0847056095023a Mon Sep 17 00:00:00 2001 From: Cho Date: Sat, 15 Mar 2014 00:57:35 +0100 Subject: Made location checkbox automatically unchecked when caption is empty for ACME-1375 --- indra/newview/llfloaterfacebook.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 8eff46412d..5f2d53eaca 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -78,6 +78,7 @@ public: void updateControls(); void updateResolution(BOOL do_update); + void updateLocationCheckbox(); void checkAspectRatio(S32 index); LLUICtrl* getRefreshBtn(); @@ -102,6 +103,7 @@ private: LLFloaterBigPreview * mBigPreviewFloater; S32 mQuality; // Compression quality + bool mIncludeLocation; }; class LLFacebookCheckinPanel : public LLPanel -- cgit v1.2.3 From 619aa8e65c2eb81c62accbc87fcf2c85534180ae Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 17 Mar 2014 18:08:21 -0700 Subject: ACME-1376 : Suppress location checkbox in Facebook Photo panel --- indra/newview/llfloaterfacebook.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index 5f2d53eaca..fd5d3d0635 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -78,7 +78,6 @@ public: void updateControls(); void updateResolution(BOOL do_update); - void updateLocationCheckbox(); void checkAspectRatio(S32 index); LLUICtrl* getRefreshBtn(); @@ -95,7 +94,6 @@ private: LLUICtrl * mWorkingLabel; LLUICtrl * mThumbnailPlaceholder; LLUICtrl * mCaptionTextBox; - LLUICtrl * mLocationCheckbox; LLUICtrl * mPostButton; LLUICtrl * mCancelButton; LLButton * mBtnPreview; @@ -103,7 +101,6 @@ private: LLFloaterBigPreview * mBigPreviewFloater; S32 mQuality; // Compression quality - bool mIncludeLocation; }; class LLFacebookCheckinPanel : public LLPanel -- cgit v1.2.3 From 3eb53f5426a710b0403a84bd6849fe48553194eb Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 7 May 2014 07:42:48 -0700 Subject: Fix Windows build issues: change in onVisibility() profile needed to percolate to SL Share panels --- indra/newview/llfloaterfacebook.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterfacebook.h') diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index fd5d3d0635..34356412d6 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -66,7 +66,7 @@ public: void draw(); LLSnapshotLivePreview* getPreviewView(); - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); void onClickBigPreview(); void onClickNewSnapshot(); void onSend(); @@ -155,7 +155,7 @@ public: void draw(); private: - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); bool onFacebookConnectStateChange(const LLSD& data); bool onFacebookConnectInfoChange(); void onConnect(); -- cgit v1.2.3