[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1268841 by fischer:

Old code import classes and dialogs removed.

 M  +0 -2      CMakeLists.txt  
 D             dialogs/importprojectdlg.cpp  
 D             dialogs/importprojectdlg.h  
 D             dialogs/importprojectdlgbase.ui  
 M  +0 -11     listpopupmenu.cpp  
 M  +0 -2      listpopupmenu.h  
 M  +1 -58     uml.cpp  
 M  +0 -2      uml.h  
 M  +0 -8      umllistview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #1268840:1268841
@@ -223,7 +223,6 @@
     dialogs/exportallviewsdialog.cpp
     dialogs/notedialog.cpp
     dialogs/objectnodedialog.cpp
-    dialogs/importprojectdlg.cpp
     dialogs/overwritedialogue.cpp
     dialogs/pkgcontentspage.cpp
     dialogs/parmpropdlg.cpp
@@ -247,7 +246,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codeviewerdialogbase.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codevieweroptionsbase.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/exportallviewsdialogbase.ui
-    ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/importprojectdlgbase.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/umlrolepropertiesbase.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/diagrampropertiespage.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codeimportoptionspage.ui
--- trunk/KDE/kdesdk/umbrello/umbrello/listpopupmenu.cpp #1268840:1268841
@@ -617,12 +617,6 @@
     case mt_Internalize_Folder:
         m_actions[m] = addAction(i18n("Internalize Folder"));
         break;
-    case mt_Import_Classes:
-        m_actions[m] = addAction(Icon_Utils::BarIcon(Icon_Utils::it_Import_Class), i18n("Import Classes..."));
-        break;
-    case mt_Import_Project:
-        m_actions[m] = addAction(Icon_Utils::BarIcon(Icon_Utils::it_Import_Project), i18n("Import Project..."));
-        break;
     case mt_Reset_Label_Positions:
         m_actions[m] = addAction(i18n("Reset Label Positions"));
         break;
@@ -1211,9 +1205,6 @@
         addSeparator();
         insert(mt_Paste);
         addSeparator();
-        insert(mt_Import_Classes);
-        insert(mt_Import_Project);
-        addSeparator();
         insert(mt_Expand_All);
         insert(mt_Collapse_All);
         break;
@@ -1259,8 +1250,6 @@
     case mt_Logical_Folder:
         insertContainerItems(true);
         insertStdItems();
-        insert(mt_Import_Classes);
-        insert(mt_Import_Project);
         insertSubmodelAction();
         addSeparator();
         insert(mt_Expand_All);
--- trunk/KDE/kdesdk/umbrello/umbrello/listpopupmenu.h #1268840:1268841
@@ -153,8 +153,6 @@
         mt_Rename,
         mt_Delete,
         mt_Export_Image,
-        mt_Import_Classes,
-        mt_Import_Project,
         mt_Sequence_Number,
         mt_Cut,
         mt_Copy,
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #1268840:1268841
@@ -40,7 +40,6 @@
 #include "codeimportingwizard.h"
 #include "codeviewerdialog.h"
 #include "diagramprintpage.h"
-#include "importprojectdlg.h"
 #include "settingsdlg.h"
 #include "classimport.h"
 #include "refactoringassistant.h"
@@ -271,19 +270,9 @@
 
     QAction* impWizard = actionCollection()->addAction("importing_wizard");
     impWizard->setIcon(Icon_Utils::SmallIcon(Icon_Utils::it_Import_Class));
-    impWizard->setText(i18n("NEW Code &Importing Wizard..."));
+    impWizard->setText(i18n("Code &Importing Wizard..."));
     connect(impWizard, SIGNAL(triggered(bool)), this, SLOT(slotImportingWizard()));
 
-    QAction* importClasses = actionCollection()->addAction("import_class");
-    importClasses->setIcon(Icon_Utils::SmallIcon(Icon_Utils::it_Import_Class));
-    importClasses->setText(i18n("OLD &Import Classes..."));
-    connect(importClasses, SIGNAL(triggered(bool)), this, SLOT(slotImportClasses()));
-
-    QAction* importProject = actionCollection()->addAction("import_project");
-    importProject->setIcon(Icon_Utils::SmallIcon(Icon_Utils::it_Import_Project));
-    importProject->setText(i18n("OLD Import &Project..."));
-    connect(importProject, SIGNAL(triggered(bool)), this, SLOT(slotImportProject()));
-
     QAction* genWizard = actionCollection()->addAction("generation_wizard");
     genWizard->setText(i18n("&Code Generation Wizard..."));
     connect(genWizard, SIGNAL(triggered(bool)), this, SLOT(slotExecGenerationWizard()));
@@ -2420,52 +2409,6 @@
 }
 
 /**
- * Import classes menu selection.
- * TODO: Will be deleted.
- */
-void UMLApp::slotImportClasses()
-{
-    m_doc->setLoading(true);
-    // File selection is separated from invocation of ClassImport::import()
-    // because the user might decide to choose a language different from
-    // the active language (by using the "All Files" option).
-    QString preselectedExtension;
-    const Uml::ProgrammingLanguage pl = m_codegen->language();
-    if (pl == Uml::ProgrammingLanguage::IDL) {
-        preselectedExtension = i18n("*.idl|IDL Files (*.idl)");
-    } else if (pl == Uml::ProgrammingLanguage::Python) {
-        preselectedExtension = i18n("*.py|Python Files (*.py *.pyw)");
-    } else if (pl == Uml::ProgrammingLanguage::Java) {
-        preselectedExtension = i18n("*.java|Java Files (*.java)");
-    } else if (pl == Uml::ProgrammingLanguage::Pascal) {
-        preselectedExtension = i18n("*.pas|Pascal Files (*.pas)");
-    } else if (pl == Uml::ProgrammingLanguage::Ada) {
-        preselectedExtension = i18n("*.ads *.ada|Ada Files (*.ads *.ada)");
-    } else {
-        preselectedExtension = i18n("*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)");
-    }
-    preselectedExtension.append("\n*|" + i18n("All Files"));
-    QStringList fileList = KFileDialog::getOpenFileNames(KUrl(), preselectedExtension,
-                           this, i18n("Select Code to Import") );
-    importFiles(&fileList);
-}
-
-/**
- * Import project menu selection.
- * TODO: Will be deleted.
- */
-void UMLApp::slotImportProject()
-{
-    QStringList listFile;
-
-    QPointer<ImportProjectDlg> importDlg = new ImportProjectDlg(&listFile, m_codegen->language(), this);
-    if (importDlg->exec() == KDialog::Accepted) {
-        importFiles(&listFile);
-    }
-    delete importDlg;
-}
-
-/**
  * Runs the code importing wizard.
  */
 void UMLApp::slotImportingWizard()
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #1268840:1268841
@@ -236,8 +236,6 @@
     void slotCurrentViewExportImage();
     void slotAllViewsExportImage();
     void slotCurrentViewProperties();
-    void slotImportClasses();
-    void slotImportProject();
     void slotClassWizard();
     void slotAddDefaultDatatypes();
     void slotCurrentViewChanged();
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1268840:1268841
@@ -409,14 +409,6 @@
         addNewItem(temp, UMLListViewItem::lvt_CheckConstraint);
         break;
 
-    case ListPopupMenu::mt_Import_Classes:
-        UMLApp::app()->slotImportClasses();
-        break;
-
-    case ListPopupMenu::mt_Import_Project:
-        UMLApp::app()->slotImportProject();
-        break;
-
     case ListPopupMenu::mt_Expand_All:
         expandAll(temp);
         break;