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

Color for web browser picking fixed, some more tweaking in messages view.

Browse Source
This commit is contained in:
Martin Rotter 2013-12-19 08:06:55 +01:00
parent dbf238a793
commit a01de7b37d
5 changed files with 83 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/formsettings.cpp
View File

@ -121,9 +121,10 @@ void FormSettings::changeBrowserProgressColor() {
QColorDialog color_dialog(m_initialSettings.m_webBrowserProgress, this);
color_dialog.setWindowTitle(tr("Select color for web browser progress bar"));
color_dialog.setOption(QColorDialog::ShowAlphaChannel);
color_dialog.exec();
if (color_dialog.exec() == QDialog::Accepted) {
m_initialSettings.m_webBrowserProgress = color_dialog.selectedColor();
loadWebBrowserColor(m_initialSettings.m_webBrowserProgress);
}
}
void FormSettings::selectBrowserExecutable() {
@ -208,6 +209,13 @@ bool FormSettings::doSaveCheck() {
return everything_ok;
}
void FormSettings::loadWebBrowserColor(const QColor &color) {
m_ui->m_btnWebBrowserColorSample->setStyleSheet(QString("QToolButton { background-color: rgba(%1, %2, %3, %4); }").arg(QString::number(color.red()),
QString::number(color.green()),
QString::number(color.blue()),
QString::number(color.alpha())));
}
void FormSettings::promptForRestart() {
if (m_changedDataTexts.count() > 0) {
QMessageBox msg_question(this);
@ -277,6 +285,7 @@ void FormSettings::loadBrowser() {
m_initialSettings.m_webBrowserProgress = settings->value(APP_CFG_BROWSER,
"browser_progress_color",
QColor(0, 255, 0, 100)).value<QColor>();
loadWebBrowserColor(m_initialSettings.m_webBrowserProgress);
m_ui->m_checkBrowserProgressColor->setChecked(settings->value(APP_CFG_BROWSER,
"browser_colored_progress_enabled",
true).toBool());

4
src/gui/formsettings.h
View File

@ -43,6 +43,10 @@ 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();

92
src/gui/formsettings.ui
View File

@ -17,7 +17,7 @@
<item row="0" column="1">
<widget class="QStackedWidget" name="m_stackedSettings">
<property name="currentIndex">
<number>5</number>
<number>4</number>
</property>
<widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5">
@ -69,8 +69,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>559</width>
<height>363</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
@ -147,8 +147,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>167</width>
<height>219</height>
<width>553</width>
<height>337</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
@ -424,10 +424,9 @@
<string>Web browser</string>
</attribute>
<layout class="QFormLayout" name="formLayout_4">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QCheckBox" name="m_checkBrowserProgressColor">
<property name="text">
<string>Use custom color for web browser progress bar</string>
@ -437,14 +436,53 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item>
<widget class="QPushButton" name="m_btnBrowserProgressColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Change...</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Current color</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="m_btnWebBrowserColorSample">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkQueueTabs">
<property name="text">
<string>Queue new tabs (with hyperlinks) after the active tab</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="m_checkMouseGestures">
<property name="text">
<string>Enable mouse gestures</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<item row="3" column="0">
<widget class="QLabel" name="m_lblMouseGestures">
<property name="text">
<string>Mouse gestures work with middle mouse button. Possible gestures are:
@ -463,26 +501,6 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkQueueTabs">
<property name="text">
<string>Queue new tabs (with hyperlinks) after the active tab</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="m_btnBrowserProgressColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Change...</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="m_tabProxy">
@ -651,7 +669,7 @@
<item>
<widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="m_tabFeeds">
<attribute name="title">
@ -682,7 +700,11 @@
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLineEdit" name="m_txtExternalBrowserExecutable"/>
<widget class="QLineEdit" name="m_txtExternalBrowserExecutable">
<property name="placeholderText">
<string>Executable file of web browser</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="m_btnExternalBrowserExecutable">
@ -703,7 +725,11 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLineEdit" name="m_txtExternalBrowserArguments"/>
<widget class="QLineEdit" name="m_txtExternalBrowserArguments">
<property name="placeholderText">
<string>Parameters to executable</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="m_lblExternalBrowserPreset">

3
src/gui/messagesview.cpp
View File

@ -182,8 +182,9 @@ void MessagesView::currentChanged(const QModelIndex &current,
QTreeView::currentChanged(current, previous);
}
void MessagesView::loadFeeds(const QList<int> feed_ids) {
void MessagesView::loadFeeds(const QList<int> &feed_ids) {
m_sourceModel->loadMessages(feed_ids);
emit currentMessageRemoved();
}
void MessagesView::openSelectedSourceArticlesExternally() {

2
src/gui/messagesview.h
View File

@ -23,7 +23,7 @@ class MessagesView : public QTreeView {
MessagesModel *sourceModel();
public slots:
void loadFeeds(const QList<int> feed_ids);
void loadFeeds(const QList<int> &feed_ids);
// Message manipulators.
void openSelectedSourceArticlesExternally();