Changed: Flickr floater layout.

Changed: Flickr floater size.
Changed: Aligned all widgets to an unified layout, keep 10 pixels left/right and so on.

3 files changed, 104 insertions, 86 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 1a9ffd0489..24de3ddd8d 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -10,11 +10,11 @@
   single_instance="true"
   reuse_instance="true"
   title="UPLOAD TO FLICKR"
-  height="622"
-  width="304">
+  height="590"
+  width="272">
   <panel
-   height="622"
-   width="304"
+   height="590"
+   width="272"
    visible="true"
    name="background"
    follows="all"
@@ -24,10 +24,11 @@
      name="tabs"
      tab_group="1"
      tab_min_width="70"
-     tab_height="30"
+     tab_height="21"
      tab_position="top"
      top="7"
-     height="577"
+     height="555"
+     follows="all"
      halign="center"
      use_highlighting_on_hover="true">
      <panel
@@ -51,8 +52,8 @@
       name="connection_error_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
-      left="9"
+      bottom="-5"
+      left="10"
       width="250"
       height="20"
       wrap="true"
@@ -67,14 +68,14 @@
       height="24"
       width="24"
       name="connection_loading_indicator"
-      top="2"
-      left="9"
+      top_delta="-2"
+      left="10"
       visible="true"/>
      <text
       name="connection_loading_text"
       type="string"
       follows="left|bottom|right"
-      top="5"
+      top_delta="2"
       left_pad="5"
       width="250"
       height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
index 506d2e2f74..5c2f335780 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -1,6 +1,6 @@
 <panel
 	 height="540"
-	 width="304"
+	 width="272"
 	 layout="topleft"
    name="panel_flickr_account">
   <string
@@ -15,9 +15,9 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_caption_label"
-   top="21"
+   top="5"
    type="string">
     Not connected to Flickr.
   </text>
@@ -28,7 +28,7 @@
    follows="top|left"
    font="SansSerif"
    height="16"
-   left="9"
+   left="10"
    name="account_name_label"
    parse_urls="true"
    type="string"/>
@@ -36,12 +36,14 @@
     layout="topleft"
     name="panel_buttons"
     height="345"
-    left="9">
+    left="0">
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_pad="9"
      visible="true"
+	 left="10"
+	 right="-10"
      height="23"
      label="Connect..."
      name="connect_btn"
@@ -51,8 +53,10 @@
 
     <button
      layout="topleft"
-     follows="left|top"
+     follows="left|top|right"
      top_delta="0"
+	 left="10"
+	 right="-10"
      height="23"
      label="Disconnect"
      name="disconnect_btn"
@@ -65,9 +69,9 @@
       length="1"
       follows="top|left"
       height="16"
-      left="0"
+      left="10"
       name="account_learn_more_label"
-      top_pad="20"
+      top_pad="5"
       type="string">
       [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Learn about posting to Flickr]
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 8d8ef45c0d..e31695645d 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -1,28 +1,19 @@
     <panel
       height="540"
-      width="304"
+      width="272"
+	  follows="all"
       layout="topleft"
       name="panel_flickr_photo">
-      <layout_stack
-	   layout="topleft"
-       border_size="0"
-       height="532"
-       follows="all"
-       orientation="vertical"
-       name="stack_photo"
-       top="8">
-        <layout_panel	
-         name="snapshot_panel"
-         height="507">
             <combo_box
              control_name="FlickrPhotoResolution"
              follows="left|top"
-             top="6"
-             left="9"
+			 layout="topleft"
+             top="7"
+             left="10"
              name="resolution_combobox"
              tool_tip="Image resolution"
              height="21"
-             width="135">
+             width="124">
               <combo_box.item
                label="Current Window"
                name="CurrentWindow"
@@ -42,13 +33,14 @@
             </combo_box>
             <combo_box
                control_name="FlickrPhotoFilters"
-               follows="right|top"
+               follows="left|top"
+			   layout="topleft"
                name="filters_combobox"
                tool_tip="Image filters"
-               top="6"
-               left="165"
+               top_delta="0"
+               left_pad="4"
                height="21"
-               width="135">
+               width="124">
                 <combo_box.item
                  label="No Filter"
                  name="NoFilter"
@@ -59,45 +51,59 @@
                 width="250"
                 visible="true"
                 name="thumbnail_placeholder"
-                top="33"
-                follows="left|top"
-                left="9">
+                top_pad="5"
+                follows="left|top|right"
+				layout="topleft"
+				right="-10"
+                left="10">
             </panel>
-            <button
-             follows="left|top"
-             height="23"
-             label="Refresh"
-             left="9"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <text
+			<text
                 follows="left|top"
+				layout="topleft"
                 font="SansSerif"
                 text_color="EmphasisColor"
                 height="14"
-                top_pad="-19"
-                left_pad="-30"
+                top_pad="2"
+                left="10"
                 length="1"
                 halign="center"
                 name="working_lbl"
                 translate="false"
                 type="string"
                 visible="true"
-                width="150">
+                width="251">
                 Refreshing...
             </text>
+			<view_border 
+			 bevel_style="in"
+			 follows="left|top"
+			 layout="topleft"
+			 height="1"
+			 left="10"
+			 name="refresh_border"
+			 width="250"
+			 top_pad="0"/>
+            <button
+             follows="left|top"
+			 layout="topleft"
+             height="23"
+             label="Refresh"
+             left="10"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
             <button
                 follows="right|top"
+				layout="topleft"
                 height="23"
                 label="Preview"
-                left="200"
-                top_pad="-19"
+                right="-10"
+                top_delta="0"
                 name="big_preview_btn"
                 tool_tip="Click to toggle preview"
                 is_toggle="true"
@@ -109,19 +115,21 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="title_label"
-             top_pad="15"
+             top_pad="10"
              type="string">
               Title:
             </text>
             <line_editor
              follows="left|top"
+			 layout="topleft"
              height="20"
              width="250"
-             left="9"
+             left="10"
              length="1"
              max_length="256"
              name="photo_title"
@@ -130,19 +138,23 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
+			 right="-10"
              name="description_label"
              top_pad="10"
+			 width="25"
              type="string">
               Description:
             </text>
             <text_editor
              follows="left|top"
+			 layout="topleft"
              height="50"
-             width="250"
-             left="9"
+             width="249"
+             left="10"
              length="1"
              max_length="700"
              name="photo_description"
@@ -151,6 +163,7 @@
             </text_editor>
             <check_box
              follows="left|top"
+			 layout="topleft"
              initial_value="true"
              label="Include SL location at end of description"
              name="add_location_cb"
@@ -159,23 +172,25 @@
              top_pad="8"/>
             <text
              length="1"
-             follows="top|left|right"
+             follows="top|left"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="tags_label"
-             top_pad="10"
+             top_pad="6"
              type="string">
               Tags:
             </text>
             <text
               length="1"
               follows="top|left"
+			  layout="topleft"
               font="SansSerifSmall"
               text_color="White_50"
               height="30"
               name="tags_help_label"
-              left="50"
+              left="51"
               top_pad="-16"
               type="string">
 Separate tags with spaces
@@ -183,9 +198,10 @@ Use "" for multi-word tags
             </text>
             <text_editor
              follows="left|top"
+			 layout="topleft"
              height="50"
-             width="250"
-             left="9"
+             width="249"
+             left="10"
              length="1"
              max_length="700"
              name="photo_tags"
@@ -195,8 +211,9 @@ Use "" for multi-word tags
             <combo_box
              control_name="FlickrPhotoRating"
              follows="left|top"
-             top_pad="16"
-             left="9"
+			 layout="topleft"
+             top_pad="7"
+             left="10"
              name="rating_combobox"
              tool_tip="Flickr content rating"
              height="21"
@@ -214,14 +231,11 @@ Use "" for multi-word tags
                name="RestrictedRating"
                value="3" />
             </combo_box>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
           <button
            follows="left|top"
-           top="0"
-           left="9"
+		   layout="topleft"
+           top_pad="7"
+           left="10"
            height="23"
            label="Upload"
            name="post_photo_btn"
@@ -230,16 +244,15 @@ Use "" for multi-word tags
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|top"
+               follows="right|top"
+			   layout="topleft"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
-               left_pad="15"
+               right="-10"
                top_delta="0"
                width="100">
             <button.commit_callback
              function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
+          </button>
     </panel>