From 0e71fb3c9d82bf2a307431f68f8ec84d223a4887 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 2 Nov 2013 01:50:17 +0100
Subject: added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140,
 and ACME-1141

---
 .../skins/default/xui/en/panel_flickr_photo.xml    | 152 +++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_flickr_photo.xml

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
new file mode 100644
index 0000000000..1fc4927ac2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -0,0 +1,152 @@
+    <panel
+      height="400"
+      width="304"
+      layout="topleft"
+      name="panel_flickr_photo">
+      <layout_stack
+	   layout="topleft"
+       border_size="0"
+       height="392"
+       follows="all"
+       orientation="vertical"
+       name="stack_photo"
+       top="8">
+        <layout_panel	
+         name="snapshot_panel"
+         height="367">
+            <combo_box
+             control_name="SocialPhotoResolution"
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="9"
+             type="string"
+             width="50">
+              [SIZE] KB
+            </text>
+            <panel
+                height="150"
+                width="250"
+                visible="true"
+                name="thumbnail_placeholder"
+                top="33"
+                follows="left|top"
+                left="9">
+            </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
+                follows="left|top"
+                font="SansSerif"
+                text_color="EmphasisColor"
+                height="14"
+                top_pad="-19"
+                left_pad="-20"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                width="150">
+                Refreshing...
+            </text>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="20"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="87"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+              left="9"
+              height="16"
+             top_pad="8"/>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Post"
+           name="post_photo_btn"
+           width="100">
+            <button.commit_callback
+             function="SocialSharing.SendPhoto" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_photo_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="SocialSharing.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
-- 
cgit v1.2.3


From be23aaefe53cd245752d3973bf930c87f67c6253 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 7 Nov 2013 01:30:36 +0000
Subject: added title, descriptions, tags, and safety level to
 panel_flickr_photo.xml for ACME-1142

---
 .../skins/default/xui/en/panel_flickr_photo.xml    | 98 ++++++++++++++++++++--
 1 file changed, 89 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 1fc4927ac2..d7d3fb6c1b 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -1,19 +1,19 @@
     <panel
-      height="400"
+      height="540"
       width="304"
       layout="topleft"
       name="panel_flickr_photo">
       <layout_stack
 	   layout="topleft"
        border_size="0"
-       height="392"
+       height="532"
        follows="all"
        orientation="vertical"
        name="stack_photo"
        top="8">
         <layout_panel	
          name="snapshot_panel"
-         height="367">
+         height="507">
             <combo_box
              control_name="SocialPhotoResolution"
              follows="left|top"
@@ -97,30 +97,110 @@
              font="SansSerif"
              height="16"
              left="9"
-             name="caption_label"
+             name="title_label"
              top_pad="20"
              type="string">
-              Comment (optional):
+              Title:
             </text>
             <text_editor
              follows="left|top"
-             height="87"
+             height="20"
+             width="250"
+             left="9"
+             length="1"
+             max_length="256"
+             name="photo_title"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="description_label"
+             top_pad="10"
+             type="string">
+              Description:
+            </text>
+            <text_editor
+             follows="left|top"
+             height="50"
              width="250"
              left="9"
              length="1"
              max_length="700"
-             name="photo_caption"
+             name="photo_description"
              type="string"
              word_wrap="true">
             </text_editor>
             <check_box
              follows="left|top"
              initial_value="true"
-             label="Include location in posting"
+             label="Include SL location at end of description"
              name="add_location_cb"
               left="9"
               height="16"
              top_pad="8"/>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="tags_label"
+             top_pad="10"
+             type="string">
+              Tags:
+            </text>
+            <text
+              length="1"
+              follows="top|left"
+              font="SansSerifSmall"
+              text_color="White_50"
+              height="30"
+              name="tags_help_label"
+              left="50"
+              top_pad="-16"
+              type="string">
+Separate tags with spaces
+Use "" for multi-word tags
+            </text>
+            <text_editor
+             follows="left|top"
+             height="50"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_tags"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <combo_box
+             control_name="FlickrPhotoRating"
+             follows="left|top"
+             top_pad="16"
+             left="9"
+             label="Choose Flickr rating (required)..."
+             name="rating_combobox"
+             tool_tip="Flickr content rating"
+             height="21"
+             width="250">
+              <combo_box.item
+               label="Safe"
+               name="SafeRating"
+               value="1" />
+              <combo_box.item
+               label="Moderate"
+               name="ModerateRating"
+               value="2" />
+              <combo_box.item
+               label="Restricted"
+               name="RestrictedRating"
+               value="3" />
+            </combo_box>
         </layout_panel>
         <layout_panel
           name="photo_button_panel"
@@ -130,7 +210,7 @@
            top="0"
            left="9"
            height="23"
-           label="Post"
+           label="Upload"
            name="post_photo_btn"
            width="100">
             <button.commit_callback
-- 
cgit v1.2.3


From a718b0d182dd35bdb01973eb3108e8b4a58a627c Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 18:04:23 +0000
Subject: updated Flickr photo upload UI content rating text for ACME-1178

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 d7d3fb6c1b..39935a7687 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -189,15 +189,15 @@ Use "" for multi-word tags
              height="21"
              width="250">
               <combo_box.item
-               label="Safe"
+               label="Safe content rating"
                name="SafeRating"
                value="1" />
               <combo_box.item
-               label="Moderate"
+               label="Moderate content rating"
                name="ModerateRating"
                value="2" />
               <combo_box.item
-               label="Restricted"
+               label="Restricted content rating"
                name="RestrictedRating"
                value="3" />
             </combo_box>
-- 
cgit v1.2.3


From 19c1be0e055bd06cb3083a9c9d126a4907a90788 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 22:37:24 +0000
Subject: replaced Flickr title text_editor to a line_editor for ACME-1169

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 39935a7687..b3af271f34 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -102,7 +102,7 @@
              type="string">
               Title:
             </text>
-            <text_editor
+            <line_editor
              follows="left|top"
              height="20"
              width="250"
@@ -110,9 +110,8 @@
              length="1"
              max_length="256"
              name="photo_title"
-             type="string"
-             word_wrap="true">
-            </text_editor>
+             type="string">
+            </line_editor>
             <text
              length="1"
              follows="top|left|right"
-- 
cgit v1.2.3


From 6578144b7eda1dae885e5cc172751203b1d16c2d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 18 Dec 2013 15:55:13 -0800
Subject: ACME-1236 : WIP : Added Gray Scale as an experimental filter in
 Flickr. Lots of ugly hacks for now

---
 .../skins/default/xui/en/panel_flickr_photo.xml    | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 b3af271f34..28e3557e15 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -40,19 +40,24 @@
                name="1024x768"
                value="[i1024,i768]" />
             </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="9"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
+            <combo_box
+               control_name="SocialPhotoFilters"
+               follows="right|top"
+               name="filters_combobox"
+               tool_tip="Image filters"
+               top="6"
+               left="165"
+               height="21"
+               width="135">
+                <combo_box.item
+                 label="No Filter"
+                 name="NoFilter"
+                 value="NoFilter" />
+                <combo_box.item
+                 label="Gray Scale"
+                 name="GrayScale"
+                 value="GrayScale" />
+            </combo_box>
             <panel
                 height="150"
                 width="250"
-- 
cgit v1.2.3


From 5342d0c570ef6c654b63a403d9aa7b51ef65f249 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 13 Jan 2014 14:36:42 -0800
Subject: ACME-1256 : Rename and cleanup in the default filters

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 28e3557e15..47ddecdf38 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -53,10 +53,6 @@
                  label="No Filter"
                  name="NoFilter"
                  value="NoFilter" />
-                <combo_box.item
-                 label="Gray Scale"
-                 name="GrayScale"
-                 value="GrayScale" />
             </combo_box>
             <panel
                 height="150"
-- 
cgit v1.2.3


From e970fa7f1ce9190b8a26e72bebbcceed04fb7494 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 30 Jan 2014 18:53:05 -0800
Subject: ACME-1293 : Use notification to signal from the snapshot panel to its
 container rather than grabbing global instances, use unique control_name for
 widgets, fix Post button visibility on Twitter

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 47ddecdf38..01116c6c4c 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -15,7 +15,7 @@
          name="snapshot_panel"
          height="507">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FlickrPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -41,7 +41,7 @@
                value="[i1024,i768]" />
             </combo_box>
             <combo_box
-               control_name="SocialPhotoFilters"
+               control_name="FlickrPhotoFilters"
                follows="right|top"
                name="filters_combobox"
                tool_tip="Image filters"
-- 
cgit v1.2.3


From a6123336e20ad8e6b597437e808a22d9a9a46c6b Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 6 Feb 2014 00:42:11 +0000
Subject: Made Flickr rating default to Safe for ACME-1304

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 01116c6c4c..4516c01670 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -183,21 +183,20 @@ Use "" for multi-word tags
              follows="left|top"
              top_pad="16"
              left="9"
-             label="Choose Flickr rating (required)..."
              name="rating_combobox"
              tool_tip="Flickr content rating"
              height="21"
              width="250">
               <combo_box.item
-               label="Safe content rating"
+               label="Safe Flickr rating"
                name="SafeRating"
                value="1" />
               <combo_box.item
-               label="Moderate content rating"
+               label="Moderate Flickr rating"
                name="ModerateRating"
                value="2" />
               <combo_box.item
-               label="Restricted content rating"
+               label="Restricted Flickr rating"
                name="RestrictedRating"
                value="3" />
             </combo_box>
-- 
cgit v1.2.3


From d220657d8525ccfa246e0f49904e18cc36458b28 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 25 Feb 2014 21:54:09 -0800
Subject: ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses
 the thumbnail for the moment

---
 .../newview/skins/default/xui/en/panel_flickr_photo.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 4516c01670..350c385cc3 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -82,7 +82,7 @@
                 text_color="EmphasisColor"
                 height="14"
                 top_pad="-19"
-                left_pad="-20"
+                left_pad="-30"
                 length="1"
                 halign="center"
                 name="working_lbl"
@@ -92,6 +92,19 @@
                 width="150">
                 Refreshing...
             </text>
+            <button
+                follows="right|top"
+                height="23"
+                label="Big Preview"
+                left="200"
+                top_pad="-19"
+                name="big_preview_btn"
+                tool_tip="Click to open big preview"
+                visible="true"
+                width="100" >
+                <button.commit_callback
+                function="SocialSharing.BigPreview" />
+            </button>
             <text
              length="1"
              follows="top|left|right"
@@ -99,7 +112,7 @@
              height="16"
              left="9"
              name="title_label"
-             top_pad="20"
+             top_pad="15"
              type="string">
               Title:
             </text>
-- 
cgit v1.2.3


From ed38a0aede09f42c4fe7eb4dd53ecd6490d12ca0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 26 Feb 2014 17:22:16 -0800
Subject: ACME-1327 : WIP : Make rescale of preview isotropic, make preview
 button a toggle

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_flickr_photo.xml')

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 350c385cc3..8d8ef45c0d 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -95,11 +95,12 @@
             <button
                 follows="right|top"
                 height="23"
-                label="Big Preview"
+                label="Preview"
                 left="200"
                 top_pad="-19"
                 name="big_preview_btn"
-                tool_tip="Click to open big preview"
+                tool_tip="Click to toggle preview"
+                is_toggle="true"
                 visible="true"
                 width="100" >
                 <button.commit_callback
-- 
cgit v1.2.3