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

Fix some broken connections.

Browse source
This commit is contained in:
Martin Rotter 2016-08-19 07:49:53 +02:00
parent 7d10bcc229
commit 53e3ce8715
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gui/dialogs/formmain.cpp
View file

@ -613,6 +613,11 @@ void FormMain::createConnections() {
connect(qApp->feedUpdateLock(), &Mutex::locked, this, &FormMain::updateFeedButtonsAvailability); connect(qApp->feedUpdateLock(), &Mutex::locked, this, &FormMain::updateFeedButtonsAvailability);
connect(qApp->feedUpdateLock(), &Mutex::unlocked, this, &FormMain::updateFeedButtonsAvailability); connect(qApp->feedUpdateLock(), &Mutex::unlocked, this, &FormMain::updateFeedButtonsAvailability);
connect(tabWidget()->feedMessageViewer()->messagesView(), &MessagesView::currentMessageRemoved,
this, &FormMain::updateMessageButtonsAvailability);
connect(tabWidget()->feedMessageViewer()->messagesView(), &MessagesView::currentMessageChanged,
this, &FormMain::updateMessageButtonsAvailability);
connect(qApp->feedReader(), &FeedReader::feedUpdatesStarted, this, &FormMain::onFeedUpdatesStarted); connect(qApp->feedReader(), &FeedReader::feedUpdatesStarted, this, &FormMain::onFeedUpdatesStarted);
connect(qApp->feedReader(), &FeedReader::feedUpdatesProgress, this, &FormMain::onFeedUpdatesProgress); connect(qApp->feedReader(), &FeedReader::feedUpdatesProgress, this, &FormMain::onFeedUpdatesProgress);
connect(qApp->feedReader(), &FeedReader::feedUpdatesFinished, this, &FormMain::onFeedUpdatesFinished); connect(qApp->feedReader(), &FeedReader::feedUpdatesFinished, this, &FormMain::onFeedUpdatesFinished);
@ -660,14 +665,14 @@ void FormMain::createConnections() {
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(openSelectedItemsInNewspaperMode())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(openSelectedItemsInNewspaperMode()));
connect(m_ui->m_actionDeleteSelectedItem, connect(m_ui->m_actionDeleteSelectedItem,
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(deleteSelectedItem())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(deleteSelectedItem()));
connect(m_ui->m_actionSwitchFeedsList, connect(m_ui->m_actionSwitchFeedsList, &QAction::triggered,
SIGNAL(triggered()), this, SLOT(switchFeedComponentVisibility())); tabWidget()->feedMessageViewer(), &FeedMessageViewer::switchFeedComponentVisibility);
connect(m_ui->m_actionSelectNextItem, connect(m_ui->m_actionSelectNextItem,
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(selectNextItem())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(selectNextItem()));
connect(m_ui->m_actionSwitchToolBars, connect(m_ui->m_actionSwitchToolBars, &QAction::toggled,
SIGNAL(toggled(bool)), this, SLOT(setToolBarsEnabled(bool))); tabWidget()->feedMessageViewer(), &FeedMessageViewer::setToolBarsEnabled);
connect(m_ui->m_actionSwitchListHeaders, connect(m_ui->m_actionSwitchListHeaders, &QAction::toggled,
SIGNAL(toggled(bool)), this, SLOT(setListHeadersEnabled(bool))); tabWidget()->feedMessageViewer(), &FeedMessageViewer::setListHeadersEnabled);
connect(m_ui->m_actionSelectPreviousItem, connect(m_ui->m_actionSelectPreviousItem,
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(selectPreviousItem())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->feedsView(), SLOT(selectPreviousItem()));
connect(m_ui->m_actionSelectNextMessage, connect(m_ui->m_actionSelectNextMessage,
@ -676,10 +681,10 @@ void FormMain::createConnections() {
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->messagesView(), SLOT(selectNextUnreadItem())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->messagesView(), SLOT(selectNextUnreadItem()));
connect(m_ui->m_actionSelectPreviousMessage, connect(m_ui->m_actionSelectPreviousMessage,
SIGNAL(triggered()), tabWidget()->feedMessageViewer()->messagesView(), SLOT(selectPreviousItem())); SIGNAL(triggered()), tabWidget()->feedMessageViewer()->messagesView(), SLOT(selectPreviousItem()));
connect(m_ui->m_actionSwitchMessageListOrientation, SIGNAL(triggered()), connect(m_ui->m_actionSwitchMessageListOrientation, &QAction::triggered,
this, SLOT(switchMessageSplitterOrientation())); tabWidget()->feedMessageViewer(), &FeedMessageViewer::switchMessageSplitterOrientation);
connect(m_ui->m_actionShowOnlyUnreadItems, SIGNAL(toggled(bool)), connect(m_ui->m_actionShowOnlyUnreadItems, &QAction::toggled,
this, SLOT(toggleShowOnlyUnreadFeeds())); tabWidget()->feedMessageViewer(), &FeedMessageViewer::toggleShowOnlyUnreadFeeds);
connect(m_ui->m_actionRestoreSelectedMessages, SIGNAL(triggered()), connect(m_ui->m_actionRestoreSelectedMessages, SIGNAL(triggered()),
tabWidget()->feedMessageViewer()->messagesView(), SLOT(restoreSelectedMessages())); tabWidget()->feedMessageViewer()->messagesView(), SLOT(restoreSelectedMessages()));
connect(m_ui->m_actionRestoreAllRecycleBins, SIGNAL(triggered()), connect(m_ui->m_actionRestoreAllRecycleBins, SIGNAL(triggered()),

2
src/gui/feedmessageviewer.cpp
View file

@ -200,8 +200,6 @@ void FeedMessageViewer::createConnections() {
// Message changers. // Message changers.
connect(m_messagesView, SIGNAL(currentMessageRemoved()), m_messagesBrowser, SLOT(clear())); connect(m_messagesView, SIGNAL(currentMessageRemoved()), m_messagesBrowser, SLOT(clear()));
connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), m_messagesBrowser, SLOT(loadMessage(Message,RootItem*))); connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), m_messagesBrowser, SLOT(loadMessage(Message,RootItem*)));
connect(m_messagesView, SIGNAL(currentMessageRemoved()), this, SLOT(updateMessageButtonsAvailability()));
connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), this, SLOT(updateMessageButtonsAvailability()));
connect(m_messagesBrowser, SIGNAL(markMessageRead(int,RootItem::ReadStatus)), connect(m_messagesBrowser, SIGNAL(markMessageRead(int,RootItem::ReadStatus)),
m_messagesView->sourceModel(), SLOT(setMessageReadById(int,RootItem::ReadStatus))); m_messagesView->sourceModel(), SLOT(setMessageReadById(int,RootItem::ReadStatus)));
connect(m_messagesBrowser, SIGNAL(markMessageImportant(int,RootItem::Importance)), connect(m_messagesBrowser, SIGNAL(markMessageImportant(int,RootItem::Importance)),

1
src/gui/feedmessageviewer.h
View file

@ -72,7 +72,6 @@ class FeedMessageViewer : public TabContent {
// Reloads some changeable visual settings. // Reloads some changeable visual settings.
void refreshVisualProperties(); void refreshVisualProperties();
private slots:
// Switches visibility of feed list and related // Switches visibility of feed list and related
// toolbar. // toolbar.
void switchFeedComponentVisibility(); void switchFeedComponentVisibility();