Added subscribe/unsubscribe to album icons

Fixed layout spaces for GxsGroupDialog.ui, when some labels/buttons is hided.


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

retroshare-gui/src/gui/Identity/IdDialog.ui

@@ -13,10 +13,73 @@
   <property name="windowTitle">
    <string/>
   </property>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0" rowspan="3">
+     <property name="bottomMargin">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+      <number>6</number>
+     </property>
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item row="0" column="0">
+      <widget class="QFrame" name="frame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="margin">
+         <number>1</number>
+        </property>
         <item>
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="../images.qrc">:/images/groupchat.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_10">
+          <property name="font">
+           <font>
+            <pointsize>11</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Identities</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pushButton_NewId">
+          <property name="text">
+           <string>New ID</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="0">
       <widget class="QGroupBox" name="groupBox">
        <property name="title">
         <string>Showing:</string>
@@ -84,7 +147,7 @@
        </layout>
       </widget>
      </item>
-     <item>
+     <item row="2" column="0">
       <widget class="QTreeWidget" name="treeWidget_IdList">
        <column>
         <property name="text">
@@ -106,7 +169,16 @@
     </layout>
    </item>
    <item row="0" column="1">
+    <layout class="QGridLayout" name="gridLayout_4">
+     <property name="verticalSpacing">
+      <number>0</number>
+     </property>
+     <item row="0" column="0">
+      <widget class="QFrame" name="frame">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="margin">
+         <number>3</number>
+        </property>
         <item>
          <widget class="QPushButton" name="pushButton_Delete">
           <property name="text">
@@ -129,15 +201,22 @@
          </widget>
         </item>
         <item>
-      <widget class="QPushButton" name="pushButton_NewId">
+         <spacer name="horizontalSpacer">
-       <property name="text">
+          <property name="orientation">
-        <string>New ID</string>
+           <enum>Qt::Horizontal</enum>
           </property>
-      </widget>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
         </item>
        </layout>
+      </widget>
      </item>
-   <item row="1" column="1">
+     <item row="1" column="0">
       <widget class="QGroupBox" name="groupBox_2">
        <property name="title">
         <string>Identity Type</string>
@@ -324,7 +403,7 @@
        </layout>
       </widget>
      </item>
-   <item row="2" column="1">
+     <item row="2" column="0">
       <widget class="QGroupBox" name="groupBox_3">
        <property name="title">
         <string>Reputation</string>
@@ -357,9 +436,11 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources>
-  <include location="../LinksCloud/images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>

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

@@ -330,6 +330,7 @@ void PhotoShare::updateAlbums()
 
         ui.toolButton_subscribe->setEnabled(true);
         ui.toolButton_subscribe->setText("Unsubscribe From Album");
+        ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png"));
         ui.toolButton_NewAlbum->setEnabled(false);
         ui.toolButton_SlideShow->setEnabled(true);
 
@@ -347,6 +348,7 @@ void PhotoShare::updateAlbums()
 
         ui.toolButton_subscribe->setEnabled(true);
         ui.toolButton_subscribe->setText("Subscribe To Album");
+        ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png"));
         ui.toolButton_NewAlbum->setEnabled(false);
         ui.toolButton_SlideShow->setEnabled(false);
 

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

@@ -111,8 +111,8 @@
          <string>Subscribe To Album</string>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
+         <iconset resource="Photo_images.qrc">
-          <normaloff>:/images/konqsidebar_news24.png</normaloff>:/images/konqsidebar_news24.png</iconset>
+          <normaloff>:/images/album_subscribe.png</normaloff>:/images/album_subscribe.png</iconset>
         </property>
         <property name="iconSize">
          <size>

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

@@ -2,5 +2,7 @@
 	<qresource prefix="/" >
 		<file>images/kuickshow.png</file>
 		<file>images/kview_24.png</file>
+		<file>images/album_subscribe.png</file>
+		<file>images/album_unsubscribe.png</file>
 	</qresource>
 </RCC>

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -159,8 +159,11 @@ border-radius: 10px;
            </item>
            <item row="1" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <property name="leftMargin">
+             <property name="spacing">
-              <number>0</number>
+              <number>9</number>
+             </property>
+             <property name="margin">
+              <number>3</number>
              </property>
              <item>
               <widget class="QPushButton" name="addLogoButton">