Changeset 63767 in vbox

Timestamp:

Sep 8, 2016 1:57:48 PM (8 years ago)

Author:

vboxsync

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

110581

Message:

FE/Qt: bugref:6899: Accessibility support (step 18): Selector UI: Rework the UITextTableLine to be an accessible class, pass it through the details elements.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/graphics/details/UIGDetailsElement.cpp (modified) (2 diffs)
• selector/graphics/details/UIGDetailsElement.h (modified) (3 diffs)
• widgets/graphics/UIGraphicsTextPane.cpp (modified) (6 diffs)
• widgets/graphics/UIGraphicsTextPane.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -119 +119 @@
 }
 
+UITextTable &UIGDetailsElement::text() const
+{
+    /* Retrieve text from text-pane: */
+    return m_pTextPane->text();
+}
+
+void UIGDetailsElement::setText(const UITextTable &text)
+{
+    /* Pass text to text-pane: */
+    m_pTextPane->setText(text);
+}
+
 void UIGDetailsElement::sltToggleButtonClicked()
 {
@@ -265 +277 @@
     updateMinimumHeaderWidth();
     updateMinimumHeaderHeight();
-}
-
-const UITextTable& UIGDetailsElement::text() const
-{
-    /* Retrieve text from text-pane: */
-    return m_pTextPane->text();
-}
-
-void UIGDetailsElement::setText(const UITextTable &text)
-{
-    /* Pass text to text-pane: */
-    m_pTextPane->setText(text);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h

@@ -34 +34 @@
 class QStateMachine;
 class QPropertyAnimation;
+class UITextTableLine;
 
 /* Typedefs: */
-typedef QPair<QString, QString> UITextTableLine;
 typedef QList<UITextTableLine> UITextTable;
+
 
 /* Details element
@@ -84 +85 @@
     /* API: Animation stuff: */
     void markAnimationFinished();
+
+    /** Returns the reference to the text table. */
+    UITextTable &text() const;
+    /** Defines the @a text table as the passed one. */
+    void setText(const UITextTable &text);
 
 protected slots:
@@ -130 +136 @@
     /* API: Name stuff: */
     void setName(const QString &strName);
-
-    /* API: Text stuff: */
-    const UITextTable& text() const;
-    void setText(const UITextTable &text);
 
     /* API: Machine stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -64 +64 @@
     {
         /* Lines: */
-        QString strLeftLine = line.first;
-        QString strRightLine = line.second;
+        QString strLeftLine = line.string1();
+        QString strRightLine = line.string2();
 
         /* If 2nd line is NOT empty: */
@@ -71 +71 @@
         {
             /* Take both lines 'as is': */
-            m_text << UITextTableLine(strLeftLine, strRightLine);
+            m_text << UITextTableLine(strLeftLine, strRightLine, parent());
         }
         /* If 2nd line is empty: */
@@ -79 +79 @@
             QStringList subLines = strLeftLine.split(QRegExp("\\n"));
             foreach (const QString &strSubLine, subLines)
-                m_text << UITextTableLine(strSubLine, QString());
+                m_text << UITextTableLine(strSubLine, QString(), parent());
         }
     }
@@ -120 +120 @@
     foreach (const UITextTableLine &line, m_text)
     {
-        bool fRightColumnPresent = !line.second.isEmpty();
+        bool fRightColumnPresent = !line.string2().isEmpty();
         if (fRightColumnPresent)
             fSingleColumnText = false;
-        QString strLeftLine = fRightColumnPresent ? line.first + ":" : line.first;
-        QString strRightLine = line.second;
+        QString strLeftLine = fRightColumnPresent ? line.string1() + ":" : line.string1();
+        QString strRightLine = line.string2();
         iMaximumLeftColumnWidth = qMax(iMaximumLeftColumnWidth, fm.width(strLeftLine));
         iMaximumRightColumnWidth = qMax(iMaximumRightColumnWidth, fm.width(strRightLine));
@@ -182 +182 @@
         /* Left layout: */
         int iLeftColumnHeight = 0;
-        if (!line.first.isEmpty())
-        {
-            bool fRightColumnPresent = !line.second.isEmpty();
+        if (!line.string1().isEmpty())
+        {
+            bool fRightColumnPresent = !line.string2().isEmpty();
             m_leftList << buildTextLayout(font(), m_pPaintDevice,
-                                          fRightColumnPresent ? line.first + ":" : line.first,
+                                          fRightColumnPresent ? line.string1() + ":" : line.string1(),
                                           iLeftColumnWidth, iLeftColumnHeight,
                                           m_strHoveredAnchor);
@@ -194 +194 @@
         /* Right layout: */
         int iRightColumnHeight = 0;
-        if (!line.second.isEmpty())
+        if (!line.string2().isEmpty())
         {
             m_rightList << buildTextLayout(font(), m_pPaintDevice,
-                                           line.second,
+                                           line.string2(),
                                            iRightColumnWidth, iRightColumnHeight,
                                            m_strHoveredAnchor);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.h

@@ -25 +25 @@
 class QTextLayout;
 
-/* Typedefs: */
-typedef QPair<QString, QString> UITextTableLine;
+
+/** QObject extension used as an
+  * accessible wrapper for QString pairs. */
+class UITextTableLine : public QObject
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs text-table line passing @a pParent to the base-class.
+      * @param  str1  Brings the 1st table string.
+      * @param  str2  Brings the 2nd table string. */
+    UITextTableLine(const QString &str1, const QString &str2, QObject *pParent = 0)
+        : QObject(pParent)
+        , m_str1(str1)
+        , m_str2(str2)
+    {}
+
+    /** Constructs text-table line on the basis of passed @a other. */
+    UITextTableLine(const UITextTableLine &other)
+        : QObject(other.parent())
+        , m_str1(other.string1())
+        , m_str2(other.string2())
+    {}
+
+    /** Assigns @a other to this. */
+    UITextTableLine &operator=(const UITextTableLine &other)
+    {
+        setParent(other.parent());
+        set1(other.string1());
+        set2(other.string2());
+        return *this;
+    }
+
+    /** Compares @a other to this. */
+    bool operator==(const UITextTableLine &other) const
+    {
+        return string1() == other.string1()
+            && string2() == other.string2();
+    }
+
+    /** Defines 1st table @a strString. */
+    void set1(const QString &strString) { m_str1 = strString; }
+    /** Returns 1st table string. */
+    const QString &string1() const { return m_str1; }
+
+    /** Defines 2nd table @a strString. */
+    void set2(const QString &strString) { m_str2 = strString; }
+    /** Returns 2nd table string. */
+    const QString &string2() const { return m_str2; }
+
+private:
+
+    /** Holds the 1st table string. */
+    QString m_str1;
+    /** Holds the 2nd table string. */
+    QString m_str2;
+};
+
+/** Defines the list of UITextTableLine instances. */
 typedef QList<UITextTableLine> UITextTable;
 Q_DECLARE_METATYPE(UITextTable);
+
 
 /** QIGraphicsWidget reimplementation to draw QTextLayout content. */
@@ -53 +112 @@
     bool isEmpty() const { return m_text.isEmpty(); }
     /** Returns contained text. */
-    const UITextTable& text() const { return m_text; }
+    UITextTable &text() { return m_text; }
     /** Defines contained text. */
     void setText(const UITextTable &text);