diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 76 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index 027dd40d08..e58eaf79a3 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -13,12 +13,9 @@ <on_click function="Inventory.GearDefault.Custom.Action" parameter="open_in_current_window" /> - <on_enable - function="Inventory.GearDefault.Enable" - parameter="open_folder" /> <on_visible function="Inventory.GearDefault.Visible" - parameter="single_folder_view" /> + parameter="open_folder" /> </menu_item_call> <menu_item_call label="Open in new window" @@ -27,8 +24,8 @@ <on_click function="Inventory.GearDefault.Custom.Action" parameter="open_in_new_window" /> - <on_enable - function="Inventory.GearDefault.Enable" + <on_visible + function="Inventory.GearDefault.Visible" parameter="open_folder" /> </menu_item_call> <menu_item_call @@ -130,8 +127,11 @@ function="Inventory.GearDefault.Custom.Action" parameter="replace_links" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_separator> + <menu_item_separator.on_visible + function="Inventory.GearDefault.Visible" + parameter="multi_folder_view" /> + </menu_item_separator> <menu_item_call label="Empty Lost and Found" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml index 0fcdb1cda0..b89ff832b9 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml @@ -53,4 +53,60 @@ function="Inventory.GearDefault.Visible" parameter="multi_folder_view" /> </menu_item_check> + <menu_item_separator> + <menu_item_separator.on_visible + function="Inventory.GearDefault.Visible" + parameter="single_folder_view" /> + </menu_item_separator> + <menu_item_check + label="List view" + layout="topleft" + name="list_view"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="list_view" /> + <on_check + function="Inventory.GearDefault.Check" + parameter="list_view" /> + <on_visible + function="Inventory.GearDefault.Visible" + parameter="single_folder_view" /> + </menu_item_check> + <menu_item_check + label="Gallery view" + layout="topleft" + name="gallery_view"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="gallery_view" /> + <on_check + function="Inventory.GearDefault.Check" + parameter="gallery_view" /> + <on_visible + function="Inventory.GearDefault.Visible" + parameter="single_folder_view" /> + </menu_item_check> + <menu_item_check + label="Combination view" + layout="topleft" + name="combination_view"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="combination_view" /> + <on_check + function="Inventory.GearDefault.Check" + parameter="combination_view" /> + <on_visible + function="Inventory.GearDefault.Visible" + parameter="single_folder_view" /> + </menu_item_check> + <menu_item_separator/> + <menu_item_call + label="Inventory settings..." + layout="topleft" + name="inv_settings"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="inv_settings" /> + </menu_item_call> </toggleable_menu> 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 606c2175d8..16ad6f60db 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -24,8 +24,8 @@ Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER] </panel.string> <panel.string name="inventory_title">INVENTORY</panel.string> - <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string> - <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string> + <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string> + <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string> <text type="string" length="1" @@ -60,9 +60,9 @@ <button follows="top|left" height="23" - image_selected="Arrow_Left" - image_pressed="Arrow_Left" - image_unselected="Arrow_Left" + image_selected="Single_Folder_Back" + image_pressed="Single_Folder_Back" + image_unselected="Single_Folder_Back" scale_image="false" layout="topleft" left="3" @@ -73,9 +73,9 @@ <button follows="top|left" height="23" - image_selected="Arrow_Right" - image_pressed="Arrow_Right" - image_unselected="Arrow_Right" + image_selected="Single_Folder_Forward" + image_pressed="Single_Folder_Forward" + image_unselected="Single_Folder_Forward" scale_image="false" layout="topleft" left_pad="1" @@ -85,9 +85,9 @@ <button follows="top|left" height="23" - image_selected="Arrow_Up" - image_pressed="Arrow_Up" - image_unselected="Arrow_Up" + image_selected="Single_Folder_Up" + image_pressed="Single_Folder_Up" + image_unselected="Single_Folder_Up" scale_image="false" layout="topleft" left_pad="1" @@ -189,7 +189,7 @@ tool_tip="Switch between views" height="23" image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Command_Map_Icon" + image_overlay="Single_Folder_Mode" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" layout="topleft" |