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

Timestamp:

Jun 26, 2019 12:12:54 PM (6 years ago)

Author:

vboxsync

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

131589

Message:

FE/Qt: bugref:6143. Adding a native langage name to layouts

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (22 diffs)
• xml/german.xml (modified) (1 diff)

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

@@ -166 +166 @@
     void sltPhysicalLayoutChanged();
     void sltLayoutNameChanged(const QString &strCaption);
+    void sltLayoutNativeNameChanged(const QString &strCaption);
 
 private:
@@ -183 +184 @@
     QLabel *m_pPhysicalLayoutLabel;
     QLabel *m_pLayoutNameLabel;
+    QLabel *m_pLayoutNativeNameLabel;
     QLabel *m_pScanCodeLabel;
     QLabel *m_pPositionLabel;
@@ -191 +193 @@
 
     QLineEdit *m_pLayoutNameEdit;
+    QLineEdit *m_pLayoutNativeNameEdit;
     QLineEdit *m_pScanCodeEdit;
     QLineEdit *m_pPositionEdit;
@@ -410 +413 @@
     const QString &name() const;
 
+    void setNativeName(const QString &strLocaName);
+    const QString &nativeName() const;
+
     void setSourceFilePath(const QString& strSourceFilePath);
     const QString& sourceFilePath() const;
@@ -437 +443 @@
       * Map key is the key position and the value is the captions of the key. */
     QMap<int, KeyCaptions> m_keyCapMap;
-
+    /** This is the English name of the layout. */
     QString m_strName;
+    QString m_strNativeName;
     QString m_strSourceFilePath;
     bool    m_fEditable;
@@ -602 +609 @@
     const QUuid &physicalLayoutUUID() const;
     const QString &name() const;
+    const QString &nativeName() const;
     const QMap<int, KeyCaptions> &keyCapMap() const;
 
@@ -612 +620 @@
     QUuid m_physicalLayoutUid;
     QString m_strName;
+    QString m_strNativeName;
 };
 
@@ -698 +707 @@
     , m_pPhysicalLayoutLabel(0)
     , m_pLayoutNameLabel(0)
+    , m_pLayoutNativeNameLabel(0)
     , m_pScanCodeLabel(0)
     , m_pPositionLabel(0)
@@ -705 +715 @@
     , m_pShiftAltGrCaptionLabel(0)
     , m_pLayoutNameEdit(0)
+    , m_pLayoutNativeNameEdit(0)
     , m_pScanCodeEdit(0)
     , m_pPositionEdit(0)
@@ -769 +780 @@
         m_pLayoutNameEdit->setText(m_pLayout ? m_pLayout->name() : QString());
 
+    if (m_pLayoutNativeNameEdit)
+        m_pLayoutNativeNameEdit->setText(m_pLayout ? m_pLayout->nativeName() : QString());
+
     if (m_pPhysicalLayoutCombo && m_pLayout)
     {
@@ -799 +813 @@
         m_pPhysicalLayoutLabel->setText(UISoftKeyboard::tr("Physical Layout"));
     if (m_pLayoutNameLabel)
-        m_pLayoutNameLabel->setText(UISoftKeyboard::tr("Layout Name"));
+        m_pLayoutNameLabel->setText(UISoftKeyboard::tr("English Name"));
+    if (m_pLayoutNativeNameLabel)
+        m_pLayoutNativeNameLabel->setText(UISoftKeyboard::tr("Native Language Name"));
     if (m_pScanCodeLabel)
         m_pScanCodeLabel->setText(UISoftKeyboard::tr("Scan Code"));
@@ -868 +884 @@
 }
 
+void UILayoutEditor::sltLayoutNativeNameChanged(const QString &strNativeName)
+{
+    if (!m_pLayout || m_pLayout->nativeName() == strNativeName)
+        return;
+    m_pLayout->setNativeName(strNativeName);
+    emit sigLayoutEdited();
+}
+
 void UILayoutEditor::prepareObjects()
 {
@@ -889 +913 @@
     m_pEditorLayout->addLayout(pTitleLayout, 0, 0, 1, 2);
 
+    m_pLayoutNativeNameLabel = new QLabel;
+    m_pLayoutNativeNameEdit = new QLineEdit;
+    m_pLayoutNativeNameLabel->setBuddy(m_pLayoutNativeNameEdit);
+    m_pEditorLayout->addWidget(m_pLayoutNativeNameLabel, 2, 0, 1, 1);
+    m_pEditorLayout->addWidget(m_pLayoutNativeNameEdit, 2, 1, 1, 1);
+    connect(m_pLayoutNativeNameEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltLayoutNativeNameChanged);
+
 
     m_pLayoutNameLabel = new QLabel;
     m_pLayoutNameEdit = new QLineEdit;
     m_pLayoutNameLabel->setBuddy(m_pLayoutNameEdit);
-    m_pEditorLayout->addWidget(m_pLayoutNameLabel, 2, 0, 1, 1);
-    m_pEditorLayout->addWidget(m_pLayoutNameEdit, 2, 1, 1, 1);
+    m_pEditorLayout->addWidget(m_pLayoutNameLabel, 3, 0, 1, 1);
+    m_pEditorLayout->addWidget(m_pLayoutNameEdit, 3, 1, 1, 1);
     connect(m_pLayoutNameEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltLayoutNameChanged);
 
@@ -901 +932 @@
     m_pPhysicalLayoutCombo = new QComboBox;
     m_pPhysicalLayoutLabel->setBuddy(m_pPhysicalLayoutCombo);
-    m_pEditorLayout->addWidget(m_pPhysicalLayoutLabel, 3, 0, 1, 1);
-    m_pEditorLayout->addWidget(m_pPhysicalLayoutCombo, 3, 1, 1, 1);
+    m_pEditorLayout->addWidget(m_pPhysicalLayoutLabel, 4, 0, 1, 1);
+    m_pEditorLayout->addWidget(m_pPhysicalLayoutCombo, 4, 1, 1, 1);
     connect(m_pPhysicalLayoutCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UILayoutEditor::sltPhysicalLayoutChanged);
@@ -909 +940 @@
     m_pSelectedKeyGroupBox->setEnabled(false);
 
-    m_pEditorLayout->addWidget(m_pSelectedKeyGroupBox, 4, 0, 1, 2);
+    m_pEditorLayout->addWidget(m_pSelectedKeyGroupBox, 5, 0, 1, 2);
     QGridLayout *pSelectedKeyLayout = new QGridLayout(m_pSelectedKeyGroupBox);
     pSelectedKeyLayout->setSpacing(0);
@@ -1564 +1595 @@
 }
 
+void UISoftKeyboardLayout::setNativeName(const QString &strNativeName)
+{
+    m_strNativeName = strNativeName;
+}
+
+const QString &UISoftKeyboardLayout::nativeName() const
+{
+    return m_strNativeName;
+}
+
 void UISoftKeyboardLayout::setEditable(bool fEditable)
 {
@@ -1602 +1643 @@
 {
     if (m_strName != otherLayout.m_strName)
+        return false;
+    if (m_strNativeName != otherLayout.m_strNativeName)
         return false;
     if (m_physicalLayoutUuid != otherLayout.m_physicalLayoutUuid)
@@ -1839 +1882 @@
     xmlWriter.writeStartElement("layout");
     xmlWriter.writeTextElement("name", m_pCurrentKeyboardLayout->name());
+    xmlWriter.writeTextElement("nativename", m_pCurrentKeyboardLayout->nativeName());
     xmlWriter.writeTextElement("physicallayoutid", pPhysicalLayout->m_uId.toString());
 
@@ -1870 +1914 @@
 {
     UISoftKeyboardLayout newLayout(*(m_pCurrentKeyboardLayout));
-    QString strNewName = QString("%1-%2").arg(newLayout.name()).arg(tr("Copy"));
+    QString strNewName;
+    if (!newLayout.name().isEmpty())
+        strNewName= QString("%1-%2").arg(newLayout.name()).arg(tr("Copy"));
+    QString strNewNativeName;
+    if (!newLayout.nativeName().isEmpty())
+        strNewNativeName= QString("%1-%2").arg(newLayout.nativeName()).arg(tr("Copy"));
     newLayout.setName(strNewName);
+    newLayout.setNativeName(strNewNativeName);
     newLayout.setEditable(true);
     newLayout.setIsFromResources(false);
@@ -2247 +2297 @@
     newLayout.setPhysicalLayoutUuid(pPhysicalLayout->m_uId);
     newLayout.setName(keyboardLayoutReader.name());
+    newLayout.setNativeName(keyboardLayoutReader.nativeName());
     newLayout.setSourceFilePath(strLayoutFileName);
     newLayout.setKeyCapMap(keyboardLayoutReader.keyCapMap());
@@ -2653 +2704 @@
         else if (m_xmlReader.name() == "name")
             m_strName = m_xmlReader.readElementText();
+        else if (m_xmlReader.name() == "nativename")
+            m_strNativeName = m_xmlReader.readElementText();
         else if (m_xmlReader.name() == "physicallayoutid")
             m_physicalLayoutUid = QUuid(m_xmlReader.readElementText());
@@ -2669 +2722 @@
 {
     return m_strName;
+}
+
+const QString &UIKeyboardLayoutReader::nativeName() const
+{
+    return m_strNativeName;
 }
 

trunk/src/VBox/Frontends/VirtualBox/xml/german.xml

@@ -2 +2 @@
 <layout>
     <name>German</name>
+    <nativename>Deutsch</nativename>
     <physicallayoutid>{d41a0398-92a0-4ba4-beba-3d91a5dd0e50}</physicallayoutid>
     <key>