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

List:       kde-commits
Subject:    [kdepim] importwizard: Improve it
From:       Montel Laurent <montel () kde ! org>
Date:       2012-02-26 11:08:34
Message-ID: 20120226110834.B8EB9A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 341eb39e3193c98cd8fd683f3df394ff4e17b6e0 by Montel Laurent.
Committed on 26/02/2012 at 12:08.
Pushed by mlaurent into branch 'master'.

Improve it

M  +2    -1    importwizard/importfilterinfogui.cpp
M  +3    -2    importwizard/importfilterinfogui.h
M  +1    -1    importwizard/importwizard.cpp
M  +3    -1    importwizard/pimimportabstract.cpp
M  +4    -1    importwizard/pimimportabstract.h
M  +11   -3    importwizard/thunderbird/thunderbirdimportdata.cpp
M  +2    -1    importwizard/thunderbird/thunderbirdimportdata.h

http://commits.kde.org/kdepim/341eb39e3193c98cd8fd683f3df394ff4e17b6e0

diff --git a/importwizard/importfilterinfogui.cpp \
b/importwizard/importfilterinfogui.cpp index 2359ab6..bd94237 100644
--- a/importwizard/importfilterinfogui.cpp
+++ b/importwizard/importfilterinfogui.cpp
@@ -16,10 +16,11 @@
 */
 
 #include "importfilterinfogui.h"
+#include "importmailpage.h"
 #include <KMessageBox>
 #include <KApplication>
 
-ImportFilterInfoGui::ImportFilterInfoGui(QWidget* parent)
+ImportFilterInfoGui::ImportFilterInfoGui(ImportMailPage* parent)
   : MailImporter::FilterInfoGui(),
     m_parent( parent )
 {
diff --git a/importwizard/importfilterinfogui.h b/importwizard/importfilterinfogui.h
index 2f9eaec..be05230 100644
--- a/importwizard/importfilterinfogui.h
+++ b/importwizard/importfilterinfogui.h
@@ -19,11 +19,12 @@
 #define IMPORTFILTERINFOGUI_H
 
 #include "filterinfogui.h"
+class ImportMailPage;
 
 class ImportFilterInfoGui : public MailImporter::FilterInfoGui
 {
 public:
-  explicit ImportFilterInfoGui( QWidget* parent);
+  explicit ImportFilterInfoGui(ImportMailPage *parent);
   ~ImportFilterInfoGui();
   void setStatusMessage( const QString& status );
   void setFrom( const QString& from );
@@ -37,7 +38,7 @@ public:
   void alert( const QString& message );
   QWidget *parent();
 private:
-  QWidget *m_parent;
+  ImportMailPage *m_parent;
 };
 
 
diff --git a/importwizard/importwizard.cpp b/importwizard/importwizard.cpp
index 1dc7030..727d5f7 100644
--- a/importwizard/importwizard.cpp
+++ b/importwizard/importwizard.cpp
@@ -68,7 +68,7 @@ ImportWizard::ImportWizard(QWidget *parent)
   addPage( mPage6 );
 
   //Import module
-  addImportModule(new ThunderbirdImportData());
+  addImportModule(new ThunderbirdImportData(mImportMailPage));
 
   // Disable the 'next button to begin with.
   setValid( currentPage(), false );
diff --git a/importwizard/pimimportabstract.cpp b/importwizard/pimimportabstract.cpp
index 27ec473..301923b 100644
--- a/importwizard/pimimportabstract.cpp
+++ b/importwizard/pimimportabstract.cpp
@@ -16,8 +16,10 @@
 */
 
 #include "pimimportabstract.h"
+#include "importmailpage.h"
 
-PimImportAbstract::PimImportAbstract()
+PimImportAbstract::PimImportAbstract(ImportMailPage *parent)
+    :mMailPage(parent)
 {
 }
 
diff --git a/importwizard/pimimportabstract.h b/importwizard/pimimportabstract.h
index 35ccd37..0b6491b 100644
--- a/importwizard/pimimportabstract.h
+++ b/importwizard/pimimportabstract.h
@@ -19,6 +19,8 @@
 #define PIMIMPORTABSTRACT_H
 #include <QObject>
 
+class ImportMailPage;
+
 class PimImportAbstract
 {
 public:
@@ -33,7 +35,7 @@ public:
 
   Q_DECLARE_FLAGS(TypeSupportedOptions, TypeSupportedOption )
 
-  explicit PimImportAbstract();
+  explicit PimImportAbstract(ImportMailPage *parent);
   virtual ~PimImportAbstract();
 
   virtual bool foundMailer() const= 0;
@@ -46,6 +48,7 @@ public:
   virtual bool importAddressBook();
 protected:
   QString mPath;
+  ImportMailPage *mMailPage;
 };
 
 
diff --git a/importwizard/thunderbird/thunderbirdimportdata.cpp \
b/importwizard/thunderbird/thunderbirdimportdata.cpp index 18b4665..f698d95 100644
--- a/importwizard/thunderbird/thunderbirdimportdata.cpp
+++ b/importwizard/thunderbird/thunderbirdimportdata.cpp
@@ -16,10 +16,14 @@
 */
 
 #include "thunderbirdimportdata.h"
-
+#include "mailimporter/filter_thunderbird.h"
+#include "mailimporter/filterinfo.h"
+#include "importfilterinfogui.h"
 #include <QDir>
+#include <QWidget>
 
-ThunderbirdImportData::ThunderbirdImportData()
+ThunderbirdImportData::ThunderbirdImportData(ImportMailPage*parent)
+    :PimImportAbstract(parent)
 {
     mPath = QDir::homePath() + QLatin1String( "/.thunderbird/" );
 }
@@ -48,7 +52,11 @@ bool ThunderbirdImportData::importSettings()
 
 bool ThunderbirdImportData::importMails()
 {
-  return false;
+    MailImporter::FilterInfo *info = new MailImporter::FilterInfo();
+    ImportFilterInfoGui *infoGui = new ImportFilterInfoGui(mMailPage);
+    info->setFilterInfoGui(infoGui);
+    delete info;
+    return false;
 }
 
 bool ThunderbirdImportData::importFilters()
diff --git a/importwizard/thunderbird/thunderbirdimportdata.h \
b/importwizard/thunderbird/thunderbirdimportdata.h index c1ffddd..32fd4f7 100644
--- a/importwizard/thunderbird/thunderbirdimportdata.h
+++ b/importwizard/thunderbird/thunderbirdimportdata.h
@@ -18,11 +18,12 @@
 #define THUNDERBIRDIMPORTDATA_H
 
 #include "pimimportabstract.h"
+class ImportMailPage;
 
 class ThunderbirdImportData : public PimImportAbstract
 {
 public:
-  explicit ThunderbirdImportData();
+  explicit ThunderbirdImportData(ImportMailPage *parent);
   ~ThunderbirdImportData();
     
   TypeSupportedOptions supportedOption();


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