* added noskin.qss for use RetroShare without styleesheets

* added for expandButton for the hide/show correct icons/ToolTips
* added for Blogs Comboboxes some usefull icons


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@696 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/apps/smplayer/baseguiplus.cpp

@@ -155,6 +155,7 @@ void BaseGuiPlus::closeWindow() {
 		BaseGui::closeWindow();
 	}
 	//tray->hide();
+	hide();
 
 }
 

retroshare-gui/src/gui/BlogDialog.ui

@@ -38,6 +38,12 @@
      </property>
      <item>
       <widget class="QLabel" name="label" >
+       <property name="maximumSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
        <property name="font" >
         <font>
          <weight>75</weight>
@@ -48,7 +54,10 @@
         <string/>
        </property>
        <property name="pixmap" >
-        <pixmap resource="images.qrc" >:/images/message-mail.png</pixmap>
+        <pixmap resource="images.qrc" >:/images/kblogger.png</pixmap>
+       </property>
+       <property name="scaledContents" >
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -87,16 +96,28 @@
         <property name="text" >
          <string>Last Month</string>
         </property>
+        <property name="icon" >
+         <iconset resource="images.qrc" >
+          <normaloff>:/images/view_calendar_month.png</normaloff>:/images/view_calendar_month.png</iconset>
+        </property>
        </item>
        <item>
         <property name="text" >
          <string>Last Week</string>
         </property>
+        <property name="icon" >
+         <iconset resource="images.qrc" >
+          <normaloff>:/images/view_calendar_week.png</normaloff>:/images/view_calendar_week.png</iconset>
+        </property>
        </item>
        <item>
         <property name="text" >
          <string>Last Day</string>
         </property>
+        <property name="icon" >
+         <iconset resource="images.qrc" >
+          <normaloff>:/images/view_calendar_day.png</normaloff>:/images/view_calendar_day.png</iconset>
+        </property>
        </item>
       </widget>
      </item>
@@ -122,6 +143,10 @@
         <property name="text" >
          <string>All Users</string>
         </property>
+        <property name="icon" >
+         <iconset resource="images.qrc" >
+          <normaloff>:/images/user/identity16.png</normaloff>:/images/user/identity16.png</iconset>
+        </property>
        </item>
        <item>
         <property name="text" >

retroshare-gui/src/gui/feeds/BlogMsgItem.cpp

@@ -129,10 +129,14 @@ void BlogMsgItem::toggle()
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
+	    expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	    expandButton->setToolTip("Hide");
 	}
 	else
 	{
 		expandFrame->hide();
+	    expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	    expandButton->setToolTip("Expand");
 	}
 }
 

retroshare-gui/src/gui/feeds/BlogMsgItem.ui

@@ -13,10 +13,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
    <item row="0" column="0" >
@@ -42,6 +39,9 @@
       </property>
       <item>
        <layout class="QHBoxLayout" >
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QPushButton" name="clearButton" >
           <property name="sizePolicy" >
@@ -57,7 +57,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/close_normal.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
           </property>
          </widget>
         </item>
@@ -69,7 +70,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>16</width>
             <height>26</height>
@@ -105,7 +106,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>1000</width>
             <height>20</height>
@@ -128,7 +129,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
         </item>
@@ -164,7 +166,7 @@
           <property name="sizeType" >
            <enum>QSizePolicy::Preferred</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>500</width>
             <height>20</height>
@@ -187,7 +189,8 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="images.qrc" >:/images/startall.png</iconset>
+           <iconset resource="../images.qrc" >
+            <normaloff>:/images/startall.png</normaloff>:/images/startall.png</iconset>
           </property>
          </widget>
         </item>
@@ -226,6 +229,7 @@
  </widget>
  <resources>
   <include location="images.qrc" />
+  <include location="../images.qrc" />
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/images.qrc

@@ -271,6 +271,9 @@
         <file>images/up.png</file>
         <file>images/underconstruction.png</file>
         <file>images/user.png</file>
+        <file>images/view_calendar_day.png</file>
+        <file>images/view_calendar_week.png</file>
+        <file>images/view_calendar_month.png</file>
         <file>images/window_fullscreen.png</file>
         <file>images/window_nofullscreen.png</file>
         <file>layouts/default.ui</file>

retroshare-gui/src/main.cpp

@@ -153,7 +153,8 @@ int main(int argc, char *argv[])
 		//skinWindow->show();
 		
 	}*/
-   /* Run Retroshare */
+   
+    /* Run Retroshare */
    //int ret = rshare.run();
 
 	/* Startup a Timer to keep the gui's updated */

retroshare-gui/src/release/qss/noskin.qss

@@ -0,0 +1,33 @@
+
+
+QPushButton#okButton {
+
+      max-height: 25px
+	  min-height: 25px;
+      min-width: 77px;
+      /*max-width: 77px;*/
+}
+
+QPushButton#cancelprefButton {
+
+	  min-height: 25px;
+      min-width: 77px;
+      max-width: 77px;
+}
+
+QPushButton#applyButton {
+
+	  min-height: 25px;
+	  max-height: 25px;
+      min-width: 77px;
+      max-width: 77px;
+}
+
+QPushButton#cancelButton {
+
+	  min-height: 25px;
+	  max-height: 25px;
+      min-width: 77px;
+      max-width: 77px;
+}
+