Changeset 41616 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 7, 2012 6:11:28 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Moving VirtualMediaManagerDlg into medium folder, renaming it to UIMediumManager.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxUI.pro (modified) (1 diff)
• src/VBoxMediaManagerDlg.cpp (deleted)
• src/VBoxMediaManagerDlg.h (deleted)
• src/VBoxMediaManagerDlg.ui (deleted)
• src/selector/UISelectorWindow.cpp (modified) (4 diffs)

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

@@ -241 +241 @@
         src/VBoxGlobalSettings.h \
         src/VBoxLicenseViewer.h \
-        src/VBoxMediaManagerDlg.h \
         src/VBoxSnapshotDetailsDlg.h \
         src/VBoxTakeSnapshotDlg.h \
@@ -288 +287 @@
         src/net/UIDownloaderExtensionPack.h \
         src/net/UIDownloaderUserManual.h \
+        src/medium/UIMediumManager.h \
         src/runtime/UIActionPoolRuntime.h \
         src/runtime/UIConsoleEventHandler.h \
@@ -408 +408 @@
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
 VirtualBox_QT_MOCSRCS = \
-        src/VBoxMediaManagerDlg.cpp \
         src/UIVMLogViewer.cpp \
         src/extensions/QISplitter.cpp \
         src/globals/UIActionPool.cpp \
         src/globals/UIExtraDataEventHandler.cpp \
+        src/medium/UIMediumManager.cpp \
         src/net/UIUpdateManager.cpp \
         src/runtime/UIActionPoolRuntime.cpp \
@@ -442 +442 @@
         src/VBoxGlobalSettings.cpp \
         src/VBoxLicenseViewer.cpp \
-        src/VBoxMediaManagerDlg.cpp \
         src/VBoxSnapshotDetailsDlg.cpp \
         src/VBoxTakeSnapshotDlg.cpp \
@@ -483 +482 @@
         src/medium/UIMediumDefs.cpp \
         src/medium/UIMedium.cpp \
+        src/medium/UIMediumManager.cpp \
         src/net/UINetworkManager.cpp \
         src/net/UINetworkManagerDialog.cpp \

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

@@ -23 +23 @@
 FORMS = \
     src/VBoxVMInformationDlg.ui \
-    src/VBoxMediaManagerDlg.ui \
     src/VBoxSnapshotDetailsDlg.ui \
     src/VBoxTakeSnapshotDlg.ui \
     src/UIVMLogViewer.ui \
+    src/medium/UIMediumManager.ui \
     src/settings/UISettingsDialog.ui \
     src/settings/global/UIGlobalSettingsGeneral.ui \

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -43 +43 @@
 #include "UIVirtualBoxEventHandler.h"
 #include "VBoxGlobal.h"
-#include "VBoxMediaManagerDlg.h"
+#include "UIMediumManager.h"
 #include "UIMessageCenter.h"
 #include "UISelectorWindow.h"
@@ -206 +206 @@
 {
     /* Show modeless Virtual Medium Manager: */
-    VBoxMediaManagerDlg::showModeless(this);
+    UIMediumManager::showModeless(this);
 }
 
@@ -1144 +1144 @@
             break;
 
-        /* Ignore the signal if a VBoxMediaManagerDlg window is active: */
+        /* Ignore the signal if a UIMediumManager window is active: */
         if (qApp->activeWindow() &&
-            !strcmp(qApp->activeWindow()->metaObject()->className(), "VBoxMediaManagerDlg"))
+            !strcmp(qApp->activeWindow()->metaObject()->className(), "UIMediumManager"))
             break;
 
@@ -1158 +1158 @@
         {
             /* Show the VDM dialog but don't refresh once more after a just-finished refresh: */
-            VBoxMediaManagerDlg::showModeless(this, false /* aRefresh */);
+            UIMediumManager::showModeless(this, false /* aRefresh */);
         }
     }