Changeset 78595 in vbox for trunk/src/VBox

Timestamp:

May 20, 2019 11:17:50 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Parsing the layout file.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (11 diffs)
• src/softkeyboard/UISoftKeyboard.h (modified) (3 diffs)
• xml/us_layout.xml (modified) (1 diff)

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

@@ -19 +19 @@
 #include <QApplication>
 #include <QFile>
-#include <QMenu>
 #include <QPushButton>
-#include <QSplitter>
 #include <QXmlStreamReader>
 #include <QVBoxLayout>
@@ -35 +33 @@
 #include "CEventSource.h"
 
+struct SoftKeyboardKey
+{
+    int      m_iWidth;
+    QString  m_strLabel;
+    LONG     m_scanCode;
+};
+
+struct SoftKeyboardRow
+{
+    int m_iHeight;
+    QList<SoftKeyboardKey> m_keys;
+};
+
+struct SoftKeyboardLayout
+{
+    QList<SoftKeyboardRow> m_rows;
+};
+
 /*********************************************************************************************************************************
 *   UIKeyboardLayoutReader definition.                                                                                  *
@@ -44 +60 @@
 public:
 
-    bool parseXMLFile(const QString &strFileName);
+    bool parseXMLFile(const QString &strFileName, SoftKeyboardLayout &layout);
 
 private:
 
-    bool parseRow();
-    bool parseKey();
+    bool parseRow(SoftKeyboardLayout &layout);
+    bool parseKey(SoftKeyboardRow &row);
     QXmlStreamReader m_xmlReader;
 };
@@ -64 +80 @@
 public:
 
-    UISoftKeyboardKey(QWidget *pParent);
+    UISoftKeyboardKey(QWidget *pParent = 0);
+    void setAspectRatio(float fRatio);
+
+protected:
+
+    virtual void resizeEvent(QResizeEvent *pEvent);
+
+private:
+
+    float m_fAspectRatio;
 };
 
@@ -71 +96 @@
 *********************************************************************************************************************************/
 
-bool UIKeyboardLayoutReader::parseXMLFile(const QString &strFileName)
+bool UIKeyboardLayoutReader::parseXMLFile(const QString &strFileName, SoftKeyboardLayout &layout)
 {
     QFile xmlFile(strFileName);
@@ -88 +113 @@
     {
         if (m_xmlReader.name() == "row")
-            parseRow();
+            parseRow(layout);
         else
             m_xmlReader.skipCurrentElement();
@@ -96 +121 @@
 }
 
-bool UIKeyboardLayoutReader::parseRow()
-{
+bool UIKeyboardLayoutReader::parseRow(SoftKeyboardLayout &layout)
+{
+    layout.m_rows.append(SoftKeyboardRow());
+    SoftKeyboardRow &row = layout.m_rows.last();
     while (m_xmlReader.readNextStartElement())
     {
         if (m_xmlReader.name() == "key")
-            parseKey();
+            parseKey(row);
+        else if (m_xmlReader.name() == "height")
+            row.m_iHeight = m_xmlReader.readElementText().toInt();
         else
             m_xmlReader.skipCurrentElement();
     }
-
     return true;
 }
 
-bool UIKeyboardLayoutReader::parseKey()
-{
+bool UIKeyboardLayoutReader::parseKey(SoftKeyboardRow &row)
+{
+    row.m_keys.append(SoftKeyboardKey());
+    SoftKeyboardKey &key = row.m_keys.last();
     while (m_xmlReader.readNextStartElement())
     {
-
-        // if (m_xmlReader.name() == "key")
-        //     parseKey();
-        // else
+        if (m_xmlReader.name() == "width")
+            key.m_iWidth = m_xmlReader.readElementText().toInt();
+        else if (m_xmlReader.name() == "label")
+            key.m_strLabel = m_xmlReader.readElementText();
+        else if (m_xmlReader.name() == "scancode")
+            key.m_scanCode = m_xmlReader.readElementText().toInt();
+        else
             m_xmlReader.skipCurrentElement();
     }
-
     return true;
 }
@@ -127 +159 @@
 *********************************************************************************************************************************/
 
-UISoftKeyboardKey::UISoftKeyboardKey(QWidget *pParent)
+UISoftKeyboardKey::UISoftKeyboardKey(QWidget *pParent /* = 0 */)
     :QPushButton(pParent)
-{
+    , m_fAspectRatio(1.f)
+{
+}
+
+void UISoftKeyboardKey::setAspectRatio(float fRatio)
+{
+    m_fAspectRatio = fRatio;
+}
+
+void UISoftKeyboardKey::resizeEvent(QResizeEvent *pEvent)
+{
+    // QWidget::resize(qMin(pEvent->size().width(),pEvent->size().height()),
+    //                 qMin(pEvent->size().width(),pEvent->size().height()));
+
+    QPushButton::resizeEvent(pEvent);
 }
 
@@ -141 +187 @@
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
+    , m_pContainerLayout(0)
     , m_pToolBar(0)
     , m_fShowToolbar(fShowToolbar)
     , m_strMachineName(strMachineName)
 {
+    prepareObjects();
     parseLayout();
-    prepareObjects();
     prepareConnections();
     prepareToolBar();
@@ -162 +209 @@
 }
 
+void UISoftKeyboard::resizeEvent(QResizeEvent *pEvent)
+{
+    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
+}
+
 void UISoftKeyboard::prepareObjects()
 {
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     /* Create layout: */
-    m_pMainLayout = new QVBoxLayout(this);
+
+    m_pMainLayout = new QHBoxLayout(this);
     if (!m_pMainLayout)
         return;
+    QWidget *pContainerWidget = new QWidget;
+    if (!pContainerWidget)
+        return;
+    pContainerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    pContainerWidget->setStyleSheet("background-color:red;");
+
+    m_pMainLayout->addWidget(pContainerWidget);
+
+    m_pContainerLayout = new QVBoxLayout;
+    m_pContainerLayout->setSpacing(0);
+    pContainerWidget->setLayout(m_pContainerLayout);
 
     /* Configure layout: */
-    m_pMainLayout->setSpacing(0);
+
 }
 
@@ -191 +256 @@
 void UISoftKeyboard::parseLayout()
 {
+    if (!m_pContainerLayout)
+        return;
+
     UIKeyboardLayoutReader reader;
-    if (!reader.parseXMLFile(":/us_layout.xml"))
-    {
+    SoftKeyboardLayout layout;
+    if (!reader.parseXMLFile(":/us_layout.xml", layout))
+        return;
+
+    for (int i = 0; i < layout.m_rows.size(); ++i)
+    {
+        QHBoxLayout *pRowLayout = new QHBoxLayout;
+        pRowLayout->setSpacing(0);
+        for (int j = 0; j < layout.m_rows[i].m_keys.size(); ++j)
+        {
+            UISoftKeyboardKey *pKey = new UISoftKeyboardKey;
+            pRowLayout->addWidget(pKey);
+            //m_pContainerLayout->addWidget(pKey, i, j);
+            //pKey->setFixedSize(layout.m_rows[i].m_keys[j].m_iWidth, layout.m_rows[i].m_iHeight);
+            pKey->setText(layout.m_rows[i].m_keys[j].m_strLabel);
+            //if (j != 3)
+
+
+            // else
+            //m_pContainerLayout->setColumnStretch(j, 0);
+            //m_pContainerLayout->addSpacing(2);
+            // QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+            // m_pContainerLayout->addItem(pSpacer);
+        }
+        //pRowLayout->addStretch(1);
+        //m_pContainerLayout->setColumnStretch(layout.m_rows[i].m_keys.size()-1, 1);
+        m_pContainerLayout->addLayout(pRowLayout);
     }
 }

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

@@ -36 +36 @@
 /* Forward declarations: */
 class UISoftKeyboardKey;
+class QHBoxLayout;
 class QVBoxLayout;
 class UIToolBar;
+
 
 class UISoftKeyboard : public QIWithRetranslateUI<QWidget>
@@ -51 +53 @@
 protected:
 
-    void retranslateUi();
+    virtual void retranslateUi();
+    virtual void resizeEvent(QResizeEvent *pEvent);
 
 private slots:
@@ -64 +67 @@
     void parseLayout();
 
-    QVBoxLayout   *m_pMainLayout;
+    QHBoxLayout   *m_pMainLayout;
+    QVBoxLayout   *m_pContainerLayout;
     UIToolBar     *m_pToolBar;
     const bool    m_fShowToolbar;

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

@@ -4 +4 @@
         <height>50</height>
         <key>
-            <width>30</width>
+            <width>50</width>
             <label>Key1</label>
             <scancode>X11</scancode>
         </key>
+        <key>
+            <width>150</width>
+            <label>Key2</label>
+            <scancode>X11</scancode>
+        </key>
+        <key>
+            <width>20</width>
+            <label>Key3</label>
+            <scancode>X11</scancode>
+        </key>
+        <key>
+            <width>50</width>
+            <label>Key4</label>
+            <scancode>X11</scancode>
+        </key>
+
     </row>
+
+    <row>
+        <height>30</height>
+        <key>
+            <width>150</width>
+            <label>Key2</label>
+            <scancode>X11</scancode>
+        </key>
+        <key>
+            <width>20</width>
+            <label>Key3</label>
+            <scancode>X11</scancode>
+        </key>
+        <key>
+            <width>50</width>
+            <label>Key4</label>
+            <scancode>X11</scancode>
+        </key>
+
+    </row>
+
 </layout>