[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [pim-data-exporter] /: Update version after split
From:       Montel Laurent <montel () kde ! org>
Date:       2016-08-31 19:47:24
Message-ID: E1bfBTo-0003oI-GJ () code ! kde ! org
[Download RAW message or body]

Git commit bd95bc94633eb60f09878636e8781b53dc4244df by Montel Laurent.
Committed on 31/08/2016 at 19:47.
Pushed by mlaurent into branch 'master'.

Update version after split

M  +1    -1    CMakeLists.txt
M  +7    -5    gui/dialog/showarchivestructuredialog.cpp

http://commits.kde.org/pim-data-exporter/bd95bc94633eb60f09878636e8781b53dc4244df

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1f5fb5..1085a9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ if(DEFINED KDEPIM_DEV_VERSION)
 endif()
 
 
-set(KDEPIM_VERSION_NUMBER "5.3.42")
+set(KDEPIM_VERSION_NUMBER "5.3.43")
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
diff --git a/gui/dialog/showarchivestructuredialog.cpp \
b/gui/dialog/showarchivestructuredialog.cpp index ed053fc..6152ff8 100644
--- a/gui/dialog/showarchivestructuredialog.cpp
+++ b/gui/dialog/showarchivestructuredialog.cpp
@@ -54,12 +54,14 @@ ShowArchiveStructureDialog::ShowArchiveStructureDialog(const \
QString &filename,  mainLayout->addWidget(searchLine);
     mainLayout->addWidget(mTreeWidget);
     mainLayout->addWidget(buttonBox);
-    const bool result = fillTree();
-    mTreeWidget->expandAll();
-    readConfig();
     user1Button->setText(i18n("Save As Text..."));
+    const bool result = fillTree();
+    if (result) {
+        mTreeWidget->expandAll();
+        connect(user1Button, &QPushButton::clicked, this, \
&ShowArchiveStructureDialog::slotExportAsLogFile); +    }
     user1Button->setEnabled(result);
-    connect(user1Button, &QPushButton::clicked, this, \
&ShowArchiveStructureDialog::slotExportAsLogFile); +    readConfig();
 }
 
 ShowArchiveStructureDialog::~ShowArchiveStructureDialog()
@@ -80,7 +82,7 @@ bool ShowArchiveStructureDialog::fillTree()
     if (!result) {
         KMessageBox::error(this, i18n("Archive cannot be opened in read mode."), \
i18n("Cannot open archive"));  delete zip;
-        return result;
+        return false;
     }
     const KArchiveDirectory *topDirectory = zip->directory();
     const bool isAValidArchive = searchArchiveElement(Utils::infoPath(), \
topDirectory, i18n("Info"));


[prev in list] [next in list] [prev in thread] [next in thread]