Changeset 10741 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2008 10:10:38 AM (17 years ago)

Author:

vboxsync

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

33482

Message:

FE/Qt4: Make the reset functionality optional.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxFilePathSelectorWidget.h (modified) (1 diff)
• src/VBoxFilePathSelectorWidget.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
     SelectorMode mode() const;
 
+    void setResetEnabled (bool aEnabled);
+    bool isResetEnabled () const;
+
     void setLineEditWhatsThis (const QString &aText);
     void setSelectorWhatsThis (const QString &aText);

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

@@ -65 +65 @@
 }
 
+void VBoxFilePathSelectorWidget::setResetEnabled (bool aEnabled)
+{
+#ifdef VBOX_USE_COMBOBOX_PATH_SELECTOR
+    if (!aEnabled &&
+        mCbPath->count() - 1 == ResetId)
+        mCbPath->removeItem (ResetId);
+    else
+    if (aEnabled &&
+        mCbPath->count() - 1  == ResetId - 1)
+        mCbPath->insertItem (ResetId, "");
+    retranslateUi();
+#else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
+    mTbReset->setVisible (aEnabled);
+#endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
+}
+
+bool VBoxFilePathSelectorWidget::isResetEnabled () const
+{
+#ifdef VBOX_USE_COMBOBOX_PATH_SELECTOR
+    return (mCbPath->count() - 1  == ResetId);
+#else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
+    return mTbReset->isVisible();
+#endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
+}
+
 void VBoxFilePathSelectorWidget::setLineEditWhatsThis (const QString &aText)
 {
@@ -135 +160 @@
     mNoneStr = tr ("None");
     mCbPath->setItemText (SelectId, tr ("Other..."));
-    mCbPath->setItemText (ResetId, tr ("Reset"));
+    if (mCbPath->count() - 1 == ResetId)
+        mCbPath->setItemText (ResetId, tr ("Reset"));
 #endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
 }
@@ -197 +223 @@
 #endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
 
+     /* Applying language settings */
     retranslateUi();
+
+    /* Set to none */
+    setPath ("");
 }
 
@@ -210 +240 @@
 QString VBoxFilePathSelectorWidget::filePath (const QString &aName, bool bLast) const
 {
-    if (mMode == PathMode)
+    if (!aName.isEmpty())
     {
-        QDir dir (aName);
-        if (bLast)
-            return dir.dirName();
+        if (mMode == PathMode)
+        {
+            QDir dir (aName);
+            if (bLast)
+                return dir.dirName();
+            else
+                return dir.path();
+        }
         else
-            return dir.path();
+        {
+            QFileInfo fi (aName);
+            if (bLast)
+                return fi.fileName();
+            else
+                return fi.filePath();
+        }
     }
-    else
-    {
-        QFileInfo fi (aName);
-        if (bLast)
-            return fi.fileName();
-        else
-            return fi.filePath();
-    }
+    return "";
 }