From f64d6d16947e6f353d7270b3d8b1a3dd6a15bb53 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 5 Jan 2016 10:26:10 +0100 Subject: [PATCH] Fixed #142. --- resources/text/CHANGELOG | 1 + src/services/standard/gui/formstandardimportexport.cpp | 5 +++-- src/services/standard/gui/formstandardimportexport.ui | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 701e85fc8..31e809ef2 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -3,6 +3,7 @@ Added: ▪ 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: ▪ Some GUI refinements and fixes. diff --git a/src/services/standard/gui/formstandardimportexport.cpp b/src/services/standard/gui/formstandardimportexport.cpp index 9b508303f..275e3fe48 100755 --- a/src/services/standard/gui/formstandardimportexport.cpp +++ b/src/services/standard/gui/formstandardimportexport.cpp @@ -58,6 +58,7 @@ FormStandardImportExport::~FormStandardImportExport() { void FormStandardImportExport::setMode(const FeedsImportExportModel::Mode &mode) { m_model->setMode(mode); + m_ui->m_progressBar->setVisible(false); switch (mode) { case FeedsImportExportModel::Export: { @@ -107,16 +108,16 @@ void FormStandardImportExport::selectFile() { void FormStandardImportExport::onParsingStarted() { m_ui->m_lblResult->setStatus(WidgetWithStatus::Progress, tr("Parsing data..."), tr("Parsing data...")); m_ui->m_btnSelectFile->setEnabled(false); - m_ui->m_progressBar->setEnabled(true); m_ui->m_progressBar->setValue(0); + m_ui->m_progressBar->setVisible(true); } void FormStandardImportExport::onParsingFinished(int count_failed, int count_succeeded, bool parsing_error) { Q_UNUSED(count_failed) Q_UNUSED(count_succeeded) + m_ui->m_progressBar->setVisible(false); m_ui->m_progressBar->setValue(0); - m_ui->m_progressBar->setEnabled(false); m_model->checkAllItems(); if (!parsing_error) { diff --git a/src/services/standard/gui/formstandardimportexport.ui b/src/services/standard/gui/formstandardimportexport.ui index 671a9dd2d..b1107d194 100755 --- a/src/services/standard/gui/formstandardimportexport.ui +++ b/src/services/standard/gui/formstandardimportexport.ui @@ -116,9 +116,6 @@ - - false - 0