Merge branch 'master' of ssh://git.code.sf.net/p/rssguard/code

CMakeLists.txt

@@ -43,7 +43,9 @@ set(MINIMUM_QT_VERSION 4.7.3)
 set(SOURCE_PACKAGE_SUFFIX "Source")
 set(EXE_NAME ${APP_LOW_NAME})
 
+# Options declaration.
 option(USE_QT_5 "Use Qt 5 for building" OFF)
+option(BUNDLE_ICON_THEME "Equip installation with custom icon theme" ON)
 
 message(STATUS "[${APP_LOW_NAME}] Welcome to ${APP_NAME} compilation process.")
 message(STATUS "[${APP_LOW_NAME}] Compilation process begins right now.")

src/core/defs.h.in

@@ -26,6 +26,7 @@
 
 #define TEXT_TITLE_LIMIT    30
 #define MAX_ZOOM_FACTOR     10.0
+#define ICON_SIZE_SETTINGS  16
 #define DATABASE_DRIVER     "QSQLITE"
 
 #define APP_DB_INIT_FILE    "db_init.sql"

src/gui/dynamicshortcutswidget.cpp

@@ -4,6 +4,7 @@
 #include <QSpacerItem>
 #include <QPalette>
 
+#include "core/defs.h"
 #include "gui/dynamicshortcutswidget.h"
 #include "gui/shortcutcatcher.h"
 #include "gui/shortcutbutton.h"
@@ -65,17 +66,23 @@ void DynamicShortcutsWidget::populate(const QList<QAction *> actions) {
     m_actionBindings << new_binding;
 
     // Add new catcher to our control.
-    QLabel *label = new QLabel(this);
-    label->setText(action->text().remove('&'));
-    label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+    QLabel *action_label = new QLabel(this);
+    action_label->setText(action->text().remove('&'));
+    action_label->setToolTip(action->toolTip());
+    action_label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
 
-    m_layout->addWidget(label, row_id, 0);
-    m_layout->addWidget(catcher, row_id, 1);
+    QLabel *action_icon = new QLabel(this);
+    action_icon->setPixmap(action->icon().pixmap(ICON_SIZE_SETTINGS, ICON_SIZE_SETTINGS));
+    action_icon->setToolTip(action->toolTip());
+
+    m_layout->addWidget(action_icon, row_id, 0);
+    m_layout->addWidget(action_label, row_id, 1);
+    m_layout->addWidget(catcher, row_id, 2);
 
     row_id++;
   }
 
   // Make sure that "spacer" is added.
   m_layout->setRowStretch(row_id, 1);
-  m_layout->setColumnStretch(0, 1);
+  m_layout->setColumnStretch(1, 1);
 }