Changeset 59920 in vbox

Timestamp:

Mar 4, 2016 11:01:11 AM (9 years ago)

Author:

vboxsync

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

105853

Message:

FE/Qt: ​​​bugref:8088: Rework session-information window: Fixing copy-paste of information-text issues and cleanups.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformation.cpp (modified) (13 diffs)
• UIInformationItem.cpp (modified) (13 diffs)
• UIInformationModel.cpp (modified) (5 diffs)
• UIInformationRuntime.cpp (modified) (4 diffs)
• UIInformationView.cpp (modified) (3 diffs)
• UIInformationView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformation.cpp

@@ -54 +54 @@
 {
     /* Create main-layout: */
-    m_pMainLayout = new QVBoxLayout(this);
+    m_pMainLayout = new QVBoxLayout;
     AssertPtrReturnVoid(m_pMainLayout);
     {
-        /* Prepare main-layout: */
+        /* Configure main-layout: */
         m_pMainLayout->setContentsMargins(2, 0, 0, 0);
         m_pMainLayout->setSpacing(0);
@@ -66 +66 @@
 void UIInformation::prepareModel()
 {
-    /* Create model: */
+    /* Create information-model: */
     m_pModel = new UIInformationModel(this, m_machine, m_console);
     AssertPtrReturnVoid(m_pModel);
     {
-        /* Prepare data for information-model: */
-        /* General data-item: */
+        /* Add data to information-model: */
+        /* Create General data-item: */
         UIInformationDataItem *pGeneral = new UIInformationDataGeneral(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pGeneral);
@@ -78 +78 @@
         }
 
-        /* System data-item: */
+        /* Create System data-item: */
         UIInformationDataItem *pSystem = new UIInformationDataSystem(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pSystem);
@@ -85 +85 @@
         }
 
-        /* Display data-item: */
+        /* Create Display data-item: */
         UIInformationDataItem *pDisplay = new UIInformationDataDisplay(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pDisplay);
@@ -92 +92 @@
         }
 
-        /* Storage data-item: */
+        /* Create Storage data-item: */
         UIInformationDataItem *pStorage = new UIInformationDataStorage(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pStorage);
@@ -99 +99 @@
         }
 
-        /* Audio data-item: */
+        /* Create Audio data-item: */
         UIInformationDataItem *pAudio = new UIInformationDataAudio(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pAudio);
@@ -106 +106 @@
         }
 
-        /* Network data-item: */
+        /* Create Network data-item: */
         UIInformationDataItem *pNetwork = new UIInformationDataNetwork(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pNetwork);
@@ -113 +113 @@
         }
 
-        /* Serial ports data-item: */
+        /* Create Serial-ports data-item: */
         UIInformationDataItem *pSerialPorts = new UIInformationDataSerialPorts(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pSerialPorts);
@@ -121 +121 @@
 
 #ifdef VBOX_WITH_PARALLEL_PORTS
-        /* Parallel ports data-item: */
+        /* Create Parallel-ports data-item: */
         UIInformationDataItem *pParallelPorts = new UIInformationDataParallelPorts(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pParallelPorts);
@@ -129 +129 @@
 #endif /* VBOX_WITH_PARALLEL_PORTS */
 
-        /* USB data-item: */
+        /* Create USB data-item: */
         UIInformationDataItem *pUSB = new UIInformationDataUSB(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pUSB);
@@ -136 +136 @@
         }
 
-        /* Shared folders data-item: */
+        /* Create Shared-folders data-item: */
         UIInformationDataItem *pSharedFolders = new UIInformationDataSharedFolders(m_machine, m_console, m_pModel);
         AssertPtrReturnVoid(pSharedFolders);
@@ -147 +147 @@
 void UIInformation::prepareView()
 {
-    /* Create view: */
+    /* Create information-view: */
     m_pView = new UIInformationView;
     AssertPtrReturnVoid(m_pView);
     {
-        /* Prepare view: */
+        /* Configure information-view: */
         m_pView->setResizeMode(QListView::Adjust);
         /* Create information-delegate item: */
@@ -163 +163 @@
                 m_pView, SLOT(updateData(const QModelIndex&, const QModelIndex&)));
 
-        /* Set model: */
+        /* Set model for view: */
         m_pView->setModel(m_pModel);
-        /* Layout view: */
+        /* Add information-view to the main-layout: */
         m_pMainLayout->addWidget(m_pView);
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp

@@ -28 +28 @@
 /* GUI includes: */
 # include "UIInformationItem.h"
+# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -34 +35 @@
     : QStyledItemDelegate(pParent)
 {
+    /* Create text-document: */
     m_pTextDocument = new QTextDocument(this);
+    AssertPtrReturnVoid(m_pTextDocument);
 }
 
 void UIInformationItem::setIcon(const QString &strIcon) const
 {
+    /* Cache icon: */
     m_strIcon = strIcon;
+    /* Update text-layout: */
     updateTextLayout();
 }
@@ -47 +52 @@
     /* Cache name: */
     m_strName = strName;
+    /* Update text-layout: */
     updateTextLayout();
 }
@@ -52 +58 @@
 const UITextTable& UIInformationItem::text() const
 {
+    /* Return text: */
     return m_text;
 }
@@ -60 +67 @@
     m_text.clear();
 
-    /* For each the line of the passed table: */
+    /* For each line of the passed table: */
     foreach (const UITextTableLine &line, text)
     {
@@ -78 +85 @@
             /* Parse the 1st one to sub-lines: */
             QStringList subLines = strLeftLine.split(QRegExp("\\n"));
+            /* Parse sub-lines: */
             foreach (const QString &strSubLine, subLines)
                 m_text << UITextTableLine(strSubLine, QString());
@@ -89 +97 @@
 void UIInformationItem::paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
+    /* Save the painter: */
     pPainter->save();
+    /* Update data: */
     updateData(index);
 
+    /* Draw item as per application style: */
     QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &option, pPainter);
     pPainter->resetTransform();
     pPainter->translate(option.rect.topLeft());
 
+    /* Draw the content of text-document: */
     m_pTextDocument->drawContents(pPainter);
+    /* Restore the painter: */
     pPainter->restore();
 }
@@ -102 +115 @@
 QSize UIInformationItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
+    /* Update data: */
     updateData(index);
+    /* Return size: */
     return m_pTextDocument->size().toSize();
 }
@@ -108 +123 @@
 void UIInformationItem::updateData(const QModelIndex &index) const
 {
+    /* Set name: */
     setName(index.data().toString());
+    /* Set icon: */
     setIcon(index.data(Qt::DecorationRole).toString());
+    /* Set text: */
     setText(index.data(Qt::UserRole + 1).value<UITextTable>());
+    /* Get type of the item: */
     m_type = index.data(Qt::UserRole + 2).value<InformationElementType>();
 }
@@ -116 +135 @@
 QString UIInformationItem::htmlData()
 {
+    /* Return html-data: */
     return m_pTextDocument->toHtml();
 }
@@ -121 +141 @@
 void UIInformationItem::updateTextLayout() const
 {
-    /* Details templates */
+    /* Details templates: */
     static const char *sSectionBoldTpl =
         "<tr><td width=22 rowspan=%1 align=left><img width=16 height=16 src='%2'></td>"
@@ -127 +147 @@
             "%4";
     static const char *sSectionItemTpl2 =
-        "<tr><td width=300><nobr>%1</nobr></td><td/><td>%2</td></tr>";
+        "<tr><td width=200><nobr>%1</nobr></td><td/><td>%2</td></tr>";
 
     const QString &sectionTpl = sSectionBoldTpl;
@@ -135 +155 @@
     {
         QString item;
+        /* Parse lines from text and add it to text: */
         foreach (const UITextTableLine &line, m_text)
             item = item + QString(sSectionItemTpl2).arg(line.first, line.second);
 
-        report = sectionTpl
-                  .arg(m_text.count() + 1) /* rows */
-                  .arg(m_strIcon, /* icon */
-                       m_strName, /* title */
-                       item); /* items */
+        /* Format the entire item: */
+        report = sectionTpl.arg(m_text.count() + 1) /* rows */
+                           .arg(m_strIcon, /* icon */
+                                m_strName, /* title */
+                                item); /* items */
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.cpp

@@ -50 +50 @@
 }
 
-int UIInformationModel::rowCount(const QModelIndex & /*parent */) const
+int UIInformationModel::rowCount(const QModelIndex& /*parent */) const
 {
+    /* Return row-count: */
     return m_list.count();
 }
@@ -57 +58 @@
 QVariant UIInformationModel::data(const QModelIndex &index, int role) const
 {
+    /* Get row: */
     int row = index.row();
-    int col = index.column();
+    /* Get item at the row: */
     UIInformationDataItem *pItem = m_list.at(row);
+    /* Return the data for the corresponding role: */
     return pItem->data(index, role);
 }
@@ -81 +84 @@
 QHash<int, QByteArray> UIInformationModel::roleNames() const
 {
+    /* Add supported roles and return: */
     QHash<int, QByteArray> roleNames;
     roleNames[Qt::DisplayRole] = "";
@@ -91 +95 @@
 void UIInformationModel::addItem(UIInformationDataItem *pItem)
 {
+    /* Make sure item is valid: */
     AssertPtrReturnVoid(pItem);
+    /* Add item: */
     m_list.append(pItem);
 }
@@ -97 +103 @@
 void UIInformationModel::updateData(const QModelIndex &idx)
 {
+    /* Emit data-changed signal: */
     emit dataChanged(idx, idx);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp

@@ -57 +57 @@
     AssertPtrReturnVoid(m_pMainLayout);
     {
-        /* Prepare main-layout: */
+        /* Configure main-layout: */
         m_pMainLayout->setContentsMargins(2, 0, 0, 0);
         m_pMainLayout->setSpacing(0);
@@ -70 +70 @@
     AssertPtrReturnVoid(m_pModel);
 
-    /* Prepare data for information-model: */
+    /* Add data to information-model: */
     UIInformationDataRuntimeAttributes *pGeneral = new UIInformationDataRuntimeAttributes(m_machine, m_console, m_pModel);
     AssertPtrReturnVoid(pGeneral);
@@ -77 +77 @@
     }
 
-    /* Prepare data for information-model: */
+    /* Create data for information-model: */
     UIInformationDataNetworkStatistics *pNetwork = new UIInformationDataNetworkStatistics(m_machine, m_console, m_pModel);
     AssertPtrReturnVoid(pNetwork);
@@ -84 +84 @@
     }
 
-    /* Prepare data for information-model: */
+    /* Create data for information-model: */
     UIInformationDataStorageStatistics *pStorage = new UIInformationDataStorageStatistics(m_machine, m_console, m_pModel);
     AssertPtrReturnVoid(pStorage);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationView.cpp

@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+# include <QTextEdit>
 # include <QClipboard>
+# include <QDebug>
 
 /* GUI includes: */
@@ -31 +33 @@
     : QListView(pParent)
 {
+    /* Create a dummy textEdit for copying rich-text as,
+     * manual copying to clipboard is not working: */
+    m_pTextEdit = new QTextEdit(this);
+    /* Hide textedit: */
+    m_pTextEdit->setVisible(false);
+    /* Set selection mode: */
+    setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
 
 void UIInformationView::updateData(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
+    /* Update: */
     update(topLeft);
 }
@@ -40 +50 @@
 void UIInformationView::keyPressEvent(QKeyEvent *pEvent)
 {
+    /* Copy the text: */
     if (pEvent == QKeySequence::Copy)
     {
-        if (selectionModel())
+        QString strText;
+        /* Get Selection model: */
+        QItemSelectionModel *pSelectionModel = selectionModel();
+        if (pSelectionModel)
         {
-            QString strText;
-            foreach (const QModelIndex &index, selectionModel()->selectedIndexes())
+            /* Check all the selected-indexes and copy the text: */
+            foreach (const QModelIndex &index, pSelectionModel->selectedIndexes())
             {
                 UIInformationItem *pItem = dynamic_cast<UIInformationItem*>(itemDelegate(index));
                 if (pItem)
                 {
+                    /* Update the data corresponding data: */
+                    pItem->updateData(index);
+                    /* Get and add the html-data of item: */
                     strText.append(pItem->htmlData());
                 }
             }
-            QApplication::clipboard()->setText(strText);
-            pEvent->accept();
         }
+        /* Set the text to text-edit and copy from it: */
+        m_pTextEdit->setText(strText);
+        m_pTextEdit->selectAll();
+        m_pTextEdit->copy();
+        /* Accept/acknowledge event: */
+        pEvent->accept();
     }
+    /* Call to base-class: */
+    else
+        QListView::keyPressEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationView.h

@@ -23 +23 @@
 #include <QModelIndex>
 
+/* Forward declarations: */
+class QTextEdit;
+class UIInformationItem;
+
 /** QListView extension
   * providing GUI with information-view in session-information window. */
@@ -40 +44 @@
     /** Handles Qt key-press @a pEvent. */
     void keyPressEvent(QKeyEvent *pEvent);
+
+private:
+    /** Holds the instance of textedit we create: */
+    QTextEdit *m_pTextEdit;
 };