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

Some changes.

Browse Source
This commit is contained in:
Martin Rotter 2014-02-01 18:15:09 +01:00
parent 1f8c968c7e
commit 8527fa5657
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/feedmessageviewer.cpp
View File

@ -91,16 +91,14 @@ void FeedMessageViewer::loadSize() {
void FeedMessageViewer::quitDownloader() { void FeedMessageViewer::quitDownloader() {
qDebug("Quitting feed downloader thread."); qDebug("Quitting feed downloader thread.");
m_feedDownloaderThread->quit(); m_feedDownloaderThread->quit();
qDebug("Feed downloader thread aborted."); qDebug("Feed downloader thread aborted.");
m_feedDownloader->deleteLater(); m_feedDownloader->deleteLater();
} }
void FeedMessageViewer::updateSelectedFeeds() { void FeedMessageViewer::updateSelectedFeeds() {
if (SystemFactory::instance()->applicationCloseLock()->tryLockForRead()) { if (SystemFactory::instance()->applicationCloseLock()->tryLockForWrite()) {
emit feedsUpdateRequested(m_feedsView->selectedFeeds()); emit feedsUpdateRequested(m_feedsView->selectedFeeds());
} }
else { else {
@ -109,7 +107,7 @@ void FeedMessageViewer::updateSelectedFeeds() {
} }
void FeedMessageViewer::updateAllFeeds() { void FeedMessageViewer::updateAllFeeds() {
if (SystemFactory::instance()->applicationCloseLock()->tryLockForRead()) { if (SystemFactory::instance()->applicationCloseLock()->tryLockForWrite()) {
emit feedsUpdateRequested(m_feedsView->allFeeds()); emit feedsUpdateRequested(m_feedsView->allFeeds());
} }
else { else {

2
src/gui/feedmessageviewer.h
View File

@ -43,7 +43,7 @@ class FeedMessageViewer : public TabContent {
void quitDownloader(); void quitDownloader();
public slots: public slots:
// Feed updates. // Feed updating.
void updateSelectedFeeds(); void updateSelectedFeeds();
void updateAllFeeds(); void updateAllFeeds();

15
src/gui/formsettings.ui
View File

@ -102,8 +102,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>564</width> <width>100</width>
<height>363</height> <height>30</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
@ -180,8 +180,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>558</width> <width>167</width>
<height>337</height> <height>219</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -763,6 +763,13 @@ Authors of this application are NOT responsible for lost data.</string>
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkRemoveReadMessagesOnExit">
<property name="text">
<string>Remove all read messages from standard feeds on application exit</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>