Changed ImageButton class constructor a bit (made the required changes into ZoomButto...

Reviewed by: Sami Rämö

diff --git a/src/ui/imagebutton.cpp b/src/ui/imagebutton.cpp
index 0dfd592..cade417 100644 (file)
--- a/src/ui/imagebutton.cpp
+++ b/src/ui/imagebutton.cpp
@@ -19,15 +19,14 @@
    USA.
 */
 
-#include <QSize>
 #include <QDebug>
-#include <QPixmap>
 #include <QPainter>
 
 #include "imagebutton.h"
 
-ImageButton::ImageButton(QWidget *parent, QString normalIconPictureFileName,
-                         QString selectedIconPictureFileName)
+ImageButton::ImageButton(const QString &normalIconPictureFileName,
+                         const QString &selectedIconPictureFileName,
+                         const QString &disabledIconPictureFileName, QWidget *parent)
     : QPushButton(parent),
       m_buttonMode(QIcon::Normal)
 {
@@ -43,6 +42,10 @@ ImageButton::ImageButton(QWidget *parent, QString normalIconPictureFileName,
         if(!selectedIconPictureFileName.isEmpty())
             icon.addFile(selectedIconPictureFileName, buttonSize, QIcon::Selected);
 
+        // If there is a picture for disabled state, use it instead of a simple color change
+        if(!disabledIconPictureFileName.isEmpty())
+            icon.addFile(disabledIconPictureFileName, buttonSize, QIcon::Disabled);
+
         initButton(buttonSize, icon);
     }
 }

diff --git a/src/ui/imagebutton.h b/src/ui/imagebutton.h
index 5876486..1627e46 100644 (file)
--- a/src/ui/imagebutton.h
+++ b/src/ui/imagebutton.h
@@ -22,12 +22,7 @@
 #ifndef IMAGEBUTTON_H
 #define IMAGEBUTTON_H
 
-#include <QIcon>
-#include <QString>
-#include <QWidget>
 #include <QPushButton>
-#include <QMouseEvent>
-#include <QPaintEvent>
 
 /**
  * @brief A simple class for icon button
@@ -42,12 +37,14 @@ public:
     /**
      * @brief Constructor
      *
-     * @param parent Parent
      * @param normalIconPictureFileName Normal state icon image file name
      * @param selectedIconPictureFileName Selected state icon image file name (optional)
+     * @param disabledIconPictureFileName Disabled state icon image file name (optional)
+     * @param parent Parent
      */
-    ImageButton(QWidget *parent = 0, QString normalIconPictureFileName = "",
-                QString selectedIconPictureFileName = "");
+    ImageButton(const QString &normalIconPictureFileName = QString(),
+                const QString &selectedIconPictureFileName = QString(),
+                const QString &disabledIconPictureFileName = QString(), QWidget *parent = 0);
 
 /*******************************************************************************
  * BASE CLASS INHERITED AND REIMPLEMENTED MEMBER FUNCTIONS

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index 7fd54e1..a775b02 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -25,6 +25,7 @@
 
 #include <QFormLayout>
 #include <QLabel>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QSettings>
 #include <QVBoxLayout>
@@ -97,10 +98,12 @@ UserInfo::UserInfo(QWidget *parent)
     m_updatedLabel = new QLabel();
     m_updatedLabel->setWordWrap(true);
 
-    ImageButton *updateFriendsButton = new ImageButton(this, ":/res/images/refresh.png",
-                                                             ":/res/images/refresh_s.png");
-    ImageButton *updateStatusMessageButton = new ImageButton(this, ":/res/images/send_position.png",
-                                                                   ":/res/images/send_position_s.png");
+    ImageButton *updateFriendsButton = new ImageButton(":/res/images/refresh.png",
+                                                       ":/res/images/refresh_s.png",
+                                                       "", this);
+    ImageButton *updateStatusMessageButton = new ImageButton(":/res/images/send_position.png",
+                                                             ":/res/images/send_position_s.png",
+                                                             "", this);
 
     buttonLayout->addWidget(updateFriendsButton);
     buttonLayout->addWidget(updateStatusMessageButton);

diff --git a/src/ui/zoombutton.cpp b/src/ui/zoombutton.cpp
index 74fbcc6..addc02a 100644 (file)
--- a/src/ui/zoombutton.cpp
+++ b/src/ui/zoombutton.cpp
@@ -20,15 +20,14 @@
  */
 
 #include <QDebug>
-#include <QTimer>
+#include <QMouseEvent>
 
 #include "zoombutton.h"
 
 #include "panelcommon.h"
 
-ZoomButton::ZoomButton(QWidget *parent, QString normalIconPictureFileName,
-                       QString selectedIconPictureFileName)
-    : ImageButton(parent, normalIconPictureFileName, selectedIconPictureFileName)
+ZoomButton::ZoomButton(const QString &iconPictureFileName, QWidget *parent)
+    : ImageButton(iconPictureFileName, "", "", parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 }

diff --git a/src/ui/zoombutton.h b/src/ui/zoombutton.h
index 773a483..6dd89e7 100644 (file)
--- a/src/ui/zoombutton.h
+++ b/src/ui/zoombutton.h
@@ -22,8 +22,6 @@
 #ifndef ZOOMBUTTON_H
 #define ZOOMBUTTON_H
 
-class QTimer;
-
 #include "imagebutton.h"
 
 /**
@@ -39,12 +37,10 @@ public:
     /**
      * @brief Constructor
      *
+     * @param iconPictureFileName Icon image file name
      * @param parent Parent
-     * @param normalIconPictureFileName Normal state Icon image file name
-     * @param selectedIconPictureFileName Selected state Icon image file name (optional)
      */
-    ZoomButton(QWidget *parent = 0, QString normalIconPictureFileName = QString(),
-               QString selectedIconPictureFileName = QString());
+    ZoomButton(const QString &iconPictureFileName = QString(), QWidget *parent = 0);
 
 /*******************************************************************************
  * BASE CLASS INHERITED AND REIMPLEMENTED MEMBER FUNCTIONS

diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp
index 6ff47ef..970b3cd 100644 (file)
--- a/src/ui/zoombuttonpanel.cpp
+++ b/src/ui/zoombuttonpanel.cpp
@@ -21,6 +21,7 @@
 */
 
 #include <QDebug>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QSettings>
 
@@ -41,8 +42,8 @@ ZoomButtonPanel::ZoomButtonPanel(QWidget *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_zoomInButton = new ZoomButton(this, ":/res/images/zoom_in.png");
-    m_zoomOutButton = new ZoomButton(this, ":/res/images/zoom_out.png");
+    m_zoomInButton = new ZoomButton(":/res/images/zoom_in.png", this);
+    m_zoomOutButton = new ZoomButton(":/res/images/zoom_out.png", this);
 
     m_panelLayout.setMargin(0);
     m_panelLayout.setSpacing(0);