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

Timestamp:

Jun 17, 2019 1:23:13 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Connecting the editor widget to selector widget

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (48 diffs)
• src/softkeyboard/UISoftKeyboard.h (modified) (2 diffs)
• xml/german.xml (modified) (1 diff)

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

@@ -35 +35 @@
 #include <QVBoxLayout>
 
-
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
@@ -122 +121 @@
 
     void sigLayoutEdited();
+    void sigKeyCaptionsEdited(UISoftKeyboardKey* pKey);
     void sigGoBackButton();
 
@@ -141 +141 @@
     void sltKeyShiftCaptionChange();
     void sltKeyAltGrCaptionChange();
-    void sltLayoutNameChange();
     void sltHandlePhysicalLayoutChanged();
 
@@ -149 +148 @@
     void prepareConnections();
     QWidget *prepareKeyCaptionEditWidgets();
+    void reset();
 
     QGridLayout *m_pEditorLayout;
@@ -175 +175 @@
     /** The layout which is being currently edited. */
     UISoftKeyboardLayout *m_pLayout;
-    QVector<UISoftKeyboardPhysicalLayout> m_physicalLayouts;
 };
 
@@ -188 +187 @@
 signals:
 
-    void sigApplySelectedLayout(const QString &strSelectedLayoutName);
-    void sigEditSelectedLayout();
+    void sigLayoutSelectionChanged(const QString &strSelectedLayoutName);
+    void sigShowLayoutEditor();
 
 public:
@@ -195 +194 @@
     UILayoutSelector(QWidget *pParent = 0);
     void setLayoutList(const QStringList &layoutNames);
-    QString selectedLayoutName() const;
-    void selectLayoutByName(const QString &strLayoutName);
+    void setCurrentLayout(const QString &strLayoutName);
 
 protected:
@@ -352 +350 @@
 public:
 
-    UISoftKeyboardLayout()
-        :m_pPhysicalLayout(0){}
+    UISoftKeyboardLayout(){}
 
     void setName(const QString &strName)
@@ -360 +357 @@
     }
 
+    void updateKeyCaptions(int iKeyPosition, KeyCaptions &newCaptions)
+    {
+        if (!m_keyCapMap.contains(iKeyPosition))
+            return;
+        m_keyCapMap[iKeyPosition] = newCaptions;
+    }
+
     const QString &name() const
     {
@@ -365 +369 @@
     }
 
-    /** The physical layout used by this layout. */
-    UISoftKeyboardPhysicalLayout *m_pPhysicalLayout;
+    /** The UUID of the physical layout used by this layout. */
+    QUuid m_physicalLayoutUuid;
 
     /** We cache the key caps here instead of reading the layout files each time layout changes.
@@ -395 +399 @@
 
     void sigPutKeyboardSequence(QVector<LONG> sequence);
-    void sigLayoutChange(const QString &strLayoutName);
-    void sigLayoutListChanged(QStringList layoutNames);
+    void sigCurrentLayoutChange();
+    void sigKeyToEdit(UISoftKeyboardKey* pKey);
 
 public:
@@ -407 +411 @@
     void loadLayouts();
     void showContextMenu(const QPoint &globalPoint);
-    void applyLayoutByName(const QString &strLayoutName);
+
+    void setCurrentLayout(const QString &strLayoutName);
+    UISoftKeyboardLayout *currentLayout();
+
     QStringList layoutNameList() const;
     const QVector<UISoftKeyboardPhysicalLayout> &physicalLayouts() const;
+
+    void toggleEditMode(bool fIsEditMode);
+    /** Is called when the captions in UISoftKeyboardKey is changed and forward this changes to
+      * corresponding UISoftKeyboardLayout */
+    void updateKeyCaptionsInLayout(UISoftKeyboardKey *pKey);
 
 protected:
@@ -423 +435 @@
     void sltHandleContextMenuRequest(const QPoint &point);
     void sltHandleSaveLayout();
-    void sltHandleLayoutEditModeToggle(bool fToggle);
     void sltHandleNewLayout();
     void sltPhysicalLayoutForLayoutChanged(int iIndex);
@@ -440 +451 @@
     void               reset();
     void               prepareObjects();
+    UISoftKeyboardPhysicalLayout *findPhysicalLayout(const QUuid &uuid);
     /** Sets m_pKeyBeingEdited. */
     void               setKeyBeingEdited(UISoftKeyboardKey *pKey);
     void               setCurrentLayout(UISoftKeyboardLayout *pLayout);
-    void               emitLayoutNames();
     UISoftKeyboardLayout *findLayoutByName(const QString &strName);
 
@@ -552 +563 @@
     , m_pAltGrCaptionEdit(0)
     , m_pKey(0)
+    , m_pLayout(0)
 {
     setAutoFillBackground(true);
@@ -580 +592 @@
 void UILayoutEditor::setLayoutToEdit(UISoftKeyboardLayout *pLayout)
 {
-    if (m_pLayout != pLayout)
-        return;
+    if (m_pLayout == pLayout)
+        return;
+
+    m_pLayout = pLayout;
+    if (!m_pLayout)
+        reset();
+
     if (m_pLayoutNameEdit)
-        m_pLayoutNameEdit->setText(m_pLayout->name());
+        m_pLayoutNameEdit->setText(m_pLayout ? m_pLayout->name() : QString());
+
+    if (m_pPhysicalLayoutCombo && m_pLayout)
+    {
+        int iIndex = m_pPhysicalLayoutCombo->findData(m_pLayout->m_physicalLayoutUuid);
+        if (iIndex != -1)
+            m_pPhysicalLayoutCombo->setCurrentIndex(iIndex);
+    }
     update();
 }
@@ -589 +613 @@
 void UILayoutEditor::setPhysicalLayoutList(const QVector<UISoftKeyboardPhysicalLayout> &physicalLayouts)
 {
-    m_physicalLayouts = physicalLayouts;
-
     if (!m_pPhysicalLayoutCombo)
         return;
@@ -627 +649 @@
         return;
     m_pKey->setBaseCaption(m_pBaseCaptionEdit->text());
+    emit sigKeyCaptionsEdited(m_pKey);
+}
+
+void UILayoutEditor::sltKeyShiftCaptionChange()
+{
+    if (!m_pKey || !m_pShiftCaptionEdit)
+        return;
+    m_pKey->setShiftCaption(m_pShiftCaptionEdit->text());
+    emit sigKeyCaptionsEdited(m_pKey);
+}
+
+void UILayoutEditor::sltKeyAltGrCaptionChange()
+{
+    if (!m_pKey || !m_pAltGrCaptionEdit)
+        return;
+    m_pKey->setAltGrCaption(m_pAltGrCaptionEdit->text());
+    emit sigKeyCaptionsEdited(m_pKey);
+}
+
+void UILayoutEditor::sltHandlePhysicalLayoutChanged()
+{
+    if (!m_pPhysicalLayoutCombo || !m_pLayout)
+        return;
+    QUuid currentData = m_pPhysicalLayoutCombo->currentData().toUuid();
+    if (!currentData.isNull())
+        m_pLayout->m_physicalLayoutUuid = currentData;
     emit sigLayoutEdited();
-}
-
-void UILayoutEditor::sltKeyShiftCaptionChange()
-{
-    if (!m_pKey || !m_pShiftCaptionEdit)
-        return;
-    m_pKey->setShiftCaption(m_pShiftCaptionEdit->text());
-    emit sigLayoutEdited();
-}
-
-void UILayoutEditor::sltKeyAltGrCaptionChange()
-{
-    if (!m_pKey || !m_pAltGrCaptionEdit)
-        return;
-    m_pKey->setAltGrCaption(m_pAltGrCaptionEdit->text());
-    emit sigLayoutEdited();
-}
-
-void UILayoutEditor::sltLayoutNameChange()
-{
-    if (!m_pLayoutNameEdit)
-        return;
-    emit sigLayoutEdited();
-}
-
-void UILayoutEditor::sltHandlePhysicalLayoutChanged()
-{
-    if (!m_pPhysicalLayoutCombo)
-        return;
-
-
 }
 
@@ -678 +695 @@
     m_pEditorLayout->addWidget(m_pLayoutNameLabel, 1, 0, 1, 1);
     m_pEditorLayout->addWidget(m_pLayoutNameEdit, 1, 1, 1, 1);
-    connect(m_pLayoutNameEdit, &QLineEdit::editingFinished, this, &UILayoutEditor::sltLayoutNameChange);
+    connect(m_pLayoutNameEdit, &QLineEdit::editingFinished, this, &UILayoutEditor::sigLayoutEdited);
 
 
@@ -756 +773 @@
     connect(m_pAltGrCaptionEdit, &QLineEdit::editingFinished, this, &UILayoutEditor::sltKeyAltGrCaptionChange);
 
-
     QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
     if (pSpacer)
         pCaptionEditorLayout->addItem(pSpacer, 4, 1);
     return m_pCaptionEditGroupBox;
+}
+
+void UILayoutEditor::reset()
+{
+    if (m_pLayoutNameEdit)
+        m_pLayoutNameEdit->clear();
+    if (m_pScanCodeEdit)
+        m_pScanCodeEdit->clear();
+    if (m_pPositionEdit)
+        m_pPositionEdit->clear();
+    if (m_pBaseCaptionEdit)
+        m_pBaseCaptionEdit->clear();
+    if (m_pShiftCaptionEdit)
+        m_pShiftCaptionEdit->clear();
+    if (m_pAltGrCaptionEdit)
+        m_pAltGrCaptionEdit->clear();
 }
 
@@ -776 +808 @@
 }
 
-QString UILayoutSelector::selectedLayoutName() const
-{
-    if (!m_pLayoutListWidget || !m_pLayoutListWidget->currentItem())
-        return QString();
-    return m_pLayoutListWidget->currentItem()->text();
-}
-
-void UILayoutSelector::selectLayoutByName(const QString &strLayoutName)
+void UILayoutSelector::setCurrentLayout(const QString &strLayoutName)
 {
     if (!m_pLayoutListWidget)
         return;
+    if (strLayoutName.isEmpty())
+    {
+        m_pLayoutListWidget->selectionModel()->clear();
+        return;
+    }
     QList<QListWidgetItem *> items = m_pLayoutListWidget->findItems(strLayoutName, Qt::MatchFixedString |Qt::MatchCaseSensitive);
     if (items.isEmpty())
@@ -823 +853 @@
     m_pLayoutListWidget = new QListWidget;
     pLayout->addWidget(m_pLayoutListWidget);
-    connect(m_pLayoutListWidget, &QListWidget::currentTextChanged, this, &UILayoutSelector::sigApplySelectedLayout);
+    connect(m_pLayoutListWidget, &QListWidget::currentTextChanged, this, &UILayoutSelector::sigLayoutSelectionChanged);
 
     QHBoxLayout *pButtonsLayout = new QHBoxLayout;
     pLayout->addLayout(pButtonsLayout);
-
-    // m_pApplyLayoutButton = new QToolButton;
-    // m_pApplyLayoutButton->setIcon(UIIconPool::iconSet(":/keyboard_16px.png"));
-    // pButtonsLayout->addWidget(m_pApplyLayoutButton);
-
 
     m_pEditLayoutButton = new QToolButton;
     m_pEditLayoutButton->setIcon(UIIconPool::iconSet(":/keyboard_settings_16px.png"));
     pButtonsLayout->addWidget(m_pEditLayoutButton);
-    connect(m_pEditLayoutButton, &QToolButton::pressed, this, &UILayoutSelector::sigEditSelectedLayout);
+    connect(m_pEditLayoutButton, &QToolButton::pressed, this, &UILayoutSelector::sigShowLayoutEditor);
 
     pButtonsLayout->addStretch(2);
@@ -1189 +1214 @@
     Q_UNUSED(pEvent);
 
-    int iEditDialogWidth = 0;
-    if (m_enmMode == Mode_LayoutEdit)
-        iEditDialogWidth = 34 * QApplication::fontMetrics().width('x');
-    m_fScaleFactorX = (width() - iEditDialogWidth) / (float) m_iInitialWidth;
+    m_fScaleFactorX = width() / (float) m_iInitialWidth;
     m_fScaleFactorY = height() / (float) m_iInitialHeight;
 
@@ -1208 +1230 @@
     if (!m_pCurrentKeyboardLayout || m_iInitialWidth == 0 || m_iInitialHeight == 0)
         return;
-    if (!m_pCurrentKeyboardLayout->m_pPhysicalLayout)
-        return;
-
-    QVector<UISoftKeyboardRow> &rows = m_pCurrentKeyboardLayout->m_pPhysicalLayout->m_rows;
+
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->m_physicalLayoutUuid);
+    if (!pPhysicalLayout)
+        return;
+
+    QVector<UISoftKeyboardRow> &rows = pPhysicalLayout->m_rows;
     for (int i = 0; i < rows.size(); ++i)
     {
@@ -1371 +1395 @@
 //         {
 //             m_pLastSelectedLayout = pSenderAction;
-//             emit sigLayoutChange(strLayout);
+//             emit sigCurrentLayoutChange(strLayout);
 //             return;
 //         }
@@ -1380 +1404 @@
 //         QString strLayout = m_pLastSelectedLayout->data().toString();
 //         loadPhysicalLayout(strLayout);
-//         emit sigLayoutChange(strLayout);
+//         emit sigCurrentLayoutChange(strLayout);
 //         m_pLastSelectedLayout->setChecked(true);
 //     }
@@ -1391 +1415 @@
     if (strFileName.isEmpty())
         return;
-    if (!m_pCurrentKeyboardLayout || !m_pCurrentKeyboardLayout->m_pPhysicalLayout)
+    if (!m_pCurrentKeyboardLayout)
+        return;
+
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->m_physicalLayoutUuid);
+    if (!pPhysicalLayout)
         return;
 
@@ -1408 +1436 @@
     xmlWriter.writeStartElement("layout");
     xmlWriter.writeTextElement("name", m_pCurrentKeyboardLayout->name());
-    xmlWriter.writeTextElement("physicallayoutid", m_pCurrentKeyboardLayout->m_pPhysicalLayout->m_uId.toString());
-
-    QVector<UISoftKeyboardRow> &rows = m_pCurrentKeyboardLayout->m_pPhysicalLayout->m_rows;
+    xmlWriter.writeTextElement("physicallayoutid", pPhysicalLayout->m_uId.toString());
+
+    QVector<UISoftKeyboardRow> &rows = pPhysicalLayout->m_rows;
     for (int i = 0; i < rows.size(); ++i)
     {
@@ -1460 +1488 @@
 // }
 
-void UISoftKeyboardWidget::sltHandleLayoutEditModeToggle(bool fToggle)
-{
-    if (fToggle)
+void UISoftKeyboardWidget::toggleEditMode(bool fIsEditMode)
+{
+    if (fIsEditMode)
         m_enmMode = Mode_LayoutEdit;
     else
@@ -1471 +1499 @@
 }
 
+void UISoftKeyboardWidget::updateKeyCaptionsInLayout(UISoftKeyboardKey *pKey)
+{
+    if (!m_pCurrentKeyboardLayout || !pKey)
+        return;
+
+    /* Assuming the key captions are changed for the current layout: */
+    KeyCaptions newCaptions;
+    newCaptions.m_strBase = pKey->baseCaption();
+    newCaptions.m_strShift = pKey->shiftCaption();
+    newCaptions.m_strAltGr = pKey->altGrCaption();
+    m_pCurrentKeyboardLayout->updateKeyCaptions(pKey->position(), newCaptions);
+}
+
 void UISoftKeyboardWidget::sltHandleNewLayout()
 {
@@ -1478 +1519 @@
     m_layouts.append(UISoftKeyboardLayout());
     UISoftKeyboardLayout &newLayout = m_layouts.back();
-    newLayout.m_pPhysicalLayout = &(m_physicalLayouts[0]);
+    newLayout.m_physicalLayoutUuid = m_physicalLayouts[0].m_uId;
     newLayout.setName(QString(UISoftKeyboard::tr("Unnamed")));
     setCurrentLayout(&newLayout);
@@ -1490 +1531 @@
         return;
 
-    if (m_pCurrentKeyboardLayout->m_pPhysicalLayout == &(m_physicalLayouts[iIndex]))
-        return;
-    m_pCurrentKeyboardLayout->m_pPhysicalLayout = &(m_physicalLayouts[iIndex]);
+    if (m_pCurrentKeyboardLayout->m_physicalLayoutUuid == m_physicalLayouts[iIndex].m_uId)
+        return;
+    m_pCurrentKeyboardLayout->m_physicalLayoutUuid = m_physicalLayouts[iIndex].m_uId;
     update();
 }
@@ -1516 +1557 @@
 UISoftKeyboardKey *UISoftKeyboardWidget::keyUnderMouse(const QPoint &eventPosition)
 {
-    if (!m_pCurrentKeyboardLayout || !m_pCurrentKeyboardLayout->m_pPhysicalLayout)
+    if (!m_pCurrentKeyboardLayout)
         return 0;
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->m_physicalLayoutUuid);
+    if (!pPhysicalLayout)
+        return 0;
+
     UISoftKeyboardKey *pKey = 0;
-    QVector<UISoftKeyboardRow> &rows = m_pCurrentKeyboardLayout->m_pPhysicalLayout->m_rows;
+    QVector<UISoftKeyboardRow> &rows = pPhysicalLayout->m_rows;
     for (int i = 0; i < rows.size(); ++i)
     {
@@ -1586 +1631 @@
 }
 
-void UISoftKeyboardWidget::applyLayoutByName(const QString &strLayoutName)
+void UISoftKeyboardWidget::setCurrentLayout(const QString &strLayoutName)
 {
     UISoftKeyboardLayout *pLayout = findLayoutByName(strLayoutName);
@@ -1592 +1637 @@
         return;
     setCurrentLayout(pLayout);
+}
+
+UISoftKeyboardLayout *UISoftKeyboardWidget::currentLayout()
+{
+    return m_pCurrentKeyboardLayout;
 }
 
@@ -1696 +1746 @@
     m_layouts.append(UISoftKeyboardLayout());
     UISoftKeyboardLayout &newLayout = m_layouts.back();
-    newLayout.m_pPhysicalLayout = pPhysicalLayout;
+    newLayout.m_physicalLayoutUuid = pPhysicalLayout->m_uId;
     newLayout.setName(keyboardLayoutReader.name());
     newLayout.m_keyCapMap = keyboardLayoutReader.keyCapMap();
     return true;
+}
+
+UISoftKeyboardPhysicalLayout *UISoftKeyboardWidget::findPhysicalLayout(const QUuid &uuid)
+{
+    for (int i = 0; i < m_physicalLayouts.size(); ++i)
+    {
+        if (m_physicalLayouts[i].m_uId == uuid)
+            return &(m_physicalLayouts[i]);
+    }
+    return 0;
 }
 
@@ -1722 +1782 @@
     foreach (const QString &strName, keyboardLayoutNames)
         loadKeyboardLayout(strName);
-    emitLayoutNames();
+
     if (m_layouts.isEmpty())
         return;
@@ -1736 +1796 @@
 
     m_pLayoutEditModeToggleAction = m_pContextMenu->addAction(UISoftKeyboard::tr("Edit the layout"));
-    connect(m_pLayoutEditModeToggleAction, &QAction::toggled, this, &UISoftKeyboardWidget::sltHandleLayoutEditModeToggle);
     m_pLayoutEditModeToggleAction->setCheckable(true);
     m_pLayoutEditModeToggleAction->setChecked(false);
@@ -1760 +1819 @@
         return;
     m_pKeyBeingEdited = pKey;
-    // if (m_pLayoutEditor)
-    //     m_pLayoutEditor->setKey(pKey);
+    emit sigKeyToEdit(pKey);
 }
 
@@ -1771 +1829 @@
     if (!m_pCurrentKeyboardLayout)
     {
-        emit sigLayoutChange(QString());
-        return;
-    }
-    emit sigLayoutChange(m_pCurrentKeyboardLayout->name());
+        emit sigCurrentLayoutChange();
+        return;
+    }
+    emit sigCurrentLayoutChange();
 
     const QMap<int, KeyCaptions> &keyCapMap = m_pCurrentKeyboardLayout->m_keyCapMap;
 
+   UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->m_physicalLayoutUuid);
+    if (!pPhysicalLayout)
+        return;
+
     /* Update the key captions: */
-    QVector<UISoftKeyboardRow> &rows = m_pCurrentKeyboardLayout->m_pPhysicalLayout->m_rows;
+    QVector<UISoftKeyboardRow> &rows = pPhysicalLayout->m_rows;
     for (int i = 0; i < rows.size(); ++i)
     {
@@ -1794 +1856 @@
         }
     }
-}
-
-void UISoftKeyboardWidget::emitLayoutNames()
-{
-    emit sigLayoutListChanged(layoutNameList());
+    update();
 }
 
@@ -2117 +2175 @@
     , m_pSession(pSession)
     , m_pMainLayout(0)
-    , m_pContainerWidget(0)
+    , m_pKeyboardWidget(0)
     , m_strMachineName(strMachineName)
     , m_pSplitter(0)
@@ -2129 +2187 @@
     prepareConnections();
 
-    if (m_pContainerWidget)
-        m_pContainerWidget->loadLayouts();
+    if (m_pKeyboardWidget)
+    {
+        m_pKeyboardWidget->loadLayouts();
+        /* Update the selector widget: */
+        if (m_pLayoutSelector)
+            m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList());
+        if (m_pLayoutEditor)
+            m_pLayoutEditor->setPhysicalLayoutList(m_pKeyboardWidget->physicalLayouts());
+    }
 
     loadSettings();
     retranslateUi();
-    updateStatusBarMessage();
 }
 
@@ -2158 +2222 @@
         if (pMouseEvent && pMouseEvent->button() == Qt::LeftButton)
         {
-            if (m_pContainerWidget)
-                m_pContainerWidget->showContextMenu(m_pSettingsButton->mapToGlobal(pMouseEvent->pos()));
+            if (m_pKeyboardWidget)
+                m_pKeyboardWidget->showContextMenu(m_pSettingsButton->mapToGlobal(pMouseEvent->pos()));
             return true;
         }
@@ -2181 +2245 @@
 void UISoftKeyboard::sltHandleStatusBarContextMenuRequest(const QPoint &point)
 {
-    if (m_pContainerWidget)
-        m_pContainerWidget->showContextMenu(statusBar()->mapToGlobal(point));
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->showContextMenu(statusBar()->mapToGlobal(point));
+}
+
+void UISoftKeyboard::sltLayoutSelectionChanged(const QString &strLayoutName)
+{
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->setCurrentLayout(strLayoutName);
+}
+
+void UISoftKeyboard::sltCurentLayoutChanged()
+{
+    if (!m_pKeyboardWidget)
+        return;
+    UISoftKeyboardLayout *pCurrentLayout = m_pKeyboardWidget->currentLayout();
+
+    /* Update the status bar string: */
+    QString strLayoutName = pCurrentLayout ? pCurrentLayout->name() : QString();
+    updateStatusBarMessage(strLayoutName);
+}
+
+void UISoftKeyboard::sltShowLayoutSelector()
+{
+    if (m_pSidePanelContainerWidget && m_pLayoutSelector)
+        m_pSidePanelContainerWidget->setCurrentWidget(m_pLayoutSelector);
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->toggleEditMode(false);
+}
+
+void UISoftKeyboard::sltShowLayoutEditor()
+{
+    if (m_pSidePanelContainerWidget && m_pLayoutEditor)
+    {
+        m_pLayoutEditor->setLayoutToEdit(m_pKeyboardWidget->currentLayout());
+        m_pSidePanelContainerWidget->setCurrentWidget(m_pLayoutEditor);
+    }
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->toggleEditMode(true);
+}
+
+void UISoftKeyboard::sltKeyToEditChanged(UISoftKeyboardKey* pKey)
+{
+    if (m_pLayoutEditor)
+        m_pLayoutEditor->setKey(pKey);
+}
+
+void UISoftKeyboard::sltLayoutEdited()
+{
+    if (!m_pKeyboardWidget)
+        return;
+    m_pKeyboardWidget->update();
+    if (m_pLayoutSelector)
+    {
+        m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList());
+        m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout() ? m_pKeyboardWidget->currentLayout()->name() : QString());
+    }
+}
+
+void UISoftKeyboard::sltKeyCaptionsEdited(UISoftKeyboardKey* pKey)
+{
+    if (m_pKeyboardWidget)
+    {
+        m_pKeyboardWidget->updateKeyCaptionsInLayout(pKey);
+        m_pKeyboardWidget->update();
+    }
 }
 
@@ -2203 +2330 @@
         m_pSidePanelContainerWidget->addWidget(m_pLayoutEditor);
 
-    m_pContainerWidget = new UISoftKeyboardWidget;
-    if (!m_pContainerWidget)
-        return;
-    m_pContainerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    m_pContainerWidget->updateGeometry();
-    m_pSplitter->addWidget(m_pContainerWidget);
+    m_pKeyboardWidget = new UISoftKeyboardWidget;
+    if (!m_pKeyboardWidget)
+        return;
+    m_pKeyboardWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    m_pKeyboardWidget->updateGeometry();
+    m_pSplitter->addWidget(m_pKeyboardWidget);
 
     statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -2230 +2357 @@
 {
     connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltHandleKeyboardLedsChange);
-    connect(m_pContainerWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltHandlePutKeyboardSequence);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltHandlePutKeyboardSequence);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentLayoutChange, this, &UISoftKeyboard::sltCurentLayoutChanged);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);
+
+    connect(m_pLayoutSelector, &UILayoutSelector::sigLayoutSelectionChanged, this, &UISoftKeyboard::sltLayoutSelectionChanged);
+    connect(m_pLayoutSelector, &UILayoutSelector::sigShowLayoutEditor, this, &UISoftKeyboard::sltShowLayoutEditor);
+    connect(m_pLayoutEditor, &UILayoutEditor::sigGoBackButton, this, &UISoftKeyboard::sltShowLayoutSelector);
+    connect(m_pLayoutEditor, &UILayoutEditor::sigLayoutEdited, this, &UISoftKeyboard::sltLayoutEdited);
+    connect(m_pLayoutEditor, &UILayoutEditor::sigKeyCaptionsEdited, this, &UISoftKeyboard::sltKeyCaptionsEdited);
 }
 
@@ -2241 +2376 @@
 }
 
-void UISoftKeyboard::updateStatusBarMessage()
+void UISoftKeyboard::updateStatusBarMessage(const QString &strName)
 {
     QString strMessage;
-    if (!m_strLayoutName.isEmpty())
-        strMessage += QString("%1: %2").arg(tr("Layout")).arg(m_strLayoutName);
-    if (!m_strKeyCapFileName.isEmpty())
-        strMessage += QString("\t/\t %1: %2").arg(tr("Key Captions File")).arg(m_strKeyCapFileName);
-    statusBar()->showMessage(strMessage);
+    if (!strName.isEmpty())
+    {
+        strMessage += QString("%1: %2").arg(tr("Layout")).arg(strName);
+        statusBar()->showMessage(strMessage);
+    }
+    else
+        statusBar()->showMessage(QString());
 }
 

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

@@ -68 +68 @@
     void sltHandleStatusBarContextMenuRequest(const QPoint &point);
 
+    /** Handles the signal we get from the layout selector widget.
+      * Selection changed is forwarded to the keyboard widget. */
+    void sltLayoutSelectionChanged(const QString &strLayoutName);
+
+    /** Handles the signal we get from the keyboard widget. */
+    void sltCurentLayoutChanged();
+
+    void sltShowLayoutSelector();
+    void sltShowLayoutEditor();
+    void sltKeyToEditChanged(UISoftKeyboardKey* pKey);
+    void sltLayoutEdited();
+    /** Make th necessary changes to data structures when th key captions updated. */
+    void sltKeyCaptionsEdited(UISoftKeyboardKey* pKey);
+
 private:
 
@@ -74 +88 @@
     void saveSettings();
     void loadSettings();
-    void updateStatusBarMessage();
+    void updateStatusBarMessage(const QString &strLayoutName);
     CKeyboard& keyboard() const;
 
     UISession     *m_pSession;
     QHBoxLayout   *m_pMainLayout;
-    UISoftKeyboardWidget       *m_pContainerWidget;
+    UISoftKeyboardWidget       *m_pKeyboardWidget;
     QString       m_strMachineName;
-    QString       m_strLayoutName;
-    QString       m_strKeyCapFileName;
     QSplitter      *m_pSplitter;
     QToolButton    *m_pSettingsButton;

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

@@ -5 +5 @@
     <key>
         <position>110</position>
-        <basecaption>Esc</basecaption>
+        <basecaption>Escxx</basecaption>
         <shiftcaption></shiftcaption>
         <altgrcaption></altgrcaption>