From 097f9711f22df449c11b3dcd960186a206bcd3ac Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 27 May 2010 18:36:07 +0300 Subject: EXT-2260 FIXED Changed camera floater according to new style - Implemented new widget- panel_camera_item, to use in camera floater. They are used inside of two panels. Their order is configurable via XML. Mouse down callbacks and images which are used for selected and and unselected items are also set in XML. - Now there are only 3 buttons instead of four at the bottom of the floater- pan and orbit are now shown simultaneously. - Implemented correct work of object view after moving from camera modes to presets list (and back). It wasn't workin completely correct in old version of floater. - Integrated new art. Reviewed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/436/ --HG-- branch : product-engine --- .../textures/bottomtray/Cam_Preset_Back_Off.png | Bin 700 -> 49285 bytes .../textures/bottomtray/Cam_Preset_Back_On.png | Bin 754 -> 50855 bytes .../textures/bottomtray/Cam_Preset_Front_Off.png | Bin 959 -> 50394 bytes .../textures/bottomtray/Cam_Preset_Front_On.png | Bin 1087 -> 50127 bytes .../textures/bottomtray/Cam_Preset_Side_Off.png | Bin 945 -> 49268 bytes .../textures/bottomtray/Cam_Preset_Side_On.png | Bin 1049 -> 50209 bytes .../textures/bottomtray/Mouselook_View_Off.png | Bin 0 -> 51189 bytes .../textures/bottomtray/Mouselook_View_On.png | Bin 0 -> 53113 bytes .../default/textures/bottomtray/Object_View_Off.png | Bin 0 -> 55000 bytes .../default/textures/bottomtray/Object_View_On.png | Bin 0 -> 51183 bytes .../textures/bottomtray/PanOrbit_Disabled.png | Bin 0 -> 50975 bytes .../default/textures/bottomtray/PanOrbit_Off.png | Bin 0 -> 51539 bytes .../default/textures/bottomtray/PanOrbit_Over.png | Bin 0 -> 54713 bytes .../default/textures/bottomtray/PanOrbit_Press.png | Bin 0 -> 51053 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Object_View_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Object_View_On.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png (limited to 'indra/newview/skins/default/textures/bottomtray') diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png index 3cfe2e850e..00158a7bc2 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png index bb5d85e410..3748f5e190 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png index 9876aa456c..c49b8f9a27 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png index f481fed88c..bc8c4db04d 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png index d58b4ff990..b919a0a152 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png index 6e73898992..de9da359a0 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png new file mode 100644 index 0000000000..8d32cad95f Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png new file mode 100644 index 0000000000..4c98e35868 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png new file mode 100644 index 0000000000..e9dea7e17e Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png new file mode 100644 index 0000000000..7a348ba22e Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png new file mode 100644 index 0000000000..20fa40e127 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png new file mode 100644 index 0000000000..53efa3a9a9 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png new file mode 100644 index 0000000000..f1420e0002 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png new file mode 100644 index 0000000000..89a6269edc Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png differ -- cgit v1.2.3