Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60770)
@@ -431,4 +431,5 @@
 	src/widgets/UIBootTable.h \
 	src/widgets/UIFilePathSelector.h \
+	src/widgets/UIEmptyFilePathSelector.h \
 	src/widgets/UIHostComboEditor.h \
 	src/widgets/UIHotKeyEditor.h \
@@ -721,4 +722,5 @@
 	src/widgets/UIBootTable.cpp \
 	src/widgets/UIFilePathSelector.cpp \
+	src/widgets/UIEmptyFilePathSelector.cpp \
 	src/widgets/UIHostComboEditor.cpp \
 	src/widgets/UIHotKeyEditor.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 60770)
@@ -13224,5 +13224,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 60770)
@@ -14046,5 +14046,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 60770)
@@ -14051,5 +14051,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 60770)
@@ -14023,5 +14023,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 60770)
@@ -12736,5 +12736,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 60770)
@@ -6613,5 +6613,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 60770)
@@ -5986,5 +5986,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 60770)
@@ -14450,5 +14450,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 60770)
@@ -10523,5 +10523,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts	(revision 60770)
@@ -9069,5 +9069,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 60770)
@@ -11077,5 +11077,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 60770)
@@ -11276,5 +11276,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts	(revision 60770)
@@ -10426,5 +10426,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 60770)
@@ -13858,5 +13858,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 60770)
@@ -12529,5 +12529,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 60770)
@@ -14829,5 +14829,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 60770)
@@ -14020,5 +14020,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 60770)
@@ -10519,5 +10519,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 60770)
@@ -13302,5 +13302,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 60770)
@@ -11060,5 +11060,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 60770)
@@ -10745,5 +10745,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 60770)
@@ -12428,5 +12428,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 60770)
@@ -11759,5 +11759,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 60770)
@@ -14947,5 +14947,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 60770)
@@ -11825,5 +11825,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 60770)
@@ -13191,5 +13191,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 60770)
@@ -11514,5 +11514,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 60770)
@@ -12155,5 +12155,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 60770)
@@ -13781,5 +13781,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 60770)
@@ -12454,5 +12454,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 60770)
@@ -12538,5 +12538,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 60770)
@@ -6602,5 +6602,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 60770)
@@ -10716,5 +10716,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>&amp;Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 60770)
@@ -6602,5 +6602,5 @@
 </context>
 <context>
-    <name>VBoxEmptyFileSelector</name>
+    <name>UIEmptyFilePathSelector</name>
     <message>
         <source>Choose...</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp	(revision 60770)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp	(revision 60770)
@@ -0,0 +1,251 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - VirtualBox Qt extensions: UIEmptyFilePathSelector class implementation.
+ */
+
+/*
+ * Copyright (C) 2008-2013 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifdef VBOX_WITH_PRECOMPILED_HEADERS
+# include <precomp.h>
+#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+/* Local includes */
+# include "QIFileDialog.h"
+# include "QIToolButton.h"
+# include "QILabel.h"
+# include "QILineEdit.h"
+# include "UIIconPool.h"
+# include "UIEmptyFilePathSelector.h"
+# include "VBoxGlobal.h"
+
+/* Global includes */
+# include <iprt/assert.h>
+# include <QAction>
+# include <QApplication>
+# include <QClipboard>
+# include <QDir>
+# include <QFocusEvent>
+# include <QHBoxLayout>
+# include <QLineEdit>
+# include <QTimer>
+
+#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+
+UIEmptyFilePathSelector::UIEmptyFilePathSelector (QWidget *aParent /* = NULL */)
+    : QIWithRetranslateUI<QWidget> (aParent)
+    , mPathWgt (NULL)
+    , mLabel (NULL)
+    , mMode (UIEmptyFilePathSelector::Mode_File_Open)
+    , mLineEdit (NULL)
+    , m_fButtonToolTipSet(false)
+    , mHomeDir (QDir::current().absolutePath())
+    , mIsModified (false)
+{
+    mMainLayout = new QHBoxLayout (this);
+    mMainLayout->setMargin (0);
+
+    mSelectButton = new QIToolButton(this);
+    mSelectButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
+    connect(mSelectButton, SIGNAL(clicked()), this, SLOT(choose()));
+    mMainLayout->addWidget(mSelectButton);
+
+    setEditable (false);
+
+    retranslateUi();
+}
+
+void UIEmptyFilePathSelector::setMode (UIEmptyFilePathSelector::Mode aMode)
+{
+    mMode = aMode;
+}
+
+UIEmptyFilePathSelector::Mode UIEmptyFilePathSelector::mode() const
+{
+    return mMode;
+}
+
+void UIEmptyFilePathSelector::setButtonPosition (ButtonPosition aPos)
+{
+    if (aPos == LeftPosition)
+    {
+        mMainLayout->setDirection (QBoxLayout::LeftToRight);
+        setTabOrder (mSelectButton, mPathWgt);
+    }
+    else
+    {
+        mMainLayout->setDirection (QBoxLayout::RightToLeft);
+        setTabOrder (mPathWgt, mSelectButton);
+    }
+}
+
+UIEmptyFilePathSelector::ButtonPosition UIEmptyFilePathSelector::buttonPosition() const
+{
+    return mMainLayout->direction() == QBoxLayout::LeftToRight ? LeftPosition : RightPosition;
+}
+
+void UIEmptyFilePathSelector::setEditable (bool aOn)
+{
+    if (mPathWgt)
+    {
+        delete mPathWgt;
+        mLabel = NULL;
+        mLineEdit = NULL;
+    }
+
+    if (aOn)
+    {
+        mPathWgt = mLineEdit = new QILineEdit (this);
+        connect (mLineEdit, SIGNAL (textChanged (const QString&)),
+                 this, SLOT (textChanged (const QString&)));
+    }
+    else
+    {
+        mPathWgt = mLabel = new QILabel (this);
+        mLabel->setWordWrap (true);
+    }
+    mMainLayout->addWidget (mPathWgt, 2);
+    setButtonPosition (buttonPosition());
+
+    setPath (mPath);
+}
+
+bool UIEmptyFilePathSelector::isEditable() const
+{
+    return mLabel ? false : true;
+}
+
+void UIEmptyFilePathSelector::setChooserVisible (bool aOn)
+{
+    mSelectButton->setVisible (aOn);
+}
+
+bool UIEmptyFilePathSelector::isChooserVisible() const
+{
+    return mSelectButton->isVisible();
+}
+
+void UIEmptyFilePathSelector::setPath (const QString& aPath)
+{
+    QString tmpPath = QDir::toNativeSeparators (aPath);
+    if (mLabel)
+        mLabel->setText (QString ("<compact elipsis=\"start\">%1</compact>").arg (tmpPath));
+    else if (mLineEdit)
+        mLineEdit->setText (tmpPath);
+    textChanged(tmpPath);
+}
+
+QString UIEmptyFilePathSelector::path() const
+{
+    return mPath;
+}
+
+void UIEmptyFilePathSelector::setDefaultSaveExt (const QString &aExt)
+{
+    mDefaultSaveExt = aExt;
+}
+
+QString UIEmptyFilePathSelector::defaultSaveExt() const
+{
+    return mDefaultSaveExt;
+}
+
+void UIEmptyFilePathSelector::setChooseButtonToolTip(const QString &strToolTip)
+{
+    m_fButtonToolTipSet = !strToolTip.isEmpty();
+    mSelectButton->setToolTip(strToolTip);
+}
+
+QString UIEmptyFilePathSelector::chooseButtonToolTip() const
+{
+    return mSelectButton->toolTip();
+}
+
+void UIEmptyFilePathSelector::setFileDialogTitle (const QString& aTitle)
+{
+    mFileDialogTitle = aTitle;
+}
+
+QString UIEmptyFilePathSelector::fileDialogTitle() const
+{
+    return mFileDialogTitle;
+}
+
+void UIEmptyFilePathSelector::setFileFilters (const QString& aFilters)
+{
+    mFileFilters = aFilters;
+}
+
+QString UIEmptyFilePathSelector::fileFilters() const
+{
+    return mFileFilters;
+}
+
+void UIEmptyFilePathSelector::setHomeDir (const QString& aDir)
+{
+    mHomeDir = aDir;
+}
+
+QString UIEmptyFilePathSelector::homeDir() const
+{
+    return mHomeDir;
+}
+
+void UIEmptyFilePathSelector::retranslateUi()
+{
+    if (!m_fButtonToolTipSet)
+        mSelectButton->setToolTip(tr("Choose..."));
+}
+
+void UIEmptyFilePathSelector::choose()
+{
+    QString path = mPath;
+
+    /* Preparing initial directory. */
+    QString initDir = path.isNull() ? mHomeDir :
+        QIFileDialog::getFirstExistingDir (path);
+    if (initDir.isNull())
+        initDir = mHomeDir;
+
+    switch (mMode)
+    {
+        case UIEmptyFilePathSelector::Mode_File_Open:
+            path = QIFileDialog::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
+        case UIEmptyFilePathSelector::Mode_File_Save:
+        {
+            path = QIFileDialog::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
+            if (!path.isEmpty() && QFileInfo (path).suffix().isEmpty())
+                path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
+            break;
+        }
+        case UIEmptyFilePathSelector::Mode_Folder:
+            path = QIFileDialog::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
+    }
+    if (path.isEmpty())
+        return;
+
+    path.remove (QRegExp ("[\\\\/]$"));
+    setPath (path);
+}
+
+void UIEmptyFilePathSelector::textChanged (const QString& aPath)
+{
+    const QString oldPath = mPath;
+    mPath = aPath;
+    if (oldPath != mPath)
+    {
+        mIsModified = true;
+        emit pathChanged (mPath);
+    }
+}
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.h	(revision 60770)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.h	(revision 60770)
@@ -0,0 +1,121 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - VirtualBox Qt extensions: UIEmptyFilePathSelector class declaration.
+ */
+
+/*
+ * Copyright (C) 2008-2013 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef __UIEmptyFilePathSelector_h__
+#define __UIEmptyFilePathSelector_h__
+
+/* VBox includes */
+#include "QIWithRetranslateUI.h"
+
+/* Qt includes */
+#include <QComboBox>
+
+/* VBox forward declarations */
+class QILabel;
+class QILineEdit;
+
+/* Qt forward declarations */
+class QHBoxLayout;
+class QAction;
+class QIToolButton;
+
+
+class UIEmptyFilePathSelector: public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+
+public:
+
+    enum Mode
+    {
+        Mode_Folder = 0,
+        Mode_File_Open,
+        Mode_File_Save
+    };
+
+    enum ButtonPosition
+    {
+        LeftPosition,
+        RightPosition
+    };
+
+    UIEmptyFilePathSelector (QWidget *aParent = NULL);
+
+    void setMode (UIEmptyFilePathSelector::Mode aMode);
+    UIEmptyFilePathSelector::Mode mode() const;
+
+    void setButtonPosition (ButtonPosition aPos);
+    ButtonPosition buttonPosition() const;
+
+    void setEditable (bool aOn);
+    bool isEditable() const;
+
+    void setChooserVisible (bool aOn);
+    bool isChooserVisible() const;
+
+    QString path() const;
+
+    void setDefaultSaveExt (const QString &aExt);
+    QString defaultSaveExt() const;
+
+    bool isModified () const { return mIsModified; }
+    void resetModified () { mIsModified = false; }
+
+    void setChooseButtonToolTip(const QString &strToolTip);
+    QString chooseButtonToolTip() const;
+
+    void setFileDialogTitle (const QString& aTitle);
+    QString fileDialogTitle() const;
+
+    void setFileFilters (const QString& aFilters);
+    QString fileFilters() const;
+
+    void setHomeDir (const QString& aDir);
+    QString homeDir() const;
+
+signals:
+    void pathChanged (QString);
+
+public slots:
+    void setPath (const QString& aPath);
+
+protected:
+    void retranslateUi();
+
+private slots:
+    void choose();
+    void textChanged (const QString& aPath);
+
+private:
+    /* Private member vars */
+    QHBoxLayout *mMainLayout;
+    QWidget *mPathWgt;
+    QILabel *mLabel;
+    UIEmptyFilePathSelector::Mode mMode;
+    QILineEdit *mLineEdit;
+    QIToolButton *mSelectButton;
+    bool m_fButtonToolTipSet;
+    QString mFileDialogTitle;
+    QString mFileFilters;
+    QString mDefaultSaveExt;
+    QString mHomeDir;
+    bool mIsModified;
+    QString mPath;
+};
+
+#endif /* !___UIEmptyFilePathSelector_h___ */
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp	(revision 60770)
@@ -42,8 +42,4 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
-////////////////////////////////////////////////////////////////////////////////
-// UIFilePathSelector
-
 enum
 {
@@ -52,4 +48,5 @@
     ResetId
 };
+
 
 /**
@@ -563,212 +560,2 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// VBoxEmptyFileSelector
-
-VBoxEmptyFileSelector::VBoxEmptyFileSelector (QWidget *aParent /* = NULL */)
-    : QIWithRetranslateUI<QWidget> (aParent)
-    , mPathWgt (NULL)
-    , mLabel (NULL)
-    , mMode (UIFilePathSelector::Mode_File_Open)
-    , mLineEdit (NULL)
-    , m_fButtonToolTipSet(false)
-    , mHomeDir (QDir::current().absolutePath())
-    , mIsModified (false)
-{
-    mMainLayout = new QHBoxLayout (this);
-    mMainLayout->setMargin (0);
-
-    mSelectButton = new QIToolButton(this);
-    mSelectButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
-    connect(mSelectButton, SIGNAL(clicked()), this, SLOT(choose()));
-    mMainLayout->addWidget(mSelectButton);
-
-    setEditable (false);
-
-    retranslateUi();
-}
-
-void VBoxEmptyFileSelector::setMode (UIFilePathSelector::Mode aMode)
-{
-    mMode = aMode;
-}
-
-UIFilePathSelector::Mode VBoxEmptyFileSelector::mode() const
-{
-    return mMode;
-}
-
-void VBoxEmptyFileSelector::setButtonPosition (ButtonPosition aPos)
-{
-    if (aPos == LeftPosition)
-    {
-        mMainLayout->setDirection (QBoxLayout::LeftToRight);
-        setTabOrder (mSelectButton, mPathWgt);
-    }
-    else
-    {
-        mMainLayout->setDirection (QBoxLayout::RightToLeft);
-        setTabOrder (mPathWgt, mSelectButton);
-    }
-}
-
-VBoxEmptyFileSelector::ButtonPosition VBoxEmptyFileSelector::buttonPosition() const
-{
-    return mMainLayout->direction() == QBoxLayout::LeftToRight ? LeftPosition : RightPosition;
-}
-
-void VBoxEmptyFileSelector::setEditable (bool aOn)
-{
-    if (mPathWgt)
-    {
-        delete mPathWgt;
-        mLabel = NULL;
-        mLineEdit = NULL;
-    }
-
-    if (aOn)
-    {
-        mPathWgt = mLineEdit = new QILineEdit (this);
-        connect (mLineEdit, SIGNAL (textChanged (const QString&)),
-                 this, SLOT (textChanged (const QString&)));
-    }
-    else
-    {
-        mPathWgt = mLabel = new QILabel (this);
-        mLabel->setWordWrap (true);
-    }
-    mMainLayout->addWidget (mPathWgt, 2);
-    setButtonPosition (buttonPosition());
-
-    setPath (mPath);
-}
-
-bool VBoxEmptyFileSelector::isEditable() const
-{
-    return mLabel ? false : true;
-}
-
-void VBoxEmptyFileSelector::setChooserVisible (bool aOn)
-{
-    mSelectButton->setVisible (aOn);
-}
-
-bool VBoxEmptyFileSelector::isChooserVisible() const
-{
-    return mSelectButton->isVisible();
-}
-
-void VBoxEmptyFileSelector::setPath (const QString& aPath)
-{
-    QString tmpPath = QDir::toNativeSeparators (aPath);
-    if (mLabel)
-        mLabel->setText (QString ("<compact elipsis=\"start\">%1</compact>").arg (tmpPath));
-    else if (mLineEdit)
-        mLineEdit->setText (tmpPath);
-    textChanged(tmpPath);
-}
-
-QString VBoxEmptyFileSelector::path() const
-{
-    return mPath;
-}
-
-void VBoxEmptyFileSelector::setDefaultSaveExt (const QString &aExt)
-{
-    mDefaultSaveExt = aExt;
-}
-
-QString VBoxEmptyFileSelector::defaultSaveExt() const
-{
-    return mDefaultSaveExt;
-}
-
-void VBoxEmptyFileSelector::setChooseButtonToolTip(const QString &strToolTip)
-{
-    m_fButtonToolTipSet = !strToolTip.isEmpty();
-    mSelectButton->setToolTip(strToolTip);
-}
-
-QString VBoxEmptyFileSelector::chooseButtonToolTip() const
-{
-    return mSelectButton->toolTip();
-}
-
-void VBoxEmptyFileSelector::setFileDialogTitle (const QString& aTitle)
-{
-    mFileDialogTitle = aTitle;
-}
-
-QString VBoxEmptyFileSelector::fileDialogTitle() const
-{
-    return mFileDialogTitle;
-}
-
-void VBoxEmptyFileSelector::setFileFilters (const QString& aFilters)
-{
-    mFileFilters = aFilters;
-}
-
-QString VBoxEmptyFileSelector::fileFilters() const
-{
-    return mFileFilters;
-}
-
-void VBoxEmptyFileSelector::setHomeDir (const QString& aDir)
-{
-    mHomeDir = aDir;
-}
-
-QString VBoxEmptyFileSelector::homeDir() const
-{
-    return mHomeDir;
-}
-
-void VBoxEmptyFileSelector::retranslateUi()
-{
-    if (!m_fButtonToolTipSet)
-        mSelectButton->setToolTip(tr("Choose..."));
-}
-
-void VBoxEmptyFileSelector::choose()
-{
-    QString path = mPath;
-
-    /* Preparing initial directory. */
-    QString initDir = path.isNull() ? mHomeDir :
-        QIFileDialog::getFirstExistingDir (path);
-    if (initDir.isNull())
-        initDir = mHomeDir;
-
-    switch (mMode)
-    {
-        case UIFilePathSelector::Mode_File_Open:
-            path = QIFileDialog::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
-        case UIFilePathSelector::Mode_File_Save:
-        {
-            path = QIFileDialog::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
-            if (!path.isEmpty() && QFileInfo (path).suffix().isEmpty())
-                path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
-            break;
-        }
-        case UIFilePathSelector::Mode_Folder:
-            path = QIFileDialog::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
-    }
-    if (path.isEmpty())
-        return;
-
-    path.remove (QRegExp ("[\\\\/]$"));
-    setPath (path);
-}
-
-void VBoxEmptyFileSelector::textChanged (const QString& aPath)
-{
-    const QString oldPath = mPath;
-    mPath = aPath;
-    if (oldPath != mPath)
-    {
-        mIsModified = true;
-        emit pathChanged (mPath);
-    }
-}
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h	(revision 60770)
@@ -16,6 +16,6 @@
  */
 
-#ifndef __VBoxFilePathSelectorWidget_h__
-#define __VBoxFilePathSelectorWidget_h__
+#ifndef ___UIFilePathSelector_h___
+#define ___UIFilePathSelector_h___
 
 /* VBox includes */
@@ -34,6 +34,4 @@
 class QIToolButton;
 
-////////////////////////////////////////////////////////////////////////////////
-// UIFilePathSelector
 
 class UIFilePathSelector: public QIWithRetranslateUI<QComboBox>
@@ -125,82 +123,4 @@
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// VBoxEmptyFileSelector
+#endif /* !___UIFilePathSelector_h___ */
 
-class VBoxEmptyFileSelector: public QIWithRetranslateUI<QWidget>
-{
-    Q_OBJECT;
-
-public:
-    enum ButtonPosition
-    {
-        LeftPosition,
-        RightPosition
-    };
-
-    VBoxEmptyFileSelector (QWidget *aParent = NULL);
-
-    void setMode (UIFilePathSelector::Mode aMode);
-    UIFilePathSelector::Mode mode() const;
-
-    void setButtonPosition (ButtonPosition aPos);
-    ButtonPosition buttonPosition() const;
-
-    void setEditable (bool aOn);
-    bool isEditable() const;
-
-    void setChooserVisible (bool aOn);
-    bool isChooserVisible() const;
-
-    QString path() const;
-
-    void setDefaultSaveExt (const QString &aExt);
-    QString defaultSaveExt() const;
-
-    bool isModified () const { return mIsModified; }
-    void resetModified () { mIsModified = false; }
-
-    void setChooseButtonToolTip(const QString &strToolTip);
-    QString chooseButtonToolTip() const;
-
-    void setFileDialogTitle (const QString& aTitle);
-    QString fileDialogTitle() const;
-
-    void setFileFilters (const QString& aFilters);
-    QString fileFilters() const;
-
-    void setHomeDir (const QString& aDir);
-    QString homeDir() const;
-
-signals:
-    void pathChanged (QString);
-
-public slots:
-    void setPath (const QString& aPath);
-
-protected:
-    void retranslateUi();
-
-private slots:
-    void choose();
-    void textChanged (const QString& aPath);
-
-private:
-    /* Private member vars */
-    QHBoxLayout *mMainLayout;
-    QWidget *mPathWgt;
-    QILabel *mLabel;
-    UIFilePathSelector::Mode mMode;
-    QILineEdit *mLineEdit;
-    QIToolButton *mSelectButton;
-    bool m_fButtonToolTipSet;
-    QString mFileDialogTitle;
-    QString mFileFilters;
-    QString mDefaultSaveExt;
-    QString mHomeDir;
-    bool mIsModified;
-    QString mPath;
-};
-
-#endif /* __VBoxFilePathSelectorWidget_h__ */
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp	(revision 60770)
@@ -34,5 +34,5 @@
 # include "UIWizardExportAppDefs.h"
 # include "VBoxGlobal.h"
-# include "UIFilePathSelector.h"
+# include "UIEmptyFilePathSelector.h"
 # include "QIRichTextLabel.h"
 
@@ -226,9 +226,9 @@
                 m_pBucketLabel->setBuddy(m_pBucketEditor);
             }
-            m_pFileSelector = new VBoxEmptyFileSelector(this);
-            {
-                m_pFileSelector->setMode(UIFilePathSelector::Mode_File_Save);
+            m_pFileSelector = new UIEmptyFilePathSelector(this);
+            {
+                m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Save);
                 m_pFileSelector->setEditable(true);
-                m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+                m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition);
                 m_pFileSelector->setDefaultSaveExt("ova");
             }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h	(revision 60770)
@@ -28,5 +28,5 @@
 class QLabel;
 class QLineEdit;
-class VBoxEmptyFileSelector;
+class UIEmptyFilePathSelector;
 class QComboBox;
 class QCheckBox;
@@ -81,5 +81,5 @@
     QLineEdit *m_pBucketEditor;
     QLabel *m_pFileSelectorLabel;
-    VBoxEmptyFileSelector *m_pFileSelector;
+    UIEmptyFilePathSelector *m_pFileSelector;
     QLabel *m_pFormatComboBoxLabel;
     QComboBox *m_pFormatComboBox;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 60770)
@@ -36,5 +36,5 @@
 # include "UIWizardExportAppDefs.h"
 # include "VBoxGlobal.h"
-# include "UIFilePathSelector.h"
+# include "UIEmptyFilePathSelector.h"
 # include "UIApplianceExportEditorWidget.h"
 
@@ -117,9 +117,9 @@
                     m_pBucketLabel->setBuddy(m_pBucketEditor);
                 }
-                m_pFileSelector = new VBoxEmptyFileSelector(m_pSettingsCnt);
-                {
-                    m_pFileSelector->setMode(UIFilePathSelector::Mode_File_Save);
+                m_pFileSelector = new UIEmptyFilePathSelector(m_pSettingsCnt);
+                {
+                    m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Save);
                     m_pFileSelector->setEditable(true);
-                    m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+                    m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition);
                     m_pFileSelector->setDefaultSaveExt("ova");
                 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp	(revision 60770)
@@ -29,5 +29,5 @@
 # include "UIWizardImportApp.h"
 # include "VBoxGlobal.h"
-# include "UIFilePathSelector.h"
+# include "UIEmptyFilePathSelector.h"
 # include "QIRichTextLabel.h"
 
@@ -45,9 +45,9 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        m_pFileSelector = new VBoxEmptyFileSelector(this);
+        m_pFileSelector = new UIEmptyFilePathSelector(this);
         {
             m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
-            m_pFileSelector->setMode(UIFilePathSelector::Mode_File_Open);
-            m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+            m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Open);
+            m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition);
             m_pFileSelector->setEditable(true);
         }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h	(revision 60770)
@@ -23,5 +23,5 @@
 
 /* Forward declarations: */
-class VBoxEmptyFileSelector;
+class UIEmptyFilePathSelector;
 class QIRichTextLabel;
 
@@ -35,5 +35,5 @@
 
     /* Widgets: */
-    VBoxEmptyFileSelector *m_pFileSelector;
+    UIEmptyFilePathSelector *m_pFileSelector;
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp	(revision 60769)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp	(revision 60770)
@@ -29,5 +29,5 @@
 # include "UIWizardImportApp.h"
 # include "VBoxGlobal.h"
-# include "UIFilePathSelector.h"
+# include "UIEmptyFilePathSelector.h"
 # include "UIApplianceImportEditorWidget.h"
 
@@ -46,9 +46,9 @@
             QVBoxLayout *pApplianceCntLayout = new QVBoxLayout(m_pApplianceCnt);
             {
-                m_pFileSelector = new VBoxEmptyFileSelector(m_pApplianceCnt);
+                m_pFileSelector = new UIEmptyFilePathSelector(m_pApplianceCnt);
                 {
                     m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
-                    m_pFileSelector->setMode(UIFilePathSelector::Mode_File_Open);
-                    m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+                    m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Open);
+                    m_pFileSelector->setButtonPosition(UIEmptyFilePathSelector::RightPosition);
                     m_pFileSelector->setEditable(true);
                 }
