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

Fixed #13.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-18 17:15:05 +01:00
parent 7d17bfa798
commit 861b8de47c
3 changed files with 139 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/formsettings.cpp
View File

@ -171,6 +171,7 @@ void FormSettings::selectBrowserExecutable() {
} }
void FormSettings::loadFeedsMessages() { void FormSettings::loadFeedsMessages() {
m_ui->m_checkKeppMessagesInTheMiddle->setChecked(Settings::instance()->value(APP_CFG_MESSAGES, "keep_cursor_center", false).toBool());
m_ui->m_checkRemoveReadMessagesOnExit->setChecked(Settings::instance()->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool()); m_ui->m_checkRemoveReadMessagesOnExit->setChecked(Settings::instance()->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool());
m_ui->m_checkAutoUpdate->setChecked(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_enabled", false).toBool()); m_ui->m_checkAutoUpdate->setChecked(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_enabled", false).toBool());
m_ui->m_spinAutoUpdateInterval->setValue(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_interval", DEFAULT_AUTO_UPDATE_INTERVAL).toInt()); m_ui->m_spinAutoUpdateInterval->setValue(Settings::instance()->value(APP_CFG_FEEDS, "auto_update_interval", DEFAULT_AUTO_UPDATE_INTERVAL).toInt());
@ -179,6 +180,7 @@ void FormSettings::loadFeedsMessages() {
} }
void FormSettings::saveFeedsMessages() { void FormSettings::saveFeedsMessages() {
Settings::instance()->setValue(APP_CFG_MESSAGES, "keep_cursor_center", m_ui->m_checkKeppMessagesInTheMiddle->isChecked());
Settings::instance()->setValue(APP_CFG_MESSAGES, "clear_read_on_exit", m_ui->m_checkRemoveReadMessagesOnExit->isChecked()); Settings::instance()->setValue(APP_CFG_MESSAGES, "clear_read_on_exit", m_ui->m_checkRemoveReadMessagesOnExit->isChecked());
Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_enabled", m_ui->m_checkAutoUpdate->isChecked()); Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_enabled", m_ui->m_checkAutoUpdate->isChecked());
Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_interval", m_ui->m_spinAutoUpdateInterval->value()); Settings::instance()->setValue(APP_CFG_FEEDS, "auto_update_interval", m_ui->m_spinAutoUpdateInterval->value());

155
src/gui/formsettings.ui
View File

@ -17,11 +17,20 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QStackedWidget" name="m_stackedSettings"> <widget class="QStackedWidget" name="m_stackedSettings">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="m_pageGeneral"> <widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5"> <layout class="QFormLayout" name="formLayout_5">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -35,7 +44,16 @@
</widget> </widget>
<widget class="QWidget" name="m_pageDataStorage"> <widget class="QWidget" name="m_pageDataStorage">
<layout class="QFormLayout" name="formLayout_14"> <layout class="QFormLayout" name="formLayout_14">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -71,7 +89,16 @@
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -111,7 +138,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageMysql"> <widget class="QWidget" name="m_pageMysql">
<layout class="QFormLayout" name="formLayout_16"> <layout class="QFormLayout" name="formLayout_16">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -225,7 +261,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageShortcuts"> <widget class="QWidget" name="m_pageShortcuts">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -241,12 +286,21 @@ 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>576</width> <width>100</width>
<height>373</height> <height>30</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -260,7 +314,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageUi"> <widget class="QWidget" name="m_pageUi">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -276,7 +339,16 @@ Authors of this application are NOT responsible for lost data.</string>
<string>Icons &amp;&amp; skins</string> <string>Icons &amp;&amp; skins</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -292,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>568</width> <width>209</width>
<height>344</height> <height>245</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -508,7 +580,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageLanguages"> <widget class="QWidget" name="m_pageLanguages">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -537,7 +618,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageProxy"> <widget class="QWidget" name="m_pageProxy">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -847,7 +937,16 @@ Authors of this application are NOT responsible for lost data.</string>
</widget> </widget>
<widget class="QWidget" name="m_pageFeedsMessages"> <widget class="QWidget" name="m_pageFeedsMessages">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -860,6 +959,16 @@ Authors of this application are NOT responsible for lost data.</string>
<string>Feeds</string> <string>Feeds</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout_10"> <layout class="QFormLayout" name="formLayout_10">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
<property name="text">
<string>Update all feed on application startup</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdate"> <widget class="QCheckBox" name="m_checkAutoUpdate">
<property name="text"> <property name="text">
@ -912,13 +1021,6 @@ Authors of this application are NOT responsible for lost data.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
<property name="text">
<string>Update all feed on application startup</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="m_tabMessages"> <widget class="QWidget" name="m_tabMessages">
@ -936,6 +1038,13 @@ Authors of this application are NOT responsible for lost data.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkKeppMessagesInTheMiddle">
<property name="text">
<string>Kepp message selection in the middle of the message list viewport</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

29
src/gui/messagesview.cpp
View File

@ -197,30 +197,11 @@ void MessagesView::currentChanged(const QModelIndex &current,
void MessagesView::selectionChanged(const QItemSelection &selected, void MessagesView::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected) { const QItemSelection &deselected) {
// QModelIndex current_index = currentIndex(); if (Settings::instance()->value(APP_CFG_MESSAGES,
// QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); "keep_cursor_center",
false).toBool()) {
// qDebug("Current row changed - row [%d,%d] source [%d, %d].", scrollTo(currentIndex(), QAbstractItemView::PositionAtCenter);
// current_index.row(), current_index.column(), }
// mapped_current_index.row(), mapped_current_index.column());
// if (mapped_current_index.isValid()) {
// if (!m_batchUnreadSwitch) {
// // Set this message as read only if current item
// // wasn't changed by "mark selected messages unread" action.
// m_sourceModel->setMessageRead(mapped_current_index.row(), 1);
// }
// emit currentMessagesChanged(QList<Message>() <<
// m_sourceModel->messageAt(mapped_current_index.row()));
// }
// else {
// emit currentMessagesRemoved();
// }
// TODO: This fixes bug #13 + possibly
// move code from currentChanged to this method too.
//scrollTo(current_index, QAbstractItemView::PositionAtCenter);
QTreeView::selectionChanged(selected, deselected); QTreeView::selectionChanged(selected, deselected);
} }