Changeset 79527 in vbox

Timestamp:

Jul 4, 2019 12:36:05 PM (6 years ago)

Author:

vboxsync

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

131811

Message:

FE/Qt: bugref:6143. Showing correct layout name in the status bar

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -396 +396 @@
     void setNativeName(const QString &strLocaName);
     const QString &nativeName() const;
+
+    /** Combines name and native name and returns the string. */
+    QString nameString() const;
 
     void setSourceFilePath(const QString& strSourceFilePath);
@@ -1581 +1584 @@
 }
 
+QString UISoftKeyboardLayout::nameString() const
+{
+    QString strCombinedName;
+    if (nativeName().isEmpty() && !name().isEmpty())
+        strCombinedName = name();
+    else if (!nativeName().isEmpty() && name().isEmpty())
+        strCombinedName = nativeName();
+    else
+        strCombinedName = QString("%1 (%2)").arg(nativeName()).arg(name());
+    return strCombinedName;
+}
+
 void UISoftKeyboardLayout::setSourceFilePath(const QString& strSourceFilePath)
 {
@@ -2699 +2714 @@
     QStringList layoutNames;
     foreach (const UISoftKeyboardLayout &layout, m_layouts)
-    {
-        if (layout.nativeName().isEmpty() && !layout.name().isEmpty())
-            layoutNames << layout.name();
-        else if (!layout.nativeName().isEmpty() && layout.name().isEmpty())
-            layoutNames << layout.nativeName();
-        else
-            layoutNames << QString("%1 (%2)").arg(layout.nativeName()).arg(layout.name());
-    }
+        layoutNames << layout.nameString();
     return layoutNames;
 }
@@ -3314 +3322 @@
 
     /* Update the status bar string: */
-    QString strLayoutName = pCurrentLayout ? pCurrentLayout->name() : QString();
-    updateStatusBarMessage(strLayoutName);
+    if (!pCurrentLayout)
+        return;
+    updateStatusBarMessage(pCurrentLayout->nameString());
 }