Changeset 81456 in vbox for trunk

Timestamp:

Oct 22, 2019 4:37:21 PM (5 years ago)

Author:

vboxsync

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

134175

Message:

FE/Qt: bugref:6699 Making sure that the layout name is unique during copy.

File:

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

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

@@ -526 +526 @@
 
     void drawTextInRect(const UISoftKeyboardKey &key, QPainter &painter);
+
+
 
 private:
@@ -2425 +2427 @@
 void UISoftKeyboardWidget::copyCurentLayout()
 {
+
     UISoftKeyboardLayout newLayout(*(m_pCurrentKeyboardLayout));
-    QString strNewName;
-    if (!newLayout.name().isEmpty())
-        strNewName= QString("%1-%2").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy"));
-    QString strNewNativeName;
-    if (!newLayout.nativeName().isEmpty())
-        strNewNativeName= QString("%1-%2").arg(newLayout.nativeName()).arg(UISoftKeyboard::tr("Copy"));
+
+    QString strNewName = QString("%1-%2").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy"));
+    int iCount = 1;
+    while (findLayoutByName(strNewName))
+    {
+        strNewName = QString("%1-%2-%3").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy")).arg(QString::number(iCount));
+        ++iCount;
+    }
+
     newLayout.setName(strNewName);
     newLayout.setEditedBuNotSaved(true);
-    newLayout.setNativeName(strNewNativeName);
     newLayout.setEditable(true);
     newLayout.setIsFromResources(false);
@@ -2944 +2949 @@
     UIKeyboardLayoutReader keyboardLayoutReader;
 
-    m_layouts.append(UISoftKeyboardLayout());
-    UISoftKeyboardLayout &newLayout = m_layouts.back();
-
+    UISoftKeyboardLayout newLayout;
     if (!keyboardLayoutReader.parseFile(strLayoutFileName, newLayout))
-    {
-        m_layouts.removeLast();
         return false;
-    }
 
     UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(newLayout.physicalLayoutUuid());
     /* If no pyhsical layout with the UUID the keyboard layout refers is found then cancel loading the keyboard layout: */
     if (!pPhysicalLayout)
-    {
-        m_layouts.removeLast();
         return false;
-    }
-    /* Make sure we have unique layout UUIDs: */
+
+    /* Make sure we have unique lay1out UUIDs: */
     int iCount = 0;
     foreach (const UISoftKeyboardLayout &layout, m_layouts)
@@ -2968 +2966 @@
     }
     if (iCount > 1)
-    {
-        m_layouts.removeLast();
         return false;
-    }
+
     newLayout.setSourceFilePath(strLayoutFileName);
+    addLayout(newLayout);
     return true;
 }