From 0051782aef510746558c2e6bfd87a9f99f196a42 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Thu, 29 Aug 2013 22:02:04 +0000
Subject: [PATCH] Changed help buttons from QPushButton to QToolButton to use
 auto raise effect.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6647 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.ui         | 14 ++-----
 retroshare-gui/src/gui/ChatLobbyWidget.ui     | 14 ++-----
 .../src/gui/FileTransfer/TransfersDialog.ui   | 14 ++-----
 retroshare-gui/src/gui/ForumsDialog.ui        | 14 ++-----
 retroshare-gui/src/gui/FriendsDialog.ui       | 14 ++-----
 retroshare-gui/src/gui/MainPage.cpp           | 10 ++---
 retroshare-gui/src/gui/MessagesDialog.ui      | 42 ++++++++-----------
 retroshare-gui/src/gui/NewsFeed.ui            | 14 ++-----
 retroshare-gui/src/retroshare-gui/mainpage.h  |  4 +-
 9 files changed, 49 insertions(+), 91 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index f8a6ed36e..2ccf8ce45 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -76,15 +76,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="images.qrc">
@@ -93,7 +87,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui
index d23c46cfb..067d3f92b 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.ui
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui
@@ -70,15 +70,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="images.qrc">
@@ -87,7 +81,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
index 517cd8c83..8d5085efb 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
@@ -70,15 +70,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="../images.qrc">
@@ -87,7 +81,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui
index 6dfca6614..672738739 100644
--- a/retroshare-gui/src/gui/ForumsDialog.ui
+++ b/retroshare-gui/src/gui/ForumsDialog.ui
@@ -76,15 +76,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="images.qrc">
@@ -93,7 +87,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui
index 59b50688a..5b646c3a4 100644
--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@@ -67,15 +67,9 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="images.qrc">
@@ -84,7 +78,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/gui/MainPage.cpp b/retroshare-gui/src/gui/MainPage.cpp
index 6a8c7db2b..d60118446 100644
--- a/retroshare-gui/src/gui/MainPage.cpp
+++ b/retroshare-gui/src/gui/MainPage.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <retroshare-gui/mainpage.h>
 #include <QGraphicsBlurEffect>
-#include <QPushButton>
+#include <QAbstractButton>
 #include <QGraphicsDropShadowEffect>
 
 MainPage::MainPage(QWidget *parent , Qt::WindowFlags flags ) : QWidget(parent, flags) 
@@ -12,19 +12,19 @@ MainPage::MainPage(QWidget *parent , Qt::WindowFlags flags ) : QWidget(parent, f
 class MyTextBrowser: public QTextBrowser
 {
 	public:
-		MyTextBrowser(QWidget *parent,QPushButton *bt)
+		MyTextBrowser(QWidget *parent,QAbstractButton *bt)
 			: QTextBrowser(parent),button(bt)
 		{
 		}
 
-		virtual void	mousePressEvent ( QMouseEvent * e )
+		virtual void	mousePressEvent ( QMouseEvent* )
 		{
 			hide() ;
 			button->setChecked(false) ;
 		}
 
 	protected:
-		QPushButton *button ;
+		QAbstractButton *button ;
 };
 
 void MainPage::showHelp(bool b) 
@@ -40,7 +40,7 @@ void MainPage::showHelp(bool b)
 		help_browser->hide() ;
 }
 
-void MainPage::registerHelpButton(QPushButton *button,const QString& help_html_txt)
+void MainPage::registerHelpButton(QAbstractButton *button,const QString& help_html_txt)
 {
 	if(help_browser == NULL)
 	{
diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui
index b4316c9e2..eee665571 100644
--- a/retroshare-gui/src/gui/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/MessagesDialog.ui
@@ -292,29 +292,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="13">
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="images.qrc">
-          <normaloff>:/images/64px_help.png</normaloff>:/images/64px_help.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="3">
        <widget class="Line" name="line">
         <property name="orientation">
@@ -451,6 +428,23 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="13">
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="icon">
+         <iconset resource="images.qrc">
+          <normaloff>:/images/64px_help.png</normaloff>:/images/64px_help.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -819,7 +813,7 @@
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
    <class>RSTabWidget</class>
diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui
index a4db6b803..e78f28796 100644
--- a/retroshare-gui/src/gui/NewsFeed.ui
+++ b/retroshare-gui/src/gui/NewsFeed.ui
@@ -93,15 +93,9 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="helpButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
+       <widget class="QToolButton" name="helpButton">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
          <iconset resource="images.qrc">
@@ -110,7 +104,7 @@
         <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/retroshare-gui/src/retroshare-gui/mainpage.h b/retroshare-gui/src/retroshare-gui/mainpage.h
index 27480859d..7a677f6d6 100644
--- a/retroshare-gui/src/retroshare-gui/mainpage.h
+++ b/retroshare-gui/src/retroshare-gui/mainpage.h
@@ -27,7 +27,7 @@
 #include <QTextBrowser>
 
 class UserNotify;
-class QPushButton ;
+class QAbstractButton ;
 
 class MainPage : public QWidget
 {
@@ -43,7 +43,7 @@ class MainPage : public QWidget
 		// Overload this to add some help info  to the page. The way the info is 
 		// shown is handled by showHelp() below;
 		//
-		void registerHelpButton(QPushButton *button, const QString& help_html_text) ;
+		void registerHelpButton(QAbstractButton *button, const QString& help_html_text) ;
 
 	private slots:
 		void showHelp(bool b) ;