From 27a7a68883ab93a41df815684b74631a5dca0a73 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 16 Mar 2010 19:22:17 +0200 Subject: =?UTF-8?q?Fix=20for=20normal=20task=20(EXT-6355)=20[TRANSLATED=20?= =?UTF-8?q?BUT=20IN=20EN]=20-=20Inventory,=20hovertext=20of=20system=20fol?= =?UTF-8?q?ders:=20hovertext=20isn=C2=B4t=20localized.=20-=20Added=20updat?= =?UTF-8?q?ing=20tooltips=20with=20localized=20names.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/39/ --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 1 + indra/newview/llinventorypanel.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index d3e3d2b57b..72e34594db 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -260,6 +260,7 @@ void LLFolderViewItem::refreshFromListener() LLTrans::findString(mLabel, "InvFolder " + mLabel); }; + setToolTip(mLabel); setIcon(mListener->getIcon()); time_t creation_date = mListener->getCreationDate(); if (mCreationDate != creation_date) diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index ec83a1fd6d..d7720b735c 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -293,9 +293,6 @@ void LLInventoryPanel::modelChanged(U32 mask) bridge->clearDisplayName(); view_item->refresh(); - - // Set the new tooltip with the new display name. - view_item->setToolTip(bridge->getDisplayName()); } } } -- cgit v1.2.3 From 38ab25aed8f413b95cdaf1bddca4f38c4222cf48 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Tue, 16 Mar 2010 20:27:10 +0200 Subject: Fixed normal bug EXT - 6027 ([TRANSLATED BUT IN EN] Bubble shown when you mouseover on system folder within Inventory > Library) - Added localized string from strings.xml as a tooltip --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 72e34594db..8b3ba6c72b 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -258,6 +258,7 @@ void LLFolderViewItem::refreshFromListener() if (LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); + setToolTip(mLabel); }; setToolTip(mLabel); -- cgit v1.2.3 From 24d95dc0ba3a1fc642484192d79d92bcaa6dfdd9 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 17 Mar 2010 10:57:45 +0200 Subject: Fixed normal task EXT-6021 [HARD CODED] Bubble shown when you mouseover on script within Contents is in EN (task inventory) * Added new string name="PanelContentsTooltip into strings.xml * Set this tooltip to LLFolderView inside the Build Tool Note: Fix for localization of default "New Script" name will be fixed in the EXT-5839. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/43/ --HG-- branch : product-engine --- indra/newview/llpanelobjectinventory.cpp | 2 +- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 9e92ee337f..7505581904 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1578,7 +1578,7 @@ void LLPanelObjectInventory::reset() p.title = "task inventory"; p.task_id = getTaskUUID(); p.parent_panel = this; - p.tool_tip= p.name; + p.tool_tip= LLTrans::getString("PanelContentsTooltip"); mFolders = LLUICtrlFactory::create(p); // this ensures that we never say "searching..." or "no items found" mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 111daec242..707a830622 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2121,6 +2121,7 @@ Clears (deletes) the media and all params from the given face. New Script + Content of object The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing. -- cgit v1.2.3 From 8bf0509959e5f8ff7d8628d02f9193c8609b2f31 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 17 Mar 2010 13:22:29 +0200 Subject: fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs to be localized extracted strings used in LLAppViewer::forceDisconnect(...) calls Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/41/ --HG-- branch : product-engine --- indra/newview/llviewermenu.cpp | 3 ++- indra/newview/llviewermessage.cpp | 2 +- indra/newview/llworld.cpp | 3 ++- indra/newview/skins/default/xui/en/strings.xml | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1d58daba2c..5c40d02f8d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -86,6 +86,7 @@ #include "lltoolmgr.h" #include "lltoolpie.h" #include "lltoolselectland.h" +#include "lltrans.h" #include "llviewergenericmessage.h" #include "llviewerhelp.h" #include "llviewermenufile.h" // init_menu_file() @@ -7047,7 +7048,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id ) void handle_disconnect_viewer(void *) { - LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect"); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("TestingDisconnect")); } void force_error_breakpoint(void *) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index eed3f25231..bd0012057c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3080,7 +3080,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) << x << ":" << y << " current pos " << gAgent.getPositionGlobal() << LL_ENDL; - LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region."); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("SentToInvalidRegion")); return; } diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index d7e5b464a6..19f303ab88 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -45,6 +45,7 @@ #include "llhttpnode.h" #include "llregionhandle.h" #include "llsurface.h" +#include "lltrans.h" #include "llviewercamera.h" #include "llviewertexture.h" #include "llviewertexturelist.h" @@ -258,7 +259,7 @@ void LLWorld::removeRegion(const LLHost &host) llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl; llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl; - LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in."); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected")); return; } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 707a830622..da39f13726 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -56,7 +56,9 @@ Saving your settings... Logging out... Shutting down... - + You have been disconnected from the region you were in. + You were sent to an invalid region. + Testing viewer disconnect Person -- cgit v1.2.3 From 5cae8140f4dfbdd9c4b3237a0d47248753180913 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 17 Mar 2010 13:25:18 +0200 Subject: fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert: "MiddleMouse" needs to be localized) Control value is preserved, it is being localized on presentation Reviewed by Richard at https://codereview.productengine.com/secondlife/r/24/ --HG-- branch : product-engine --- indra/newview/llfloaterpreference.cpp | 25 ++++++++++++++++++++-- .../default/xui/en/panel_preferences_advanced.xml | 4 ++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 8bffe9bf57..e998d10fcc 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -110,6 +110,9 @@ const F32 MAX_USER_FAR_CLIP = 512.f; const F32 MIN_USER_FAR_CLIP = 64.f; +//control value for middle mouse as talk2push button +const static std::string MIDDLE_MOUSE_CV = "MiddleMouse"; + class LLVoiceSetKeyDialog : public LLModalDialog { public: @@ -1008,9 +1011,17 @@ void LLFloaterPreference::setKey(KEY key) void LLFloaterPreference::onClickSetMiddleMouse() { - childSetValue("modifier_combo", "MiddleMouse"); + LLUICtrl* p2t_line_editor = getChild("modifier_combo"); + // update the control right away since we no longer wait for apply - getChild("modifier_combo")->onCommit(); + p2t_line_editor->setControlValue(MIDDLE_MOUSE_CV); + + //push2talk button "middle mouse" control value is in English, need to localize it for presentation + LLPanel* advanced_preferences = dynamic_cast(p2t_line_editor->getParent()); + if (advanced_preferences) + { + p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse")); + } } /* void LLFloaterPreference::onClickSkipDialogs() @@ -1302,6 +1313,16 @@ BOOL LLPanelPreference::postBuild() getChild("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); } + // Panel Advanced + if (hasChild("modifier_combo")) + { + //localizing if push2talk button is set to middle mouse + if (MIDDLE_MOUSE_CV == childGetValue("modifier_combo").asString()) + { + childSetValue("modifier_combo", getString("middle_mouse")); + } + } + apply(); return true; } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 4be4d6b432..c658e0de6f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -12,6 +12,10 @@ [NUM]:[DEN] + + + Middle Mouse Date: Wed, 17 Mar 2010 14:02:54 +0200 Subject: Code cleanup: remove superfluous call of the setToolTip method. These calls were added while working on two separate tickets - EXT - 6027 ([TRANSLATED BUT IN EN] Bubble shown when you mouseover on system folder within Inventory > Library) (37baa70ea94b) - (EXT-6355) [TRANSLATED BUT IN EN] - Inventory, hovertext of system folders: hovertext isn?t localized. (80b6110ba41e) --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 8b3ba6c72b..72e34594db 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -258,7 +258,6 @@ void LLFolderViewItem::refreshFromListener() if (LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); - setToolTip(mLabel); }; setToolTip(mLabel); -- cgit v1.2.3 From 464092e2c9354c62143f3cbf5503445e6e6fe84e Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 17 Mar 2010 14:17:35 +0200 Subject: Fixed normal EXT - 6028 ( [HARD CODED]? Inventory > Library > \"Accessories\" folder) Added localization string to the strings.xml for Accessories folder and localization support of Accessories folder from source code (llfolderviewitem.cpp). TRANSLATION TO THE CORRESPONDING LANGUAGE -- this string should be added to the strings.xml for each locale. Note: due to Accessories category is created out of viewer & has the FT_NONE type it can not be localized as other protected (system) categories. So, hack was provided to check this folder (in a Library) & localize it. Reviewd by Mike Antipov at https://codereview.productengine.com/secondlife/r/42/ --HG-- branch : product-engine --- indra/newview/llfolderviewitem.cpp | 20 +++++++++++++++++++- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 72e34594db..bb4c75d3ac 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -255,7 +255,25 @@ void LLFolderViewItem::refreshFromListener() // temporary attempt to display the inventory folder in the user locale. // mantipov: *NOTE: be sure this code is synchronized with LLFriendCardsManager::findChildFolderUUID // it uses the same way to find localized string - if (LLFolderType::lookupIsProtectedType(preferred_type)) + + // HACK: EXT - 6028 ([HARD CODED]? Inventory > Library > "Accessories" folder) + // Translation of Accessories folder in Library inventory folder + bool accessories = false; + if(mLabel == std::string("Accessories")) + { + //To ensure that Accessories folder is in Library we have to check its parent folder. + //Due to parent LLFolderViewFloder is not set to this item yet we have to check its parent via Inventory Model + LLInventoryCategory* cat = gInventory.getCategory(mListener->getUUID()); + if(cat) + { + const LLUUID& parent_folder_id = cat->getParentUUID(); + accessories = (parent_folder_id == gInventory.getLibraryRootFolderID()); + } + } + + //"Accessories" inventory category has folder type FT_NONE. So, this folder + //can not be detected as protected with LLFolderType::lookupIsProtectedType + if (accessories || LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); }; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index da39f13726..eb45a9765b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1894,6 +1894,7 @@ Clears (deletes) the media and all params from the given face. Favorites Current Outfit My Outfits + Accessories Friends -- cgit v1.2.3 From 733a9275a615ffa678f52356ad4eefae80db52f4 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 17 Mar 2010 14:34:15 +0200 Subject: replaced SL Logo EXT-4819 [NUX] New Application Icon Integration Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/46/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/icons/SL_Logo.png | Bin 973 -> 3999 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png index c9fbde987a..8342d7cfee 100644 Binary files a/indra/newview/skins/default/textures/icons/SL_Logo.png and b/indra/newview/skins/default/textures/icons/SL_Logo.png differ -- cgit v1.2.3 From 69491cccae0ec7a638abcee34f460aed314997ef Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 17 Mar 2010 14:40:50 +0200 Subject: Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My Appearance > Wearing tab - where it's linked description) - Replaced hardcoded '(active)' string with [GESLABEL] arg. - this line with translation should be added to the rest locales - Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/ --HG-- branch : product-engine --- indra/newview/llinventorybridge.cpp | 6 ++++-- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ceeffea1c9..1f918c72ea 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3808,7 +3808,9 @@ std::string LLGestureBridge::getLabelSuffix() const { if( LLGestureManager::instance().isGestureActive(mUUID) ) { - return LLItemBridge::getLabelSuffix() + " (active)"; + LLStringUtil::format_map_t args; + args["[GESLABEL]"] = LLItemBridge::getLabelSuffix(); + return LLTrans::getString("ActiveGesture", args); } else { @@ -4157,7 +4159,7 @@ std::string LLObjectBridge::getLabelSuffix() const // e.g. "(worn on ...)" / "(attached to ...)" LLStringUtil::format_map_t args; - args["[ATTACHMENT_POINT]"] = attachment_point_name.c_str(); + args["[ATTACHMENT_POINT]"] = LLTrans::getString(attachment_point_name); return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args); } else diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index eb45a9765b..a8f888f0cb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1838,6 +1838,7 @@ Clears (deletes) the media and all params from the given face. Loading contents... No contents + Yes No -- cgit v1.2.3 From 962521ec19a1fce7946b7897c2bb57b4fbab030a Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 17 Mar 2010 15:25:53 +0200 Subject: Fixed normal task EXT-6403 [TRUNCATION] [EN XUI REDESIGN] - Menu Einstellungen, Tab Sound & Medien: Stummschalten, wenn minimiert is truncated * Increased floater width from 620 to 658 px to accommodate it to checkbox label width. * Updated "Busy mode response" (on General tab) texteditor and "Always show" & "Never show" lists (on Notifications tab) to be looks better on a wider width. * Content of other panels was not redesigned. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/floater_preferences.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_preferences_alerts.xml | 8 ++++---- indra/newview/skins/default/xui/en/panel_preferences_general.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index d7a7daf30c..b5a3764e73 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -10,7 +10,7 @@ help_topic="preferences" single_instance="true" title="PREFERENCES" - width="620"> + width="658">