From 7398a2176f51cf55288c7bc7de786033dc042da5 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Thu, 22 Nov 2012 15:51:13 +0000
Subject: [PATCH] moved subscribe button to the left side, reorder category,
 added some category

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/PhotoShare/AlbumCreateDialog.ui   | 31 +++++++++++--
 .../src/gui/PhotoShare/PhotoShare.ui          | 46 +++++++++----------
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
index b45df4373..89b016535 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
@@ -67,12 +67,12 @@
            <widget class="QComboBox" name="comboBox_Category_2">
             <item>
              <property name="text">
-              <string>Travel</string>
+              <string>Animals</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>Holiday</string>
+              <string>Family</string>
              </property>
             </item>
             <item>
@@ -82,7 +82,32 @@
             </item>
             <item>
              <property name="text">
-              <string>Family</string>
+              <string>Flowers</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Holiday</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Landcapes</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Pets</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Portraits</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Travel</string>
              </property>
             </item>
             <item>
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
index ba24bf785..f27d948dd 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
@@ -69,6 +69,29 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QToolButton" name="toolButton_subscribe">
+        <property name="text">
+         <string>Subscribe To Album</string>
+        </property>
+        <property name="icon">
+         <iconset resource="Photo_images.qrc">
+          <normaloff>:/images/album_subscribe.png</normaloff>:/images/album_subscribe.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QToolButton" name="toolButton_SlideShow">
         <property name="text">
@@ -105,29 +128,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="toolButton_subscribe">
-        <property name="text">
-         <string>Subscribe To Album</string>
-        </property>
-        <property name="icon">
-         <iconset resource="Photo_images.qrc">
-          <normaloff>:/images/album_subscribe.png</normaloff>:/images/album_subscribe.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextBesideIcon</enum>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>