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

Pulled out another pair of strings from the locationctrl widgets file. 

Also apparently search doesn't need it's tooltip in widgets, it gets specified in the xml file that uses it.
meow-7.2.2
Leyla Farazha 2009-10-20 20:50:07 +00:00
parent 366c54e9bb
commit 2de36de179
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lllocationinputctrl.cpp
View File

@ -264,6 +264,8 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
mAddLandmarkTooltip = LLTrans::getString("LocationCtrlAddLandmarkTooltip");
mEditLandmarkTooltip = LLTrans::getString("LocationCtrlEditLandmarkTooltip");
getChild<LLView>("Location History")->setToolTip(LLTrans::getString("LocationCtrlComboBtnTooltip"));
getChild<LLView>("Place Information")->setToolTip(LLTrans::getString("LocationCtrlInfoBtnTooltip"));
}
LLLocationInputCtrl::~LLLocationInputCtrl()

5
indra/newview/llsearchcombobox.cpp
View File

@ -85,11 +85,6 @@ LLSearchComboBox::LLSearchComboBox(const Params&p)
setSelectionCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this));
setPrearrangeCallback(boost::bind(&LLSearchComboBox::onSearchPrearrange, this, _2));
mSearchButton->setCommitCallback(boost::bind(&LLSearchComboBox::onTextCommit, this, _2));
// set tooltip here for now since we don't want to parse /en/widgets
std::string tool_tip = LLTrans::getString("Search");
getChild<LLView>("child1")->setToolTip(tool_tip);
getChild<LLView>("child3")->setToolTip(tool_tip);
}
void LLSearchComboBox::rebuildSearchHistory(const std::string& filter)

6
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2844,13 +2844,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Wide Lips">Wide Lips</string>
<string name="Wild">Wild</string>
<string name="Wrinkles">Wrinkles</string>
<string name="Search">Search</string>
<!-- Favorites Bar -->
<string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
<string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
<string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
<string name="LocationCtrlComboBtnTooltip">My location history</string>
<!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">
[APP_NAME] Update

4
indra/newview/skins/default/xui/en/widgets/location_input.xml
View File

@ -21,7 +21,6 @@
>
<info_button name="Place Information"
label=""
tool_tip="See more info about the current location"
width="16"
height="16"
follows="left|top"
@ -43,8 +42,7 @@
left="-3" />
<combo_button name="Location History"
label=""
pad_right="0"
tool_tip="My location history"/>
pad_right="0"/>
<combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
scroll_bar_bg_visible="true" />
<combo_editor name="Combo Text Entry"