From 86e1f105e65150140e491c9628b2872339038997 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 23 Nov 2012 00:11:05 +0000
Subject: [PATCH] some layout improvements for Create Album added placeholder
 text

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/PhotoShare/AlbumCreateDialog.cpp  |   7 +
 .../src/gui/PhotoShare/AlbumCreateDialog.ui   | 305 ++++++++++--------
 .../src/gui/PhotoShare/PhotoShare.ui          |  26 +-
 3 files changed, 194 insertions(+), 144 deletions(-)

diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
index 7356747e1..c4e2bf462 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
@@ -14,6 +14,13 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhotoV2 *rs_photo
     
 	ui->headerFrame->setHeaderImage(QPixmap(":/images/album_create_64.png"));
     ui->headerFrame->setHeaderText(tr("Create Album"));
+    
+
+#if QT_VERSION >= 0x040700
+    ui->lineEdit_Title_2->setPlaceholderText(tr("Untitle Album")) ;
+    //ui->textEdit_Description->setPlaceholderText(tr("Say something about this album...")) ;
+    ui->lineEdit_Where->setPlaceholderText(tr("Where were this taken?")) ;
+#endif
 
     connect(ui->publishButton, SIGNAL(clicked()), this, SLOT(publishAlbum()));
     connect(ui->AlbumThumbNail, SIGNAL(clicked()), this, SLOT(addAlbumThumbnail()));
diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
index 89b016535..24f33b61f 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
@@ -180,35 +180,48 @@ border-radius: 10px;
         <item row="0" column="1">
          <widget class="QLineEdit" name="lineEdit_Caption_2"/>
         </item>
-        <item row="0" column="2">
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_13">
+          <property name="text">
+           <string>Description:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" rowspan="2">
+         <widget class="QTextEdit" name="textEdit_Description"/>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="lineEdit_Photographer"/>
+        </item>
+        <item row="2" column="0">
          <widget class="QLabel" name="label_12">
           <property name="text">
            <string>Photographer:</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
-         <widget class="QLineEdit" name="lineEdit_Photographer"/>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="lineEdit_Where"/>
         </item>
         <item row="1" column="0">
-         <widget class="QLabel" name="label_13">
-          <property name="text">
-           <string>Description</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" rowspan="2">
-         <widget class="QTextEdit" name="textEdit_Description"/>
-        </item>
-        <item row="1" column="2">
          <widget class="QLabel" name="label_14">
           <property name="text">
            <string>Where:</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="3">
-         <widget class="QLineEdit" name="lineEdit_Where"/>
+        <item row="4" column="0">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
         </item>
        </layout>
       </item>
@@ -219,119 +232,6 @@ border-radius: 10px;
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QGroupBox" name="groupBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="title">
-         <string>Share Options</string>
-        </property>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QComboBox" name="privacyComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>Public</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Restricted</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QComboBox" name="comboBox_5">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>Resize Images (&lt; 1Mb)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Resize Images (&lt; 10Mb)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Send Original Images</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QComboBox" name="comboBox_6">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>No Comments Allowed</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Authenticated Comments</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Any Comments Allowed</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QComboBox" name="comboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>Publish with Identity</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="3">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>168</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="5" column="0" colspan="2">
        <spacer name="horizontalSpacer">
         <property name="orientation">
@@ -359,6 +259,155 @@ border-radius: 10px;
         </property>
        </widget>
       </item>
+      <item row="4" column="0" colspan="4">
+       <widget class="QGroupBox" name="groupBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="title">
+         <string>Share Options</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Policy:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>Quality:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_3">
+             <property name="text">
+              <string>Comments:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string>Identity:</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="0" column="1">
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QComboBox" name="privacyComboBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Public</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Restricted</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox_5">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Resize Images (&lt; 1Mb)</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Resize Images (&lt; 10Mb)</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Send Original Images</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox_6">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>No Comments Allowed</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Authenticated Comments</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Any Comments Allowed</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <item>
+              <property name="text">
+               <string>Publish with Identity</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="0" column="2">
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>168</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
index f27d948dd..8d16bb21b 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
@@ -236,7 +236,7 @@
       <property name="alignment">
        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
       </property>
-      <widget class="QWidget" name="scrollAreaWidgetContents_2">
+      <widget class="PhotoDrop" name="scrollAreaWidgetContents_2">
        <property name="geometry">
         <rect>
          <x>0</x>
@@ -248,21 +248,7 @@
        <property name="styleSheet">
         <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>426</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       <layout class="QHBoxLayout" name="horizontalLayout_3"/>
       </widget>
      </widget>
     </widget>
@@ -299,6 +285,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PhotoDrop</class>
+   <extends>QWidget</extends>
+   <header>gui/PhotoShare/PhotoDrop.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../images.qrc"/>
   <include location="Photo_images.qrc"/>