diff options
Diffstat (limited to 'indra/newview/skins')
15 files changed, 230 insertions, 254 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml index d6406939c1..37a17f4bd6 100644 --- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml @@ -9,20 +9,17 @@ <text name="ItemcountText"> Genstande: </text> - <filter_editor label="Filter" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Alle ting" name="All Items"/> - <recent_inventory_panel label="Nye ting" name="Recent Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <button name="options_gear_btn" tool_tip="Vis yderligere valg"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Tilføj ny genstand"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <filter_editor label="Filter" name="inventory search editor"/> + <button name="options_gear_btn" tool_tip="Vis yderligere valg"/> + <button name="add_btn" tool_tip="Tilføj ny genstand"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Alle ting" name="All Items"/> + <recent_inventory_panel label="Nye ting" name="Recent Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index 175f6e1003..072bd99393 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Objekte: </text> - <filter_editor label="Suchtext eingeben" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Name" name="Name" value="search_by_name"/> - <item label="Ersteller" name="Creator" value="search_by_creator"/> - <item label="Beschreibung" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="MEIN INVENTAR" name="All Items"/> - <recent_inventory_panel label="AKTUELL" name="Recent Items"/> - <inventory_panel label="GETRAGEN" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Name" name="Name" value="search_by_name"/> + <item label="Ersteller" name="Creator" value="search_by_creator"/> + <item label="Beschreibung" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Suchtext eingeben" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> + <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="MEIN INVENTAR" name="All Items"/> + <recent_inventory_panel label="AKTUELL" name="Recent Items"/> + <inventory_panel label="GETRAGEN" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 71f450baac..324c08e68e 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -565,6 +565,14 @@ layout="topleft" name="Gesture Separator" /> <menu_item_call + label="Play" + layout="topleft" + name="PlayGesture"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="play" /> + </menu_item_call> + <menu_item_call label="Activate" layout="topleft" name="Activate"> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index f7a9c552cc..4aadc0591c 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -47,7 +47,8 @@ top_pad="10" left="2" right="-4" - orientation="horizontal"> + orientation="horizontal" + name="top_stack"> <layout_panel border="false" bevel_style="in" @@ -101,7 +102,8 @@ user_resize="false" height="25" width="381" - visible="true"> + visible="true" + name="filter_layout_panel"> <combo_box height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index edf1e1efd4..0b3639f779 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -259,7 +259,7 @@ follows="left|top" layout="topleft" height="24" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -271,7 +271,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt1" @@ -305,7 +305,7 @@ follows="left|top" layout="topleft" height="24" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -317,7 +317,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt2" @@ -351,7 +351,7 @@ follows="left|top" layout="topleft" height="25" - width="52" + width="53" left_delta="2" top_pad="1" halign="right" @@ -363,7 +363,7 @@ follows="left|top" enabled="false" top_delta="3" - left_pad="21" + left_pad="20" height="20" layout="topleft" name="edt_invname_alt3" @@ -460,7 +460,7 @@ follows="left|top" layout="topleft" height="12" - width="52" + width="53" left_delta="2" top_pad="2" halign="right" @@ -477,7 +477,7 @@ mouse_opaque="false" visible="true" top_delta="-3" - left_pad="2"/> + left_pad="1"/> <line_editor follows="left|top" enabled="false" @@ -516,7 +516,7 @@ follows="left|top" layout="topleft" height="12" - width="52" + width="53" left_delta="2" top_pad="2" halign="right" @@ -533,7 +533,7 @@ mouse_opaque="false" visible="true" top_delta="-3" - left_pad="2"/> + left_pad="1"/> <line_editor follows="left|top" enabled="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 896120c6c0..5d33853adc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2864,7 +2864,7 @@ If you continue to receive this message, please contact Second Life support for <string name="GroupMoneyBalance">Balance</string> <string name="GroupMoneyCredits">Credits</string> <string name="GroupMoneyDebits">Debits</string> - <string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> + <string name="GroupMoneyStartDate">Transactions since [weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml index bf1205046b..a1a88b095e 100644 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Ítems: </text> - <filter_editor label="Ingresar texto de búsqueda" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Nombre" name="Name" value="search_by_name"/> - <item label="Creador" name="Creator" value="search_by_creator"/> - <item label="Descripción" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Todos los ítems" name="All Items"/> - <recent_inventory_panel label="Ítems recientes" name="Recent Items"/> - <inventory_panel label="(VESTIMENTA)" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Ver más opciones"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Añadir un ítem nuevo"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Nombre" name="Name" value="search_by_name"/> + <item label="Creador" name="Creator" value="search_by_creator"/> + <item label="Descripción" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Ingresar texto de búsqueda" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Ver más opciones"/> + <button name="add_btn" tool_tip="Añadir un ítem nuevo"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Todos los ítems" name="All Items"/> + <recent_inventory_panel label="Ítems recientes" name="Recent Items"/> + <inventory_panel label="(VESTIMENTA)" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index 5bf4d6c15d..aebb042cfe 100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Articles : </text> - <filter_editor label="Saisir ici le texte de la recherche" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Nom" name="Name" value="search_by_name"/> - <item label="Créateur" name="Creator" value="search_by_creator"/> - <item label="Description" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="MON INVENTAIRE" name="All Items"/> - <recent_inventory_panel label="RÉCENT" name="Recent Items"/> - <inventory_panel label="PORTÉ" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Afficher d'autres options"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Ajouter un nouvel article"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Supprimer l'article sélectionné"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Nom" name="Name" value="search_by_name"/> + <item label="Créateur" name="Creator" value="search_by_creator"/> + <item label="Description" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Saisir ici le texte de la recherche" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Afficher d'autres options"/> + <button name="add_btn" tool_tip="Ajouter un nouvel article"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="MON INVENTAIRE" name="All Items"/> + <recent_inventory_panel label="RÉCENT" name="Recent Items"/> + <inventory_panel label="PORTÉ" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index d6890229e7..da8592e5d7 100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Oggetti: </text> - <filter_editor label="Inserisci ricerca" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Nome" name="Name" value="search_by_name"/> - <item label="Creatore" name="Creator" value="search_by_creator"/> - <item label="Descrizione" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Tutti gli elementi" name="All Items"/> - <recent_inventory_panel label="Elementi recenti" name="Recent Items"/> - <inventory_panel label="INDOSSATI" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Aggiungi nuovo elemento"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Nome" name="Name" value="search_by_name"/> + <item label="Creatore" name="Creator" value="search_by_creator"/> + <item label="Descrizione" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Inserisci ricerca" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> + <button name="add_btn" tool_tip="Aggiungi nuovo elemento"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Tutti gli elementi" name="All Items"/> + <recent_inventory_panel label="Elementi recenti" name="Recent Items"/> + <inventory_panel label="INDOSSATI" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index a38492c6d1..5b5116a05d 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -13,29 +13,25 @@ <text name="ItemcountText"> アイテム: </text> - <filter_editor label="検索用語を入力する" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="名前" name="Name" value="search_by_name"/> - <item label="制作者" name="Creator" value="search_by_creator"/> - <item label="説明" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn"/> - <filter_editor label="検索語句を入力" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="インベントリ" name="All Items"/> - <recent_inventory_panel label="最新" name="Recent Items"/> - <inventory_panel label="着用中" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="オプションを表示します。"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="新しいアイテムを追加します。"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します。"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="名前" name="Name" value="search_by_name"/> + <item label="制作者" name="Creator" value="search_by_creator"/> + <item label="説明" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn"/> + <filter_editor label="検索用語を入力する" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="オプションを表示します。"/> + <button name="add_btn" tool_tip="新しいアイテムを追加します。"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="インベントリ" name="All Items"/> + <recent_inventory_panel label="最新" name="Recent Items"/> + <inventory_panel label="着用中" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml index 1011c38378..34d9d995bc 100644 --- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml @@ -10,20 +10,17 @@ <text name="ItemcountText"> Obiekty: </text> - <filter_editor label="Filtruj Szafę" name="inventory search editor" /> - <tab_container name="inventory filter tabs"> - <inventory_panel label="MOJA SZAFA" name="All Items" /> - <recent_inventory_panel label="OSTATNIE" name="Recent Items" /> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button tool_tip="Pokaż dodatkowe opcje" name="options_gear_btn" /> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Dodaj nowy obiekt" /> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Usuń zaznaczony obiekt" /> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <filter_editor label="Filtruj Szafę" name="inventory search editor" /> + <menu_button tool_tip="Pokaż dodatkowe opcje" name="options_gear_btn" /> + <button name="add_btn" tool_tip="Dodaj nowy obiekt" /> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="MOJA SZAFA" name="All Items" /> + <recent_inventory_panel label="OSTATNIE" name="Recent Items" /> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index e0cf528468..debd601966 100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Itens: </text> - <filter_editor label="Digite o texto de pesquisa" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Nome" name="Name" value="search_by_name"/> - <item label="Criador" name="Creator" value="search_by_creator"/> - <item label="Descrição" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Todos os itens" name="All Items"/> - <recent_inventory_panel label="Itens recentes" name="Recent Items"/> - <inventory_panel label="USADO" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Adicionar novo item"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Nome" name="Name" value="search_by_name"/> + <item label="Criador" name="Creator" value="search_by_creator"/> + <item label="Descrição" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Digite o texto de pesquisa" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> + <button name="add_btn" tool_tip="Adicionar novo item"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Todos os itens" name="All Items"/> + <recent_inventory_panel label="Itens recentes" name="Recent Items"/> + <inventory_panel label="USADO" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml index b473fb8f98..a0ff3a9f67 100644 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Вещи: </text> - <filter_editor label="Введите текст поиска" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Название" name="Name" value="search_by_name"/> - <item label="Создатель" name="Creator" value="search_by_creator"/> - <item label="Описание" name="Description" value="search_by_description"/> - <item label="УУИд" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="МОЙ ИНВЕНТАРЬ" name="All Items"/> - <recent_inventory_panel label="НЕДАВНИЕ" name="Recent Items"/> - <inventory_panel label="НОСИМОЕ" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Показать дополнительные параметры"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Добавить новую вещь"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Удалить выбранную вещь"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Название" name="Name" value="search_by_name"/> + <item label="Создатель" name="Creator" value="search_by_creator"/> + <item label="Описание" name="Description" value="search_by_description"/> + <item label="УУИд" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Введите текст поиска" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Показать дополнительные параметры"/> + <button name="add_btn" tool_tip="Добавить новую вещь"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="МОЙ ИНВЕНТАРЬ" name="All Items"/> + <recent_inventory_panel label="НЕДАВНИЕ" name="Recent Items"/> + <inventory_panel label="НОСИМОЕ" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml index 7e98078635..af55d4cafc 100644 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Ögeler: </text> - <filter_editor label="Arama metnini gir" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Ad" name="Name" value="search_by_name"/> - <item label="Oluşturan" name="Creator" value="search_by_creator"/> - <item label="Açıklama" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="ENVANTERİM" name="All Items"/> - <recent_inventory_panel label="SON" name="Recent Items"/> - <inventory_panel label="GİYİLEN" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="İlave seçenekleri göster"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Yeni öge ekle"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Seçilen öğeyi sil"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Ad" name="Name" value="search_by_name"/> + <item label="Oluşturan" name="Creator" value="search_by_creator"/> + <item label="Açıklama" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Arama metnini gir" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="İlave seçenekleri göster"/> + <button name="add_btn" tool_tip="Yeni öge ekle"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="ENVANTERİM" name="All Items"/> + <recent_inventory_panel label="SON" name="Recent Items"/> + <inventory_panel label="GİYİLEN" name="Worn Items"/> + </tab_container> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml index 9ffa9323cc..6a8ead28b4 100644 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> 物品: </text> - <filter_editor label="輸入搜尋文字" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="名稱" name="Name" value="search_by_name"/> - <item label="創造者" name="Creator" value="search_by_creator"/> - <item label="描述" name="Description" value="search_by_description"/> - <item label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="我的收納區" name="All Items"/> - <recent_inventory_panel label="最近" name="Recent Items"/> - <inventory_panel label="已穿戴" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="顯示額外選項"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="添加新物品"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="移除所選擇的物品"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="名稱" name="Name" value="search_by_name"/> + <item label="創造者" name="Creator" value="search_by_creator"/> + <item label="描述" name="Description" value="search_by_description"/> + <item label="UUID" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="輸入搜尋文字" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="顯示額外選項"/> + <button name="add_btn" tool_tip="添加新物品"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="我的收納區" name="All Items"/> + <recent_inventory_panel label="最近" name="Recent Items"/> + <inventory_panel label="已穿戴" name="Worn Items"/> + </tab_container> + </panel> </panel> |