Changeset 81476 in vbox for trunk/src/VBox

Timestamp:

Oct 23, 2019 8:13:40 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Removing a persistent pointer to a container element. was not a very bright idea.

File:

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

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

@@ -617 +617 @@
     void loadLayouts();
 
-    void setCurrentLayout(const QString &strLayoutName);
     void setCurrentLayout(const QUuid &layoutUid);
     UISoftKeyboardLayout *currentLayout();
@@ -656 +655 @@
     void parentDialogDeactivated();
     bool isColorThemeEditable() const;
-
+    /** Returns a list of layout names that have been edited but not yet saved to a file. */
     QStringList unsavedLayoutsNameList() const;
 
@@ -687 +686 @@
     /** Sets m_pKeyBeingEdited. */
     void               setKeyBeingEdited(UISoftKeyboardKey *pKey);
-    void               setCurrentLayout(UISoftKeyboardLayout *pLayout);
-    UISoftKeyboardLayout *findLayoutByName(const QString &strName);
-    UISoftKeyboardLayout *findLayoutByUid(const QUuid &uid);
+    bool               layoutByNameExists(const QString &strName) const;
+
     /** Looks under the default keyboard layout folder and add the file names to the fileList. */
     void               lookAtDefaultLayoutFolder(QStringList &fileList);
@@ -703 +701 @@
     QVector<UISoftKeyboardKey*> m_pressedModifiers;
     QVector<UISoftKeyboardPhysicalLayout> m_physicalLayouts;
-    UISoftKeyboardPhysicalLayout          m_numPadLayout;
-    UISoftKeyboardPhysicalLayout          m_multiMediaKeysLayout;
-    QVector<UISoftKeyboardLayout>         m_layouts;
-    UISoftKeyboardLayout *m_pCurrentKeyboardLayout;
+    UISoftKeyboardPhysicalLayout       m_numPadLayout;
+    UISoftKeyboardPhysicalLayout       m_multiMediaKeysLayout;
+    QMap<QUuid, UISoftKeyboardLayout>  m_layouts;
+    QUuid                              m_uCurrentLayoutId;
     /** Key is the key position as read from the layout and value is the message we show as mouse hovers over the key. */
     QMap<int, QString> m_keyTooltips;
@@ -2133 +2131 @@
     , m_pKeyPressed(0)
     , m_currentColorTheme(0)
-    , m_pCurrentKeyboardLayout(0)
     , m_iInitialHeight(0)
     , m_iInitialWidth(0)
@@ -2168 +2165 @@
 {
     Q_UNUSED(pEvent);
-    if (!m_pCurrentKeyboardLayout || m_iInitialWidth == 0 || m_iInitialWidthNoNumPad == 0 || m_iInitialHeight == 0)
+    if (!m_layouts.contains(m_uCurrentLayoutId))
+        return;
+
+    UISoftKeyboardLayout &currentLayout = m_layouts[m_uCurrentLayoutId];
+
+    if (m_iInitialWidth == 0 || m_iInitialWidthNoNumPad == 0 || m_iInitialHeight == 0)
         return;
 
@@ -2192 +2194 @@
     float fLedMargin =  0.6 * unitSize;
 
-    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->physicalLayoutUuid());
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(currentLayout.physicalLayoutUuid());
     if (!pPhysicalLayout)
         return;
@@ -2232 +2234 @@
             painter.drawPolygon(key.polygon());
 
-            m_pCurrentKeyboardLayout->drawTextInRect(key, painter);
+            currentLayout.drawTextInRect(key, painter);
             /* Draw small LED like circles on the modifier/lock keys: */
             if (key.type() != KeyType_Ordinary)
@@ -2339 +2341 @@
 void UISoftKeyboardWidget::saveCurentLayoutToFile()
 {
-    if (!m_pCurrentKeyboardLayout)
-        return;
-
+    if (!m_layouts.contains(m_uCurrentLayoutId))
+        return;
+    UISoftKeyboardLayout &currentLayout = m_layouts[m_uCurrentLayoutId];
     QString strHomeFolder = uiCommon().homeFolder();
     QDir dir(strHomeFolder);
@@ -2358 +2360 @@
     dialog.setWindowModality(Qt::WindowModal);
     dialog.setWindowTitle(UISoftKeyboard::tr("Provide a file name"));
-    dialog.setTextValue(m_pCurrentKeyboardLayout->name());
+    dialog.setTextValue(currentLayout.name());
     dialog.setLabelText(QString("%1 %2").arg(UISoftKeyboard::tr("The file will be saved under:\n")).arg(strHomeFolder));
     if (dialog.exec() == QDialog::Rejected)
@@ -2369 +2371 @@
     }
 
-    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->physicalLayoutUuid());
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(currentLayout.physicalLayoutUuid());
     if (!pPhysicalLayout)
     {
@@ -2393 +2395 @@
     xmlWriter.writeStartDocument("1.0");
     xmlWriter.writeStartElement("layout");
-    xmlWriter.writeTextElement("name", m_pCurrentKeyboardLayout->name());
-    xmlWriter.writeTextElement("nativename", m_pCurrentKeyboardLayout->nativeName());
+    xmlWriter.writeTextElement("name", currentLayout.name());
+    xmlWriter.writeTextElement("nativename", currentLayout.nativeName());
     xmlWriter.writeTextElement("physicallayoutid", pPhysicalLayout->uid().toString());
-    xmlWriter.writeTextElement("id", m_pCurrentKeyboardLayout->uid().toString());
+    xmlWriter.writeTextElement("id", currentLayout.uid().toString());
 
     QVector<UISoftKeyboardRow> &rows = pPhysicalLayout->rows();
@@ -2409 +2411 @@
            UISoftKeyboardKey &key = keys[j];
            xmlWriter.writeTextElement("position", QString::number(key.position()));
-           xmlWriter.writeTextElement("basecaption", m_pCurrentKeyboardLayout->baseCaption(key.position()));
-           xmlWriter.writeTextElement("shiftcaption", m_pCurrentKeyboardLayout->shiftCaption(key.position()));
-           xmlWriter.writeTextElement("altgrcaption", m_pCurrentKeyboardLayout->altGrCaption(key.position()));
-           xmlWriter.writeTextElement("shiftaltgrcaption", m_pCurrentKeyboardLayout->shiftAltGrCaption(key.position()));
+           xmlWriter.writeTextElement("basecaption", currentLayout.baseCaption(key.position()));
+           xmlWriter.writeTextElement("shiftcaption", currentLayout.shiftCaption(key.position()));
+           xmlWriter.writeTextElement("altgrcaption", currentLayout.altGrCaption(key.position()));
+           xmlWriter.writeTextElement("shiftaltgrcaption", currentLayout.shiftAltGrCaption(key.position()));
            xmlWriter.writeEndElement();
        }
@@ -2420 +2422 @@
 
    xmlFile.close();
-   m_pCurrentKeyboardLayout->setSourceFilePath(strFileName);
-   m_pCurrentKeyboardLayout->setEditedBuNotSaved(false);
+   currentLayout.setSourceFilePath(strFileName);
+   currentLayout.setEditedBuNotSaved(false);
    sigStatusBarMessage(QString("%1 %2").arg(strFileName).arg(UISoftKeyboard::tr(" is saved")));
 }
@@ -2427 +2429 @@
 void UISoftKeyboardWidget::copyCurentLayout()
 {
-
-    UISoftKeyboardLayout newLayout(*(m_pCurrentKeyboardLayout));
+    UISoftKeyboardLayout newLayout(m_layouts[m_uCurrentLayoutId]);
 
     QString strNewName = QString("%1-%2").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy"));
     int iCount = 1;
-    while (findLayoutByName(strNewName))
+    while (layoutByNameExists(strNewName))
     {
         strNewName = QString("%1-%2-%3").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy")).arg(QString::number(iCount));
@@ -2588 +2589 @@
 }
 
-
 void UISoftKeyboardWidget::deleteCurrentLayout()
 {
-    if (!m_pCurrentKeyboardLayout || !m_pCurrentKeyboardLayout->editable() || m_pCurrentKeyboardLayout->isFromResources())
-        return;
-    /* Make sure we have at least one layout. */
+    if (!m_layouts.contains(m_uCurrentLayoutId))
+        return;
+
+    /* Make sure we will have at least one layout remaining. */
     if (m_layouts.size() <= 1)
         return;
 
-    int iIndex = m_layouts.indexOf(*(m_pCurrentKeyboardLayout));
-    if (iIndex == -1)
-        return;
+    const UISoftKeyboardLayout &layout = m_layouts.value(m_uCurrentLayoutId);
+    if (!layout.editable() || layout.isFromResources())
+        return;
+
+    m_layouts.remove(m_uCurrentLayoutId);
+    setCurrentLayout(m_layouts.firstKey());
 
     QDir fileToDelete;
-    QString strFilePath(m_pCurrentKeyboardLayout->sourceFilePath());
+    QString strFilePath(layout.sourceFilePath());
+
     bool fFileExists = false;
     if (!strFilePath.isEmpty())
         fFileExists = fileToDelete.exists(strFilePath);
-
+    /* It might be that the layout copied but not yet saved into a file: */
     if (fFileExists)
     {
@@ -2616 +2621 @@
                                         false /* ok button by default? */))
             return;
-    }
-
-    m_layouts.removeAt(iIndex);
-    setCurrentLayout(&(m_layouts[0]));
-    /* It might be that the layout copied but not yet saved into a file: */
-    if (fFileExists)
-    {
+
         if (fileToDelete.remove(strFilePath))
             sigStatusBarMessage(QString("%1 %2 %3").arg(UISoftKeyboard::tr("The file ")).arg(strFilePath).arg(UISoftKeyboard::tr(" has been deleted")));
@@ -2644 +2643 @@
 void UISoftKeyboardWidget::addLayout(const UISoftKeyboardLayout &newLayout)
 {
-    m_layouts.append(newLayout);
+    if (m_layouts.contains(newLayout.uid()))
+        return;
+    m_layouts[newLayout.uid()] = newLayout;
 }
 
@@ -2667 +2668 @@
 UISoftKeyboardKey *UISoftKeyboardWidget::keyUnderMouse(const QPoint &eventPosition)
 {
-    if (!m_pCurrentKeyboardLayout)
-        return 0;
-    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->physicalLayoutUuid());
+    const UISoftKeyboardLayout &currentLayout = m_layouts.value(m_uCurrentLayoutId);
+
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(currentLayout.physicalLayoutUuid());
     if (!pPhysicalLayout)
         return 0;
@@ -2813 +2814 @@
 }
 
-void UISoftKeyboardWidget::setCurrentLayout(const QString &strLayoutName)
-{
-    UISoftKeyboardLayout *pLayout = findLayoutByName(strLayoutName);
-    if (!pLayout)
-        return;
-    setCurrentLayout(pLayout);
-}
-
 void UISoftKeyboardWidget::setCurrentLayout(const QUuid &layoutUid)
 {
-    UISoftKeyboardLayout *pLayout = findLayoutByUid(layoutUid);
-    if (!pLayout)
-        return;
-    setCurrentLayout(pLayout);
+    if (m_uCurrentLayoutId == layoutUid || !m_layouts.contains(layoutUid))
+        return;
+
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_layouts[layoutUid].physicalLayoutUuid());
+    if (!pPhysicalLayout)
+        return;
+
+    m_uCurrentLayoutId = layoutUid;
+    emit sigCurrentLayoutChange();
+    update();
 }
 
 UISoftKeyboardLayout *UISoftKeyboardWidget::currentLayout()
 {
-    return m_pCurrentKeyboardLayout;
+    if (!m_layouts.contains(m_uCurrentLayoutId))
+        return 0;
+    return &(m_layouts[m_uCurrentLayoutId]);
 }
 
@@ -3026 +3027 @@
         loadKeyboardLayout(strName);
     /* Mark the layouts we load from the resources as non-editable: */
-    for (int i = 0; i < m_layouts.size(); ++i)
-    {
-        m_layouts[i].setEditable(false);
-        m_layouts[i].setIsFromResources(true);
+    for (QMap<QUuid, UISoftKeyboardLayout>::iterator iterator = m_layouts.begin(); iterator != m_layouts.end(); ++iterator)
+    {
+        iterator.value().setEditable(false);
+        iterator.value().setIsFromResources(true);
     }
     keyboardLayoutNames.clear();
@@ -3039 +3040 @@
     if (m_layouts.isEmpty())
         return;
-    for (int i = 0; i < m_layouts.size(); ++i)
-        m_layouts[i].setEditedBuNotSaved(false);
-    setCurrentLayout(&(m_layouts[0]));
+    for (QMap<QUuid, UISoftKeyboardLayout>::iterator iterator = m_layouts.begin(); iterator != m_layouts.end(); ++iterator)
+        iterator.value().setEditedBuNotSaved(false);
+    setCurrentLayout(m_layouts.firstKey());
 }
 
@@ -3078 +3079 @@
 }
 
-void UISoftKeyboardWidget::setCurrentLayout(UISoftKeyboardLayout *pLayout)
-{
-    if (m_pCurrentKeyboardLayout == pLayout)
-        return;
-    m_pCurrentKeyboardLayout = pLayout;
-    if (!m_pCurrentKeyboardLayout)
-    {
-        emit sigCurrentLayoutChange();
-        return;
-    }
-    emit sigCurrentLayoutChange();
-
-    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->physicalLayoutUuid());
-    if (!pPhysicalLayout)
-        return;
-
-    update();
-}
-
-UISoftKeyboardLayout *UISoftKeyboardWidget::findLayoutByName(const QString &strName)
-{
-    for (int i = 0; i < m_layouts.size(); ++i)
-    {
-        if (m_layouts[i].name() == strName)
-            return &(m_layouts[i]);
-    }
-    return 0;
-}
-
-UISoftKeyboardLayout *UISoftKeyboardWidget::findLayoutByUid(const QUuid &uid)
-{
-    if (uid.isNull())
-        return 0;
-    for (int i = 0; i < m_layouts.size(); ++i)
-    {
-        if (m_layouts[i].uid() == uid)
-            return &(m_layouts[i]);
-    }
-    return 0;
+bool UISoftKeyboardWidget::layoutByNameExists(const QString &strName) const
+{
+    foreach (const UISoftKeyboardLayout &layout, m_layouts)
+    {
+        if (layout.name() == strName)
+            return true;
+    }
+    return false;
 }