Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 64964)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 64965)
@@ -106,6 +106,6 @@
if (!m_strGroup.isEmpty())
groups << m_strGroup;
- m_machine = vbox.CreateMachine(field("machineFilePath").toString(),
- field("machineBaseName").toString(),
+ m_machine = vbox.CreateMachine(QString() /* no file-path for now */,
+ field("name").toString(),
groups, strTypeId, QString());
if (!vbox.isOk())
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 64964)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp (revision 64965)
@@ -31,5 +31,4 @@
# include "UIMessageCenter.h"
# include "UINameAndSystemEditor.h"
-# include "UIFilePathSelector.h"
# include "QIRichTextLabel.h"
@@ -205,30 +204,4 @@
}
-void UIWizardNewVMPage1::adjustToolTip(const QString &strNewName /* = QString() */)
-{
- /* Compose tool-tip: */
- QString strToolTip;
- /* If name is empty: */
- if (strNewName.isEmpty())
- {
- /* We are just reseting the tool-tip to default: */
- strToolTip = UIWizardNewVM::tr("Holds the name or full path to the virtual "
- "machine folder you are about to create.
");
- }
- /* If name is NOT empty: */
- else
- {
- /* Compose the machine file-path, acquire the machine folder from it: */
- const QString strMachineFilePath = composeMachineFilePath(strNewName);
- const QString strMachineFolder = QDir::toNativeSeparators(QFileInfo(strMachineFilePath).absolutePath());
- /* And compose the location-editor tool-tip accordingly: */
- strToolTip = UIWizardNewVM::tr("You are about to create the virtual machine in the "
- "following folder:
%1
")
- .arg(strMachineFolder);
- }
- /* Assign tool-tip: */
- m_pNameAndSystemEditor->locationEditor()->setToolTip(strToolTip);
-}
-
bool UIWizardNewVMPage1::machineFolderCreated()
{
@@ -245,8 +218,17 @@
}
- /* Compose machine file-path, parse it to folder and base-name: */
- const QString strMachineFilePath = composeMachineFilePath(m_pNameAndSystemEditor->name());
- const QString strMachineFolder = QDir::toNativeSeparators(QFileInfo(strMachineFilePath).absolutePath());
- const QString strMachineBaseName = QFileInfo(strMachineFilePath).completeBaseName();
+ /* Get VBox: */
+ CVirtualBox vbox = vboxGlobal().virtualBox();
+ /* Get default machine folder: */
+ const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
+ /* Compose machine filename: */
+ const QString strMachineFilePath = vbox.ComposeMachineFilename(m_pNameAndSystemEditor->name(),
+ m_strGroup,
+ QString(),
+ strDefaultMachineFolder);
+ /* Compose machine folder/basename: */
+ const QFileInfo fileInfo(strMachineFilePath);
+ const QString strMachineFolder = fileInfo.absolutePath();
+ const QString strMachineBaseName = fileInfo.completeBaseName();
/* Make sure that folder doesn't exists: */
@@ -268,5 +250,4 @@
m_strMachineFolder = strMachineFolder;
m_strMachineBaseName = strMachineBaseName;
- m_strMachineFilePath = strMachineFilePath;
return true;
}
@@ -286,21 +267,4 @@
}
-QString UIWizardNewVMPage1::composeMachineFilePath(const QString &strUserMachineLocation)
-{
- /* Get VBox: */
- CVirtualBox vbox = vboxGlobal().virtualBox();
- /* Get default machine folder: */
- const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
- /* Fetch user's machine location: */
- const QString strUserMachineFolder = QFileInfo(strUserMachineLocation).absolutePath();
- const QString strUserMachineBaseName = QFileInfo(strUserMachineLocation).fileName();
- const bool fUseDefaultPath = strUserMachineLocation == strUserMachineBaseName;
- /* Compose machine filename: */
- return vbox.ComposeMachineFilename(strUserMachineBaseName,
- fUseDefaultPath ? m_strGroup : QString() /* no group in that case */,
- QString(),
- fUseDefaultPath ? strDefaultMachineFolder : strUserMachineFolder);
-}
-
UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
: UIWizardNewVMPage1(strGroup)
@@ -310,5 +274,5 @@
{
m_pLabel = new QIRichTextLabel(this);
- m_pNameAndSystemEditor = new UINameAndSystemEditor(this, true);
+ m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
pMainLayout->addWidget(m_pLabel);
pMainLayout->addWidget(m_pNameAndSystemEditor);
@@ -318,5 +282,4 @@
/* Setup connections: */
connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltNameChanged(const QString &)));
- connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltAdjustToolTip(const QString &)));
connect(m_pNameAndSystemEditor, SIGNAL(sigOsTypeChanged()), this, SLOT(sltOsTypeChanged()));
@@ -326,8 +289,4 @@
registerField("machineFolder", this, "machineFolder");
registerField("machineBaseName", this, "machineBaseName");
- registerField("machineFilePath", this, "machineFilePath");
-
- /* Initialize tool-tip: */
- adjustToolTip();
}
@@ -336,10 +295,4 @@
/* Call to base-class: */
onNameChanged(strNewName);
-}
-
-void UIWizardNewVMPageBasic1::sltAdjustToolTip(const QString &strNewName)
-{
- /* Call to base-class: */
- adjustToolTip(strNewName);
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 64964)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h (revision 64965)
@@ -38,14 +38,8 @@
void onOsTypeChanged();
- /** Adjusts tool-tip according to @a strNewName. */
- void adjustToolTip(const QString &strNewName = QString());
-
/* Helping stuff: */
bool machineFolderCreated();
bool createMachineFolder();
bool cleanupMachineFolder();
-
- /** Composes and returns machine file-path on the basis of passed @a strUserMachineLocation. */
- QString composeMachineFilePath(const QString &strUserMachineLocation);
/** Returns the machine folder value. */
@@ -59,15 +53,8 @@
void setMachineBaseName(const QString &strMachineBaseName) { m_strMachineBaseName = strMachineBaseName; }
- /** Returns the machine file-path value. */
- QString machineFilePath() const { return m_strMachineFilePath; }
- /** Defines the @a strMachineFilePath value. */
- void setMachineFilePath(const QString &strMachineFilePath) { m_strMachineFilePath = strMachineFilePath; }
-
/** Holds the machine folder value. */
QString m_strMachineFolder;
/** Holds the machine base-name value. */
QString m_strMachineBaseName;
- /** Holds the machine file-path value. */
- QString m_strMachineFilePath;
/* Widgets: */
@@ -86,5 +73,4 @@
Q_PROPERTY(QString machineFolder READ machineFolder WRITE setMachineFolder);
Q_PROPERTY(QString machineBaseName READ machineBaseName WRITE setMachineBaseName);
- Q_PROPERTY(QString machineFilePath READ machineFilePath WRITE setMachineFilePath);
public:
@@ -103,7 +89,4 @@
void sltNameChanged(const QString &strNewText);
void sltOsTypeChanged();
-
- /** Adjusts tool-tip according to @a strNewName. */
- void sltAdjustToolTip(const QString &strNewName);
private:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 64964)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp (revision 64965)
@@ -57,5 +57,5 @@
QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
{
- m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt, true);
+ m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
}
@@ -139,5 +139,4 @@
/* Setup connections: */
connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltNameChanged(const QString &)));
- connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltAdjustToolTip(const QString &)));
connect(m_pNameAndSystemEditor, SIGNAL(sigOsTypeChanged()), this, SLOT(sltOsTypeChanged()));
connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged()));
@@ -156,12 +155,8 @@
registerField("machineFolder", this, "machineFolder");
registerField("machineBaseName", this, "machineBaseName");
- registerField("machineFilePath", this, "machineFilePath");
registerField("ram", m_pRamSlider, "value", SIGNAL(valueChanged(int)));
registerField("virtualDisk", this, "virtualDisk");
registerField("virtualDiskId", this, "virtualDiskId");
registerField("virtualDiskLocation", this, "virtualDiskLocation");
-
- /* Initialize tool-tip: */
- adjustToolTip();
}
@@ -178,10 +173,4 @@
/* Broadcast complete-change: */
emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltAdjustToolTip(const QString &strNewName)
-{
- /* Call to base-class: */
- adjustToolTip(strNewName);
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 64964)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h (revision 64965)
@@ -36,5 +36,4 @@
Q_PROPERTY(QString machineFolder READ machineFolder WRITE setMachineFolder);
Q_PROPERTY(QString machineBaseName READ machineBaseName WRITE setMachineBaseName);
- Q_PROPERTY(QString machineFilePath READ machineFilePath WRITE setMachineFilePath);
Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
Q_PROPERTY(QString virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);
@@ -65,7 +64,4 @@
void sltGetWithFileOpenDialog();
- /** Adjusts tool-tip according to @a strNewName. */
- void sltAdjustToolTip(const QString &strNewName);
-
private: