Changeset 11361 in vbox for trunk/src

Timestamp:

Aug 12, 2008 2:34:05 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: VBoxFilePathSelectorWidget: Disable methods altering the tooltips for predefined items.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -38 +38 @@
 public:
 
-    enum SelectorMode
+    enum Mode
     {
-        PathMode = 0,
-        FileMode
+        Mode_Folder = 0,
+        Mode_File
     };
 
@@ -47 +47 @@
    ~VBoxFilePathSelectorWidget();
 
-    void setMode (SelectorMode aMode);
-    SelectorMode mode() const;
+    void setMode (Mode aMode);
+    Mode mode() const;
 
     void setResetEnabled (bool aEnabled);
     bool isResetEnabled () const;
 
+#if 0
+
+    /// @todo enabling this requires to allow to customize the names of the
+    /// "Other..." and "Reset" items too which is not yet done.
+
     void setNoneToolTip (const QString &aText);
     void setSelectToolTip (const QString &aText);
     void setResetToolTip (const QString &aText);
+
+#endif /* 0 */
 
     bool isModified() const;
@@ -89 +96 @@
     QFileIconProvider *mIconProvider;
     QAction *mCopyAction;
-    SelectorMode mMode;
+    Mode mMode;
     QString mPath;
     QString mNoneStr;

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

@@ -30 +30 @@
 #include <QFileIconProvider>
 
+#include <VBoxDefs.h>
+
 enum
 {
@@ -41 +43 @@
     , mIconProvider (new QFileIconProvider())
     , mCopyAction (new QAction (this))
-    , mMode (PathMode)
+    , mMode (Mode_Folder)
 {
     /* Populate items */
@@ -72 +74 @@
 }
 
-void VBoxFilePathSelectorWidget::setMode (SelectorMode aMode)
+void VBoxFilePathSelectorWidget::setMode (Mode aMode)
 {
     mMode = aMode;
 }
 
-VBoxFilePathSelectorWidget::SelectorMode VBoxFilePathSelectorWidget::mode() const
+VBoxFilePathSelectorWidget::Mode VBoxFilePathSelectorWidget::mode() const
 {
     return mMode;
@@ -96 +98 @@
 }
 
+#if 0
+
+/// @todo enabling this requires to allow to customize the names of the
+/// "Other..." and "Reset" items too which is not yet done.
+
 void VBoxFilePathSelectorWidget::setNoneToolTip (const QString &aText)
 {
@@ -116 +123 @@
 }
 
+#endif /* 0 */
+
 bool VBoxFilePathSelectorWidget::isModified() const
 {
@@ -124 +133 @@
 {
     mPath = aPath.isEmpty() ? QString::null : aPath;
-
-    /* Attach corresponding icon */
-    setItemIcon (PathId, QFileInfo (mPath).exists() ?
-                         mIconProvider->icon (QFileInfo (mPath)) :
-                         defaultIcon());
-
-    /* Store full path as tooltip */
-    setToolTip (filePath());
-    setItemData (PathId, toolTip(), Qt::ToolTipRole);
 
     refreshText();
@@ -150 +150 @@
 void VBoxFilePathSelectorWidget::retranslateUi()
 {
+    /* how do we interpret the "nothing selected" item? */
+    if (isResetEnabled())
+    {
+        mNoneStr = tr ("<reset to default>");
+        mNoneTip = tr ("The actual default path value will be displayed after "
+                       "accepting the changes and opening this dialog again.");
+    }
+    else
+    {
+        mNoneStr = tr ("<not selected>");
+        mNoneTip = tr ("Please use the <b>Other...</b> item from the drop-down "
+                       "list to select a desired path.");
+    }
+
     /* Retranslate 'path' item */
-    mNoneStr = tr ("None");
     if (mPath.isNull())
     {
@@ -166 +179 @@
         setItemText (ResetId, tr ("Reset"));
 
+    /* set tooltips of the above two items based on the mode */
+    switch (mMode)
+    {
+        case Mode_Folder:
+            setItemData (SelectId,
+                         tr ("Opens a dialog to select a different folder."),
+                         Qt::ToolTipRole);
+            setItemData (ResetId,
+                         tr ("Resets the folder path to the default value."),
+                         Qt::ToolTipRole);
+            break;
+        case Mode_File:
+            setItemData (SelectId,
+                         tr ("Opens a dialog to select a different file."),
+                         Qt::ToolTipRole);
+            setItemData (ResetId,
+                         tr ("Resets the file path to the default value."),
+                         Qt::ToolTipRole);
+            break;
+        default:
+            AssertFailedBreak();
+    }
+
     /* Retranslate copy action */
     mCopyAction->setText (tr ("&Copy"));
@@ -199 +235 @@
 QIcon VBoxFilePathSelectorWidget::defaultIcon() const
 {
-    if (mMode == PathMode)
+    if (mMode == Mode_Folder)
         return mIconProvider->icon (QFileIconProvider::Folder);
     else
@@ -207 +243 @@
 QString VBoxFilePathSelectorWidget::filePath() const
 {
+    /// @todo (r=dmik) why is it used as if it always returns a full path while
+    /// it actually may not?
+
     if (!mPath.isNull())
     {
-        if (mMode == PathMode)
-            return QDir (mPath).path();
-        else
-            return QFileInfo (mPath).filePath();
-    }
-
-    return mNoneTip;
+        switch (mMode)
+        {
+            case Mode_Folder:
+                return QDir (mPath).path();
+            case Mode_File:
+                return QFileInfo (mPath).filePath();
+            default:
+                AssertFailedBreak();
+        }
+    }
+
+    return QString::null;
 }
 
 QString VBoxFilePathSelectorWidget::shrinkText (int aWidth) const
 {
-    /* Full text stored in toolTip */
-    QString fullText = toolTip();
+    QString fullText = filePath();
     if (fullText.isEmpty())
         return fullText;
@@ -257 +300 @@
     int newSize = fontMetrics().width (fullText);
 
-    return newSize < oldSize ? fullText : toolTip();
+    return newSize < oldSize ? fullText : filePath();
 }
 
@@ -265 +308 @@
     {
         if (itemText (PathId) != mNoneStr)
+        {
             setItemText (PathId, mNoneStr);
+            setItemIcon (PathId, QIcon());
+            setItemData (PathId, mNoneTip, Qt::ToolTipRole);
+            setToolTip (mNoneTip);
+        }
     }
     else
@@ -275 +323 @@
             QStyle::CC_ComboBox, &options, QStyle::SC_ComboBoxEditField);
         setItemText (PathId, shrinkText (rect.width() - iconSize().width()));
-    }
-}
-
+
+        /* Attach corresponding icon */
+        setItemIcon (PathId, QFileInfo (mPath).exists() ?
+                             mIconProvider->icon (QFileInfo (mPath)) :
+                             defaultIcon());
+
+        /* Store full path as tooltip */
+        setToolTip (filePath());
+        setItemData (PathId, toolTip(), Qt::ToolTipRole);
+    }
+}
+

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

@@ -31 +31 @@
     Ui::VBoxGLSettingsGeneral::setupUi (this);
 
-    mPsVRDP->setMode (VBoxFilePathSelectorWidget::FileMode);
+    mPsVRDP->setMode (VBoxFilePathSelectorWidget::Mode_File);
 
     /* Setup connections */
@@ -76 +76 @@
     Ui::VBoxGLSettingsGeneral::retranslateUi (this);
 
-    mPsVdi->setWhatsThis (tr ("Displays the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks."));
-    mPsVdi->setNoneToolTip (tr ("The actual default path will be displayed after accepting the changes and opening this dialog again."));
-    mPsVdi->setSelectToolTip (tr ("Opens a dialog to select the default VDI folder."));
-    mPsVdi->setResetToolTip (tr ("Resets the VDI folder path to the default value."));
-
-    mPsMach->setWhatsThis (tr ("Displays the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines."));
-    mPsMach->setNoneToolTip (tr ("The actual default path will be displayed after accepting the changes and opening this dialog again."));
-    mPsMach->setSelectToolTip (tr ("Opens a dialog to select the default virtual machine folder."));
-    mPsMach->setResetToolTip (tr ("Resets the virtual machine folder path to the default value."));
-
-    mPsVRDP->setWhatsThis (tr ("Displays the path to the library that provides authentication for Remote Display (VRDP) clients."));
-    mPsVRDP->setNoneToolTip (tr ("The actual default library file will be displayed after accepting the changes and opening this dialog again."));
-    mPsVRDP->setSelectToolTip (tr ("Opens a dialog to select the VRDP authentication library file."));
-    mPsVRDP->setResetToolTip (tr ("Resets the authentication library file to the default value."));
+    mPsVdi->setWhatsThis (tr ("Displays the path to the default VDI folder. "
+                              "This folder is used, if not explicitly "
+                              "specified otherwise, when adding existing or "
+                              "creating new virtual hard disks."));
+    mPsMach->setWhatsThis (tr ("Displays the path to the default virtual "
+                               "machine folder. This folder is used, if not "
+                               "explicitly specified otherwise, when creating "
+                               "new virtual machines."));
+    mPsVRDP->setWhatsThis (tr ("Displays the path to the library that "
+                               "provides authentication for Remote Display "
+                               "(VRDP) clients."));
 }
 

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

@@ -377 +377 @@
 
     /* Path selector */
-    mPsSnapshot->setWhatsThis (tr ("Displays the path where snapshots of this virtual machine will be stored. Note that snapshots can take quite a lot of disk space."));
-    mPsSnapshot->setNoneToolTip (tr ("The actual default path will be displayed after accepting the changes and opening this dialog again."));
-    mPsSnapshot->setSelectToolTip (tr ("Selects the snapshot folder path."));
-    mPsSnapshot->setResetToolTip (tr ("Resets the snapshot folder path to the default value."));
+    mPsSnapshot->setWhatsThis (tr ("Displays the path where snapshots of this "
+                                   "virtual machine will be stored. Note that "
+                                   "snapshots can take quite a lot of disk "
+                                   "space."));
 }
 

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

@@ -115 +115 @@
     Ui::VBoxVMSettingsSFDetails::retranslateUi (this);
 
-    mPsPath->setNoneToolTip (tr ("No shared folder path is currently selected."));
-    mPsPath->setSelectToolTip (tr ("Selects shared folder path."));
-
     switch (mType)
     {