Changeset 11497 in vbox for trunk/src/VBox

Timestamp:

Aug 19, 2008 6:16:55 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

34998

Message:

Fe/Qt4: 'File/Folder Path Selector' widget updated. It becomes editable combo-box. In editable (focused) mode it contains no any icon and allows user to edit contained path as simple non-compressed text. Select Path function become encapsulated. Focus loosing bug (after selecting 'Other...' path) fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxFilePathSelectorWidget.h (modified) (3 diffs)
• include/VBoxGLSettingsGeneral.h (modified) (1 diff)
• include/VBoxVMSettingsGeneral.h (modified) (1 diff)
• include/VBoxVMSettingsSFDetails.h (modified) (1 diff)
• src/VBoxFilePathSelectorWidget.cpp (modified) (12 diffs)
• src/VBoxGLSettingsGeneral.cpp (modified) (2 diffs)
• src/VBoxVMSettingsGeneral.cpp (modified) (3 diffs)
• src/VBoxVMSettingsSFDetails.cpp (modified) (3 diffs)

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

@@ -54 +54 @@
 
     bool isModified() const;
+    bool isPathLineChosen() const;
+
+    QString path() const;
+
+public slots:
 
     void setPath (const QString &aPath);
-    QString path() const;
-
-signals:
-
-    void selectPath();
+    void setHomeDir (const QString &aHomeDir);
 
 protected:
 
     void resizeEvent (QResizeEvent *aEvent);
+    void focusInEvent (QFocusEvent *aEvent);
+    void focusOutEvent (QFocusEvent *aEvent);
     void retranslateUi();
 
@@ -74 +77 @@
 private:
 
+    void selectPath();
     QIcon defaultIcon() const;
     QString fullPath (bool aAbsolute = true) const;
@@ -84 +88 @@
     Mode mMode;
     QString mPath;
+    QString mHomeDir;
     QString mNoneStr;
     QString mNoneTip;
+    bool mIsEditableMode;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGLSettingsGeneral.h

@@ -46 +46 @@
 
     void retranslateUi();
-
-private slots:
-
-    void onSelectFolderClicked();
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsGeneral.h

@@ -63 +63 @@
                                    QTreeWidgetItem *aPrev = 0);
 
-    void selectSnapshotFolder();
-
 private:
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsSFDetails.h

@@ -62 +62 @@
 
     void retranslateUi();
-    
+
 private slots:
 
-    void selectPath();
+    void onSelectPath();
     void validate();
 

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

@@ -30 +30 @@
 #include <QDir>
 #include <QFileIconProvider>
+#include <QLineEdit>
 
 enum
@@ -43 +44 @@
     , mCopyAction (new QAction (this))
     , mMode (Mode_Folder)
+    , mHomeDir (QDir::current().absolutePath())
+    , mIsEditableMode (false)
 {
     /* Populate items */
@@ -58 +61 @@
     mCopyAction->setShortcutContext (Qt::WidgetShortcut);
 
+    /* Initial Setup */
+    setEditable (true);
+    Assert (lineEdit());
+    setInsertPolicy (QComboBox::NoInsert);
+    setContextMenuPolicy (Qt::ActionsContextMenu);
+    setMinimumWidth (200);
+
     /* Setup connections */
+    connect (lineEdit(), SIGNAL (textEdited (const QString &)),
+             this, SLOT (setPath (const QString &)));
     connect (this, SIGNAL (activated (int)), this, SLOT (onActivated (int)));
     connect (mCopyAction, SIGNAL (triggered (bool)), this, SLOT (copyToClipboard()));
@@ -64 +76 @@
     /* Applying language settings */
     retranslateUi();
-
-    /* Initial Setup */
-    setContextMenuPolicy (Qt::ActionsContextMenu);
-    setMinimumWidth (200);
 }
 
@@ -107 +115 @@
 }
 
+bool VBoxFilePathSelectorWidget::isPathLineChosen() const
+{
+    return (currentIndex() == PathId);
+}
+
+QString VBoxFilePathSelectorWidget::path() const
+{
+    return mPath;
+}
+
 void VBoxFilePathSelectorWidget::setPath (const QString &aPath)
 {
-    mPath = aPath.isEmpty() ? QString::null : aPath;
+    mPath = aPath.isEmpty() ? QString::null :
+            QDir::toNativeSeparators (aPath);
     refreshText();
 }
 
-QString VBoxFilePathSelectorWidget::path() const
-{
-    return mPath;
+void VBoxFilePathSelectorWidget::setHomeDir (const QString &aHomeDir)
+{
+    mHomeDir = aHomeDir;
 }
 
@@ -122 +141 @@
     QIWithRetranslateUI<QComboBox>::resizeEvent (aEvent);
     refreshText();
+}
+
+void VBoxFilePathSelectorWidget::focusInEvent (QFocusEvent *aEvent)
+{
+    if (isPathLineChosen())
+    {
+        mIsEditableMode = true;
+        refreshText();
+    }
+    QIWithRetranslateUI<QComboBox>::focusInEvent (aEvent);
+}
+
+void VBoxFilePathSelectorWidget::focusOutEvent (QFocusEvent *aEvent)
+{
+    if (isPathLineChosen())
+    {
+        mIsEditableMode = false;
+        refreshText();
+    }
+    QIWithRetranslateUI<QComboBox>::focusOutEvent (aEvent);
 }
 
@@ -188 +227 @@
         case SelectId:
         {
-            emit selectPath();
+            selectPath();
             break;
         }
@@ -200 +239 @@
     }
     setCurrentIndex (PathId);
+    setFocus();
 }
 
@@ -211 +251 @@
 }
 
+void VBoxFilePathSelectorWidget::selectPath()
+{
+    /* Preparing initial directory. */
+    QString initDir = mPath.isNull() ? mHomeDir :
+        VBoxGlobal::getFirstExistingDir (mPath);
+    if (initDir.isNull())
+        initDir = mHomeDir;
+
+    /* Open existing file or directory. */
+    QString path = mMode == Mode_File ?
+        VBoxGlobal::getOpenFileName (initDir, QString::null, parentWidget(), QString::null) :
+        VBoxGlobal::getExistingDirectory (initDir, parentWidget());
+    if (path.isNull())
+        return;
+
+    path.remove (QRegExp ("[\\\\/]$"));
+    setPath (path);
+}
+
 QIcon VBoxFilePathSelectorWidget::defaultIcon() const
 {
@@ -219 +278 @@
 }
 
-QString VBoxFilePathSelectorWidget::fullPath (bool aAbsolute) const
-{
-    if (!mPath.isNull())
-    {
-        switch (mMode)
-        {
-            case Mode_Folder:
-                return aAbsolute ? QDir (mPath).absolutePath() :
-                                   QDir (mPath).path();
-            case Mode_File:
-                return aAbsolute ? QFileInfo (mPath).absoluteFilePath() :
-                                   QFileInfo (mPath).filePath();
-            default:
-                AssertFailedBreak();
-        }
-    }
-    return QString::null;
+QString VBoxFilePathSelectorWidget::fullPath (bool aAbsolute /* = true */) const
+{
+    if (mPath.isNull())
+        return mPath;
+
+    QString result;
+    switch (mMode)
+    {
+        case Mode_Folder:
+            result = aAbsolute ? QDir (mPath).absolutePath() :
+                                 QDir (mPath).path();
+            break;
+        case Mode_File:
+            result = aAbsolute ? QFileInfo (mPath).absoluteFilePath() :
+                                 QFileInfo (mPath).filePath();
+            break;
+        default:
+            AssertFailedBreak();
+    }
+    return QDir::toNativeSeparators (result);
 }
 
@@ -245 +307 @@
 
     int oldSize = fontMetrics().width (fullText);
-    int indentSize = fontMetrics().width ("...x");
+    int indentSize = fontMetrics().width ("x...x");
 
     /* Compress text */
@@ -281 +343 @@
 void VBoxFilePathSelectorWidget::refreshText()
 {
-    if (mPath.isNull())
-    {
+    if (mIsEditableMode)
+    {
+        /* In editable mode there should be no any icon
+         * and text have be corresponding real stored path
+         * which can be absolute or relative. */
+        setItemText (PathId, mPath);
+        setItemIcon (PathId, QIcon());
+    }
+    else if (mPath.isNull())
+    {
+        /* If we are not in editable mode and no path is
+         * stored here - show the translated 'none' string. */
         if (itemText (PathId) != mNoneStr)
         {

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGLSettingsGeneral.cpp

@@ -31 +31 @@
     Ui::VBoxGLSettingsGeneral::setupUi (this);
 
+    mPsVdi->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
+    mPsMach->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
+    mPsVRDP->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
     mPsVRDP->setMode (VBoxFilePathSelectorWidget::Mode_File);
-
-    /* Setup connections */
-    connect (mPsVdi,  SIGNAL (selectPath()), this, SLOT (onSelectFolderClicked()));
-    connect (mPsMach, SIGNAL (selectPath()), this, SLOT (onSelectFolderClicked()));
-    connect (mPsVRDP, SIGNAL (selectPath()), this, SLOT (onSelectFolderClicked()));
 
     /* Applying language settings */
@@ -86 +84 @@
 }
 
-void VBoxGLSettingsGeneral::onSelectFolderClicked()
-{
-    VBoxFilePathSelectorWidget *ps = qobject_cast<VBoxFilePathSelectorWidget*> (sender());
-    Assert (ps);
-
-    QString initDir = VBoxGlobal::getFirstExistingDir (ps->path());
-    if (initDir.isNull())
-        initDir = vboxGlobal().virtualBox().GetHomeFolder();
-
-
-    QString path = ps == mPsVRDP ?
-        VBoxGlobal::getOpenFileName (initDir, QString::null, this, QString::null) :
-        VBoxGlobal::getExistingDirectory (initDir, this);
-    if (path.isNull())
-        return;
-
-    path = QDir::convertSeparators (path);
-    /* remove trailing slash if any */
-    path.remove (QRegExp ("[\\\\/]$"));
-
-    ps->setPath (path);
-}
-

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsGeneral.cpp

@@ -75 +75 @@
     connect (mLeVideo, SIGNAL (textChanged (const QString&)),
              this, SLOT (textChangedVRAM (const QString&)));
-    connect (mPsSnapshot, SIGNAL (selectPath()),
-             this, SLOT (selectSnapshotFolder()));
     connect (mTbBootItemUp, SIGNAL (clicked()),
              this, SLOT (moveBootItemUp()));
@@ -215 +213 @@
     /* Snapshot folder */
     mPsSnapshot->setPath (aMachine.GetSnapshotFolder());
+    mPsSnapshot->setHomeDir (QFileInfo (mMachine.GetSettingsFilePath()).absolutePath());
 
     /* Description */
@@ -446 +445 @@
     mTbBootItemUp->setEnabled (upEnabled);
     mTbBootItemDown->setEnabled (downEnabled);
-}
-
-void VBoxVMSettingsGeneral::selectSnapshotFolder()
-{
-    QString settingsFolder = VBoxGlobal::getFirstExistingDir (mPsSnapshot->path());
-    if (settingsFolder.isNull())
-        settingsFolder = QFileInfo (mMachine.GetSettingsFilePath()).absolutePath();
-
-    QString folder = vboxGlobal().getExistingDirectory (settingsFolder, this);
-    if (folder.isNull())
-        return;
-
-    folder = QDir::convertSeparators (folder);
-    /* Remove trailing slash if any */
-    folder.remove (QRegExp ("[\\\\/]$"));
-
-    mPsSnapshot->setPath (folder);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsSFDetails.cpp

@@ -44 +44 @@
     /* No reset button */
     mPsPath->setResetEnabled (false);
-    connect (mPsPath, SIGNAL (selectPath()),
-             this, SLOT (selectPath()));
+    connect (mPsPath, SIGNAL (currentIndexChanged (int)),
+             this, SLOT (onSelectPath()));
 
     connect (mLeName, SIGNAL (textChanged (const QString &)),
@@ -141 +141 @@
 }
 
-void VBoxVMSettingsSFDetails::selectPath()
+void VBoxVMSettingsSFDetails::onSelectPath()
 {
-    QString folderName = vboxGlobal()
-        .getExistingDirectory (mPsPath->path().isEmpty() ? QDir::homePath() : mPsPath->path(),
-                               this,
-                               tr ("Select a folder to share"));
-    if (folderName.isNull())
+    if (!mPsPath->isPathLineChosen())
         return;
 
+    QString folderName (mPsPath->path());
     QDir folder (folderName);
-    mPsPath->setPath (QDir::toNativeSeparators (folder.absolutePath()));
     if (!folder.isRoot())
-        /* processing non-root folder */
+        /* Processing non-root folder */
         mLeName->setText (folder.dirName());
     else
     {
-        /* processing root folder */
+        /* Processing root folder */
 #if defined (Q_OS_WIN) || defined (Q_OS_OS2)
         mLeName->setText (folderName.toUpper()[0] + "_DRIVE");
@@ -166 +162 @@
     /* Validate the fields */
     validate();
-
 }