diff --git a/CMakeLists.txt b/CMakeLists.txt
index 962a7e6e0..b72944a02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,22 @@
+#################################################################
+# RSS Guard compilation script for CMake.
+#
+# Usage:
+# a) DEBUG build for testing.
+# cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT_5=ON
+#
+# b) RELEASE build for production use.
+# cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT_5=ON
+#
+# Arguments:
+# "-DCMAKE_INSTALL_PREFIX=/usr"
+# Installation path, replace with something like "C:\rssguard" on Windows.
+#
+# "-DUSE_QT_5=ON"
+# Specifies which major Qt version to use. Qt 4 and Qt 5 are supported.
+# If "OFF" is passed as an argument, then Qt 4 is used.
+#################################################################
+
cmake_minimum_required(VERSION 2.8.11)
# Setup basic variables.
@@ -24,9 +43,6 @@ endif(APPLE)
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-# Obtain revision number if available.
-message(STATUS "[${APP_LOW_NAME}] Obtaining revision number.")
-
# Select which Qt version to use.
if(${USE_QT_5})
message(STATUS "[${APP_LOW_NAME}] Using Qt 5 library for building.")
@@ -37,6 +53,9 @@ else(${USE_QT_5})
message(STATUS "[${APP_LOW_NAME}] Using Qt 4 library for building.")
endif(${USE_QT_5})
+# Obtain revision number if available.
+message(STATUS "[${APP_LOW_NAME}] Obtaining revision number.")
+
if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
find_package(Git)
if(GIT_FOUND)
diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h
index 50252f473..fe2d410b2 100644
--- a/src/core/messagesmodel.h
+++ b/src/core/messagesmodel.h
@@ -51,7 +51,7 @@ class MessagesModel : public QSqlTableModel {
public slots:
// CORE messages manipulators.
// NOTE: These are used to change properties of one message.
- // NOTE: Model is NOT reset after these methods are applied.
+ // NOTE: Model is NOT reset after one of these methods are applied.
bool switchMessageImportance(int row_index);
bool setMessageDeleted(int row_index, int deleted);
bool setMessageRead(int row_index, int read);
@@ -59,7 +59,7 @@ class MessagesModel : public QSqlTableModel {
// BATCH messages manipulators.
// NOTE: These methods are used for changing of attributes of
// many messages via DIRECT SQL calls.
- // NOTE: Model is reset after these methods is applied.
+ // NOTE: Model is reset after one of these methods is applied.
bool switchBatchMessageImportance(const QModelIndexList &messages);
bool setBatchMessagesDeleted(const QModelIndexList &messages, int deleted);
bool setBatchMessagesRead(const QModelIndexList &messages, int read);
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 42541e505..767946674 100644
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -148,8 +148,20 @@ void FormMain::setupIcons() {
m_ui->m_actionImport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-import"));
m_ui->m_actionExport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-export"));
m_ui->m_actionFullscreen->setIcon(IconThemeFactory::getInstance()->fromTheme("view-fullscreen"));
- m_ui->m_actionUpdateAll->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
- m_ui->m_actionUpdateSelected->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionUpdateSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+
+ m_ui->m_actionDeleteAllMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionDeleteSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionDeleteSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionEditSelectedFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionMarkAllMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionMarkAllMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionMarkFeedsAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+ m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
+
// Setup icons for underlying components: opened web browsers...
foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) {
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index ac03dcd51..01b35e62c 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -80,7 +80,7 @@