pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #142.

Browse source
This commit is contained in:
Martin Rotter 2016-01-05 10:26:10 +01:00
parent cad7219ea2
commit f64d6d1694
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/text/CHANGELOG
View file

@ -3,6 +3,7 @@
Added: Added:
▪ Added generic "Add new feed" action, which can be accessed via "Feeds & messages" menu. (issue #146) ▪ Added generic "Add new feed" action, which can be accessed via "Feeds & messages" menu. (issue #146)
▪ Added support for import/export to/from plain TXT file (one feed URL per line). (issue #142)
Changed: Changed:
▪ Some GUI refinements and fixes. ▪ Some GUI refinements and fixes.

5
src/services/standard/gui/formstandardimportexport.cpp
View file

@ -58,6 +58,7 @@ FormStandardImportExport::~FormStandardImportExport() {
void FormStandardImportExport::setMode(const FeedsImportExportModel::Mode &mode) { void FormStandardImportExport::setMode(const FeedsImportExportModel::Mode &mode) {
m_model->setMode(mode); m_model->setMode(mode);
m_ui->m_progressBar->setVisible(false);
switch (mode) { switch (mode) {
case FeedsImportExportModel::Export: { case FeedsImportExportModel::Export: {
@ -107,16 +108,16 @@ void FormStandardImportExport::selectFile() {
void FormStandardImportExport::onParsingStarted() { void FormStandardImportExport::onParsingStarted() {
m_ui->m_lblResult->setStatus(WidgetWithStatus::Progress, tr("Parsing data..."), tr("Parsing data...")); m_ui->m_lblResult->setStatus(WidgetWithStatus::Progress, tr("Parsing data..."), tr("Parsing data..."));
m_ui->m_btnSelectFile->setEnabled(false); m_ui->m_btnSelectFile->setEnabled(false);
m_ui->m_progressBar->setEnabled(true);
m_ui->m_progressBar->setValue(0); m_ui->m_progressBar->setValue(0);
m_ui->m_progressBar->setVisible(true);
} }
void FormStandardImportExport::onParsingFinished(int count_failed, int count_succeeded, bool parsing_error) { void FormStandardImportExport::onParsingFinished(int count_failed, int count_succeeded, bool parsing_error) {
Q_UNUSED(count_failed) Q_UNUSED(count_failed)
Q_UNUSED(count_succeeded) Q_UNUSED(count_succeeded)
m_ui->m_progressBar->setVisible(false);
m_ui->m_progressBar->setValue(0); m_ui->m_progressBar->setValue(0);
m_ui->m_progressBar->setEnabled(false);
m_model->checkAllItems(); m_model->checkAllItems();
if (!parsing_error) { if (!parsing_error) {

3
src/services/standard/gui/formstandardimportexport.ui
View file

@ -116,9 +116,6 @@
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QProgressBar" name="m_progressBar"> <widget class="QProgressBar" name="m_progressBar">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value"> <property name="value">
<number>0</number> <number>0</number>
</property> </property>