From 55c645a824e7bab9ca7be7ad2c3141625b2d43f1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 16 Feb 2014 18:43:33 +0100 Subject: [PATCH] Some changes. --- src/core/defs.h.in | 1 + src/core/feedsmodel.cpp | 4 ++++ src/core/feedsmodel.h | 4 ++++ src/gui/formmain.cpp | 3 --- src/gui/formsettings.cpp | 2 +- src/gui/locationlineedit.cpp | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core/defs.h.in b/src/core/defs.h.in index 984b0a994..9423110e2 100755 --- a/src/core/defs.h.in +++ b/src/core/defs.h.in @@ -70,6 +70,7 @@ #define APP_CFG_BROWSER "browser" #define APP_CFG_MESSAGES "messages" #define APP_CFG_FEEDS "feeds" +#define APP_CFG_CAT_EXT "expanded_categories" #ifdef Q_OS_OSX #define APP_PREFIX "@CMAKE_INSTALL_PREFIX@/@APP_LOW_NAME@.app/Contents/Resources" diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index faaf5ffd5..7d053b549 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -38,6 +38,10 @@ FeedsModel::~FeedsModel() { delete m_rootItem; } +QModelIndexList FeedsModel::persistentIndexList() const { + return QAbstractItemModel::persistentIndexList(); +} + QVariant FeedsModel::headerData(int section, Qt::Orientation orientation, int role) const { diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h index b3b2aef23..f3672184e 100644 --- a/src/core/feedsmodel.h +++ b/src/core/feedsmodel.h @@ -27,6 +27,10 @@ class FeedsModel : public QAbstractItemModel { explicit FeedsModel(QObject *parent = 0); virtual ~FeedsModel(); + // Returns list of all indexes available + // in the model. + QModelIndexList persistentIndexList() const; + // Model implementation. inline QVariant data(const QModelIndex &index, int role) const { return itemForIndex(index)->data(index.column(), role); diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 8a621c9cc..d1b419e17 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -136,7 +136,6 @@ void FormMain::processExecutionMessage(const QString &message) { void FormMain::quit() { qDebug("Quitting the application."); - qApp->quit(); } @@ -387,8 +386,6 @@ void FormMain::showAbout() { void FormMain::showSettings() { QPointer form_pointer = new FormSettings(this); - form_pointer.data()->exec(); - delete form_pointer.data(); } diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 3122d9474..ee9e0f62e 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -303,7 +303,7 @@ void FormSettings::loadBrowser() { // Load settings of web browser GUI. m_initialSettings.m_webBrowserProgress = QColor(settings->value(APP_CFG_BROWSER, "browser_progress_color", - QColor(59, 94, 248)).toString()); + QColor(155, 250, 80)).toString()); m_ui->m_checkBrowserProgressColor->setChecked(settings->value(APP_CFG_BROWSER, "browser_colored_progress_enabled", true).toBool()); diff --git a/src/gui/locationlineedit.cpp b/src/gui/locationlineedit.cpp index 1dcde178e..bf0bdd542 100644 --- a/src/gui/locationlineedit.cpp +++ b/src/gui/locationlineedit.cpp @@ -60,7 +60,7 @@ void LocationLineEdit::paintEvent(QPaintEvent *event) { QPalette current_palette = palette(); QColor loadingColor = QColor(settings->value(APP_CFG_BROWSER, "browser_progress_color", - QColor(59, 94, 248)).toString()); + QColor(155, 250, 80)).toString()); QLinearGradient gradient(0, 0, width(), 0); qreal percentage_border = m_progress / 100.0;