pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many many.

Browse source
This commit is contained in:
Martin Rotter 2013-11-24 18:35:12 +01:00
parent f2a0ed3fe5
commit 99fa66167e
4 changed files with 88 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CMakeLists.txt
View file

@ -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) cmake_minimum_required(VERSION 2.8.11)
# Setup basic variables. # Setup basic variables.
@ -24,9 +43,6 @@ endif(APPLE)
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) 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. # Select which Qt version to use.
if(${USE_QT_5}) if(${USE_QT_5})
message(STATUS "[${APP_LOW_NAME}] Using Qt 5 library for building.") 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.") message(STATUS "[${APP_LOW_NAME}] Using Qt 4 library for building.")
endif(${USE_QT_5}) endif(${USE_QT_5})
# Obtain revision number if available.
message(STATUS "[${APP_LOW_NAME}] Obtaining revision number.")
if(EXISTS "${PROJECT_SOURCE_DIR}/.git") if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)

4
src/core/messagesmodel.h
View file

@ -51,7 +51,7 @@ class MessagesModel : public QSqlTableModel {
public slots: public slots:
// CORE messages manipulators. // CORE messages manipulators.
// NOTE: These are used to change properties of one message. // 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 switchMessageImportance(int row_index);
bool setMessageDeleted(int row_index, int deleted); bool setMessageDeleted(int row_index, int deleted);
bool setMessageRead(int row_index, int read); bool setMessageRead(int row_index, int read);
@ -59,7 +59,7 @@ class MessagesModel : public QSqlTableModel {
// BATCH messages manipulators. // BATCH messages manipulators.
// NOTE: These methods are used for changing of attributes of // NOTE: These methods are used for changing of attributes of
// many messages via DIRECT SQL calls. // 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 switchBatchMessageImportance(const QModelIndexList &messages);
bool setBatchMessagesDeleted(const QModelIndexList &messages, int deleted); bool setBatchMessagesDeleted(const QModelIndexList &messages, int deleted);
bool setBatchMessagesRead(const QModelIndexList &messages, int read); bool setBatchMessagesRead(const QModelIndexList &messages, int read);

16
src/gui/formmain.cpp
View file

@ -148,8 +148,20 @@ void FormMain::setupIcons() {
m_ui->m_actionImport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-import")); m_ui->m_actionImport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-import"));
m_ui->m_actionExport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-export")); m_ui->m_actionExport->setIcon(IconThemeFactory::getInstance()->fromTheme("document-export"));
m_ui->m_actionFullscreen->setIcon(IconThemeFactory::getInstance()->fromTheme("view-fullscreen")); m_ui->m_actionFullscreen->setIcon(IconThemeFactory::getInstance()->fromTheme("view-fullscreen"));
m_ui->m_actionUpdateAll->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh")); m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh"));
m_ui->m_actionUpdateSelected->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... // Setup icons for underlying components: opened web browsers...
foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) { foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) {

68
src/gui/formmain.ui
View file

@ -80,7 +80,7 @@
</widget> </widget>
<widget class="QMenu" name="m_menuWebBrowser"> <widget class="QMenu" name="m_menuWebBrowser">
<property name="title"> <property name="title">
<string>Web browser</string> <string>&amp;Web browser</string>
</property> </property>
<widget class="QMenu" name="m_menuCurrentTab"> <widget class="QMenu" name="m_menuCurrentTab">
<property name="title"> <property name="title">
@ -97,19 +97,26 @@
<property name="title"> <property name="title">
<string>Fee&amp;ds</string> <string>Fee&amp;ds</string>
</property> </property>
<addaction name="m_actionUpdateAll"/> <addaction name="m_actionUpdateAllFeeds"/>
<addaction name="m_actionUpdateSelected"/> <addaction name="m_actionUpdateSelectedFeeds"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="m_actionEditSelected"/> <addaction name="m_actionEditSelectedFeed"/>
<addaction name="m_actionDeleteSelected"/> <addaction name="m_actionDeleteSelectedFeeds"/>
<addaction name="separator"/>
<addaction name="m_actionMarkFeedsAsRead"/>
</widget> </widget>
<widget class="QMenu" name="m_menuMessages"> <widget class="QMenu" name="m_menuMessages">
<property name="title"> <property name="title">
<string>&amp;Messages</string> <string>&amp;Messages</string>
</property> </property>
<addaction name="actionMark_selected_as_read"/> <addaction name="m_actionMarkSelectedMessagesAsRead"/>
<addaction name="actionMark_selected_as_unread"/> <addaction name="m_actionMarkSelectedMessagesAsUnread"/>
<addaction name="actionSwitch_importance"/> <addaction name="m_actionMarkAllMessagesAsRead"/>
<addaction name="m_actionMarkAllMessagesAsUnread"/>
<addaction name="m_actionSwitchImportanceOfSelectedMessages"/>
<addaction name="separator"/>
<addaction name="m_actionDeleteSelectedMessages"/>
<addaction name="m_actionDeleteAllMessages"/>
</widget> </widget>
<addaction name="m_menuFile"/> <addaction name="m_menuFile"/>
<addaction name="m_menuView"/> <addaction name="m_menuView"/>
@ -215,7 +222,7 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
</action> </action>
<action name="m_actionUpdateAll"> <action name="m_actionUpdateAllFeeds">
<property name="text"> <property name="text">
<string>Update &amp;all</string> <string>Update &amp;all</string>
</property> </property>
@ -223,7 +230,7 @@
<string>Update all feeds.</string> <string>Update all feeds.</string>
</property> </property>
</action> </action>
<action name="m_actionUpdateSelected"> <action name="m_actionUpdateSelectedFeeds">
<property name="text"> <property name="text">
<string>Update &amp;selected</string> <string>Update &amp;selected</string>
</property> </property>
@ -231,7 +238,7 @@
<string>Update selected feeds/categories.</string> <string>Update selected feeds/categories.</string>
</property> </property>
</action> </action>
<action name="m_actionEditSelected"> <action name="m_actionEditSelectedFeed">
<property name="text"> <property name="text">
<string>&amp;Edit selected</string> <string>&amp;Edit selected</string>
</property> </property>
@ -239,7 +246,7 @@
<string>Edit selected feed/category.</string> <string>Edit selected feed/category.</string>
</property> </property>
</action> </action>
<action name="m_actionDeleteSelected"> <action name="m_actionDeleteSelectedFeeds">
<property name="text"> <property name="text">
<string>&amp;Delete selected</string> <string>&amp;Delete selected</string>
</property> </property>
@ -247,30 +254,55 @@
<string>Delete selected feeds/categories.</string> <string>Delete selected feeds/categories.</string>
</property> </property>
</action> </action>
<action name="actionMark_selected_as_read"> <action name="m_actionMarkSelectedMessagesAsRead">
<property name="text"> <property name="text">
<string>Mark as &amp;read</string> <string>Mark selected messages &amp;read</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Mark selected messages as read.</string> <string>Mark selected messages as read.</string>
</property> </property>
</action> </action>
<action name="actionMark_selected_as_unread"> <action name="m_actionMarkSelectedMessagesAsUnread">
<property name="text"> <property name="text">
<string>Mark as &amp;unread</string> <string>Mark selected messages &amp;unread</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Mark selected messages as unread.</string> <string>Mark selected messages as unread.</string>
</property> </property>
</action> </action>
<action name="actionSwitch_importance"> <action name="m_actionSwitchImportanceOfSelectedMessages">
<property name="text"> <property name="text">
<string>Switch importance</string> <string>Switch &amp;importance of selected messages</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Switch importance of selected messages.</string> <string>Switch importance of selected messages.</string>
</property> </property>
</action> </action>
<action name="m_actionMarkFeedsAsRead">
<property name="text">
<string>Mark selected as read</string>
</property>
</action>
<action name="m_actionMarkAllMessagesAsRead">
<property name="text">
<string>Mark &amp;all messages read</string>
</property>
</action>
<action name="m_actionMarkAllMessagesAsUnread">
<property name="text">
<string>Mark a&amp;ll messages unread</string>
</property>
</action>
<action name="m_actionDeleteSelectedMessages">
<property name="text">
<string>&amp;Delete selected messages</string>
</property>
</action>
<action name="m_actionDeleteAllMessages">
<property name="text">
<string>Dele&amp;te all messages</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>