diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp index 9788c50dc..f4c0bb91f 100755 --- a/src/gui/dialogs/formmain.cpp +++ b/src/gui/dialogs/formmain.cpp @@ -114,10 +114,12 @@ QList FormMain::allActions() { actions << m_ui->m_actionOpenSelectedSourceArticlesExternally; actions << m_ui->m_actionOpenSelectedSourceArticlesInternally; actions << m_ui->m_actionOpenSelectedMessagesInternally; - actions << m_ui->m_actionMarkAllFeedsRead; - actions << m_ui->m_actionMarkSelectedFeedsAsRead; - actions << m_ui->m_actionMarkSelectedFeedsAsUnread; - actions << m_ui->m_actionClearSelectedFeeds; + actions << m_ui->m_actionMarkAllItemsRead; + actions << m_ui->m_actionMarkSelectedItemsAsRead; + actions << m_ui->m_actionMarkSelectedItemsAsUnread; + actions << m_ui->m_actionClearSelectedItems; + actions << m_ui->m_actionClearAllItems; + actions << m_ui->m_actionShowOnlyUnreadItems; actions << m_ui->m_actionMarkSelectedMessagesAsRead; actions << m_ui->m_actionMarkSelectedMessagesAsUnread; actions << m_ui->m_actionSwitchImportanceOfSelectedMessages; @@ -127,11 +129,11 @@ QList FormMain::allActions() { actions << m_ui->m_actionEditSelectedItem; actions << m_ui->m_actionDeleteSelectedItem; actions << m_ui->m_actionViewSelectedItemsNewspaperMode; - actions << m_ui->m_actionSelectNextFeedCategory; - actions << m_ui->m_actionSelectPreviousFeedCategory; + actions << m_ui->m_actionSelectNextItem; + actions << m_ui->m_actionSelectPreviousItem; actions << m_ui->m_actionSelectNextMessage; actions << m_ui->m_actionSelectPreviousMessage; - actions << m_ui->m_actionExpandCollapseFeedCategory; + actions << m_ui->m_actionExpandCollapseItem; return actions; } @@ -149,7 +151,7 @@ void FormMain::prepareMenus() { m_trayMenu->addAction(m_ui->m_actionSwitchMainWindow); m_trayMenu->addSeparator(); m_trayMenu->addAction(m_ui->m_actionUpdateAllItems); - m_trayMenu->addAction(m_ui->m_actionMarkAllFeedsRead); + m_trayMenu->addAction(m_ui->m_actionMarkAllItemsRead); m_trayMenu->addSeparator(); m_trayMenu->addAction(m_ui->m_actionSettings); m_trayMenu->addAction(m_ui->m_actionQuit); @@ -299,14 +301,14 @@ void FormMain::setupIcons() { m_ui->m_menuAddItem->setIcon(icon_theme_factory->fromTheme(QSL("item-new"))); m_ui->m_actionUpdateAllItems->setIcon(icon_theme_factory->fromTheme(QSL("item-update-all"))); m_ui->m_actionUpdateSelectedItems->setIcon(icon_theme_factory->fromTheme(QSL("item-update-selected"))); - m_ui->m_actionClearSelectedFeeds->setIcon(icon_theme_factory->fromTheme(QSL("mail-remove"))); - m_ui->m_actionClearAllFeeds->setIcon(icon_theme_factory->fromTheme(QSL("mail-remove"))); + m_ui->m_actionClearSelectedItems->setIcon(icon_theme_factory->fromTheme(QSL("mail-remove"))); + m_ui->m_actionClearAllItems->setIcon(icon_theme_factory->fromTheme(QSL("mail-remove"))); m_ui->m_actionDeleteSelectedItem->setIcon(icon_theme_factory->fromTheme(QSL("item-remove"))); m_ui->m_actionDeleteSelectedMessages->setIcon(icon_theme_factory->fromTheme(QSL("mail-remove"))); m_ui->m_actionEditSelectedItem->setIcon(icon_theme_factory->fromTheme(QSL("item-edit"))); - m_ui->m_actionMarkAllFeedsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read"))); - m_ui->m_actionMarkSelectedFeedsAsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read"))); - m_ui->m_actionMarkSelectedFeedsAsUnread->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread"))); + m_ui->m_actionMarkAllItemsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read"))); + m_ui->m_actionMarkSelectedItemsAsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read"))); + m_ui->m_actionMarkSelectedItemsAsUnread->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread"))); m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read"))); m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread"))); m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-favorite"))); @@ -315,12 +317,12 @@ void FormMain::setupIcons() { m_ui->m_actionOpenSelectedMessagesInternally->setIcon(icon_theme_factory->fromTheme(QSL("item-open-internal"))); m_ui->m_actionSendMessageViaEmail->setIcon(icon_theme_factory->fromTheme(QSL("item-send-email"))); m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(icon_theme_factory->fromTheme(QSL("item-newspaper"))); - m_ui->m_actionSelectNextFeedCategory->setIcon(icon_theme_factory->fromTheme(QSL("go-down"))); - m_ui->m_actionSelectPreviousFeedCategory->setIcon(icon_theme_factory->fromTheme(QSL("go-up"))); + m_ui->m_actionSelectNextItem->setIcon(icon_theme_factory->fromTheme(QSL("go-down"))); + m_ui->m_actionSelectPreviousItem->setIcon(icon_theme_factory->fromTheme(QSL("go-up"))); m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme(QSL("go-down"))); m_ui->m_actionSelectPreviousMessage->setIcon(icon_theme_factory->fromTheme(QSL("go-up"))); - m_ui->m_actionShowOnlyUnreadFeeds->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread"))); - m_ui->m_actionExpandCollapseFeedCategory->setIcon(icon_theme_factory->fromTheme(QSL("expand-collapse"))); + m_ui->m_actionShowOnlyUnreadItems->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread"))); + m_ui->m_actionExpandCollapseItem->setIcon(icon_theme_factory->fromTheme(QSL("expand-collapse"))); // Setup icons for underlying components: opened web browsers... foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) { @@ -361,7 +363,7 @@ void FormMain::loadSize() { m_ui->m_actionSwitchListHeaders->setChecked(settings->value(GROUP(GUI), SETTING(GUI::ListHeadersVisible)).toBool()); // Make sure that only unread feeds are shown if user has that feature set on. - m_ui->m_actionShowOnlyUnreadFeeds->setChecked(settings->value(GROUP(Feeds), SETTING(Feeds::ShowOnlyUnreadFeeds)).toBool()); + m_ui->m_actionShowOnlyUnreadItems->setChecked(settings->value(GROUP(Feeds), SETTING(Feeds::ShowOnlyUnreadFeeds)).toBool()); } void FormMain::saveSize() { diff --git a/src/gui/dialogs/formmain.h b/src/gui/dialogs/formmain.h index 55ea35fd5..c71b5d82c 100755 --- a/src/gui/dialogs/formmain.h +++ b/src/gui/dialogs/formmain.h @@ -21,7 +21,6 @@ #include "ui_formmain.h" #include -#include class StatusBar; diff --git a/src/gui/dialogs/formmain.ui b/src/gui/dialogs/formmain.ui index 5c39e7d99..c3d135bac 100755 --- a/src/gui/dialogs/formmain.ui +++ b/src/gui/dialogs/formmain.ui @@ -139,19 +139,19 @@ - - + + - - + + - - + + - - - + + + @@ -180,8 +180,8 @@ - + @@ -305,20 +305,20 @@ Switch &importance of selected messages - + &Mark selected items as read - Mark all messages (without message filters) from selected feeds as read. + Mark all messages (without message filters) from selected items as read. - + &Mark selected items as unread - Mark all messages (without message filters) from selected feeds as unread. + Mark all messages (without message filters) from selected items as unread. @@ -326,12 +326,12 @@ &Delete selected messages - + &Clean selected items - Deletes all messages from selected feeds. + Deletes all messages from selected items. @@ -360,12 +360,12 @@ - + &Mark all items as &read - Marks all messages in all feeds read. This does not take message filters into account. + Marks all messages in all items read. This does not take message filters into account. @@ -373,7 +373,7 @@ View selected items in &newspaper mode - Displays all messages from selected feeds/categories in a new "newspaper mode" tab. Note that messages are not set as read automatically. + Displays all messages from selected item in a new "newspaper mode" tab. Note that messages are not set as read automatically. @@ -401,31 +401,31 @@ L - + &Clean all items - Deletes all messages from all feeds. + Deletes all messages from all items. - Ctrl+Shift+C + Ctrl+Shift+C - + Select &next item - S + S - + Select &previous item - A + A @@ -600,7 +600,7 @@ Ctrl+Shift+Del - + true @@ -608,15 +608,15 @@ Show only unread items - Ctrl+Shift+U + Ctrl+Shift+U - + &Expand/collapse selected item - E + E diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index d07f6e500..ff15a2382 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -296,15 +296,15 @@ void FeedMessageViewer::updateFeedButtonsAvailability() { form_main->m_ui->m_actionServiceDelete->setEnabled(!critical_action_running && service_selected); form_main->m_ui->m_actionBackupDatabaseSettings->setEnabled(!critical_action_running); form_main->m_ui->m_actionCleanupDatabase->setEnabled(!critical_action_running); - form_main->m_ui->m_actionClearSelectedFeeds->setEnabled(feed_selected || category_selected || service_selected); + form_main->m_ui->m_actionClearSelectedItems->setEnabled(feed_selected || category_selected || service_selected); form_main->m_ui->m_actionDeleteSelectedItem->setEnabled(!critical_action_running && anything_selected); form_main->m_ui->m_actionEditSelectedItem->setEnabled(!critical_action_running && anything_selected); - form_main->m_ui->m_actionMarkSelectedFeedsAsRead->setEnabled(feed_selected || category_selected || service_selected); - form_main->m_ui->m_actionMarkSelectedFeedsAsUnread->setEnabled(feed_selected || category_selected || service_selected); + form_main->m_ui->m_actionMarkSelectedItemsAsRead->setEnabled(feed_selected || category_selected || service_selected); + form_main->m_ui->m_actionMarkSelectedItemsAsUnread->setEnabled(feed_selected || category_selected || service_selected); form_main->m_ui->m_actionUpdateAllItems->setEnabled(!critical_action_running); form_main->m_ui->m_actionUpdateSelectedItems->setEnabled(!critical_action_running && (feed_selected || category_selected || service_selected)); form_main->m_ui->m_actionViewSelectedItemsNewspaperMode->setEnabled(feed_selected || category_selected || service_selected); - form_main->m_ui->m_actionExpandCollapseFeedCategory->setEnabled(feed_selected || category_selected || service_selected); + form_main->m_ui->m_actionExpandCollapseItem->setEnabled(feed_selected || category_selected || service_selected); form_main->m_ui->m_menuAddItem->setEnabled(!critical_action_running); } @@ -370,17 +370,17 @@ void FeedMessageViewer::createConnections() { SIGNAL(triggered()), m_messagesView, SLOT(openSelectedMessagesInternally())); connect(form_main->m_ui->m_actionSendMessageViaEmail, SIGNAL(triggered()), m_messagesView, SLOT(sendSelectedMessageViaEmail())); - connect(form_main->m_ui->m_actionMarkAllFeedsRead, + connect(form_main->m_ui->m_actionMarkAllItemsRead, SIGNAL(triggered()), m_feedsView, SLOT(markAllFeedsRead())); - connect(form_main->m_ui->m_actionMarkSelectedFeedsAsRead, + connect(form_main->m_ui->m_actionMarkSelectedItemsAsRead, SIGNAL(triggered()), m_feedsView, SLOT(markSelectedFeedsRead())); - connect(form_main->m_ui->m_actionExpandCollapseFeedCategory, + connect(form_main->m_ui->m_actionExpandCollapseItem, SIGNAL(triggered()), m_feedsView, SLOT(expandCollapseCurrentItem())); - connect(form_main->m_ui->m_actionMarkSelectedFeedsAsUnread, + connect(form_main->m_ui->m_actionMarkSelectedItemsAsUnread, SIGNAL(triggered()), m_feedsView, SLOT(markSelectedFeedsUnread())); - connect(form_main->m_ui->m_actionClearSelectedFeeds, + connect(form_main->m_ui->m_actionClearSelectedItems, SIGNAL(triggered()), m_feedsView, SLOT(clearSelectedFeeds())); - connect(form_main->m_ui->m_actionClearAllFeeds, + connect(form_main->m_ui->m_actionClearAllItems, SIGNAL(triggered()), m_feedsView, SLOT(clearAllFeeds())); connect(form_main->m_ui->m_actionUpdateSelectedItems, SIGNAL(triggered()), m_feedsView, SLOT(updateSelectedFeeds())); @@ -394,13 +394,13 @@ void FeedMessageViewer::createConnections() { SIGNAL(triggered()), m_feedsView, SLOT(deleteSelectedItem())); connect(form_main->m_ui->m_actionSwitchFeedsList, SIGNAL(triggered()), this, SLOT(switchFeedComponentVisibility())); - connect(form_main->m_ui->m_actionSelectNextFeedCategory, + connect(form_main->m_ui->m_actionSelectNextItem, SIGNAL(triggered()), m_feedsView, SLOT(selectNextItem())); connect(form_main->m_ui->m_actionSwitchToolBars, SIGNAL(toggled(bool)), this, SLOT(setToolBarsEnabled(bool))); connect(form_main->m_ui->m_actionSwitchListHeaders, SIGNAL(toggled(bool)), this, SLOT(setListHeadersEnabled(bool))); - connect(form_main->m_ui->m_actionSelectPreviousFeedCategory, + connect(form_main->m_ui->m_actionSelectPreviousItem, SIGNAL(triggered()), m_feedsView, SLOT(selectPreviousItem())); connect(form_main->m_ui->m_actionSelectNextMessage, SIGNAL(triggered()), m_messagesView, SLOT(selectNextItem())); @@ -408,7 +408,7 @@ void FeedMessageViewer::createConnections() { SIGNAL(triggered()), m_messagesView, SLOT(selectPreviousItem())); connect(form_main->m_ui->m_actionSwitchMessageListOrientation, SIGNAL(triggered()), this, SLOT(switchMessageSplitterOrientation())); - connect(form_main->m_ui->m_actionShowOnlyUnreadFeeds, SIGNAL(toggled(bool)), + connect(form_main->m_ui->m_actionShowOnlyUnreadItems, SIGNAL(toggled(bool)), this, SLOT(toggleShowOnlyUnreadFeeds())); } diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 0b37f0d83..6e60b6d94 100755 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -497,8 +497,8 @@ void FeedsView::initializeContextMenuCategories(RootItem *clicked_item) { qApp->mainForm()->m_ui->m_actionUpdateSelectedItems << qApp->mainForm()->m_ui->m_actionEditSelectedItem << qApp->mainForm()->m_ui->m_actionViewSelectedItemsNewspaperMode << - qApp->mainForm()->m_ui->m_actionMarkSelectedFeedsAsRead << - qApp->mainForm()->m_ui->m_actionMarkSelectedFeedsAsUnread << + qApp->mainForm()->m_ui->m_actionMarkSelectedItemsAsRead << + qApp->mainForm()->m_ui->m_actionMarkSelectedItemsAsUnread << qApp->mainForm()->m_ui->m_actionDeleteSelectedItem); if (!specific_actions.isEmpty()) { @@ -521,8 +521,8 @@ void FeedsView::initializeContextMenuFeeds(RootItem *clicked_item) { qApp->mainForm()->m_ui->m_actionUpdateSelectedItems << qApp->mainForm()->m_ui->m_actionEditSelectedItem << qApp->mainForm()->m_ui->m_actionViewSelectedItemsNewspaperMode << - qApp->mainForm()->m_ui->m_actionMarkSelectedFeedsAsRead << - qApp->mainForm()->m_ui->m_actionMarkSelectedFeedsAsUnread << + qApp->mainForm()->m_ui->m_actionMarkSelectedItemsAsRead << + qApp->mainForm()->m_ui->m_actionMarkSelectedItemsAsUnread << qApp->mainForm()->m_ui->m_actionDeleteSelectedItem); if (!specific_actions.isEmpty()) { diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 2c0831e54..0c82fd4b0 100755 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -69,6 +69,7 @@ void TabWidget::openMainMenu() { m_menuMain = new QMenu(tr("Main menu"), this); m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuFile); m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuView); + m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuServices); m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuFeeds); m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuMessages); m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuWebBrowser); diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index ece288281..56c8cbac1 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -82,7 +82,7 @@ DKEY GUI::ToolbarStyle = "toolbar_style"; DVALUE(Qt::ToolButtonStyle) GUI::ToolbarStyleDef = Qt::ToolButtonIconOnly; DKEY GUI::FeedsToolbarActions = "feeds_toolbar"; -DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllItems,m_actionMarkAllFeedsRead"; +DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllItems,m_actionMarkAllItemsRead"; DKEY GUI::MainWindowInitialSize = "window_size"; DKEY GUI::MainWindowInitialPosition = "window_position";