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

GUI code moved out of FeedsModel.

Browse source
This commit is contained in:
Martin Rotter 2016-08-25 14:04:12 +02:00
parent 99e53c3309
commit f5fe206a30
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/feedsmodel.cpp
View file

@ -456,10 +456,7 @@ void FeedsModel::reloadChangedItem(RootItem *item) {
} }
void FeedsModel::notifyWithCounts() { void FeedsModel::notifyWithCounts() {
if (SystemTrayIcon::isSystemTrayActivated()) { emit messageCountsChanged(countOfUnreadMessages(), hasAnyFeedNewMessages());
// TODO: Udělat přes signál, jádro by nemělo inkludovat GUI prvky.
qApp->trayIcon()->setNumber(countOfUnreadMessages(), hasAnyFeedNewMessages());
}
} }
void FeedsModel::onItemDataChanged(const QList<RootItem *> &items) { void FeedsModel::onItemDataChanged(const QList<RootItem *> &items) {

2
src/core/feedsmodel.h
View file

@ -155,7 +155,7 @@ class FeedsModel : public QAbstractItemModel {
signals: signals:
// Emitted if counts of messages are changed. // Emitted if counts of messages are changed.
void messageCountsChanged(int unread_messages, int total_messages, bool any_feed_has_unread_messages); void messageCountsChanged(int unread_messages, bool any_feed_has_unread_messages);
// Emitted if any item requested that any view should expand it. // Emitted if any item requested that any view should expand it.
void itemExpandRequested(QList<RootItem*> items, bool expand); void itemExpandRequested(QList<RootItem*> items, bool expand);

1
src/miscellaneous/application.cpp
View file

@ -275,6 +275,7 @@ SystemTrayIcon *Application::trayIcon() {
if (m_trayIcon == nullptr) { if (m_trayIcon == nullptr) {
m_trayIcon = new SystemTrayIcon(APP_ICON_PATH, APP_ICON_PLAIN_PATH, m_mainForm); m_trayIcon = new SystemTrayIcon(APP_ICON_PATH, APP_ICON_PLAIN_PATH, m_mainForm);
connect(m_trayIcon, &SystemTrayIcon::shown, m_feedReader->feedsModel(), &FeedsModel::notifyWithCounts); connect(m_trayIcon, &SystemTrayIcon::shown, m_feedReader->feedsModel(), &FeedsModel::notifyWithCounts);
connect(m_feedReader->feedsModel(), &FeedsModel::messageCountsChanged, m_trayIcon, &SystemTrayIcon::setNumber);
} }
return m_trayIcon; return m_trayIcon;