Added a headerframee icon for Create Album

Added a close button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5865 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp

@@ -11,9 +11,13 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhotoV2 *rs_photo
     ui(new Ui::AlbumCreateDialog), mPhotoQueue(photoQueue), mRsPhoto(rs_photo)
 {
     ui->setupUi(this);
+    
+	ui->headerFrame->setHeaderImage(QPixmap(":/images/album_create_64.png"));
+    ui->headerFrame->setHeaderText(tr("Create Album"));
 
     connect(ui->publishButton, SIGNAL(clicked()), this, SLOT(publishAlbum()));
     connect(ui->AlbumThumbNail, SIGNAL(clicked()), this, SLOT(addAlbumThumbnail()));
+    
 }
 
 AlbumCreateDialog::~AlbumCreateDialog()

retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui

@@ -24,7 +24,7 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <widget class="QFrame" name="headerFrame">
+    <widget class="HeaderFrame" name="headerFrame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -42,42 +42,28 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0" colspan="3">
+      <item row="0" column="0" colspan="4">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <layout class="QGridLayout" name="gridLayout_7">
-          <item row="0" column="0" colspan="2">
-           <widget class="QLabel" name="label_Headline">
-            <property name="font">
-             <font>
-              <pointsize>18</pointsize>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Album Details</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
+          <item row="0" column="0">
            <widget class="QLabel" name="label_18">
             <property name="text">
              <string>Album Name:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="0" column="1">
            <widget class="QLineEdit" name="lineEdit_Title_2"/>
           </item>
-          <item row="2" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="label_19">
             <property name="text">
              <string>Category:</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="1" column="1">
            <widget class="QComboBox" name="comboBox_Category_2">
             <item>
              <property name="text">
@@ -150,14 +136,14 @@ border-radius: 10px;
         </item>
        </layout>
       </item>
-      <item row="1" column="0" colspan="3">
+      <item row="1" column="0" colspan="4">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
+      <item row="2" column="0" colspan="4">
        <layout class="QGridLayout" name="gridLayout_6">
         <item row="0" column="0">
          <widget class="QLabel" name="captionLabel">
@@ -201,7 +187,7 @@ border-radius: 10px;
         </item>
        </layout>
       </item>
-      <item row="3" column="0" colspan="3">
+      <item row="3" column="0" colspan="4">
        <widget class="Line" name="line_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -308,7 +294,7 @@ border-radius: 10px;
         </layout>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2">
+      <item row="4" column="1" colspan="3">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -334,18 +320,33 @@ border-radius: 10px;
         </property>
        </spacer>
       </item>
-      <item row="5" column="2">
+      <item row="5" column="3">
        <widget class="QPushButton" name="publishButton">
         <property name="text">
          <string>Publish Album</string>
         </property>
        </widget>
       </item>
+      <item row="5" column="2">
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Cancel</set>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HeaderFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/common/HeaderFrame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../images.qrc"/>
  </resources>

retroshare-gui/src/gui/PhotoShare/Photo_images.qrc

@@ -3,6 +3,7 @@
 		<file>images/kuickshow.png</file>
 		<file>images/kview_24.png</file>
 		<file>images/album_subscribe.png</file>
-		<file>images/album_unsubscribe.png</file>
+		<file>images/album_unsubscribe.png</file>
+		<file>images/album_create_64.png</file>
 	</qresource>
 </RCC>