SL-15312 Updated picks's layout

- better emphasis onto saving
- better resize logic
- ability to discard changes

1 files changed, 247 insertions, 93 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index b5e5f593a7..e39ad7c0c1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -14,98 +14,252 @@
     >
         (will update after save)
     </panel.string>
-    <texture_picker
-     name="pick_snapshot"
-     top="10"
-     left="10"
-     height="161"
-     width="260"
-     follows="left|top"
-     layout="topleft"
-     fallback_image="default_land_picture.j2c"
-    />
-    <line_editor
-     name="pick_name"
-     enabled="false"
-     top_pad="-15"
-     left="10"
-     height="20"
-     width="290"
-     follows="left|right|top"
-     layout="topleft"
-    />
-    <text_editor
-     name="pick_desc"
-     trusted_content="false"
-     always_show_icons="true"
-     enabled="false"
-     top_pad="8"
-     left="10"
-     height="102"
-     width="290"
+
+  <layout_stack
+   name="main_pick_stack"
+   left="1"
+   right="-1"
+   top="0"
+   bottom="-1"
+   follows="all"
+   layout="topleft"
+   orientation="vertical"
+   animate="false">
+    <layout_panel
      follows="all"
-     layout="topleft"
-     allow_html="true"
-     border_visible="true"
-     h_pad="4"
-     max_length="1023"
-     v_pad="3"
-     word_wrap="true"
-    />
-    <line_editor
-     name="pick_location"
-     enabled="false"
-     left="10"
-     height="20"
-     width="290"
-     follows="left|right|bottom"
-     layout="topleft"
-     length="1"
-     type="string"
-    >
-        Loading...
-    </line_editor>
-    <button
-     name="teleport_btn"
-     label="Teleport"
-     bottom="-27"
-     left="10"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-    />
-    <button
-     name="show_on_map_btn"
-     label="Show on Map"
-     bottom_delta="0"
-     left_pad="7"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-    />
-    <button
-     name="set_to_curr_location_btn"
-     label="Set Location"
-     tool_tip="Set to Current Location"
-     bottom="-3"
-     left="10"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="save_changes_btn"
-     label="Save Pick"
-     bottom_delta="0"
-     left_pad="7"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-     visible="false"
-    />
+     layout="bottomleft"
+     left_pad="2"
+     name="main_pick_lp"
+     auto_resize="true"
+     height="314">
+      <texture_picker
+       name="pick_snapshot"
+       top="10"
+       left="10"
+       height="161"
+       width="260"
+       follows="left|top"
+       layout="topleft"
+       fallback_image="default_land_picture.j2c"
+      />
+      <line_editor
+       name="pick_name"
+       enabled="false"
+       top_pad="-15"
+       left="10"
+       height="20"
+       width="290"
+       follows="left|right|top"
+       layout="topleft"
+      />
+      <text_editor
+       name="pick_desc"
+       trusted_content="false"
+       always_show_icons="true"
+       enabled="false"
+       top_pad="8"
+       left="10"
+       height="102"
+       width="290"
+       follows="all"
+       layout="topleft"
+       allow_html="true"
+       border_visible="true"
+       h_pad="4"
+       max_length="1023"
+       v_pad="3"
+       word_wrap="true"
+      />
+      <line_editor
+       name="pick_location"
+       enabled="false"
+       left="10"
+       height="23"
+       width="290"
+       follows="left|right|bottom"
+       layout="topleft"
+       length="1"
+       type="string"
+      >
+          Loading...
+      </line_editor>
+    </layout_panel>
+
+
+    <layout_panel
+     follows="all"
+     layout="bottomleft"
+     name="save_changes_lp"
+     auto_resize="false"
+     height="25">
+      <layout_stack
+       name="save_changes_stack"
+       left="1"
+       right="-1"
+       top="0"
+       height="25"
+       follows="left|top|right"
+       layout="topleft"
+       orientation="horizontal"
+       animate="false">
+
+        <layout_panel
+         follows="all"
+         layout="topleft"
+         name="util_resizer_left"
+         auto_resize="true"
+         width="1">
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="map_btn_lp"
+         auto_resize="false"
+         width="100">
+          <button
+           name="show_on_map_btn"
+           label="Show on Map"
+           left="0"
+           top="0"
+           height="23"
+           width="100"
+           follows="left|top"
+           layout="topleft"
+      />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="tp_btn_lp"
+         auto_resize="false"
+         width="100">
+          <button
+           name="teleport_btn"
+           label="Teleport"
+           left="0"
+           top="0"
+           height="23"
+           width="100"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="topleft"
+         name="util_resizer_right"
+         auto_resize="true"
+         width="1">
+        </layout_panel>
+
+      </layout_stack>
+    </layout_panel>
+
+    <layout_panel
+     follows="all"
+     layout="bottomleft"
+     name="save_changes_lp"
+     auto_resize="false"
+     height="41">
+      <view_border
+          bevel_style="none"
+          height="0"
+          follows="left|top|right"
+          layout="topleft"
+          left="0"
+          name="save_emphasis_border"
+          top="5"
+          width="310"/>
+      <layout_stack
+       name="save_changes_stack"
+       left="1"
+       right="-1"
+       top="11"
+       height="25"
+       follows="left|top|right"
+       layout="topleft"
+       orientation="horizontal"
+       animate="false">
+
+        <layout_panel
+         follows="all"
+         layout="topleft"
+         name="save_resizer_left"
+         auto_resize="true"
+         width="1">
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="create_btn_lp"
+         auto_resize="false"
+         width="130">
+          <button
+           name="create_changes_btn"
+           label="Create Pick"
+           left="0"
+           top="0"
+           height="23"
+           width="130"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="save_btn_lp"
+         auto_resize="false"
+         width="130">
+          <button
+           name="save_changes_btn"
+           label="Save Pick"
+           left="0"
+           top="0"
+           height="23"
+           width="130"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="cancel_btn_lp"
+         auto_resize="false"
+         width="130">
+          <button
+           name="cancel_changes_btn"
+           label="Cancel"
+           left="0"
+           top="0"
+           height="23"
+           width="130"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
+         layout="topleft"
+         name="save_resizer_right"
+         auto_resize="true"
+         width="1">
+        </layout_panel>
+
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
 </panel>