diff options
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Toolbar_SearchVisibility.png | bin | 756 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/TextField_Search_Highlight.png | bin | 16287 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml | 44 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 40 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/filter_editor.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/search_editor.xml | 4 |
7 files changed, 17 insertions, 78 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Toolbar_SearchVisibility.png b/indra/newview/skins/default/textures/icons/Inv_Toolbar_SearchVisibility.png Binary files differdeleted file mode 100644 index 048da25c92..0000000000 --- a/indra/newview/skins/default/textures/icons/Inv_Toolbar_SearchVisibility.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 1302edda7a..7325d836d2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -333,8 +333,6 @@ with the same filename but different name <texture name="Inv_Unknown" file_name="icons/Inv_UnknownObject.png" preload="false" /> <texture name="Inv_VersionFolderClosed" file_name="icons/Inv_VersionFolderClosed.png" preload="false" /> <texture name="Inv_VersionFolderOpen" file_name="icons/Inv_VersionFolderOpen.png" preload="false" /> - - <texture name="Inv_Toolbar_SearchVisibility" file_name="icons/Inv_Toolbar_SearchVisibility.png" preload="false" /> <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/> <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/> @@ -650,7 +648,6 @@ with the same filename but different name <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> - <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" /> <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Highlight.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Highlight.png Binary files differdeleted file mode 100644 index e3944289c6..0000000000 --- a/indra/newview/skins/default/textures/widgets/TextField_Search_Highlight.png +++ /dev/null diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml deleted file mode 100644 index 46193f4a7a..0000000000 --- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu - bottom="806" - layout="topleft" - left="0" - mouse_opaque="false" - name="menu_search_visibility" - visible="false"> - <menu_item_check - label="Search Trash" - layout="topleft" - name="search_trash"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="toggle_search_trash" /> - <on_check - function="Inventory.GearDefault.Check" - parameter="toggle_search_trash" /> - </menu_item_check> - <menu_item_check - label="Search Library" - layout="topleft" - name="search_library"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="toggle_search_library" /> - <on_check - function="Inventory.GearDefault.Check" - parameter="toggle_search_library" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Include links" - layout="topleft" - name="include_links"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="include_links" /> - <on_check - function="Inventory.GearDefault.Check" - parameter="include_links" /> - </menu_item_check> -</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 2ff58035ed..d77fbdec0a 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -32,20 +32,30 @@ left="12" name="ItemcountText" font="SansSerifMedium" - text_color="InventoryItemLinkColor" + text_color="EmphasisColor" use_ellipses="true" top_pad="0" width="300"> Items: </text> - <combo_box + <filter_editor + text_pad_left="10" + follows="left|top|right" height="23" + label="Enter search text" layout="topleft" left="10" + max_length_chars="300" + name="inventory search editor" top="18" + width="208" /> + <combo_box + height="23" + layout="topleft" + left_pad="4" name="search_type" - follows="top|left" - width="88"> + follows="top|right" + width="90"> <item label="Name" name="Name" @@ -62,27 +72,7 @@ label="UUID" name="UUID" value="search_by_UUID"/> - </combo_box> - <menu_button - follows="top|left" - tool_tip="Show search visibility options" - height="23" - image_overlay="Inv_Toolbar_SearchVisibility" - layout="topleft" - left_pad="3" - name="options_visibility_btn" - width="31" /> - <filter_editor - text_pad_left="10" - follows="left|top|right" - height="23" - label="Enter search text" - layout="topleft" - left_pad="3" - max_length_chars="300" - highlight_text_field="true" - name="inventory search editor" - width="177" /> + </combo_box> <tab_container follows="all" halign="center" diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index 1c4822b8d5..2cc4abdd30 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -6,11 +6,9 @@ text_pad_left="7" select_on_focus="true" text_tentative_color="TextFgTentativeColor" - highlight_text_field="false" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" - background_image_focused="TextField_Search_Active" - background_image_highlight="TextField_Search_Highlight"> + background_image_focused="TextField_Search_Active"> <search_button label="" top_pad="4" left_pad="4" diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index dc5a07bf4f..faa0404b35 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -7,11 +7,9 @@ text_pad_right="6" select_on_focus="true" text_tentative_color="TextFgTentativeColor" - highlight_text_field="false" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" - background_image_focused="TextField_Search_Active" - background_image_highlight="TextField_Search_Highlight"> + background_image_focused="TextField_Search_Active" > <search_button top_pad="4" left_pad="4" |
