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

List:       kde-commits
Subject:    KDE/kdevelop/plugins/appwizard
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2008-12-15 20:51:21
Message-ID: 1229374281.861998.25212.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 897360 by apaku:

Remove the import action, its been superseeded by a new wizard dialog in
kdevplatform

 M  +0 -2      CMakeLists.txt  
 M  +0 -15     appwizardplugin.cpp  
 M  +0 -1      appwizardplugin.h  
 D             importproject.cpp  
 D             importproject.h  
 D             importproject.ui  
 M  +1 -2      kdevappwizard.rc  


--- trunk/KDE/kdevelop/plugins/appwizard/CMakeLists.txt #897359:897360
@@ -9,13 +9,11 @@
     projectselectionpage.cpp
     projecttemplatesmodel.cpp
     projecttemplateitem.cpp
-    importproject.cpp
     projectvcspage.cpp
 )
 
 set(kdevappwizard_PART_UI
     projectselectionpage.ui
-    importproject.ui
     projectvcspage.ui
 )
 
--- trunk/KDE/kdevelop/plugins/appwizard/appwizardplugin.cpp #897359:897360
@@ -49,7 +49,6 @@
 #include "projectselectionpage.h"
 #include "projectvcspage.h"
 #include "projecttemplatesmodel.h"
-#include "importproject.h"
 
 using KDevelop::IBasicVersionControl;
 using KDevelop::ICentralizedVersionControl;
@@ -66,8 +65,6 @@
     dirs->addResourceType("apptemplates", "data", "kdevappwizard/templates/");
     dirs->addResourceType("apptemplate_descriptions","data", \
                "kdevappwizard/template_descriptions/");
     dirs->addResourceType("apptemplate_previews","data", \
                "kdevappwizard/template_previews/");
-    dirs->addResourceType("appimports", "data", "kdevappwizard/imports/");
-    dirs->addResourceType("appimportfiles", "data", "kdevappwizard/importfiles/");
     setComponentData(compData);
 )
 K_EXPORT_PLUGIN(AppWizardFactory(KAboutData("kdevappwizard","kdevappwizard", \
ki18n("Project Wizard"), "0.1", ki18n("Support for creating and importing projects"), \
KAboutData::License_GPL))) @@ -87,12 +84,6 @@
                                "It helps you to generate a skeleton for your "
                                "application from a set of templates.</p>") );
 
-    action = actionCollection()->addAction( "project_import" );
-    action->setIcon(KIcon("document-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);
 }
 
@@ -114,12 +105,6 @@
     }
 }
 
-void AppWizardPlugin::slotImportProject()
-{
-    ImportProject import(this, QApplication::activeWindow());
-    import.exec();
-}
-
 namespace
 {
 
--- trunk/KDE/kdevelop/plugins/appwizard/appwizardplugin.h #897359:897360
@@ -31,7 +31,6 @@
 
 private slots:
     void slotNewProject();
-    void slotImportProject();
 
 private:
     QString createProject(const ApplicationInfo& );
--- trunk/KDE/kdevelop/plugins/appwizard/kdevappwizard.rc #897359:897360
@@ -1,10 +1,9 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevAppWizard" version="2">
+<kpartgui name="KDevAppWizard" version="3">
 <MenuBar>
   <Menu name="project" >
     <text context="@title:menu">Project</text>
     <Action name="project_new" group="project_new"/>
-    <Action name="project_import" group="project_import"/>
   </Menu>
 </MenuBar>
 </kpartgui>


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