summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-07-08 16:01:20 -0700
committerMerov Linden <merov@lindenlab.com>2013-07-08 16:01:20 -0700
commit0be0b0e8b01338564b1502b8bb2b40e5a9454b0f (patch)
tree684bf0a520f02265736b4321cc34fdaa21c394ba
parenta1cc147829be2c341721ea75f713ac66279ad40c (diff)
ACME-651 : Implement all missing status messages, tweak colors and positioning
-rw-r--r--indra/newview/llfloatersocial.cpp24
-rw-r--r--indra/newview/llfloatersocial.h4
-rw-r--r--indra/newview/skins/default/xui/en/floater_social.xml37
3 files changed, 58 insertions, 7 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index 9986a9c230..1d47213a3a 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -591,7 +591,9 @@ void LLSocialCheckinPanel::clearAndClose()
LLFloaterSocial::LLFloaterSocial(const LLSD& key) : LLFloater(key),
mSocialPhotoPanel(NULL),
mStatusErrorText(NULL),
+ mStatusPostingErrorText(NULL),
mStatusLoadingText(NULL),
+ mStatusPostingText(NULL),
mStatusLoadingIndicator(NULL)
{
mCommitCallbackRegistrar.add("SocialSharing.Cancel", boost::bind(&LLFloaterSocial::onCancel, this));
@@ -608,7 +610,9 @@ BOOL LLFloaterSocial::postBuild()
mSocialPhotoPanel = static_cast<LLSocialPhotoPanel*>(getChild<LLUICtrl>("panel_social_photo"));
// Connection status widgets
mStatusErrorText = getChild<LLTextBox>("connection_error_text");
+ mStatusPostingErrorText = getChild<LLTextBox>("connection_error_posting_text");
mStatusLoadingText = getChild<LLTextBox>("connection_loading_text");
+ mStatusPostingText = getChild<LLTextBox>("connection_posting_text");
mStatusLoadingIndicator = getChild<LLUICtrl>("connection_loading_indicator");
return LLFloater::postBuild();
}
@@ -647,29 +651,43 @@ void LLFloaterSocial::postUpdate()
void LLFloaterSocial::draw()
{
- if (mStatusErrorText && mStatusLoadingText && mStatusLoadingIndicator)
+ if (mStatusErrorText && mStatusPostingErrorText && mStatusLoadingText && mStatusPostingText && mStatusLoadingIndicator)
{
mStatusErrorText->setVisible(false);
+ mStatusPostingErrorText->setVisible(false);
mStatusLoadingText->setVisible(false);
+ mStatusPostingText->setVisible(false);
mStatusLoadingIndicator->setVisible(false);
LLFacebookConnect::EConnectionState connection_state = LLFacebookConnect::instance().getConnectionState();
switch (connection_state)
{
case LLFacebookConnect::FB_NOT_CONNECTED:
+ // No status displayed when first opening the panel and no connection done
break;
case LLFacebookConnect::FB_CONNECTION_IN_PROGRESS:
- case LLFacebookConnect::FB_POSTING:
+ // Connection loading indicator
mStatusLoadingText->setVisible(true);
mStatusLoadingIndicator->setVisible(true);
break;
+ case LLFacebookConnect::FB_POSTING:
+ // Posting indicator
+ mStatusPostingText->setVisible(true);
+ mStatusLoadingIndicator->setVisible(true);
+ break;
case LLFacebookConnect::FB_CONNECTED:
+ // When successfully connected, no message is displayed
break;
case LLFacebookConnect::FB_POSTED:
+ // No success message to show since we actually close the floater after successful posting completion
break;
case LLFacebookConnect::FB_CONNECTION_FAILED:
- case LLFacebookConnect::FB_POST_FAILED:
+ // Error connecting to the service
mStatusErrorText->setVisible(true);
break;
+ case LLFacebookConnect::FB_POST_FAILED:
+ // Error posting to the service
+ mStatusPostingErrorText->setVisible(true);
+ break;
}
}
LLFloater::draw();
diff --git a/indra/newview/llfloatersocial.h b/indra/newview/llfloatersocial.h
index cc47fb61e1..76f7d080cc 100644
--- a/indra/newview/llfloatersocial.h
+++ b/indra/newview/llfloatersocial.h
@@ -125,8 +125,10 @@ public:
private:
LLSocialPhotoPanel* mSocialPhotoPanel;
LLTextBox* mStatusErrorText;
+ LLTextBox* mStatusPostingErrorText;
LLTextBox* mStatusLoadingText;
- LLUICtrl* mStatusLoadingIndicator;
+ LLTextBox* mStatusPostingText;
+ LLUICtrl* mStatusLoadingIndicator;
};
#endif // LL_LLFLOATERSOCIAL_H
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 40800c87e6..52840c5435 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -65,9 +65,24 @@
wrap="true"
halign="left"
valign="center"
- text_color="Yellow"
+ text_color="DrYellow"
font="SansSerif">
- Problem Connecting to Facebook
+ Problem connecting to Facebook
+ </text>
+ <text
+ name="connection_error_posting_text"
+ type="string"
+ follows="left|top"
+ top="3"
+ left="12"
+ width="250"
+ height="20"
+ wrap="true"
+ halign="left"
+ valign="center"
+ text_color="DrYellow"
+ font="SansSerif">
+ Problem posting to Facebook
</text>
<loading_indicator
follows="left|top"
@@ -88,8 +103,24 @@
wrap="true"
halign="left"
valign="center"
+ text_color="EmphasisColor"
+ font="SansSerif">
+ Connecting to Facebook...
+ </text>
+ <text
+ name="connection_posting_text"
+ type="string"
+ follows="left|top"
+ top="3"
+ left="38"
+ width="250"
+ height="20"
+ wrap="true"
+ halign="left"
+ valign="center"
+ text_color="EmphasisColor"
font="SansSerif">
- Connecting to Facebook...
+ Posting...
</text>
</panel>
</floater>