diff options
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 36 | ||||
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 27 | ||||
| -rw-r--r-- | indra/llui/lltoolbar.h | 8 | ||||
| -rw-r--r-- | indra/llui/lltoolbarview.cpp | 45 | ||||
| -rw-r--r-- | indra/llui/lltoolbarview.h | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 118 | ||||
| -rw-r--r-- | indra/newview/app_settings/toolbars.xml | 6 | ||||
| -rw-r--r-- | indra/newview/llfloatertoybox.cpp | 28 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 44 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_toolbars.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 78 |
11 files changed, 269 insertions, 133 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index bc740dde17..8a0513f246 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -455,12 +455,42 @@ void LLFloaterReg::toggleFloaterInstance(const LLSD& sdname) //static void LLFloaterReg::toggleToolbarFloaterInstance(const LLSD& sdname) { - // Do some extra logic here for 3-state toolbar floater toggling madness :) - + // + // Floaters controlled by the toolbar behave a bit differently from others. + // Namely they have 3-4 states as defined in the design wiki page here: + // https://wiki.lindenlab.com/wiki/FUI_Button_states + // + // The basic idea is this: + // * If the target floater is minimized, this button press will un-minimize it. + // * Else if the target floater is closed open it. + // * Else if the target floater does not have focus, give it focus. + // * Also, if it is not on top, bring it forward when focus is given. + // * Else the target floater is open, close it. + // + + // First parse the parameter LLSD key; std::string name = sdname.asString(); parse_name_key(name, key); - toggleInstance(name, key); + + LLFloater* instance = findInstance(name, key); + + if (LLFloater::isMinimized(instance)) + { + instance->setMinimized(FALSE); + } + else if (!LLFloater::isShown(instance)) + { + showInstance(name, key, TRUE); + } + else if (!instance->hasFocus()) + { + instance->setFocus(TRUE); + } + else + { + instance->closeFloater(); + } } //static diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 45567d5859..75c7d91f8a 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -213,6 +213,14 @@ bool LLToolBar::addCommand(const LLCommandId& commandId) return add_command; } +void LLToolBar::clearCommandsList() +{ + // Clears the commands list + mButtonCommands.clear(); + // This will clear the buttons + createButtons(); +} + bool LLToolBar::hasCommand(const LLCommandId& commandId) const { bool has_command = false; @@ -278,7 +286,7 @@ BOOL LLToolBar::isSettingChecked(const LLSD& userdata) const std::string setting_name = userdata.asString(); - if (setting_name == "icons_and_labels") + if (setting_name == "icons_with_text") { retval = (mButtonType == BTNTYPE_ICONS_WITH_TEXT); } @@ -296,18 +304,23 @@ void LLToolBar::onSettingEnable(const LLSD& userdata) const std::string setting_name = userdata.asString(); - const ButtonType current_button_type = mButtonType; - - if (setting_name == "icons_and_labels") + if (setting_name == "icons_with_text") { - mButtonType = BTNTYPE_ICONS_WITH_TEXT; + setButtonType(BTNTYPE_ICONS_WITH_TEXT); } else if (setting_name == "icons_only") { - mButtonType = BTNTYPE_ICONS_ONLY; + setButtonType(BTNTYPE_ICONS_ONLY); } +} - if(current_button_type != mButtonType) +void LLToolBar::setButtonType(LLToolBarEnums::ButtonType button_type) +{ + bool regenerate_buttons = (mButtonType != button_type); + + mButtonType = button_type; + + if (regenerate_buttons) { createButtons(); } diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 8e484c7e13..03b1756988 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -123,7 +123,6 @@ public: bool addCommand(const LLCommandId& commandId); bool hasCommand(const LLCommandId& commandId) const; bool enableCommand(const LLCommandId& commandId, bool enabled); - command_id_list_t& getCommandsList() { return mButtonCommands; } protected: friend class LLUICtrlFactory; @@ -132,6 +131,13 @@ protected: void initFromParams(const Params&); +public: + // Methods used in loading and saving toolbar settings + void setButtonType(LLToolBarEnums::ButtonType button_type); + LLToolBarEnums::ButtonType getButtonType() { return mButtonType; } + command_id_list_t& getCommandsList() { return mButtonCommands; } + void clearCommandsList(); + private: void createContextMenu(); void updateLayoutAsNeeded(); diff --git a/indra/llui/lltoolbarview.cpp b/indra/llui/lltoolbarview.cpp index f60598edcb..1c6cf3230b 100644 --- a/indra/llui/lltoolbarview.cpp +++ b/indra/llui/lltoolbarview.cpp @@ -41,7 +41,8 @@ LLToolBarView* gToolBarView = NULL; static LLDefaultChildRegistry::Register<LLToolBarView> r("toolbar_view"); LLToolBarView::Toolbar::Toolbar() -: commands("command") +: button_display_mode("button_display_mode"), + commands("command") {} LLToolBarView::ToolbarSet::ToolbarSet() @@ -112,13 +113,17 @@ bool LLToolBarView::addCommand(const LLCommandId& command, LLToolBar* toolbar) return true; } -bool LLToolBarView::loadToolbars() +bool LLToolBarView::loadToolbars(bool force_default) { LLToolBarView::ToolbarSet toolbar_set; - // Load the default toolbars.xml file + // Load the toolbars.xml file std::string toolbar_file = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "toolbars.xml"); - if (!gDirUtilp->fileExists(toolbar_file)) + if (force_default) + { + toolbar_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "toolbars.xml"); + } + else if (!gDirUtilp->fileExists(toolbar_file)) { llwarns << "User toolbars def not found -> use default" << llendl; toolbar_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "toolbars.xml"); @@ -145,9 +150,28 @@ bool LLToolBarView::loadToolbars() return false; } + // Clear the toolbars now before adding the loaded commands and settings + if (mToolbarLeft) + { + mToolbarLeft->clearCommandsList(); + } + if (mToolbarRight) + { + mToolbarRight->clearCommandsList(); + } + if (mToolbarBottom) + { + mToolbarBottom->clearCommandsList(); + } + // Add commands to each toolbar if (toolbar_set.left_toolbar.isProvided() && mToolbarLeft) { + if (toolbar_set.left_toolbar.button_display_mode.isProvided()) + { + U32 button_type = toolbar_set.left_toolbar.button_display_mode; + mToolbarLeft->setButtonType((LLToolBarEnums::ButtonType)(button_type)); + } BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.left_toolbar.commands) { addCommand(LLCommandId(command),mToolbarLeft); @@ -155,6 +179,11 @@ bool LLToolBarView::loadToolbars() } if (toolbar_set.right_toolbar.isProvided() && mToolbarRight) { + if (toolbar_set.right_toolbar.button_display_mode.isProvided()) + { + U32 button_type = toolbar_set.right_toolbar.button_display_mode; + mToolbarRight->setButtonType((LLToolBarEnums::ButtonType)(button_type)); + } BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.right_toolbar.commands) { addCommand(LLCommandId(command),mToolbarRight); @@ -162,6 +191,11 @@ bool LLToolBarView::loadToolbars() } if (toolbar_set.bottom_toolbar.isProvided() && mToolbarBottom) { + if (toolbar_set.bottom_toolbar.button_display_mode.isProvided()) + { + U32 button_type = toolbar_set.bottom_toolbar.button_display_mode; + mToolbarBottom->setButtonType((LLToolBarEnums::ButtonType)(button_type)); + } BOOST_FOREACH(LLCommandId::Params& command, toolbar_set.bottom_toolbar.commands) { addCommand(LLCommandId(command),mToolbarBottom); @@ -176,14 +210,17 @@ void LLToolBarView::saveToolbars() const LLToolBarView::ToolbarSet toolbar_set; if (mToolbarLeft) { + toolbar_set.left_toolbar.button_display_mode = (int)(mToolbarLeft->getButtonType()); addToToolset(mToolbarLeft->getCommandsList(),toolbar_set.left_toolbar); } if (mToolbarRight) { + toolbar_set.right_toolbar.button_display_mode = (int)(mToolbarRight->getButtonType()); addToToolset(mToolbarRight->getCommandsList(),toolbar_set.right_toolbar); } if (mToolbarBottom) { + toolbar_set.bottom_toolbar.button_display_mode = (int)(mToolbarBottom->getButtonType()); addToToolset(mToolbarBottom->getCommandsList(),toolbar_set.bottom_toolbar); } diff --git a/indra/llui/lltoolbarview.h b/indra/llui/lltoolbarview.h index b19841997b..efe6920db8 100644 --- a/indra/llui/lltoolbarview.h +++ b/indra/llui/lltoolbarview.h @@ -50,7 +50,8 @@ public: // the user folder for the user specific (saved) settings struct Toolbar : public LLInitParam::Block<Toolbar> { - Multiple<LLCommandId::Params> commands; + Mandatory<U32> button_display_mode; + Multiple<LLCommandId::Params> commands; Toolbar(); }; struct ToolbarSet : public LLInitParam::Block<ToolbarSet> @@ -70,7 +71,8 @@ public: // Checks if the commandId is being used somewhere in one of the toolbars bool hasCommand(const LLCommandId& commandId) const; // Loads the toolbars from the existing user or default settings - bool loadToolbars(); // return false if load fails + bool loadToolbars(bool force_default = false); // return false if load fails + bool loadDefaultToolbars() { return loadToolbars(true); } protected: friend class LLUICtrlFactory; diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 5fbd9248c1..224c1b4b48 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -1,12 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <commands> + <command name="aboutland" + available_in_toybox="true" + icon="Command_AboutLand_Icon" + label_ref="Command_AboutLand_Label" + tooltip_ref="Command_AboutLand_Tooltip" + function="Floater.ToolbarToggle" + parameter="about_land" + /> + <command name="appearance" + available_in_toybox="true" + icon="Command_Appearance_Icon" + label_ref="Command_Appearance_Label" + tooltip_ref="Command_Appearance_Tooltip" + function="Floater.ToolbarToggle" + parameter="appearance" + /> <command name="avatar" available_in_toybox="true" icon="Command_Avatar_Icon" label_ref="Command_Avatar_Label" tooltip_ref="Command_Avatar_Tooltip" function="Floater.ToolbarToggle" - parameter="avatar" + parameter="avatar_picker" /> <command name="build" available_in_toybox="true" @@ -22,7 +38,7 @@ label_ref="Command_Chat_Label" tooltip_ref="Command_Chat_Tooltip" function="Floater.ToolbarToggle" - parameter="chat" + parameter="chat_bar" /> <command name="compass" available_in_toybox="false" @@ -32,6 +48,14 @@ function="Floater.ToolbarToggle" parameter="compass" /> + <command name="destinations" + available_in_toybox="true" + icon="Command_Destinations_Icon" + label_ref="Command_Destinations_Label" + tooltip_ref="Command_Destinations_Tooltip" + function="Floater.ToolbarToggle" + parameter="destinations" + /> <command name="gestures" available_in_toybox="true" icon="Command_Gestures_Icon" @@ -46,15 +70,15 @@ label_ref="Command_HowTo_Label" tooltip_ref="Command_HowTo_Tooltip" function="Floater.ToolbarToggle" - parameter="howto" + parameter="floater_help_browser" /> - <command name="landmarks" + <command name="inventory" available_in_toybox="true" - icon="Command_Landmarks_Icon" - label_ref="Command_Landmarks_Label" - tooltip_ref="Command_Landmarks_Tooltip" + icon="Command_Inventory_Icon" + label_ref="Command_Inventory_Label" + tooltip_ref="Command_Inventory_Tooltip" function="Floater.ToolbarToggle" - parameter="landmarks" + parameter="inventory" /> <command name="map" available_in_toybox="true" @@ -62,7 +86,15 @@ label_ref="Command_Map_Label" tooltip_ref="Command_Map_Tooltip" function="Floater.ToolbarToggle" - parameter="map" + parameter="world_map" + /> + <command name="marketplace" + available_in_toybox="true" + icon="Command_Marketplace_Icon" + label_ref="Command_Marketplace_Label" + tooltip_ref="Command_Marketplace_Tooltip" + function="Floater.ToolbarToggle" + parameter="marketplace" /> <command name="minimap" available_in_toybox="true" @@ -70,7 +102,7 @@ label_ref="Command_MiniMap_Label" tooltip_ref="Command_MiniMap_Tooltip" function="Floater.ToolbarToggle" - parameter="minimap" + parameter="mini_map" /> <command name="move" available_in_toybox="true" @@ -78,23 +110,7 @@ label_ref="Command_Move_Label" tooltip_ref="Command_Move_Tooltip" function="Floater.ToolbarToggle" - parameter="move" - /> - <command name="myland" - available_in_toybox="true" - icon="Command_MyLand_Icon" - label_ref="Command_MyLand_Label" - tooltip_ref="Command_MyLand_Tooltip" - function="Floater.ToolbarToggle" - parameter="myland" - /> - <command name="mystuff" - available_in_toybox="true" - icon="Command_MyStuff_Icon" - label_ref="Command_MyStuff_Label" - tooltip_ref="Command_MyStuff_Tooltip" - function="Floater.ToolbarToggle" - parameter="mystuff" + parameter="moveview" /> <command name="people" available_in_toybox="true" @@ -112,29 +128,29 @@ function="Floater.ToolbarToggle" parameter="places" /> - <command name="search" + <command name="preferences" available_in_toybox="true" - icon="Command_Search_Icon" - label_ref="Command_Search_Label" - tooltip_ref="Command_Search_Tooltip" + icon="Command_Preferences_Icon" + label_ref="Command_Preferences_Label" + tooltip_ref="Command_Preferences_Tooltip" function="Floater.ToolbarToggle" - parameter="search" + parameter="preferences" /> - <command name="settings" + <command name="profile" available_in_toybox="true" - icon="Command_Settings_Icon" - label_ref="Command_Settings_Label" - tooltip_ref="Command_Settings_Tooltip" + icon="Command_Profile_Icon" + label_ref="Command_Profile_Label" + tooltip_ref="Command_Profile_Tooltip" function="Floater.ToolbarToggle" - parameter="settings" + parameter="profile" /> - <command name="shop" + <command name="search" available_in_toybox="true" - icon="Command_Shop_Icon" - label_ref="Command_Shop_Label" - tooltip_ref="Command_Shop_Tooltip" + icon="Command_Search_Icon" + label_ref="Command_Search_Label" + tooltip_ref="Command_Search_Tooltip" function="Floater.ToolbarToggle" - parameter="shop" + parameter="search" /> <command name="snapshot" available_in_toybox="true" @@ -152,20 +168,20 @@ function="Floater.ToolbarToggle" parameter="speak" /> - <command name="upload" - available_in_toybox="true" - icon="Command_Upload_Icon" - label_ref="Command_Upload_Label" - tooltip_ref="Command_Upload_Tooltip" - function="Floater.ToolbarToggle" - parameter="upload" - /> <command name="view" available_in_toybox="true" icon="Command_View_Icon" label_ref="Command_View_Label" tooltip_ref="Command_View_Tooltip" function="Floater.ToolbarToggle" - parameter="view" + parameter="camera" + /> + <command name="voice" + available_in_toybox="true" + icon="Command_Voice_Icon" + label_ref="Command_Voice_Label" + tooltip_ref="Command_Voice_Tooltip" + function="Floater.ToolbarToggle" + parameter="voice_controls" /> </commands> diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index 55327ea919..19dec78c63 100644 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <toolbars> - <bottom_toolbar> + <bottom_toolbar + button_display_mode="0"> <command name="chat"/> <command name="speak"/> <command name="places"/> @@ -10,7 +11,8 @@ <command name="move"/> <command name="howto"/> </bottom_toolbar> - <left_toolbar> + <left_toolbar + button_display_mode="1"> <command name="avatar"/> <command name="inventory"/> <command name="snapshot"/> diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp index c3fa322f85..d7f114043d 100644 --- a/indra/newview/llfloatertoybox.cpp +++ b/indra/newview/llfloatertoybox.cpp @@ -33,6 +33,7 @@ #include "llpanel.h" #include "lltoolbar.h" #include "lltoolbarview.h" +#include "lltrans.h" LLFloaterToybox::LLFloaterToybox(const LLSD& key) @@ -47,6 +48,14 @@ LLFloaterToybox::~LLFloaterToybox() { } +bool compare_localized_command_labels(LLCommand * cmd1, LLCommand * cmd2) +{ + std::string lab1 = LLTrans::getString(cmd1->labelRef()); + std::string lab2 = LLTrans::getString(cmd2->labelRef()); + + return (lab1 < lab2); +} + BOOL LLFloaterToybox::postBuild() { center(); @@ -54,11 +63,13 @@ BOOL LLFloaterToybox::postBuild() mBtnRestoreDefaults = getChild<LLButton>("btn_restore_defaults"); mToolBar = getChild<LLToolBar>("toybox_toolbar"); + LLCommandManager& cmdMgr = LLCommandManager::instance(); + // - // Create Buttons + // Sort commands by localized labels so they will appear alphabetized in all languages // - LLCommandManager& cmdMgr = LLCommandManager::instance(); + std::list<LLCommand *> alphabetized_commands; for (U32 i = 0; i < cmdMgr.commandCount(); i++) { @@ -66,10 +77,21 @@ BOOL LLFloaterToybox::postBuild() if (command->availableInToybox()) { - mToolBar->addCommand(command->id()); + alphabetized_commands.push_back(command); } } + alphabetized_commands.sort(compare_localized_command_labels); + + // + // Create Buttons + // + + for (std::list<LLCommand *>::iterator it = alphabetized_commands.begin(); it != alphabetized_commands.end(); ++it) + { + mToolBar->addCommand((*it)->id()); + } + return TRUE; } diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index be68c2873e..57ce7fe57a 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -125,27 +125,29 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark" preload="true" /> - <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MiniMap_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyStuff_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Settings_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Shop_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Upload_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_AboutLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Appearance_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Destinations_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Inventory_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Marketplace_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_MiniMap_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Preferences_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Profile_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Voice_Icon" file_name="icons/SL_Logo.png" preload="true" /> <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml index de13fec670..59912b5503 100644 --- a/indra/newview/skins/default/xui/en/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -12,11 +12,11 @@ <menu_item_separator layout="topleft" /> <menu_item_check label="Icons and labels" layout="topleft" - name="icons_and_labels"> + name="icons_with_text"> <on_click function="Toolbars.EnableSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> <on_check function="Toolbars.CheckSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> </menu_item_check> <menu_item_check label="Icons only" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index feea555fdc..158e1c711d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -16,16 +16,16 @@ <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading [APP_NAME]...</string> <string name="StartupClearingCache">Clearing cache...</string> - <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingTextureCache">Initializing texture cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> - <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> + <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> - <string name="ProgressChangingResolution">Changing Resolution...</string> + <string name="ProgressChangingResolution">Changing resolution...</string> <!-- Legacy strings, almost never used --> - <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> + <string name="Fullbright">Fullbright (legacy)</string> <!-- used in the Build > materials dropdown--> <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> @@ -38,8 +38,8 @@ <string name="LoginInitializingMultimedia">Initializing multimedia...</string> <string name="LoginInitializingFonts">Loading fonts...</string> <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> - <string name="LoginProcessingResponse">Processing Response...</string> - <string name="LoginInitializingWorld">Initializing World...</string> + <string name="LoginProcessingResponse">Processing response...</string> + <string name="LoginInitializingWorld">Initializing world...</string> <string name="LoginDecodingImages">Decoding images...</string> <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> @@ -56,7 +56,7 @@ <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string> - <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string> <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> @@ -3652,47 +3652,53 @@ Try enclosing path to the editor with double quotes. <string name="ParticleHiding">Hiding Particles</string> <!-- commands --> + + <string name="Command_AboutLand_Label">About land</string> + <string name="Command_Appearance_Label">Appearance</string> <string name="Command_Avatar_Label">Avatar</string> - <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string> <string name="Command_Build_Label">Build</string> - <string name="Command_Build_Tooltip">Building, reshaping terrain</string> <string name="Command_Chat_Label">Chat</string> - <string name="Command_Chat_Tooltip">Chat with people nearby</string> <string name="Command_Compass_Label">Compass</string> - <string name="Command_Compass_Tooltip"></string> + <string name="Command_Destinations_Label">Destinations</string> <string name="Command_Gestures_Label">Gestures</string> - <string name="Command_Gestures_Tooltip"></string> - <string name="Command_HowTo_Label">How To</string> - <string name="Command_HowTo_Tooltip"></string> - <string name="Command_Landmarks_Label">Landmarks</string> - <string name="Command_Landmarks_Tooltip"></string> + <string name="Command_HowTo_Label">How to</string> + <string name="Command_Inventory_Label">Inventory</string> <string name="Command_Map_Label">Map</string> - <string name="Command_Map_Tooltip"></string> - <string name="Command_MiniMap_Label">Mini Map</string> - <string name="Command_MiniMap_Tooltip"></string> + <string name="Command_Marketplace_Label">Marketplace</string> + <string name="Command_MiniMap_Label">Mini-map</string> <string name="Command_Move_Label">Move</string> - <string name="Command_Move_Tooltip"></string> - <string name="Command_MyLand_Label">My Land</string> - <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string> - <string name="Command_MyStuff_Label">My Stuff</string> - <string name="Command_MyStuff_Tooltip">View and use your belongings</string> <string name="Command_People_Label">People</string> - <string name="Command_People_Tooltip"></string> <string name="Command_Places_Label">Places</string> - <string name="Command_Places_Tooltip">Destination guide</string> + <string name="Command_Preferences_Label">Preferences</string> + <string name="Command_Profile_Label">Profile</string> <string name="Command_Search_Label">Search</string> - <string name="Command_Search_Tooltip">Find...</string> - <string name="Command_Settings_Label">Settings</string> - <string name="Command_Settings_Tooltip">Preferences</string> - <string name="Command_Shop_Label">Shop</string> - <string name="Command_Shop_Tooltip"></string> <string name="Command_Snapshot_Label">Snapshot</string> - <string name="Command_Snapshot_Tooltip">Take a picture</string> <string name="Command_Speak_Label">Speak</string> - <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> - <string name="Command_Upload_Label">Upload</string> - <string name="Command_Upload_Tooltip"></string> <string name="Command_View_Label">View</string> - <string name="Command_View_Tooltip">Changing your view of the world</string> + <string name="Command_Voice_Label">Nearby voice</string> + + <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string> + <string name="Command_Appearance_Tooltip">Change your avatar</string> + <string name="Command_Avatar_Tooltip">Choose a complete avatar</string> + <string name="Command_Build_Tooltip">Building objects and reshaping them</string> + <string name="Command_Chat_Tooltip">Chat with people nearby using text</string> + <string name="Command_Compass_Tooltip">Compass</string> + <string name="Command_Destinations_Tooltip">Destinations of interest</string> + <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> + <string name="Command_HowTo_Tooltip">How to do common tasks</string> + <string name="Command_Inventory_Tooltip">View and use your belongings</string> + <string name="Command_Map_Tooltip">Map of the world</string> + <string name="Command_Marketplace_Tooltip">Go shopping</string> + <string name="Command_MiniMap_Tooltip">Show nearby people</string> + <string name="Command_Move_Tooltip">Moving your avatar</string> + <string name="Command_People_Tooltip">Friends, groups, and nearby people</string> + <string name="Command_Places_Tooltip">Places you've saved</string> + <string name="Command_Preferences_Tooltip">Preferences</string> + <string name="Command_Profile_Tooltip">Edit or view your profile</string> + <string name="Command_Search_Tooltip">Find places, events, people</string> + <string name="Command_Snapshot_Tooltip">Take a picture</string> + <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> + <string name="Command_View_Tooltip">Changing camera angle</string> + <string name="Command_Voice_Tooltip">People nearby with voice capability</string> </strings> |