From kde-commits  Wed Oct 17 08:14:12 2007
From: Hamish Rodda <rodda () kde ! org>
Date: Wed, 17 Oct 2007 08:14:12 +0000
To: kde-commits
Subject: KDE/kdevelop/plugins/appwizard
Message-Id: <1192608852.908519.1204.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=119260885808929

SVN commit 726208 by rodda:

Restore support for importing a project

Could someone with knowledge of the intended .kdev4 structure check that the output is correct?


 M  +2 -0      CMakeLists.txt  
 M  +13 -0     appwizardpart.cpp  
 M  +1 -0      appwizardpart.h  
 A             importproject.cpp   branches/KDE/3.5/kdevelop/parts/appwizard/importdlg.cpp#725412 [License: GPL (v2+)]
 A             importproject.h   branches/KDE/3.5/kdevelop/parts/appwizard/importdlg.h#725412 [License: GPL (v2+)]
 A             importproject.ui  
 M  +2 -1      kdevappwizard.rc  


--- trunk/KDE/kdevelop/plugins/appwizard/CMakeLists.txt #726207:726208
@@ -9,10 +9,12 @@
     projectselectionpage.cpp
     projecttemplatesmodel.cpp
     projecttemplateitem.cpp
+    importproject.cpp
 )
 
 set(kdevappwizard_PART_UI
     projectselectionpage.ui
+    importproject.ui
 )
 
 kde4_add_ui_files(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI})
--- trunk/KDE/kdevelop/plugins/appwizard/appwizardpart.cpp #726207:726208
@@ -38,6 +38,7 @@
 #include "appwizarddialog.h"
 #include "projectselectionpage.h"
 #include "projecttemplatesmodel.h"
+#include "importproject.h"
 
 K_PLUGIN_FACTORY(AppWizardFactory,
     registerPlugin<AppWizardPart>();
@@ -66,6 +67,12 @@
                                "It helps you to generate a skeleton for your "
                                "application from a set of templates.</p>") );
 
+    action = actionCollection()->addAction( "project_import" );
+    action->setIcon(KIcon("project-import"));
+    action->setText(i18n( "&Import Existing Project..." ));
+    connect( action, SIGNAL( triggered( bool ) ), SLOT( slotImportProject() ) );
+    action->setToolTip( i18n( "Import existing project" ) );
+
     m_templatesModel = new ProjectTemplatesModel(this);
 }
 
@@ -89,6 +96,12 @@
     }
 }
 
+void AppWizardPart::slotImportProject()
+{
+    ImportProject import(this, QApplication::activeWindow());
+    import.exec();
+}
+
 QString AppWizardPart::createProject(ProjectSelectionPage *selectionPage)
 {
     QFileInfo templateInfo(selectionPage->selectedTemplate());
--- trunk/KDE/kdevelop/plugins/appwizard/appwizardpart.h #726207:726208
@@ -29,6 +29,7 @@
 
 private slots:
     void slotNewProject();
+    void slotImportProject();
 
 private:
     QString createProject(ProjectSelectionPage *selectionPage);
--- trunk/KDE/kdevelop/plugins/appwizard/kdevappwizard.rc #726207:726208
@@ -1,8 +1,9 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevAppWizard" version="1">
+<kpartgui name="KDevAppWizard" version="2">
 <MenuBar>
   <Menu name="project" >
     <Action name="project_new" group="project_new"/>
+    <Action name="project_import" group="project_import"/>
   </Menu>
 </MenuBar>
 </kpartgui>