From 4380251c08fe5e2172e9a2ef0e550affb2c4a56a Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Mon, 17 May 2010 21:30:56 +0000
Subject: [PATCH] moved Post Button to header and fixed Subscribe Buttons Icon
 to not stretch the Button in cleanlooks style.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/unfinished/blogs/BlogsDialog.ui   | 111 +++++++++---------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.ui b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.ui
index e437ab81c..92c1bbed9 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.ui
+++ b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.ui
@@ -82,7 +82,7 @@
         <property name="maximumSize">
          <size>
           <width>220</width>
-          <height>16777215</height>
+          <height>38</height>
          </size>
         </property>
         <property name="baseSize">
@@ -127,7 +127,7 @@ border: 1px solid #CCCCCC;}
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap>:/images/kblogger.png</pixmap>
+              <pixmap resource="../../images.qrc">:/images/kblogger.png</pixmap>
              </property>
              <property name="scaledContents">
               <bool>true</bool>
@@ -160,7 +160,7 @@ p, li { white-space: pre-wrap; }
            </property>
           </spacer>
          </item>
-         <item row="0" column="2">
+         <item row="0" column="3">
           <widget class="QPushButton" name="blogpushButton">
            <property name="toolTip">
             <string>Add</string>
@@ -184,7 +184,7 @@ p, li { white-space: pre-wrap; }
             <string/>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../../images.qrc">
              <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
            </property>
            <property name="iconSize">
@@ -201,6 +201,42 @@ p, li { white-space: pre-wrap; }
            </property>
           </widget>
          </item>
+         <item row="0" column="2">
+          <widget class="QToolButton" name="postButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Post To Blog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="../../images.qrc">
+             <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -270,7 +306,7 @@ border-radius: 10px;
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap>:/images/hi64-app-kblogger.png</pixmap>
+             <pixmap resource="../../images.qrc">:/images/hi64-app-kblogger.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>false</bool>
@@ -313,52 +349,6 @@ p, li { white-space: pre-wrap; }
           <property name="rightMargin">
            <number>9</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="postButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>25</height>
-             </size>
-            </property>
-            <property name="toolTip">
-             <string>Post To Channel</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QToolButton, QPushButton, QComboBox { 
-border-image: url(:/images/btn_26.png) 4;
-border-width: 4;
-padding: 0px 6px;
-font-size: 12px;
-}
-
-QToolButton:hover, QPushButton:hover, QComboBox:hover { 
-border-image: url(:/images/btn_26_hover.png) 4;
-}
-
-QToolButton:disabled, QPushButton:disabled, QComboBox::disabled {
-color:gray;
-}
-
-QToolButton:pressed, QPushButton:pressed{
-border-image: url(:/images/btn_26_pressed.png) 4;
-}</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="3">
            <widget class="QPushButton" name="unsubscribeButton">
             <property name="sizePolicy">
@@ -419,6 +409,12 @@ border-image: url(:/images/btn_26_pressed.png) 4;
               <height>26</height>
              </size>
             </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>26</height>
+             </size>
+            </property>
             <property name="toolTip">
              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -450,12 +446,12 @@ border-image: url(:/images/btn_26_pressed.png) 4;
              <string>Subscribe</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>:/images/konqsidebar_news24.png</normaloff>:/images/konqsidebar_news24.png</iconset>
+             <iconset resource="../../images.qrc">
+              <normaloff>:/images/konqsidebar_news16.png</normaloff>:/images/konqsidebar_news16.png</iconset>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="0" column="0" colspan="2">
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -558,7 +554,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
   </layout>
   <action name="actionCreate_Blog">
    <property name="icon">
-    <iconset>
+    <iconset resource="../../images.qrc">
      <normaloff>:/images/kblogger.png</normaloff>:/images/kblogger.png</iconset>
    </property>
    <property name="text">
@@ -570,7 +566,10 @@ border-image: url(:/images/btn_26_pressed.png) 4;
   </action>
  </widget>
  <resources>
-  <include location="../images.qrc"/>
+  <include location="../../images.qrc"/>
+  <include location="../../images.qrc"/>
+  <include location="../../images.qrc"/>
+  <include location="../../images.qrc"/>
  </resources>
  <connections/>
 </ui>