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

merge

meow-7.2.2
Arrehn 2011-08-11 23:06:06 -04:00
parent 03e3fd46a9 300d17822e
commit b7a2fb2302
6 changed files with 143 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.xml
View File

@ -1927,6 +1927,7 @@
<key>options</key>
<array>
<string>--platform darwin</string>
<string>--package</string>
</array>
</map>
<key>name</key>
@ -2135,6 +2136,7 @@
<key>options</key>
<array>
<string>--platform linux32</string>
<string>--package</string>
</array>
</map>
<key>name</key>

15
indra/newview/llavatarlist.cpp
View File

@ -263,6 +263,19 @@ LLAvatarList::LLAvatarList(const Params& p)
mLITUpdateTimer->start();
}
// AO: Because Avatarlist is shared in so many places, some without good initialization
// one-off exceptions here
if (getName() == "speakers_list")
{
mShowInfoBtn = true;
}
else
{
mShowInfoBtn = false;
}
LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&LLAvatarList::handleDisplayNamesOptionChanged, this));
}
@ -802,7 +815,7 @@ BOOL LLAvalineListItem::postBuild()
setOnline(true);
showLastInteractionTime(false);
setShowProfileBtn(false);
setShowInfoBtn(false);
mAvatarIcon->setValue("Avaline_Icon");
mAvatarIcon->setToolTip(std::string(""));
}

25
indra/newview/llavatarlistitem.cpp
View File

@ -150,8 +150,6 @@ BOOL LLAvatarListItem::postBuild()
mIconPermissionEditTheirs->setVisible(false);
// radar
mNearbyRange = getChild<LLTextBox>("radar_range");
mNearbyRange->setValue("N/A");
@ -170,8 +168,8 @@ BOOL LLAvatarListItem::postBuild()
mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
mInfoBtn = getChild<LLButton>("info_btn");
mProfileBtn = getChild<LLButton>("profile_btn");
mInfoBtn->setVisible(true); // changed from false to have the info button always shown -WoLf
mInfoBtn->setVisible(false); // AO: enable this by calling setShowInfoButton
mInfoBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onInfoBtnClick, this));
mProfileBtn->setVisible(false);
@ -205,24 +203,8 @@ S32 LLAvatarListItem::notifyParent(const LLSD& info)
void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask)
{
getChildView("hovered_icon")->setVisible( true);
// AO: behave differently based on which avlist we are. Should move this into XUI or subclasses.
std::string listName = getParent()->getParent()->getName();
if ( listName == "speakers_list" )
{
//LLButton* b1 = getChild<LLButton>("info_btn");
//b1->setVisible(TRUE);
//[RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d
mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) );
}
// AO: We normally do not show the hover-over items because of space contraints and ease of access through better known context menu.
// mInfoBtn->setVisible(mShowInfoBtn);
// mProfileBtn->setVisible(mShowProfileBtn);
// [RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d
// mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) );
// mProfileBtn->setVisible( (mShowProfileBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) );
// [/RLVa:KB]
// AO, removed on-hover visibility. Don't do this. instead flip info buttons on full-time in postbuild.
mHovered = true;
LLPanel::onMouseEnter(x, y, mask);
@ -368,6 +350,7 @@ void LLAvatarListItem::setLastInteractionTime(U32 secs_since)
void LLAvatarListItem::setShowInfoBtn(bool show)
{
mShowInfoBtn = show;
mInfoBtn->setVisible( (mShowInfoBtn) && ((!mRlvCheckShowNames) || (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))) );
}
void LLAvatarListItem::setShowProfileBtn(bool show)

36
indra/newview/llbottomtray.cpp
View File

@ -1750,9 +1750,9 @@ void LLBottomTray::initResizeStateContainers()
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_SEARCH, getChild<LLPanel>("search_btn_panel")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_WORLD_MAP, getChild<LLPanel>("world_map_btn_panel")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MINI_MAP, getChild<LLPanel>("mini_map_btn_panel")));
// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild<LLPanel>("bottom_sbhome")));
// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild<LLPanel>("bottom_sbme")));
// AO mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild<LLPanel>("bottom_sbplaces")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild<LLPanel>("bottom_sbhome")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild<LLPanel>("bottom_sbme")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild<LLPanel>("bottom_sbplaces")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_APPEARANCE, getChild<LLPanel>("bottom_sbappearance")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_INVENTORY, getChild<LLPanel>("bottom_sbinv")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_AO, getChild<LLPanel>("ao_btn_panel"))); // ## Zi: Animation Overrider
@ -1769,16 +1769,16 @@ void LLBottomTray::initResizeStateContainers()
mButtonsProcessOrder.push_back(RS_BUTTON_GESTURES);
mButtonsProcessOrder.push_back(RS_BUTTON_MOVEMENT);
mButtonsProcessOrder.push_back(RS_BUTTON_CAMERA);
// mButtonsProcessOrder.push_back(RS_BUTTON_AVATARS);
mButtonsProcessOrder.push_back(RS_BUTTON_AVATARS);
mButtonsProcessOrder.push_back(RS_BUTTON_SNAPSHOT);
mButtonsProcessOrder.push_back(RS_BUTTON_PEOPLE);
mButtonsProcessOrder.push_back(RS_BUTTON_BUILD);
mButtonsProcessOrder.push_back(RS_BUTTON_SEARCH);
mButtonsProcessOrder.push_back(RS_BUTTON_WORLD_MAP);
mButtonsProcessOrder.push_back(RS_BUTTON_MINI_MAP);
//AO mButtonsProcessOrder.push_back(RS_BUTTON_HOME);
//AO mButtonsProcessOrder.push_back(RS_BUTTON_ME);
//AO mButtonsProcessOrder.push_back(RS_BUTTON_PLACES);
mButtonsProcessOrder.push_back(RS_BUTTON_HOME);
mButtonsProcessOrder.push_back(RS_BUTTON_ME);
mButtonsProcessOrder.push_back(RS_BUTTON_PLACES);
mButtonsProcessOrder.push_back(RS_BUTTON_APPEARANCE);
mButtonsProcessOrder.push_back(RS_BUTTON_INVENTORY);
mButtonsProcessOrder.push_back(RS_BUTTON_AO); // ## Zi: Animation Overrider
@ -1834,9 +1834,9 @@ void LLBottomTray::initButtonsVisibility()
setVisibleAndFitWidths(RS_BUTTON_WORLD_MAP, gSavedSettings.getBOOL("ShowWorldMapButton"));
setVisibleAndFitWidths(RS_BUTTON_MINI_MAP, gSavedSettings.getBOOL("ShowMiniMapButton"));
//AO setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton"));
//AO setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton"));
//AO setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton"));
setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton"));
setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton"));
setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton"));
setVisibleAndFitWidths(RS_BUTTON_AO, gSavedSettings.getBOOL("ShowAOButton")); // ## Zi: Animation Overrider
setVisibleAndFitWidths(RS_BUTTON_QUICKPREFS, gSavedSettings.getBOOL("ShowQuickPrefsButton")); // Quick Preferences panel -WoLf
// take care of additional sidebar button visibility -Zi
@ -1865,9 +1865,9 @@ void LLBottomTray::setButtonsControlsAndListeners()
gSavedSettings.getControl("ShowSearchButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_SEARCH, _2));
gSavedSettings.getControl("ShowWorldMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_WORLD_MAP, _2));
gSavedSettings.getControl("ShowMiniMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MINI_MAP, _2));
// gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2));
// gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2));
// gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2));
gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2));
gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2));
gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2));
gSavedSettings.getControl("ShowAOButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_AO, _2)); // ## Zi: Animation Overrider
gSavedSettings.getControl("ShowQuickPrefsButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_QUICKPREFS, _2)); // Quick Preferences panel -WoLf
// take care of additional sidebar button visibility -Zi
@ -2205,9 +2205,13 @@ std::string LLBottomTray::resizeStateToString(EResizeState state)
case RS_BUTTON_HOWTO: rs_string = "RS_BUTTON_HOWTO"; break;
case RS_BUTTON_SPLITTER_1: rs_string = "RS_BUTTON_SPLITTER_1"; break;
//<AO>
case RS_BUTTON_APPEARANCE: rs_string = "RS_BUTTON_APPEARANCE"; break;
case RS_BUTTON_INVENTORY: rs_string = "RS_BUTTON_INVENTORY"; break;
case RS_BUTTON_QUICKPREFS: rs_string = "RS_BUTTON_QUICKPREFS"; break;
case RS_BUTTON_APPEARANCE: rs_string = "RS_BUTTON_APPEARANCE"; break;
case RS_BUTTON_INVENTORY: rs_string = "RS_BUTTON_INVENTORY"; break;
case RS_BUTTON_PLACES: rs_string = "RS_BUTTON_PLACES"; break;
case RS_BUTTON_AO: rs_string = "RS_BUTTON_AO"; break;
case RS_BUTTON_QUICKPREFS: rs_string = "RS_BUTTON_QUICKPREFS"; break;
case RS_BUTTON_HOME: rs_string = "RS_BUTTON_HOME"; break;
case RS_BUTTON_ME: rs_string = "RS_BUTTON_ME"; break;
//</AO>
case RS_BUTTON_SPLITTER_2: rs_string = "RS_BUTTON_SPLITTER_2"; break;
case RS_BUTTONS_CAN_BE_HIDDEN: rs_string = "RS_BUTTONS_CAN_BE_HIDDEN"; break;

17
indra/newview/llbottomtray.h
View File

@ -152,6 +152,7 @@ public:
private:
typedef enum e_resize_state
{
// LL Stock buttons
RS_NORESIZE = 0x0000,
RS_CHICLET_PANEL = 0x0001,
RS_CHATBAR_INPUT = 0x0002,
@ -173,12 +174,15 @@ private:
RS_BUTTON_HOWTO = 0x20000,
RS_BUTTON_SPLITTER_1 = 0x40000,
RS_BUTTON_SPLITTER_2 = 0x80000,
//-TT 2.6.9 - changed values to let the defaults be same as LL
RS_BUTTON_AO = 0x10000, // ## Zi: Animation Overrider
// sidebar buttons -Zi
// FS Buttons
RS_BUTTON_AO = 0x100000, // ## Zi: Animation Overrider
RS_BUTTON_APPEARANCE = 0x200000,
RS_BUTTON_INVENTORY = 0x400000,
RS_BUTTON_QUICKPREFS = 0x800000, // Quick Preferences panel -WoLf
RS_BUTTON_PLACES = 0x1000000,
RS_BUTTON_HOME = 0x2000000,
RS_BUTTON_ME = 0x4000000,
/*
Once new button that can be hidden on resize is added don't forget to update related places:
@ -193,9 +197,10 @@ private:
*/
RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES
| RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP
| RS_BUTTON_AO // ## Zi: Animation Overrider
| RS_BUTTON_PEOPLE | RS_BUTTON_APPEARANCE | RS_BUTTON_INVENTORY // more sidebar buttons -Zi
| RS_BUTTON_QUICKPREFS // Quick Preferences panel -WoLf
| RS_BUTTON_DESTINATIONS | RS_BUTTON_AVATARS
| RS_BUTTON_PROFILE | RS_BUTTON_HOWTO | RS_BUTTON_PEOPLE | RS_BUTTON_APPEARANCE
| RS_BUTTON_INVENTORY | RS_BUTTON_PLACES | RS_BUTTON_HOME | RS_BUTTON_ME
// AO: Removed AO and QUickprefs from the "can be hidden" list, due to the strong number of use cases for these, even in very small screens
}EResizeState;

185
indra/newview/skins/default/xui/en/panel_bottomtray.xml
View File

@ -269,7 +269,6 @@
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
@ -425,6 +424,98 @@
parameter="mini_map" />
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="bottom_sbplaces"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="false"
image_overlay="TabIcon_Places_Selected"
layout="topleft"
left="0"
name="sidebar_places_btn"
tool_tip="Shows/hides places panel"
top="5"
enabled="true"
use_ellipses="true"
width="36">
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="search_btn_panel"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="true"
image_overlay="search_18"
layout="topleft"
left="0"
name="search_btn"
tool_tip="Shows/hides Search"
top="5"
use_ellipses="true"
width="36">
<init_callback
function="Button.SetFloaterToggle"
parameter="search" />
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="bottom_sbhome"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="false"
image_overlay="TabIcon_Home_Selected"
layout="topleft"
left="0"
name="sidebar_home_btn"
tool_tip="Shows/hides sidebar home"
top="5"
enabled="true"
use_ellipses="true"
width="36">
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
@ -568,98 +659,6 @@
</layout_panel>
<!-- Quick Preferences panel -WoLf -->
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="search_btn_panel"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="true"
image_overlay="search_18"
layout="topleft"
left="0"
name="search_btn"
tool_tip="Shows/hides Search"
top="5"
use_ellipses="true"
width="36">
<init_callback
function="Button.SetFloaterToggle"
parameter="search" />
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="bottom_sbhome"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="false"
image_overlay="TabIcon_Home_Selected"
layout="topleft"
left="0"
name="sidebar_home_btn"
tool_tip="Shows/hides sidebar home"
top="5"
enabled="true"
use_ellipses="true"
width="36">
</bottomtray_button>
</layout_panel>
<layout_panel
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="40"
mouse_opaque="false"
name="bottom_sbplaces"
user_resize="false"
width="40">
<bottomtray_button
follows="left|right"
height="23"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
is_toggle="false"
image_overlay="TabIcon_Places_Selected"
layout="topleft"
left="0"
name="sidebar_places_btn"
tool_tip="Shows/hides places panel"
top="5"
enabled="true"
use_ellipses="true"
width="36">
</bottomtray_button>
</layout_panel>
<layout_panel
follows="left|right"
height="30"