Skip to content

Commit 43ebf04

Browse files
adeas31adeas31
committed
Bundled all import and export actions under File menu
Update to new interface of `buildEncryptedPackage` setSaveContentsType whenever we update the class information.
1 parent 29420dd commit 43ebf04

File tree

8 files changed

+138
-141
lines changed

8 files changed

+138
-141
lines changed

‎OMEdit/OMEditGUI/MainWindow.cpp

Lines changed: 76 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3234,6 +3234,58 @@ void MainWindow::createActions()
32343234
mpSaveTotalAction = new QAction(Helper::saveTotal, this);
32353235
mpSaveTotalAction->setStatusTip(Helper::saveTotalTip);
32363236
mpSaveTotalAction->setEnabled(false);
3237+
// import FMU action
3238+
mpImportFMUAction = new QAction(QIcon(":/Resources/icons/import-fmu.svg"), Helper::FMU, this);
3239+
mpImportFMUAction->setStatusTip(Helper::importFMUTip);
3240+
connect(mpImportFMUAction, SIGNAL(triggered()), SLOT(importModelFMU()));
3241+
// import FMU model description action
3242+
mpImportFMUModelDescriptionAction = new QAction(tr("FMU Model Description"), this);
3243+
mpImportFMUModelDescriptionAction->setStatusTip(tr("Imports the model from Functional Mockup Interface (FMU) model description"));
3244+
connect(mpImportFMUModelDescriptionAction, SIGNAL(triggered()), SLOT(importFMUModelDescription()));
3245+
// import from OMNotebook action
3246+
mpImportFromOMNotebookAction = new QAction(QIcon(":/Resources/icons/import-omnotebook.svg"), tr("From OMNotebook"), this);
3247+
mpImportFromOMNotebookAction->setStatusTip(Helper::importFromOMNotebookTip);
3248+
connect(mpImportFromOMNotebookAction, SIGNAL(triggered()), SLOT(importModelfromOMNotebook()));
3249+
// import ngspice netlist action
3250+
mpImportNgspiceNetlistAction = new QAction(tr("Ngspice netlist"), this);
3251+
mpImportNgspiceNetlistAction->setStatusTip(Helper::importNgspiceNetlistTip);
3252+
connect(mpImportNgspiceNetlistAction, SIGNAL(triggered()), SLOT(importNgspiceNetlist()));
3253+
// export to clipboard action
3254+
mpExportToClipboardAction = new QAction(tr("To Clipboard"), this);
3255+
mpExportToClipboardAction->setStatusTip(Helper::exportAsImageTip);
3256+
connect(mpExportToClipboardAction, SIGNAL(triggered()), SLOT(exportToClipboard()));
3257+
// export as image action
3258+
mpExportAsImageAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.svg"), tr("Image"), this);
3259+
mpExportAsImageAction->setStatusTip(Helper::exportAsImageTip);
3260+
connect(mpExportAsImageAction, SIGNAL(triggered()), SLOT(exportModelAsImage()));
3261+
// export FMU action
3262+
mpExportFMUAction = new QAction(QIcon(":/Resources/icons/export-fmu.svg"), Helper::FMU, this);
3263+
mpExportFMUAction->setStatusTip(Helper::exportFMUTip);
3264+
mpExportFMUAction->setEnabled(false);
3265+
connect(mpExportFMUAction, SIGNAL(triggered()), SLOT(exportModelFMU()));
3266+
// export read-only package action
3267+
mpExportReadonlyPackageAction = new QAction(Helper::exportReadonlyPackage, this);
3268+
mpExportReadonlyPackageAction->setStatusTip(Helper::exportRealonlyPackageTip);
3269+
connect(mpExportReadonlyPackageAction, SIGNAL(triggered()), SLOT(exportReadonlyPackage()));
3270+
// export encrypted package action
3271+
mpExportEncryptedPackageAction = new QAction(Helper::exportEncryptedPackage, this);
3272+
mpExportEncryptedPackageAction->setStatusTip(Helper::exportEncryptedPackageTip);
3273+
connect(mpExportEncryptedPackageAction, SIGNAL(triggered()), SLOT(exportEncryptedPackage()));
3274+
// export XML action
3275+
mpExportXMLAction = new QAction(QIcon(":/Resources/icons/export-xml.svg"), Helper::exportXML, this);
3276+
mpExportXMLAction->setStatusTip(Helper::exportXMLTip);
3277+
mpExportXMLAction->setEnabled(false);
3278+
connect(mpExportXMLAction, SIGNAL(triggered()), SLOT(exportModelXML()));
3279+
// export XML action
3280+
mpExportFigaroAction = new QAction(QIcon(":/Resources/icons/console.svg"), tr("Figaro"), this);
3281+
mpExportFigaroAction->setStatusTip(Helper::exportFigaroTip);
3282+
mpExportFigaroAction->setEnabled(false);
3283+
connect(mpExportFigaroAction, SIGNAL(triggered()), SLOT(exportModelFigaro()));
3284+
// export to OMNotebook action
3285+
mpExportToOMNotebookAction = new QAction(QIcon(":/Resources/icons/export-omnotebook.svg"), tr("To OMNotebook"), this);
3286+
mpExportToOMNotebookAction->setStatusTip(Helper::exportToOMNotebookTip);
3287+
mpExportToOMNotebookAction->setEnabled(false);
3288+
connect(mpExportToOMNotebookAction, SIGNAL(triggered()), SLOT(exportModelToOMNotebook()));
32373289
// recent files action
32383290
for (int i = 0; i < MaxRecentFiles; ++i) {
32393291
mpRecentFileActions[i] = new QAction(this);
@@ -3375,39 +3427,6 @@ void MainWindow::createActions()
33753427
mpSimulationSetupAction->setStatusTip(Helper::simulationSetupTip);
33763428
mpSimulationSetupAction->setEnabled(false);
33773429
connect(mpSimulationSetupAction, SIGNAL(triggered()), SLOT(openSimulationDialog()));
3378-
// FMI Menu
3379-
// export FMU action
3380-
mpExportFMUAction = new QAction(QIcon(":/Resources/icons/export-fmu.svg"), Helper::exportFMU, this);
3381-
mpExportFMUAction->setStatusTip(Helper::exportFMUTip);
3382-
mpExportFMUAction->setEnabled(false);
3383-
connect(mpExportFMUAction, SIGNAL(triggered()), SLOT(exportModelFMU()));
3384-
// import FMU action
3385-
mpImportFMUAction = new QAction(QIcon(":/Resources/icons/import-fmu.svg"), Helper::importFMU, this);
3386-
mpImportFMUAction->setStatusTip(Helper::importFMUTip);
3387-
connect(mpImportFMUAction, SIGNAL(triggered()), SLOT(importModelFMU()));
3388-
// import FMU model description action
3389-
mpImportFMUModelDescriptionAction = new QAction(tr("Import FMU Model Description"), this);
3390-
mpImportFMUModelDescriptionAction->setStatusTip(Helper::importFMUTip);
3391-
connect(mpImportFMUModelDescriptionAction, SIGNAL(triggered()), SLOT(importFMUModelDescription()));
3392-
// XML Menu
3393-
// export encrypted package action
3394-
mpExportEncryptedPackageAction = new QAction(Helper::exportEncryptedPackage, this);
3395-
mpExportEncryptedPackageAction->setStatusTip(Helper::exportEncryptedPackageTip);
3396-
connect(mpExportEncryptedPackageAction, SIGNAL(triggered()), SLOT(exportEncryptedPackage()));
3397-
// export read-only package action
3398-
mpExportRealonlyPackageAction = new QAction(Helper::exportRealonlyPackage, this);
3399-
mpExportRealonlyPackageAction->setStatusTip(Helper::exportRealonlyPackageTip);
3400-
connect(mpExportRealonlyPackageAction, SIGNAL(triggered()), SLOT(exportReadonlyPackage()));
3401-
// export XML action
3402-
mpExportXMLAction = new QAction(QIcon(":/Resources/icons/export-xml.svg"), Helper::exportXML, this);
3403-
mpExportXMLAction->setStatusTip(Helper::exportXMLTip);
3404-
mpExportXMLAction->setEnabled(false);
3405-
connect(mpExportXMLAction, SIGNAL(triggered()), SLOT(exportModelXML()));
3406-
// export XML action
3407-
mpExportFigaroAction = new QAction(QIcon(":/Resources/icons/console.svg"), Helper::exportFigaro, this);
3408-
mpExportFigaroAction->setStatusTip(Helper::exportFigaroTip);
3409-
mpExportFigaroAction->setEnabled(false);
3410-
connect(mpExportFigaroAction, SIGNAL(triggered()), SLOT(exportModelFigaro()));
34113430
// Debug Menu
34123431
// Debug configurations
34133432
mpDebugConfigurationsAction = new QAction(Helper::debugConfigurations, this);
@@ -3466,19 +3485,6 @@ void MainWindow::createActions()
34663485
mpShowOMCDiffWidgetAction->setStatusTip(tr("Shows OpenModelica Compiler Diff"));
34673486
connect(mpShowOMCDiffWidgetAction, SIGNAL(triggered()), mpOMCProxy, SLOT(openOMCDiffWidget()));
34683487
}
3469-
// export to OMNotebook action
3470-
mpExportToOMNotebookAction = new QAction(QIcon(":/Resources/icons/export-omnotebook.svg"), Helper::exportToOMNotebook, this);
3471-
mpExportToOMNotebookAction->setStatusTip(Helper::exportToOMNotebookTip);
3472-
mpExportToOMNotebookAction->setEnabled(false);
3473-
connect(mpExportToOMNotebookAction, SIGNAL(triggered()), SLOT(exportModelToOMNotebook()));
3474-
// import from OMNotebook action
3475-
mpImportFromOMNotebookAction = new QAction(QIcon(":/Resources/icons/import-omnotebook.svg"), Helper::importFromOMNotebook, this);
3476-
mpImportFromOMNotebookAction->setStatusTip(Helper::importFromOMNotebookTip);
3477-
connect(mpImportFromOMNotebookAction, SIGNAL(triggered()), SLOT(importModelfromOMNotebook()));
3478-
// import ngspice netlist action
3479-
mpImportNgspiceNetlistAction = new QAction(Helper::importNgspiceNetlist, this);
3480-
mpImportNgspiceNetlistAction->setStatusTip(Helper::importNgspiceNetlistTip);
3481-
connect(mpImportNgspiceNetlistAction, SIGNAL(triggered()), SLOT(importNgspiceNetlist()));
34823488
// open working directory action
34833489
mpOpenWorkingDirectoryAction = new QAction(tr("Open Working Directory"), this);
34843490
mpOpenWorkingDirectoryAction->setStatusTip(tr("Opens the current working directory"));
@@ -3628,15 +3634,6 @@ void MainWindow::createActions()
36283634
mpClearPlotWindowAction = new QAction(QIcon(":/Resources/icons/clear.svg"), tr("Clear Plot Window"), this);
36293635
mpClearPlotWindowAction->setStatusTip(tr("Clears all the curves from the plot window"));
36303636
connect(mpClearPlotWindowAction, SIGNAL(triggered()), mpPlotWindowContainer, SLOT(clearPlotWindow()));
3631-
// Other Actions
3632-
// export as image action
3633-
mpExportAsImageAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.svg"), Helper::exportAsImage, this);
3634-
mpExportAsImageAction->setStatusTip(Helper::exportAsImageTip);
3635-
connect(mpExportAsImageAction, SIGNAL(triggered()), SLOT(exportModelAsImage()));
3636-
// export to clipboard action
3637-
mpExportToClipboardAction = new QAction(tr("Export to Clipboard"), this);
3638-
mpExportToClipboardAction->setStatusTip(Helper::exportAsImageTip);
3639-
connect(mpExportToClipboardAction, SIGNAL(triggered()), SLOT(exportToClipboard()));
36403637
// simulation parameters
36413638
mpSimulationParamsAction = new QAction(QIcon(":/Resources/icons/simulation-parameters.svg"), Helper::simulationParams, this);
36423639
mpSimulationParamsAction->setStatusTip(Helper::simulationParamsTip);
@@ -3717,6 +3714,30 @@ void MainWindow::createMenus()
37173714
//menuFile->addAction(saveAllAction);
37183715
pFileMenu->addAction(mpSaveTotalAction);
37193716
pFileMenu->addSeparator();
3717+
// Import menu
3718+
QMenu *pImportMenu = new QMenu(menuBar());
3719+
pImportMenu->setTitle(tr("Import"));
3720+
// add actions to Import menu
3721+
pImportMenu->addAction(mpImportFMUAction);
3722+
pImportMenu->addAction(mpImportFMUModelDescriptionAction);
3723+
pImportMenu->addAction(mpImportFromOMNotebookAction);
3724+
pImportMenu->addAction(mpImportNgspiceNetlistAction);
3725+
pFileMenu->addMenu(pImportMenu);
3726+
// Export menu
3727+
QMenu *pExportMenu = new QMenu(menuBar());
3728+
pExportMenu->setTitle(tr("Export"));
3729+
// add actions to Export menu
3730+
pExportMenu->addAction(mpExportToClipboardAction);
3731+
pExportMenu->addAction(mpExportAsImageAction);
3732+
pExportMenu->addAction(mpExportFMUAction);
3733+
pExportMenu->addAction(mpExportReadonlyPackageAction);
3734+
pExportMenu->addAction(mpExportEncryptedPackageAction);
3735+
pExportMenu->addAction(mpExportXMLAction);
3736+
pExportMenu->addAction(mpExportFigaroAction);
3737+
pExportMenu->addAction(mpExportToOMNotebookAction);
3738+
pFileMenu->addMenu(pExportMenu);
3739+
pFileMenu->addSeparator();
3740+
// System libraries menu
37203741
mpLibrariesMenu = new QMenu(menuBar());
37213742
mpLibrariesMenu->setObjectName("LibrariesMenu");
37223743
mpLibrariesMenu->setTitle(tr("&System Libraries"));
@@ -3835,25 +3856,6 @@ void MainWindow::createMenus()
38353856
pSimulationMenu->addAction(mpSimulationSetupAction);
38363857
// add Simulation menu to menu bar
38373858
menuBar()->addAction(pSimulationMenu->menuAction());
3838-
// FMI menu
3839-
QMenu *pFMIMenu = new QMenu(menuBar());
3840-
pFMIMenu->setTitle(tr("F&MI"));
3841-
// add actions to FMI menu
3842-
pFMIMenu->addAction(mpExportFMUAction);
3843-
pFMIMenu->addAction(mpImportFMUAction);
3844-
pFMIMenu->addAction(mpImportFMUModelDescriptionAction);
3845-
// add FMI menu to menu bar
3846-
menuBar()->addAction(pFMIMenu->menuAction());
3847-
// Export menu
3848-
QMenu *pExportMenu = new QMenu(menuBar());
3849-
pExportMenu->setTitle(tr("E&xport"));
3850-
// add actions to Export menu
3851-
pExportMenu->addAction(mpExportEncryptedPackageAction);
3852-
pExportMenu->addAction(mpExportRealonlyPackageAction);
3853-
pExportMenu->addAction(mpExportXMLAction);
3854-
pExportMenu->addAction(mpExportFigaroAction);
3855-
// add Export menu to menu bar
3856-
menuBar()->addAction(pExportMenu->menuAction());
38573859
// Debug menu
38583860
QMenu *pDebugMenu = new QMenu(menuBar());
38593861
pDebugMenu->setTitle(tr("&Debug"));
@@ -3920,11 +3922,6 @@ void MainWindow::createMenus()
39203922
pToolsMenu->addAction(mpShowOMCDiffWidgetAction);
39213923
}
39223924
pToolsMenu->addSeparator();
3923-
pToolsMenu->addAction(mpExportToOMNotebookAction);
3924-
pToolsMenu->addAction(mpImportFromOMNotebookAction);
3925-
pToolsMenu->addSeparator();
3926-
pToolsMenu->addAction(mpImportNgspiceNetlistAction);
3927-
pToolsMenu->addSeparator();
39283925
pToolsMenu->addAction(mpOpenWorkingDirectoryAction);
39293926
pToolsMenu->addAction(mpOpenTerminalAction);
39303927
pToolsMenu->addSeparator();

‎OMEdit/OMEditGUI/MainWindow.h

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class MainWindow : public QMainWindow
165165
QAction* getCheckAllModelsAction() {return mpCheckAllModelsAction;}
166166
QAction* getExportFMUAction() {return mpExportFMUAction;}
167167
QAction* getExportEncryptedPackageAction() {return mpExportEncryptedPackageAction;}
168-
QAction* getExportRealonlyPackageAction() {return mpExportRealonlyPackageAction;}
168+
QAction* getExportRealonlyPackageAction() {return mpExportReadonlyPackageAction;}
169169
QAction* getExportXMLAction() {return mpExportXMLAction;}
170170
QAction* getExportFigaroAction() {return mpExportFigaroAction;}
171171
QAction* getLineShapeAction() {return mpLineShapeAction;}
@@ -309,6 +309,18 @@ class MainWindow : public QMainWindow
309309
QAction *mpSaveAsAction;
310310
QAction *mpSaveAllAction;
311311
QAction *mpSaveTotalAction;
312+
QAction *mpImportFMUAction;
313+
QAction *mpImportFMUModelDescriptionAction;
314+
QAction *mpImportFromOMNotebookAction;
315+
QAction *mpImportNgspiceNetlistAction;
316+
QAction *mpExportToClipboardAction;
317+
QAction *mpExportAsImageAction;
318+
QAction *mpExportFMUAction;
319+
QAction *mpExportReadonlyPackageAction;
320+
QAction *mpExportEncryptedPackageAction;
321+
QAction *mpExportXMLAction;
322+
QAction *mpExportFigaroAction;
323+
QAction *mpExportToOMNotebookAction;
312324
QAction *mpRecentFileActions[MaxRecentFiles];
313325
QAction *mpClearRecentFilesAction;
314326
QAction *mpPrintModelAction;
@@ -343,15 +355,6 @@ class MainWindow : public QMainWindow
343355
QAction *mpSimulateWithAnimationAction;
344356
#endif
345357
QAction *mpSimulationSetupAction;
346-
// FMI Menu
347-
QAction *mpExportFMUAction;
348-
QAction *mpImportFMUAction;
349-
QAction *mpImportFMUModelDescriptionAction;
350-
// Export Menu
351-
QAction *mpExportEncryptedPackageAction;
352-
QAction *mpExportRealonlyPackageAction;
353-
QAction *mpExportXMLAction;
354-
QAction *mpExportFigaroAction;
355358
// Debug Menu
356359
QAction *mpDebugConfigurationsAction;
357360
QAction *mpAttachDebuggerToRunningProcessAction;
@@ -367,9 +370,6 @@ class MainWindow : public QMainWindow
367370
QAction *mpShowOMCLoggerWidgetAction;
368371
QAction *mpShowOpenModelicaCommandPromptAction;
369372
QAction *mpShowOMCDiffWidgetAction;
370-
QAction *mpExportToOMNotebookAction;
371-
QAction *mpImportFromOMNotebookAction;
372-
QAction *mpImportNgspiceNetlistAction;
373373
QAction *mpOpenWorkingDirectoryAction;
374374
QAction *mpOpenTerminalAction;
375375
QAction *mpOptionsAction;
@@ -410,9 +410,6 @@ class MainWindow : public QMainWindow
410410
QAction *mpDiagramWindowAction;
411411
QAction *mpClearPlotWindowAction;
412412
QAction *mpExportVariablesAction;
413-
// Other Actions
414-
QAction *mpExportAsImageAction;
415-
QAction *mpExportToClipboardAction;
416413
// TLM Simulation Action
417414
QAction *mpSimulationParamsAction;
418415
QAction *mpFetchInterfaceDataAction;

0 commit comments

Comments
 (0)