summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-02-19 18:51:55 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-02-19 18:51:55 +0200
commit603053807cb0bb0026058c8b01decd042300bd93 (patch)
tree1d8335c71e4372838561a6cb114c2bc66efead24 /indra/newview/skins
parent6ea8e9d7163f2d8d0b71f262e445a993b3c3aea1 (diff)
SL-19108 WIP Managing inventory thumbnail #4
Added icons
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/copy_clipboard.pngbin0 -> 3443 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/delete_icon.pngbin0 -> 3570 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/file_upload.pngbin0 -> 3191 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/paste_clipboard.pngbin0 -> 3412 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/snapshot_icon.pngbin0 -> 3341 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/texture_icon.pngbin0 -> 2812 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml54
8 files changed, 48 insertions, 18 deletions
diff --git a/indra/newview/skins/default/textures/icons/copy_clipboard.png b/indra/newview/skins/default/textures/icons/copy_clipboard.png
new file mode 100644
index 0000000000..bb1ceff1ce
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/copy_clipboard.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/delete_icon.png b/indra/newview/skins/default/textures/icons/delete_icon.png
new file mode 100644
index 0000000000..37ce374653
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/delete_icon.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/file_upload.png b/indra/newview/skins/default/textures/icons/file_upload.png
new file mode 100644
index 0000000000..58f2757136
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/file_upload.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/paste_clipboard.png b/indra/newview/skins/default/textures/icons/paste_clipboard.png
new file mode 100644
index 0000000000..e1589ab098
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/paste_clipboard.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/snapshot_icon.png b/indra/newview/skins/default/textures/icons/snapshot_icon.png
new file mode 100644
index 0000000000..41d524678f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/snapshot_icon.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/texture_icon.png b/indra/newview/skins/default/textures/icons/texture_icon.png
new file mode 100644
index 0000000000..278760a5b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/texture_icon.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..1941c388b7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -252,10 +252,16 @@ with the same filename but different name
<texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
<texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
<texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
+
+ <texture name="Icon_Copy" file_name="icons/copy_clipboard.png" preload="true" />
+
+ <texture name="Icon_Delete" file_name="icons/delete_icon.png" preload="true" />
<texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
<texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
+ <texture name="Icon_File_Upload" file_name="icons/file_upload.png" preload="true" />
+
<texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
<texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
@@ -268,10 +274,16 @@ with the same filename but different name
<texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
<texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
+
+ <texture name="Icon_Paste" file_name="icons/paste_clipboard.png" preload="true" />
<texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
<texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
+ <texture name="Icon_Snapshot" file_name="icons/snapshot_icon.png" preload="true" />
+
+ <texture name="Icon_Use_Texture" file_name="icons/texture_icon.png" preload="true" />
+
<texture name="Info" file_name="icons/Info.png" preload="false" />
<texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
<texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 97c6ecee20..9657290f1f 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -69,57 +69,75 @@
<button
follows="right|bottom"
- height="32"
- label="A"
layout="topleft"
- left="38"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_File_Upload"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="upload_local"
+ left="38"
top_pad="9"
+ height="32"
width="32" />
<button
follows="right|bottom"
- height="32"
- label="B"
layout="topleft"
- left_pad="10"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_Snapshot"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="upload_snapshot"
+ left_pad="10"
top_delta="0"
+ height="32"
width="32" />
<button
follows="right|bottom"
- height="32"
- label="C"
layout="topleft"
- left_pad="10"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_Use_Texture"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="use_texture"
+ left_pad="10"
top_delta="0"
+ height="32"
width="32" />
<button
follows="right|bottom"
- height="32"
- label="D"
layout="topleft"
- left_pad="10"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_Copy"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="copy_to_clipboard"
+ left_pad="10"
top_delta="0"
+ height="32"
width="32" />
<button
follows="right|bottom"
- height="32"
- label="E"
layout="topleft"
- left_pad="10"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_Paste"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="paste_from_clipboard"
+ left_pad="10"
top_delta="0"
+ height="32"
width="32" />
<button
follows="right|bottom"
- height="32"
- label="F"
layout="topleft"
- left_pad="10"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Icon_Delete"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
name="remove_image"
+ left_pad="10"
top_delta="0"
+ height="32"
width="32" />
<text