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

Timestamp:

Jun 18, 2007 3:05:33 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Slightly improved r22048.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• ui/VBoxNewHDWzd.ui.h (modified) (1 diff)

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

@@ -433 +433 @@
     static bool activateWindow (WId aWId, bool aSwitchDesktop = true);
 
+    static QString removeAccelMark (const QString &aText);
+
 signals:
 

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

@@ -2952 +2952 @@
 }
 
+/** 
+ *  Removes the acceletartor mark (the ampersand symbol) from the given string
+ *  and returns the result. The string is supposed to be a menu item's text
+ *  that may (or may not) contain the accelerator mark.
+ *
+ *  In order to support accelerators used in non-alphabet languages
+ *  (e.g. Japanese) that has a form of "(&<L>)" (where <L> is a latin letter),
+ *  this method first searches for this pattern and, if found, removes it as a
+ *  whole. If such a pattern is not found, then the '&' character is simply
+ *  removed from the string.
+ *
+ *  @note This function removes only the first occurense of the accelerator
+ *  mark.
+ * 
+ *  @param aText Menu item's text to remove the acceletaror mark from.
+ * 
+ *  @return The resulting string.
+ */
+/* static */
+QString VBoxGlobal::removeAccelMark (const QString &aText)
+{
+    QString result = aText;
+
+    QRegExp accel ("\\(&[a-zA-Z]\\)");
+    int pos = accel.search (result);
+    if (pos >= 0)
+        result.remove (pos, accel.cap().length());
+    else
+    {
+        pos = result.find ('&');
+        if (pos >= 0)
+            result.remove (pos, 1);
+    }
+
+    return result;
+}
+
 // Protected members
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewHDWzd.ui.h

@@ -391 +391 @@
         QString type = rbDynamicType->isOn() ? rbDynamicType->text()
                                              : rbFixedType->text();
-        type.remove (QRegExp( "\\(&\\w\\)" ));
-        type.remove ('&');
+        type = VBoxGlobal::removeAccelMark (type);
 
         Q_UINT64 sizeB = imageSize() * _1M;