FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HIG updated, changelog updated. Fixed loading of webbrowser progressbar color.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-16 08:24:27 +01:00
parent 7105bd2471
commit c2e3ee333d
8 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/text/CHANGELOG
View File

@ -5,6 +5,9 @@
<li>[#] Virtual desktop change hides main window.</li> <li>[#] Virtual desktop change hides main window.</li>
<li>[#] Misleding external browser settings.</li> <li>[#] Misleding external browser settings.</li>
<li>[#] Non-functional external browser shortcuts.</li> <li>[#] Non-functional external browser shortcuts.</li>
<li>[#] Saving of webbrowser progressbar color.</li>
<li>[~] Usability of some GUI elements.</li>
<li>[@] Completely switched to new website.</li>
<li>[+] Some missing shortcuts.</li> <li>[+] Some missing shortcuts.</li>
</ul> </ul>
[1.9.9.4] [1.9.9.4]

2
src/core/feedsmodel.cpp
View File

@ -21,7 +21,7 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) {
m_rootItem = new FeedsModelRootItem(); m_rootItem = new FeedsModelRootItem();
m_rootItem->setId(NO_PARENT_CATEGORY); 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_rootItem->setIcon(IconThemeFactory::instance()->fromTheme("folder-root"));
m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread"); m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread");
m_headerData << tr("Title"); m_headerData << tr("Title");

3
src/gui/formmain.ui
View File

@ -115,9 +115,10 @@
<addaction name="m_actionSelectNextFeedCategory"/> <addaction name="m_actionSelectNextFeedCategory"/>
<addaction name="m_actionSelectPreviousFeedCategory"/> <addaction name="m_actionSelectPreviousFeedCategory"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="m_actionViewSelectedItemsNewspaperMode"/>
<addaction name="m_actionMarkAllFeedsRead"/> <addaction name="m_actionMarkAllFeedsRead"/>
<addaction name="m_actionClearAllFeeds"/> <addaction name="m_actionClearAllFeeds"/>
<addaction name="separator"/>
<addaction name="m_actionViewSelectedItemsNewspaperMode"/>
<addaction name="m_actionMarkSelectedFeedsAsRead"/> <addaction name="m_actionMarkSelectedFeedsAsRead"/>
<addaction name="m_actionMarkSelectedFeedsAsUnread"/> <addaction name="m_actionMarkSelectedFeedsAsUnread"/>
<addaction name="m_actionClearSelectedFeeds"/> <addaction name="m_actionClearSelectedFeeds"/>

27
src/gui/formsettings.cpp
View File

@ -149,7 +149,7 @@ void FormSettings::changeBrowserProgressColor() {
QPointer<QColorDialog> color_dialog = new QColorDialog(m_initialSettings.m_webBrowserProgress, QPointer<QColorDialog> color_dialog = new QColorDialog(m_initialSettings.m_webBrowserProgress,
this); this);
color_dialog.data()->setWindowTitle(tr("Select color for web browser progress bar")); 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) { if (color_dialog.data()->exec() == QDialog::Accepted) {
m_initialSettings.m_webBrowserProgress = color_dialog.data()->selectedColor(); m_initialSettings.m_webBrowserProgress = color_dialog.data()->selectedColor();
@ -301,10 +301,9 @@ void FormSettings::loadBrowser() {
Settings *settings = Settings::instance(); Settings *settings = Settings::instance();
// Load settings of web browser GUI. // Load settings of web browser GUI.
m_initialSettings.m_webBrowserProgress = settings->value(APP_CFG_BROWSER, m_initialSettings.m_webBrowserProgress = QColor(settings->value(APP_CFG_BROWSER,
"browser_progress_color", "browser_progress_color",
QColor(59, 94, 248, 70)).value<QColor>(); QColor(59, 94, 248)).toString());
loadWebBrowserColor(m_initialSettings.m_webBrowserProgress);
m_ui->m_checkBrowserProgressColor->setChecked(settings->value(APP_CFG_BROWSER, m_ui->m_checkBrowserProgressColor->setChecked(settings->value(APP_CFG_BROWSER,
"browser_colored_progress_enabled", "browser_colored_progress_enabled",
true).toBool()); true).toBool());
@ -314,6 +313,8 @@ void FormSettings::loadBrowser() {
m_ui->m_checkQueueTabs->setChecked(settings->value(APP_CFG_BROWSER, m_ui->m_checkQueueTabs->setChecked(settings->value(APP_CFG_BROWSER,
"queue_tabs", "queue_tabs",
true).toBool()); 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_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), "-nosession %1");
m_ui->m_txtExternalBrowserExecutable->setText(settings->value(APP_CFG_BROWSER, m_ui->m_txtExternalBrowserExecutable->setText(settings->value(APP_CFG_BROWSER,
@ -329,7 +330,7 @@ void FormSettings::saveBrowser() {
// Save settings of GUI of web browser. // Save settings of GUI of web browser.
settings->setValue(APP_CFG_BROWSER, settings->setValue(APP_CFG_BROWSER,
"browser_progress_color", "browser_progress_color",
m_initialSettings.m_webBrowserProgress); m_initialSettings.m_webBrowserProgress.name());
settings->setValue(APP_CFG_BROWSER, settings->setValue(APP_CFG_BROWSER,
"browser_colored_progress_enabled", "browser_colored_progress_enabled",
m_ui->m_checkBrowserProgressColor->isChecked()); m_ui->m_checkBrowserProgressColor->isChecked());
@ -349,8 +350,8 @@ void FormSettings::saveBrowser() {
} }
void FormSettings::loadProxy() { void FormSettings::loadProxy() {
m_ui->m_cmbProxyType->addItem(tr("no proxy"), QNetworkProxy::NoProxy); 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("System proxy"), QNetworkProxy::DefaultProxy);
m_ui->m_cmbProxyType->addItem(tr("Socks5"), QNetworkProxy::Socks5Proxy); m_ui->m_cmbProxyType->addItem(tr("Socks5"), QNetworkProxy::Socks5Proxy);
m_ui->m_cmbProxyType->addItem(tr("Http"), QNetworkProxy::HttpProxy); m_ui->m_cmbProxyType->addItem(tr("Http"), QNetworkProxy::HttpProxy);
@ -696,11 +697,11 @@ void FormSettings::loadInterface() {
true).toBool()); true).toBool());
// Load toolbar button style. // Load toolbar button style.
m_ui->m_cmbToolbarButtonStyle->addItem(tr("icon only"), Qt::ToolButtonIconOnly); 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 only"), Qt::ToolButtonTextOnly);
m_ui->m_cmbToolbarButtonStyle->addItem(tr("text beside icon"), Qt::ToolButtonTextBesideIcon); 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("Text under icon"), Qt::ToolButtonTextUnderIcon);
m_ui->m_cmbToolbarButtonStyle->addItem(tr("follow OS style"), Qt::ToolButtonFollowStyle); 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, m_ui->m_cmbToolbarButtonStyle->setCurrentIndex(m_ui->m_cmbToolbarButtonStyle->findData(Settings::instance()->value(APP_CFG_GUI,
"toolbar_style", "toolbar_style",

7
src/gui/formsettings.h
View File

@ -44,11 +44,6 @@ class FormSettings : public QDialog {
void loadInterface(); void loadInterface();
void saveInterface(); void saveInterface();
void changeBrowserProgressColor();
// Loads QColor instance into given button.
void loadWebBrowserColor(const QColor &color);
void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous); void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void loadGeneral(); void loadGeneral();
@ -72,6 +67,8 @@ class FormSettings : public QDialog {
void saveBrowser(); void saveBrowser();
void changeDefaultBrowserArguments(int index); void changeDefaultBrowserArguments(int index);
void selectBrowserExecutable(); void selectBrowserExecutable();
void changeBrowserProgressColor();
void loadWebBrowserColor(const QColor &color);
void loadProxy(); void loadProxy();
void saveProxy(); void saveProxy();

30
src/gui/formsettings.ui
View File

@ -286,8 +286,8 @@ Authors of this application are NOT responsible for lost data.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>564</width>
<height>30</height> <height>363</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
@ -364,8 +364,8 @@ Authors of this application are NOT responsible for lost data.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>209</width> <width>558</width>
<height>245</height> <height>337</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -498,13 +498,10 @@ Authors of this application are NOT responsible for lost data.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="2" column="0">
<widget class="QRadioButton" name="m_radioTrayOn"> <widget class="QCheckBox" name="m_checkHideWhenMinimized">
<property name="text"> <property name="text">
<string>Enable</string> <string>Hide main window when it is minimized</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -515,10 +512,13 @@ Authors of this application are NOT responsible for lost data.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkHideWhenMinimized"> <widget class="QRadioButton" name="m_radioTrayOn">
<property name="text"> <property name="text">
<string>Hide main window when it is minimized</string> <string>Enable</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -633,7 +633,7 @@ Authors of this application are NOT responsible for lost data.</string>
<item> <item>
<widget class="QTabWidget" name="m_tabBrowserProxy"> <widget class="QTabWidget" name="m_tabBrowserProxy">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="m_tabInternalBrowser"> <widget class="QWidget" name="m_tabInternalBrowser">
<attribute name="title"> <attribute name="title">
@ -766,7 +766,7 @@ Authors of this application are NOT responsible for lost data.</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>select browser</string> <string>Select browser</string>
</property> </property>
</item> </item>
</widget> </widget>

4
src/gui/formstandardfeeddetails.cpp
View File

@ -381,8 +381,8 @@ void FormStandardFeedDetails::initialize() {
// Setup auto-update options. // Setup auto-update options.
m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL); 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("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 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 every"), QVariant::fromValue((int) FeedsModelStandardFeed::SpecificAutoUpdate));
// Set tab order. // Set tab order.
setTabOrder(m_ui->m_buttonBox, m_ui->m_cmbParentCategory); setTabOrder(m_ui->m_buttonBox, m_ui->m_cmbParentCategory);

6
src/gui/locationlineedit.cpp
View File

@ -58,9 +58,9 @@ void LocationLineEdit::paintEvent(QPaintEvent *event) {
"browser_colored_progress_enabled", "browser_colored_progress_enabled",
true).toBool()) { true).toBool()) {
QPalette current_palette = palette(); QPalette current_palette = palette();
QColor loadingColor = settings->value(APP_CFG_BROWSER, QColor loadingColor = QColor(settings->value(APP_CFG_BROWSER,
"browser_progress_color", "browser_progress_color",
QColor(59, 94, 248, 70)).value<QColor>(); QColor(59, 94, 248)).toString());
QLinearGradient gradient(0, 0, width(), 0); QLinearGradient gradient(0, 0, width(), 0);
qreal percentage_border = m_progress / 100.0; qreal percentage_border = m_progress / 100.0;