Skip to content
Snippets Groups Projects
Commit 02fac563 authored by Tofu Linden's avatar Tofu Linden
Browse files

merge STORM-89

parents 064f30d1 4c2b8ecf
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ background_visible="true" ...@@ -84,7 +84,7 @@ background_visible="true"
follows="all" follows="all"
left="8" left="8"
top_pad="0" top_pad="0"
height="536" height="506"
width="292" width="292"
border_size="0"> border_size="0">
<layout_panel <layout_panel
...@@ -176,15 +176,27 @@ background_visible="true" ...@@ -176,15 +176,27 @@ background_visible="true"
</accordion_tab> </accordion_tab>
</accordion> </accordion>
</layout_panel> </layout_panel>
<layout_panel </layout_stack>
<layout_stack
name="layout"
orientation="horizontal"
follows="bottom|left|right"
left="8"
top_pad="0"
height="30"
width="292"
border_size="0">
<layout_panel
height="30" height="30"
layout="topleft" layout="topleft"
auto_resize="false" auto_resize="false"
left="0" left="0"
top_pad="0" top_pad="0"
name="button_row" name="button_row"
follows="bottom|left|right" follows="bottom|left|right"
width="313"> width="313">
<layout_stack <layout_stack
follows="bottom|left|right" follows="bottom|left|right"
...@@ -307,5 +319,7 @@ background_visible="true" ...@@ -307,5 +319,7 @@ background_visible="true"
visible="false" visible="false"
width="65" />--> width="65" />-->
</layout_panel> </layout_panel>
</layout_stack>
</layout_stack>
</panel> </panel>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</text> --> </text> -->
<tab_container <tab_container
follows="all" follows="all"
height="575" height="555"
halign="center" halign="center"
layout="topleft" layout="topleft"
left="5" left="5"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
layout="topleft" layout="topleft"
left="0" left="0"
top="0" top="0"
height="522" height="510"
width="315" width="315"
border_size="0"> border_size="0">
<layout_panel <layout_panel
...@@ -324,82 +324,25 @@ ...@@ -324,82 +324,25 @@
</panel> </panel>
</scroll_container> </scroll_container>
</layout_panel> </layout_panel>
<!-- <layout_panel </layout_stack>
follows="bottom|left" <panel
follows="bottom|left|right"
height="23"
layout="topleft" layout="topleft"
left="0" left="0"
name="profile_buttons_panel" top_pad="1"
height="28"
width="313">
<button
follows="bottom|left"
height="23"
label="Add Friend"
layout="topleft"
left="0"
mouse_opaque="false"
name="add_friend"
tool_tip="Offer friendship to the Resident"
top="5"
width="80" />
<button
follows="bottom|left"
height="23"
label="IM"
layout="topleft"
name="im"
top="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
label="Call"
layout="topleft"
name="call"
left_pad="3"
top="5"
width="45" />
<button
enabled="false"
follows="bottom|left"
height="23"
label="Map"
layout="topleft"
name="show_on_map_btn"
top="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
label="Teleport"
layout="topleft"
name="teleport"
left_pad="3"
top="5"
width="85" />
</panel>-->
<layout_panel
follows="bottom|left"
layout="topleft"
left="0"
top_pad="0"
name="profile_me_buttons_panel" name="profile_me_buttons_panel"
visible="false" visible="false"
user_resize="false"
auto_resize="false"
height="28"
width="315"> width="315">
<button <button
follows="bottom" follows="bottom"
height="23" height="23"
left="6" left="6"
top="1" top="1"
label="Edit Profile" label="Edit Profile"
name="edit_profile_btn" name="edit_profile_btn"
tool_tip="Edit your personal information" tool_tip="Edit your personal information"
width="152" /> width="152" />
</layout_panel> </panel>
</layout_stack>
</panel> </panel>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel <panel
follows="all" follows="all"
height="533" height="515"
label="Notes &amp; Privacy" label="Notes &amp; Privacy"
layout="topleft" layout="topleft"
left="0" left="0"
......
...@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2" ...@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
<accordion <accordion
fit_parent="true" fit_parent="true"
follows="all" follows="all"
height="470" height="485"
layout="topleft" layout="topleft"
left="0" left="0"
name="accordion" name="accordion"
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel <panel
follows="all" follows="all"
height="540" height="430"
label="Profile" label="Profile"
layout="topleft" layout="topleft"
left="0" left="0"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
layout="topleft" layout="topleft"
left="0" left="0"
top="0" top="0"
height="524" height="400"
width="317" width="317"
border_size="0"> border_size="0">
<layout_panel <layout_panel
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
layout="topleft" layout="topleft"
top="0" top="0"
left="0" left="0"
height="524" height="400"
width="317"> width="317">
<scroll_container <scroll_container
color="DkGray2" color="DkGray2"
...@@ -304,11 +304,25 @@ ...@@ -304,11 +304,25 @@
</panel> </panel>
</scroll_container> </scroll_container>
</layout_panel> </layout_panel>
<layout_panel
</layout_stack>
<layout_stack
name="layout_verb_buttons"
orientation="horizontal"
follows="bottom|left|right"
layout="topleft"
left="2"
top_pad="1"
height="30"
width="315"
border_size="0">
<layout_panel
follows="bottom|left" follows="bottom|left"
height="30" height="30"
layout="topleft" layout="topleft"
name="profile_buttons_panel" name="profile_buttons_panel"
top="0"
auto_resize="false" auto_resize="false"
width="317"> width="317">
...@@ -448,6 +462,6 @@ ...@@ -448,6 +462,6 @@
tool_tip="Edit your personal information" tool_tip="Edit your personal information"
width="130" /> width="130" />
</layout_panel> </layout_panel>
</layout_stack>
</layout_stack>
</panel> </panel>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
width="150" /> width="150" />
<tab_container <tab_container
follows="all" follows="all"
height="538" height="515"
halign="center" halign="center"
layout="topleft" layout="topleft"
left="5" left="5"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment