Refactoring.
This commit is contained in:
parent
7a42e2d7a1
commit
15fed666d9
@ -1,3 +1,9 @@
|
|||||||
|
3.3.4
|
||||||
|
—————
|
||||||
|
|
||||||
|
Changed:
|
||||||
|
▪ Big application core refactoring. Many functions rewritten, some bad code removed.
|
||||||
|
|
||||||
3.3.3
|
3.3.3
|
||||||
—————
|
—————
|
||||||
|
|
||||||
|
@ -323,6 +323,21 @@ void FormMain::updateAccountsMenu() {
|
|||||||
m_ui->m_menuAccounts->addAction(m_ui->m_actionServiceDelete);
|
m_ui->m_menuAccounts->addAction(m_ui->m_actionServiceDelete);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FormMain::onFeedUpdatesStarted() {
|
||||||
|
m_ui->m_actionStopRunningItemsUpdate->setEnabled(false);
|
||||||
|
statusBar()->showProgressFeeds(0, tr("Feed update started"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void FormMain::onFeedUpdatesProgress(const Feed *feed, int current, int total) {
|
||||||
|
statusBar()->showProgressFeeds((current * 100.0) / total,
|
||||||
|
//: Text display in status bar when particular feed is updated.
|
||||||
|
tr("Updated feed '%1'").arg(feed->title()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void FormMain::onFeedUpdatesFinished(FeedDownloadResults results) {
|
||||||
|
statusBar()->clearProgressFeeds();
|
||||||
|
}
|
||||||
|
|
||||||
void FormMain::switchVisibility(bool force_hide) {
|
void FormMain::switchVisibility(bool force_hide) {
|
||||||
if (force_hide || isVisible()) {
|
if (force_hide || isVisible()) {
|
||||||
if (SystemTrayIcon::isSystemTrayActivated()) {
|
if (SystemTrayIcon::isSystemTrayActivated()) {
|
||||||
|
@ -78,6 +78,10 @@ class FormMain : public QMainWindow {
|
|||||||
void updateRecycleBinMenu();
|
void updateRecycleBinMenu();
|
||||||
void updateAccountsMenu();
|
void updateAccountsMenu();
|
||||||
|
|
||||||
|
void onFeedUpdatesStarted();
|
||||||
|
void onFeedUpdatesProgress(const Feed *feed, int current, int total);
|
||||||
|
void onFeedUpdatesFinished(FeedDownloadResults results);
|
||||||
|
|
||||||
// Displays various dialogs.
|
// Displays various dialogs.
|
||||||
void backupDatabaseSettings();
|
void backupDatabaseSettings();
|
||||||
void restoreDatabaseSettings();
|
void restoreDatabaseSettings();
|
||||||
|
@ -438,10 +438,3 @@ void FeedMessageViewer::refreshVisualProperties() {
|
|||||||
void FeedMessageViewer::onFeedsUpdateFinished() {
|
void FeedMessageViewer::onFeedsUpdateFinished() {
|
||||||
m_messagesView->reloadSelections(false);
|
m_messagesView->reloadSelections(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FeedMessageViewer::onFeedsUpdateStarted() {
|
|
||||||
// Check only "Stop running update" button.
|
|
||||||
const bool is_update_running = qApp->feedReader()->isFeedUpdateRunning();
|
|
||||||
|
|
||||||
qApp->mainForm()->m_ui->m_actionStopRunningItemsUpdate->setEnabled(is_update_running);
|
|
||||||
}
|
|
||||||
|
@ -75,7 +75,6 @@ class FeedMessageViewer : public TabContent {
|
|||||||
private slots:
|
private slots:
|
||||||
// Called when feed update finishes.
|
// Called when feed update finishes.
|
||||||
void onFeedsUpdateFinished();
|
void onFeedsUpdateFinished();
|
||||||
void onFeedsUpdateStarted();
|
|
||||||
|
|
||||||
// Switches visibility of feed list and related
|
// Switches visibility of feed list and related
|
||||||
// toolbar.
|
// toolbar.
|
||||||
|
@ -341,3 +341,21 @@ void Application::downloadRequested(QWebEngineDownloadItem *download_item) {
|
|||||||
download_item->cancel();
|
download_item->cancel();
|
||||||
download_item->deleteLater();
|
download_item->deleteLater();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Application::onFeedUpdatesStarted() {
|
||||||
|
}
|
||||||
|
|
||||||
|
void Application::onFeedUpdatesProgress(const Feed *feed, int current, int total) {
|
||||||
|
Q_UNUSED(feed)
|
||||||
|
Q_UNUSED(current)
|
||||||
|
Q_UNUSED(total)
|
||||||
|
}
|
||||||
|
|
||||||
|
void Application::onFeedUpdatesFinished(FeedDownloadResults results) {
|
||||||
|
qApp->feedUpdateLock()->unlock();
|
||||||
|
|
||||||
|
if (!results.updatedFeeds().isEmpty()) {
|
||||||
|
// Now, inform about results via GUI message/notification.
|
||||||
|
qApp->showGuiMessage(tr("New messages downloaded"), results.overview(10), QSystemTrayIcon::NoIcon, 0, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include "gui/systemtrayicon.h"
|
#include "gui/systemtrayicon.h"
|
||||||
#include "network-web/downloadmanager.h"
|
#include "network-web/downloadmanager.h"
|
||||||
#include "services/abstract/serviceentrypoint.h"
|
#include "services/abstract/serviceentrypoint.h"
|
||||||
|
#include "core/feeddownloader.h"
|
||||||
|
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
|
||||||
@ -131,6 +132,10 @@ class Application : public QtSingleApplication {
|
|||||||
void onAboutToQuit();
|
void onAboutToQuit();
|
||||||
void downloadRequested(QWebEngineDownloadItem*download_item);
|
void downloadRequested(QWebEngineDownloadItem*download_item);
|
||||||
|
|
||||||
|
void onFeedUpdatesStarted();
|
||||||
|
void onFeedUpdatesProgress(const Feed *feed, int current, int total);
|
||||||
|
void onFeedUpdatesFinished(FeedDownloadResults results);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void eliminateFirstRun();
|
void eliminateFirstRun();
|
||||||
void eliminateFirstRun(const QString &version);
|
void eliminateFirstRun(const QString &version);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user