Changeset 60921 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 10, 2016 10:45:09 AM (9 years ago)

Author:

vboxsync

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

107137

Message:

FE/Qt: ​​​​​​​​​​bugref:6769: Rework/cleanup file-path selector widget (part 11): Reuse code from refreshText() in retranslateUi(), that fixes incorrect tool-tips in few cases.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp ¶

@@ -227 +227 @@
     }
 
-    /* How do we interpret the "nothing selected" item? */
+    /* If selector is NOT focused => we interpret the "nothing selected"
+     * item depending on "reset to default" feature state: */
     if (isResetEnabled())
     {
+        /* If "reset to default" is enabled: */
         m_strNoneText = tr("<reset to default>");
         m_strNoneToolTip = tr("The actual default path value will be displayed after "
@@ -236 +238 @@
     else
     {
+        /* If "reset to default" is NOT enabled: */
         m_strNoneText = tr("<not selected>");
         m_strNoneToolTip = tr("Please use the <b>Other...</b> item from the drop-down "
@@ -241 +244 @@
     }
 
-    /* Retranslate 'path' item: */
-    if (m_strPath.isNull())
-    {
-        setItemText(PathId, m_strNoneText);
-        setItemData(PathId, m_strNoneToolTip, Qt::ToolTipRole);
-        setToolTip(m_strNoneToolTip);
-    }
+    /* Finally, retranslate current item: */
+    refreshText();
 }
 
@@ -450 +448 @@
             setItemText(PathId, m_strPath);
         setItemIcon(PathId, QIcon());
+
+        /* Set the tool-tip: */
         setToolTip(m_enmMode == Mode_Folder ?
                    tr("Holds the folder path.") :
                    tr("Holds the file path."));
+        setItemData(PathId, toolTip(), Qt::ToolTipRole);
 
         if (m_fMouseAwaited)
@@ -478 +479 @@
             setItemText(PathId, m_strNoneText);
             setItemIcon(PathId, QIcon());
-            setItemData(PathId, m_strNoneToolTip, Qt::ToolTipRole);
+
+            /* Set the tool-tip: */
             setToolTip(m_strNoneToolTip);
+            setItemData(PathId, toolTip(), Qt::ToolTipRole);
         }
     }
@@ -496 +499 @@
                             defaultIcon());
 
-        /* Set the tooltip: */
+        /* Set the tool-tip: */
         setToolTip(fullPath());
         setItemData(PathId, toolTip(), Qt::ToolTipRole);