livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP - Continued Chatbar polishing, new gesture icon

meow-7.2.2
Arrehn 2011-10-04 02:55:19 -04:00
parent f87d030bf8
commit d4786d8722
8 changed files with 73 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/bottomtray/gesture_18.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
indra/newview/skins/metaharper/themes/appalachian_sky/textures/bottomtray/gesture_18.png → indra/newview/skins/default/textures/bottomtray/nearbychat_18.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

1
indra/newview/skins/default/textures/textures.xml
View File

@ -658,6 +658,7 @@ with the same filename but different name
<texture name="view_18" file_name="bottomtray/view_18.png" preload="false" />
<texture name="move_18" file_name="bottomtray/move_18.png" preload="false" />
<texture name="conversations_18" file_name="bottomtray/conversations_18.png" preload="false" />
<texture name="nearbychat_18" file_name="bottomtray/nearbychat_18.png" preload="false" />
<texture name="gesture_18" file_name="bottomtray/gesture_18.png" preload="false" />
<texture name="map_18" file_name="bottomtray/map_18.png" preload="false" />
<texture name="minimap_18" file_name="bottomtray/minimap_18.png" preload="false" />

24
indra/newview/skins/default/xui/en/panel_bottomtray.xml
View File

@ -60,12 +60,13 @@
<button
name="conversations_btn"
tool_tip="Shows/hides conversations window"
control_name="floater_vis_imcontacts"
image_overlay="conversations_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
right="310"
top="5"
width="30"
min_width="30"
@ -74,6 +75,25 @@
<commit_callback
function="Floater.Toggle"
parameter="im_container" />
</button>
<button
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat window"
control_name="floater_vis_imcontacts"
image_overlay="nearbychat_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
top="5"
width="30"
min_width="30"
height="23"
follows="right">
<commit_callback
function="Floater.Toggle"
parameter="nearby_chat" />
</button>
</layout_panel>
@ -837,6 +857,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
user_resize="false"
min_width="4"
name="DUMMY2"
width="4" />
width="8" />
</layout_stack>
</panel>

30
indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
View File

@ -11,7 +11,7 @@
left="0"
name="bottom_tray"
top="28"
width="1310">
width="1340">
<string
name="DragIndicationImageName"
@ -34,17 +34,17 @@
name="toolbar_stack"
orientation="horizontal"
top="0"
width="1310">
width="1340">
<layout_panel
auto_resize="false"
layout="topleft"
max_width="284"
max_width="314"
min_width="34"
height="28"
mouse_opaque="false"
name="chat_bar_layout_panel"
user_resize="true"
width="284" >
width="314" >
<panel
name="chat_bar"
@ -59,12 +59,13 @@
<button
name="conversations_btn"
tool_tip="Shows/hides conversations window"
control_name="floater_vis_imcontacts"
image_overlay="conversations_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
right="310"
top="5"
width="30"
min_width="30"
@ -73,6 +74,25 @@
<commit_callback
function="Floater.Toggle"
parameter="im_container" />
</button>
<button
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat window"
control_name="floater_vis_imcontacts"
image_overlay="nearbychat_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
top="5"
width="30"
min_width="30"
height="23"
follows="right">
<commit_callback
function="Floater.Toggle"
parameter="nearby_chat" />
</button>
</layout_panel>

BIN
indra/newview/skins/metaharper/textures/bottomtray/gesture_18.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
indra/newview/skins/metaharper/textures/bottomtray/nearbychat_18.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

31
indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
View File

@ -11,7 +11,7 @@
left="0"
name="bottom_tray"
top="28"
width="1310">
width="1340">
<string
name="DragIndicationImageName"
@ -35,17 +35,17 @@
name="toolbar_stack"
orientation="horizontal"
top="0"
width="1310">
width="1340">
<layout_panel
auto_resize="false"
layout="topleft"
max_width="284"
max_width="314"
min_width="34"
height="28"
mouse_opaque="false"
name="chat_bar_layout_panel"
user_resize="true"
width="284" >
width="314" >
<panel
name="chat_bar"
@ -57,15 +57,15 @@
mouse_opaque="false"
follows="left|right"
/>
<button
name="conversations_btn"
tool_tip="Shows/hides conversations window"
control_name="floater_vis_imcontacts"
image_overlay="conversations_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
right="310"
top="5"
width="30"
min_width="30"
@ -74,6 +74,25 @@
<commit_callback
function="Floater.Toggle"
parameter="im_container" />
</button>
<button
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat window"
control_name="floater_vis_imcontacts"
image_overlay="nearbychat_18"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
right="280"
top="5"
width="30"
min_width="30"
height="23"
follows="right">
<commit_callback
function="Floater.Toggle"
parameter="nearby_chat" />
</button>
</layout_panel>