livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-273 WIP added avatar picker popup and hint

meow-7.2.2
Richard Linden 2010-10-21 17:14:14 -07:00
parent f241e2327c
commit e638204dc2
8 changed files with 68 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/ignorable_dialogs.xml
View File

@ -23,6 +23,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>FirstNotUseAvatarPicker</key>
<map>
<key>Comment</key>
<string>Shows hint when resident doesn't activate avatar picker</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FirstNotUseSidePanel</key>
<map>
<key>Comment</key>

11
indra/newview/app_settings/settings.xml
View File

@ -12069,6 +12069,17 @@
<key>Value</key>
<real>1200.0</real>
</map>
<key>AvatarPickerHintTimeout</key>
<map>
<key>Comment</key>
<string>Number of seconds to wait before telling resident about avatar picker.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>600.0</real>
</map>
<key>SidePanelHintTimeout</key>
<map>
<key>Comment</key>

1
indra/newview/llbottomtray.cpp
View File

@ -521,6 +521,7 @@ BOOL LLBottomTray::postBuild()
{
LLHints::registerHintTarget("bottom_tray", LLView::getHandle());
LLHints::registerHintTarget("dest_guide_btn", getChild<LLUICtrl>("destinations_btn")->getHandle());
LLHints::registerHintTarget("avatar_picker_btn", getChild<LLUICtrl>("avatar_picker_btn")->getHandle());
LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("NearbyChatBar.Action", boost::bind(&LLBottomTray::onContextMenuItemClicked, this, _2));
LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("NearbyChatBar.EnableMenuItem", boost::bind(&LLBottomTray::onContextMenuItemEnabled, this, _2));

7
indra/newview/llfirstuse.cpp
View File

@ -103,6 +103,13 @@ void LLFirstUse::notUsingDestinationGuide(bool enable)
firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top"));
}
void LLFirstUse::notUsingAvatarPicker(bool enable)
{
// not doing this yet
firstUseNotification("FirstNotUseAvatarPicker", enable, "HintAvatarPicker", LLSD(), LLSD().with("target", "avatar_picker_btn").with("direction", "top"));
}
// static
void LLFirstUse::notUsingSidePanel(bool enable)
{

1
indra/newview/llfirstuse.h
View File

@ -87,6 +87,7 @@ public:
static void otherAvatarChatFirst(bool enable = true);
static void sit(bool enable = true);
static void notUsingDestinationGuide(bool enable = true);
static void notUsingAvatarPicker(bool enable = true);
static void notUsingSidePanel(bool enable = true);
static void notMoving(bool enable = true);
static void viewPopup(bool enable = true);

36
indra/newview/llviewermenu.cpp
View File

@ -847,24 +847,37 @@ class LLAdvancedCheckFeature : public view_listener_t
void LLDestinationGuideToggle()
{
LLView* destination_guide = gViewerWindow->getRootView()->getChildView("destination_guide_container");
if ( destination_guide )
LLView* avatar_picker = gViewerWindow->getRootView()->getChildView("avatar_picker_container");
if ( destination_guide->getVisible() )
{
if ( destination_guide->getVisible() )
{
destination_guide->setVisible( FALSE );
}
else
{
LLFirstUse::notUsingDestinationGuide(false);
destination_guide->setVisible( true );
}
destination_guide->setVisible( FALSE );
}
else
{
llwarns << "ERROR: unable to find destination guide container" << llendl;
LLFirstUse::notUsingDestinationGuide(false);
destination_guide->setVisible( true );
avatar_picker->setVisible( false );
}
};
void LLAvatarPickerToggle()
{
LLView* avatar_picker = gViewerWindow->getRootView()->getChildView("avatar_picker_container");
LLView* destination_guide = gViewerWindow->getRootView()->getChildView("destination_guide_container");
if ( avatar_picker->getVisible() )
{
avatar_picker->setVisible( false );
}
else
{
LLFirstUse::notUsingAvatarPicker(false);
avatar_picker->setVisible( true );
destination_guide->setVisible( false );
}
};
//////////////////
// INFO DISPLAY //
//////////////////
@ -8297,4 +8310,5 @@ void initialize_menus()
view_listener_t::addMenu(new LLToggleUIHints(), "ToggleUIHints");
commit.add("DestinationGuide.toggle", boost::bind(&LLDestinationGuideToggle));
commit.add("AvatarPicker.toggle", boost::bind(&LLAvatarPickerToggle));
}

4
indra/newview/llviewerwindow.cpp
View File

@ -2460,6 +2460,10 @@ void LLViewerWindow::updateUI()
{
LLFirstUse::notUsingDestinationGuide();
}
if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("AvatarPickerHintTimeout"))
{
LLFirstUse::notUsingAvatarPicker();
}
if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("SidePanelHintTimeout"))
{
LLFirstUse::notUsingSidePanel();

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -6447,6 +6447,14 @@ Mute everyone?
The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
</notification>
<notification
name="HintAvatarPicker"
label="Change your Look"
type="hint"
unique="true">
Would you like to try a new look? Click the button below to see more Avatars.
</notification>
<notification
name="HintSidePanel"
label="Side Panel"