Changeset 16617 in vbox for trunk

Timestamp:

Feb 10, 2009 9:37:20 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: Initial support for OVF import in the GUI.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxUI.pro (modified) (1 diff)
• include/VBoxImportAppliance.h (added)
• include/VBoxProblemReporter.h (modified) (1 diff)
• include/VBoxSelectorWnd.h (modified) (2 diffs)
• src/VBoxImportAppliance.cpp (added)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)
• ui/VBoxImportApplianceDlg.ui (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -283 +283 @@
         include/VBoxSettingsDialogSpecific.h \
         include/VBoxSettingsPage.h \
-        include/VBoxSettingsSelector.h
+        include/VBoxSettingsSelector.h \
+        include/VBoxImportAppliance.h
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
@@ -358 +359 @@
         src/VBoxSettingsDialogSpecific.cpp \
         src/VBoxSettingsSelector.cpp \
-        src/VBoxMediaManagerDlg.cpp
+        src/VBoxMediaManagerDlg.cpp \
+        src/VBoxImportAppliance.cpp
 
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -55 +55 @@
     ui/VBoxGLSettingsInput.ui \
     ui/VBoxGLSettingsUpdate.ui \
-    ui/VBoxGLSettingsLanguage.ui
+    ui/VBoxGLSettingsLanguage.ui \
+    ui/VBoxImportApplianceDlg.ui
 
 TRANSLATIONS = \

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -372 +372 @@
     void cannotRunInSelectorMode();
 
+    void cannotImportAppliance (const CAppliance &aAppliance);
+    void cannotImportAppliance (const CProgress &aProgress, const CAppliance &aAppliance);
+
     void showRuntimeError (const CConsole &console, bool fatal,
                            const QString &errorID,

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -68 +68 @@
 
     void fileMediaMgr();
+    void fileImportAppliance();
     void fileSettings();
     void fileExit();
@@ -149 +150 @@
     /* Actions */
     QAction *mFileMediaMgrAction;
+    QAction *mFileApplianceImportAction;
     QAction *mFileSettingsAction;
     QAction *mFileExitAction;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -2088 +2088 @@
 }
 
+void VBoxProblemReporter::cannotImportAppliance (const CAppliance &aAppliance)
+{
+    message (mainWindowShown(),
+             Error,
+             tr ("Failed to open/interpret appliance <b>%1</b>.").arg (aAppliance.GetPath()),
+             formatErrorInfo (aAppliance));
+}
+
+void VBoxProblemReporter::cannotImportAppliance (const CProgress &aProgress, const CAppliance& aAppliance)
+{
+    AssertWrapperOk (aProgress);
+
+    message (mainWindowShown(),
+             Error,
+             tr ("Failed to import appliance <b>%1</b>.").arg (aAppliance.GetPath()),
+             formatErrorInfo (aProgress.GetErrorInfo()));
+}
+
 void VBoxProblemReporter::showRuntimeError (const CConsole &aConsole, bool fatal,
                                             const QString &errorID,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -30 +30 @@
 #include "VBoxNewVMWzd.h"
 #include "VBoxMediaManagerDlg.h"
+#include "VBoxImportAppliance.h"
 #include "VBoxSettingsDialogSpecific.h"
 #include "VBoxVMLogViewer.h"
@@ -404 +405 @@
     mFileMediaMgrAction = new QAction (this);
     mFileMediaMgrAction->setIcon (VBoxGlobal::iconSet (":/diskimage_16px.png"));
+
+    mFileApplianceImportAction = new QAction (this);
+    mFileApplianceImportAction->setIcon (VBoxGlobal::iconSet (":/diskimage_16px.png"));
+
     mFileSettingsAction = new QAction(this);
     mFileSettingsAction->setMenuRole (QAction::PreferencesRole);
@@ -540 +545 @@
     mFileMenu = menuBar()->addMenu (QString::null);
     mFileMenu->addAction (mFileMediaMgrAction);
+    mFileMenu->addAction (mFileApplianceImportAction);
     mFileMenu->addSeparator();
     mFileMenu->addAction (mFileSettingsAction);
@@ -640 +646 @@
     /* signals and slots connections */
     connect (mFileMediaMgrAction, SIGNAL (triggered()), this, SLOT (fileMediaMgr()));
+    connect (mFileApplianceImportAction, SIGNAL (triggered()), this, SLOT (fileImportAppliance()));
     connect (mFileSettingsAction, SIGNAL (triggered()), this, SLOT (fileSettings()));
     connect (mFileExitAction, SIGNAL (triggered()), this, SLOT (fileExit()));
@@ -735 +742 @@
 {
     VBoxMediaManagerDlg::showModeless (this);
+}
+
+void VBoxSelectorWnd::fileImportAppliance()
+{
+    VBoxImportAppliance::import (this);
 }
 
@@ -1251 +1263 @@
     mFileMediaMgrAction->setStatusTip (tr ("Display the Virtual Media Manager dialog"));
 
+    mFileApplianceImportAction->setText (tr ("&Import Appliance..."));
+    mFileApplianceImportAction->setShortcut (QKeySequence ("Ctrl+K"));
+    mFileApplianceImportAction->setStatusTip (tr ("Import an appliance into VirtualBox"));
+
 #ifdef Q_WS_MAC
     /*