From c2e3ee333d72c8910af8eb2252c00bb4a11be048 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 16 Feb 2014 08:24:27 +0100 Subject: [PATCH] HIG updated, changelog updated. Fixed loading of webbrowser progressbar color. --- resources/text/CHANGELOG | 3 +++ src/core/feedsmodel.cpp | 2 +- src/gui/formmain.ui | 3 ++- src/gui/formsettings.cpp | 27 +++++++++++++------------- src/gui/formsettings.h | 7 ++----- src/gui/formsettings.ui | 30 ++++++++++++++--------------- src/gui/formstandardfeeddetails.cpp | 4 ++-- src/gui/locationlineedit.cpp | 6 +++--- 8 files changed, 42 insertions(+), 40 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 6cb76f6b7..c4a2224f4 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -5,6 +5,9 @@
  • [#] Virtual desktop change hides main window.
  • [#] Misleding external browser settings.
  • [#] Non-functional external browser shortcuts.
    • +
  • [#] Saving of webbrowser progressbar color.
    • +
  • [~] Usability of some GUI elements.
    • +
  • [@] Completely switched to new website.
  • [+] Some missing shortcuts.
    • [1.9.9.4] diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 9397c2175..faaf5ffd5 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -21,7 +21,7 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) { m_rootItem = new FeedsModelRootItem(); m_rootItem->setId(NO_PARENT_CATEGORY); - m_rootItem->setTitle(tr("root")); + m_rootItem->setTitle(tr("Root")); m_rootItem->setIcon(IconThemeFactory::instance()->fromTheme("folder-root")); m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread"); m_headerData << tr("Title"); diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index 9e91095fc..d3a2ce037 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -115,9 +115,10 @@ - + + diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index a3853d54d..3122d9474 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -149,7 +149,7 @@ void FormSettings::changeBrowserProgressColor() { QPointer color_dialog = new QColorDialog(m_initialSettings.m_webBrowserProgress, this); color_dialog.data()->setWindowTitle(tr("Select color for web browser progress bar")); - color_dialog.data()->setOption(QColorDialog::ShowAlphaChannel); + color_dialog.data()->setOption(QColorDialog::ShowAlphaChannel, false); if (color_dialog.data()->exec() == QDialog::Accepted) { m_initialSettings.m_webBrowserProgress = color_dialog.data()->selectedColor(); @@ -301,10 +301,9 @@ void FormSettings::loadBrowser() { Settings *settings = Settings::instance(); // Load settings of web browser GUI. - m_initialSettings.m_webBrowserProgress = settings->value(APP_CFG_BROWSER, - "browser_progress_color", - QColor(59, 94, 248, 70)).value(); - loadWebBrowserColor(m_initialSettings.m_webBrowserProgress); + m_initialSettings.m_webBrowserProgress = QColor(settings->value(APP_CFG_BROWSER, + "browser_progress_color", + QColor(59, 94, 248)).toString()); m_ui->m_checkBrowserProgressColor->setChecked(settings->value(APP_CFG_BROWSER, "browser_colored_progress_enabled", true).toBool()); @@ -314,6 +313,8 @@ void FormSettings::loadBrowser() { m_ui->m_checkQueueTabs->setChecked(settings->value(APP_CFG_BROWSER, "queue_tabs", true).toBool()); + m_ui->m_btnWebBrowserColorSample->setMaximumHeight(m_ui->m_checkBrowserProgressColor->sizeHint().height()); + loadWebBrowserColor(m_initialSettings.m_webBrowserProgress); m_ui->m_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), "-nosession %1"); m_ui->m_txtExternalBrowserExecutable->setText(settings->value(APP_CFG_BROWSER, @@ -329,7 +330,7 @@ void FormSettings::saveBrowser() { // Save settings of GUI of web browser. settings->setValue(APP_CFG_BROWSER, "browser_progress_color", - m_initialSettings.m_webBrowserProgress); + m_initialSettings.m_webBrowserProgress.name()); settings->setValue(APP_CFG_BROWSER, "browser_colored_progress_enabled", m_ui->m_checkBrowserProgressColor->isChecked()); @@ -349,8 +350,8 @@ void FormSettings::saveBrowser() { } void FormSettings::loadProxy() { - m_ui->m_cmbProxyType->addItem(tr("no proxy"), QNetworkProxy::NoProxy); - m_ui->m_cmbProxyType->addItem(tr("system proxy"), QNetworkProxy::DefaultProxy); + m_ui->m_cmbProxyType->addItem(tr("No proxy"), QNetworkProxy::NoProxy); + m_ui->m_cmbProxyType->addItem(tr("System proxy"), QNetworkProxy::DefaultProxy); m_ui->m_cmbProxyType->addItem(tr("Socks5"), QNetworkProxy::Socks5Proxy); m_ui->m_cmbProxyType->addItem(tr("Http"), QNetworkProxy::HttpProxy); @@ -696,11 +697,11 @@ void FormSettings::loadInterface() { true).toBool()); // Load toolbar button style. - m_ui->m_cmbToolbarButtonStyle->addItem(tr("icon only"), Qt::ToolButtonIconOnly); - m_ui->m_cmbToolbarButtonStyle->addItem(tr("text only"), Qt::ToolButtonTextOnly); - m_ui->m_cmbToolbarButtonStyle->addItem(tr("text beside icon"), Qt::ToolButtonTextBesideIcon); - m_ui->m_cmbToolbarButtonStyle->addItem(tr("text under icon"), Qt::ToolButtonTextUnderIcon); - m_ui->m_cmbToolbarButtonStyle->addItem(tr("follow OS style"), Qt::ToolButtonFollowStyle); + m_ui->m_cmbToolbarButtonStyle->addItem(tr("Icon only"), Qt::ToolButtonIconOnly); + m_ui->m_cmbToolbarButtonStyle->addItem(tr("Text only"), Qt::ToolButtonTextOnly); + m_ui->m_cmbToolbarButtonStyle->addItem(tr("Text beside icon"), Qt::ToolButtonTextBesideIcon); + m_ui->m_cmbToolbarButtonStyle->addItem(tr("Text under icon"), Qt::ToolButtonTextUnderIcon); + m_ui->m_cmbToolbarButtonStyle->addItem(tr("Follow OS style"), Qt::ToolButtonFollowStyle); m_ui->m_cmbToolbarButtonStyle->setCurrentIndex(m_ui->m_cmbToolbarButtonStyle->findData(Settings::instance()->value(APP_CFG_GUI, "toolbar_style", diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h index 9eb169a10..27525cd39 100644 --- a/src/gui/formsettings.h +++ b/src/gui/formsettings.h @@ -44,11 +44,6 @@ class FormSettings : public QDialog { void loadInterface(); void saveInterface(); - void changeBrowserProgressColor(); - - // Loads QColor instance into given button. - void loadWebBrowserColor(const QColor &color); - void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous); void loadGeneral(); @@ -72,6 +67,8 @@ class FormSettings : public QDialog { void saveBrowser(); void changeDefaultBrowserArguments(int index); void selectBrowserExecutable(); + void changeBrowserProgressColor(); + void loadWebBrowserColor(const QColor &color); void loadProxy(); void saveProxy(); diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index cd7b1522d..65f46dc78 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -286,8 +286,8 @@ Authors of this application are NOT responsible for lost data. 0 0 - 100 - 30 + 564 + 363 @@ -364,8 +364,8 @@ Authors of this application are NOT responsible for lost data. 0 0 - 209 - 245 + 558 + 337 @@ -498,13 +498,10 @@ Authors of this application are NOT responsible for lost data. - - + + - Enable - - - true + Hide main window when it is minimized @@ -515,10 +512,13 @@ Authors of this application are NOT responsible for lost data. - - + + - Hide main window when it is minimized + Enable + + + true @@ -633,7 +633,7 @@ Authors of this application are NOT responsible for lost data. - 2 + 0 @@ -766,7 +766,7 @@ Authors of this application are NOT responsible for lost data. - select browser + Select browser diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index e414b7a63..605ae06a3 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -381,8 +381,8 @@ void FormStandardFeedDetails::initialize() { // Setup auto-update options. m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL); m_ui->m_cmbAutoUpdateType->addItem(tr("do not auto-update at all"), QVariant::fromValue((int) FeedsModelStandardFeed::DontAutoUpdate)); - m_ui->m_cmbAutoUpdateType->addItem(tr("auto-update using global interval"), QVariant::fromValue((int) FeedsModelStandardFeed::DefaultAutoUpdate)); - m_ui->m_cmbAutoUpdateType->addItem(tr("auto-update every"), QVariant::fromValue((int) FeedsModelStandardFeed::SpecificAutoUpdate)); + m_ui->m_cmbAutoUpdateType->addItem(tr("Auto-update using global interval"), QVariant::fromValue((int) FeedsModelStandardFeed::DefaultAutoUpdate)); + m_ui->m_cmbAutoUpdateType->addItem(tr("Auto-update every"), QVariant::fromValue((int) FeedsModelStandardFeed::SpecificAutoUpdate)); // Set tab order. setTabOrder(m_ui->m_buttonBox, m_ui->m_cmbParentCategory); diff --git a/src/gui/locationlineedit.cpp b/src/gui/locationlineedit.cpp index c81193a3e..1dcde178e 100644 --- a/src/gui/locationlineedit.cpp +++ b/src/gui/locationlineedit.cpp @@ -58,9 +58,9 @@ void LocationLineEdit::paintEvent(QPaintEvent *event) { "browser_colored_progress_enabled", true).toBool()) { QPalette current_palette = palette(); - QColor loadingColor = settings->value(APP_CFG_BROWSER, - "browser_progress_color", - QColor(59, 94, 248, 70)).value(); + QColor loadingColor = QColor(settings->value(APP_CFG_BROWSER, + "browser_progress_color", + QColor(59, 94, 248)).toString()); QLinearGradient gradient(0, 0, width(), 0); qreal percentage_border = m_progress / 100.0;