儲存庫 vbox 的更動 18397

時間撮記:

2009-3-27 下午02:11:10 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt4-OVF: changed file selector in the import wizard

位置:

trunk/src/VBox/Frontends/VirtualBox

檔案:

• include/VBoxFilePathSelectorWidget.h (修改) (3 筆差異)
• src/VBoxFilePathSelectorWidget.cpp (修改) (4 筆差異)
• src/VBoxImportApplianceWzd.cpp (修改) (1 筆差異)
• ui/VBoxImportApplianceWzd.ui (修改) (5 筆差異)

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

@@ -24 +24 @@
 #define __VBoxFilePathSelectorWidget_h__
 
+/* VBox includes */
 #include "QIWithRetranslateUI.h"
 
@@ -29 +30 @@
 #include <QComboBox>
 
+/* VBox forward declarations */
+class QILabel;
+
+/* Qt forward declarations */
 class QFileIconProvider;
 class QAction;
+class QPushButton;
+
+////////////////////////////////////////////////////////////////////////////////
+// VBoxFilePathSelectorWidget
 
 class VBoxFilePathSelectorWidget: public QIWithRetranslateUI<QComboBox>
@@ -121 +130 @@
 };
 
+////////////////////////////////////////////////////////////////////////////////
+// VBoxEmptyFileSelector
+
+class VBoxEmptyFileSelector: public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+
+public:
+    VBoxEmptyFileSelector (QWidget *aParent = NULL);
+
+    void setPath (const QString& aPath);
+    QString path() const;
+
+    bool isModified () const { return mIsModified; }
+    void resetModified () { mIsModified = false; }
+
+    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);
+
+protected:
+    void retranslateUi();
+
+private slots:
+    void choose();
+
+private:
+    /* Private member vars */
+    QILabel *mLabel;
+    QPushButton *mSelectButton;
+    QString mFileDialogTitle;
+    QString mFileFilters;
+    QString mHomeDir;
+    bool mIsModified;
+    QString mPath;
+};
+
 #endif /* __VBoxFilePathSelectorWidget_h__ */
 

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

@@ -23 +23 @@
 #include "VBoxFilePathSelectorWidget.h"
 #include "VBoxGlobal.h"
+#include "QILabel.h"
 
 /* Qt includes */
@@ -32 +33 @@
 #include <QLineEdit>
 #include <QTimer>
+#include <QPushButton>
+
+////////////////////////////////////////////////////////////////////////////////
+// VBoxFilePathSelectorWidget
 
 enum
@@ -388 +393 @@
         case Mode_File_Save:
             {
-                path = VBoxGlobal::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); 
+                path = VBoxGlobal::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
                 if (!path.isEmpty() && QFileInfo (path).suffix().isEmpty())
                     path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
@@ -551 +556 @@
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// VBoxEmptyFileSelector
+
+VBoxEmptyFileSelector::VBoxEmptyFileSelector (QWidget *aParent /* = NULL */)
+    : QIWithRetranslateUI<QWidget> (aParent)
+    , mHomeDir (QDir::current().absolutePath())
+      , mIsModified (false)
+{
+    QHBoxLayout *mainLayout = new QHBoxLayout (this);
+    mainLayout->setMargin (0);
+
+    mSelectButton = new QPushButton (this);
+    mainLayout->addWidget (mSelectButton);
+
+    mLabel = new QILabel (this);
+    mLabel->setWordWrap (true);
+    mainLayout->addWidget (mLabel, 2);
+
+    connect (mSelectButton, SIGNAL (clicked()),
+             this, SLOT (choose()));
+
+    retranslateUi();
+}
+
+void VBoxEmptyFileSelector::setPath (const QString& aPath)
+{
+    mLabel->setText (QString ("<compact elipsis=\"start\">%1</compact>").arg (aPath));
+    mPath = aPath;
+}
+
+QString VBoxEmptyFileSelector::path() const
+{
+    return mPath;
+}
+
+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()
+{
+    mSelectButton->setText (tr ("&Choose..."));
+}
+
+void VBoxEmptyFileSelector::choose()
+{
+    QString path = mPath;
+
+    /* Preparing initial directory. */
+    QString initDir = path.isNull() ? mHomeDir :
+        VBoxGlobal::getFirstExistingDir (path);
+    if (initDir.isNull())
+        initDir = mHomeDir;
+
+    path = VBoxGlobal::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
+    if (!path.isEmpty())
+    {
+        setPath (path);
+        mIsModified = true;
+        emit pathChanged (path);
+    }
+}

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

@@ -125 +125 @@
 
     /* Configure the file selector */
-    mFileSelector->setMode (VBoxFilePathSelectorWidget::Mode_File_Open);
-    mFileSelector->setResetEnabled (false);
     mFileSelector->setFileDialogTitle (tr ("Select an appliance to import"));
     mFileSelector->setFileFilters (tr ("Open Virtualization Format (%1)").arg ("*.ovf"));
     mFileSelector->setHomeDir (vboxGlobal().documentsPath());
-#ifdef Q_WS_MAC
-    /* Editable boxes are uncommon on the Mac */
-    mFileSelector->setEditable (false);
-#endif /* Q_WS_MAC */
 
     /* Validator for the file selector page */

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxImportApplianceWzd.ui

@@ -24 +24 @@
     <x>0</x>
     <y>0</y>
-    <width>550</width>
-    <height>380</height>
+    <width>547</width>
+    <height>430</height>
    </rect>
   </property>
@@ -38 +38 @@
     <widget class="QStackedWidget" name="mPageStack">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="mFileSelectPage">
@@ -116 +116 @@
           </widget>
          </item>
+         <item row="1" column="1">
+          <widget class="VBoxEmptyFileSelector" name="mFileSelector" native="true"/>
+         </item>
          <item row="2" column="1">
           <spacer name="spacer">
@@ -123 +126 @@
            <property name="sizeHint" stdset="0">
             <size>
-             <width>408</width>
-             <height>258</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="1" column="1">
-          <widget class="VBoxFilePathSelectorWidget" name="mFileSelector"/>
+             <width>406</width>
+             <height>68</height>
+            </size>
+           </property>
+          </spacer>
          </item>
         </layout>
@@ -378 +378 @@
   </customwidget>
   <customwidget>
-   <class>VBoxFilePathSelectorWidget</class>
-   <extends>QComboBox</extends>
-   <header>VBoxFilePathSelectorWidget.h</header>
-  </customwidget>
-  <customwidget>
    <class>VBoxImportApplianceWgt</class>
    <extends>QWidget</extends>
    <header>VBoxImportApplianceWgt.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>VBoxEmptyFileSelector</class>
+   <extends>QWidget</extends>
+   <header>VBoxFilePathSelectorWidget.h</header>
    <container>1</container>
   </customwidget>