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

fix #433

Browse Source
This commit is contained in:
Martin Rotter 2021-06-08 07:29:37 +02:00
parent 98e850e031
commit 09d03eacf7
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" />
<releases>
<release version="3.9.2" date="2021-06-04"/>
<release version="3.9.2" date="2021-06-08"/>
</releases>
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>

9
src/librssguard/gui/dialogs/formdatabasecleanup.cpp
View File

@ -30,7 +30,7 @@ FormDatabaseCleanup::FormDatabaseCleanup(QWidget* parent) : QDialog(parent), m_u
}
void FormDatabaseCleanup::closeEvent(QCloseEvent* event) {
if (m_ui->m_progressBar->isEnabled()) {
if (!m_ui->m_btnBox->isEnabled()) {
event->ignore();
}
else {
@ -39,7 +39,7 @@ void FormDatabaseCleanup::closeEvent(QCloseEvent* event) {
}
void FormDatabaseCleanup::keyPressEvent(QKeyEvent* event) {
if (m_ui->m_progressBar->isEnabled()) {
if (!m_ui->m_btnBox->isEnabled()) {
event->ignore();
}
else {
@ -66,7 +66,6 @@ void FormDatabaseCleanup::startPurging() {
void FormDatabaseCleanup::onPurgeStarted() {
m_ui->m_progressBar->setValue(0);
m_ui->m_progressBar->setEnabled(true);
m_ui->m_btnBox->setEnabled(false);
m_ui->m_lblResult->setStatus(WidgetWithStatus::StatusType::Information, tr("Database cleanup is running."),
tr("Database cleanup is running."));
@ -78,8 +77,7 @@ void FormDatabaseCleanup::onPurgeProgress(int progress, const QString& descripti
}
void FormDatabaseCleanup::onPurgeFinished(bool finished) {
m_ui->m_progressBar->setEnabled(false);
m_ui->m_progressBar->setValue(0);
m_ui->m_progressBar->setValue(100);
m_ui->m_btnBox->setEnabled(true);
if (finished) {
@ -100,5 +98,4 @@ void FormDatabaseCleanup::loadDatabaseInfo() {
m_ui->m_txtFileSize->setText(data_size_str);
m_ui->m_txtDatabaseType->setText(qApp->database()->driver()->humanDriverType());
m_ui->m_checkShrink->setChecked(m_ui->m_checkShrink->isEnabled());
}

15
src/librssguard/gui/dialogs/formdatabasecleanup.ui
View File

@ -25,6 +25,9 @@
<property name="text">
<string>Shrink database file</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
@ -32,9 +35,6 @@
<property name="text">
<string>Remove all read messages</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
@ -147,14 +147,7 @@
</widget>
</item>
<item>
<widget class="QProgressBar" name="m_progressBar">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
<widget class="QProgressBar" name="m_progressBar"/>
</item>
</layout>
</widget>