Changeset 34063 in vbox

Timestamp:

Nov 15, 2010 10:59:13 AM (14 years ago)

Author:

vboxsync

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

67745

Message:

FE/Qt4: boot table: enable drag & drop; add icons; code cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsSystem.cpp (modified) (9 diffs)
• src/settings/machine/UIMachineSettingsSystem.h (modified) (1 diff)
• src/settings/machine/UIMachineSettingsSystem.ui (modified) (3 diffs)
• src/widgets/UIBootTable.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxBootTable.cpp ) (2 diffs)
• src/widgets/UIBootTable.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxBootTable.h ) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -325 +325 @@
         src/widgets/UISpecialControls.h \
         src/widgets/VBoxApplianceEditorWgt.h \
-        src/widgets/VBoxBootTable.h \
+        src/widgets/UIBootTable.h \
         src/widgets/VBoxExportApplianceWgt.h \
         src/widgets/VBoxFilePathSelectorWidget.h \
@@ -339 +339 @@
         src/selector/UIVMListView.h \
         src/selector/UIVMPreviewWindow.h \
+        src/selector/UIVMItem.h \
         src/selector/UIVirtualBoxEventHandler.h \
         src/selector/VBoxSelectorWnd.h \
@@ -486 +487 @@
         src/widgets/UIToolBar.cpp \
         src/widgets/VBoxApplianceEditorWgt.cpp \
-        src/widgets/VBoxBootTable.cpp \
+        src/widgets/UIBootTable.cpp \
         src/widgets/VBoxExportApplianceWgt.cpp \
         src/widgets/VBoxFilePathSelectorWidget.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -27 +27 @@
 #include <iprt/cdefs.h>
 #include <QHeaderView>
-
-#define ITEM_TYPE_ROLE Qt::UserRole + 1
 
 UIMachineSettingsSystem::UIMachineSettingsSystem()
@@ -78 +76 @@
     for (int i = 0; i < m_possibleBootItems.size(); ++i)
     {
-        QString name = vboxGlobal().toString(m_possibleBootItems[i]);
-        QTreeWidgetItem *pItem = new QTreeWidgetItem(QStringList(name));
-        pItem->setData(0, ITEM_TYPE_ROLE, QVariant(m_possibleBootItems[i]));
-        pItem->setCheckState(0, Qt::Unchecked);
-        mTwBootOrder->addTopLevelItem(pItem);
+        QListWidgetItem *pItem = new UIBootTableItem(m_possibleBootItems[i]);
+        mTwBootOrder->addItem(pItem);
     }
 
@@ -96 +91 @@
 
     connect (mTbBootItemUp, SIGNAL (clicked()),
-             this, SLOT (moveBootItemUp()));
+             mTwBootOrder, SLOT(sltMoveItemUp()));
     connect (mTbBootItemDown, SIGNAL (clicked()),
-             this, SLOT (moveBootItemDown()));
-    connect (mTwBootOrder, SIGNAL (moveItemUp()),
-             this, SLOT (moveBootItemUp()));
-    connect (mTwBootOrder, SIGNAL (moveItemDown()),
-             this, SLOT (moveBootItemDown()));
-    connect (mTwBootOrder, SIGNAL (itemToggled()),
-             this, SIGNAL (tableChanged()));
-    connect (mTwBootOrder, SIGNAL (currentItemChanged (QTreeWidgetItem*,
-                                                       QTreeWidgetItem*)),
-             this, SLOT (onCurrentBootItemChanged (QTreeWidgetItem*,
-                                                   QTreeWidgetItem*)));
+             mTwBootOrder, SLOT(sltMoveItemDown()));
+    connect (mTwBootOrder, SIGNAL (sigRowChanged(int)),
+             this, SLOT (onCurrentBootItemChanged (int)));
 
     connect (mSlCPU, SIGNAL (valueChanged (int)),
@@ -238 +225 @@
     {
         UIBootItemData data = m_cache.m_bootItems[i];
-        QString name = vboxGlobal().toString(data.m_type);
-        QTreeWidgetItem *pItem = new QTreeWidgetItem(QStringList(name));
-        pItem->setData(0, ITEM_TYPE_ROLE, QVariant(data.m_type));
-        pItem->setCheckState(0, data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
-        mTwBootOrder->addTopLevelItem(pItem);
+        QListWidgetItem *pItem = new UIBootTableItem(data.m_type);
+        pItem->setCheckState(data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
+        mTwBootOrder->addItem(pItem);
     }
     mCbApic->setChecked(m_cache.m_fIoApicEnabled);
@@ -273 +258 @@
     /* Gather internal variables data from QWidget(s): */
     m_cache.m_bootItems.clear();
-    for (int i = 0; i < mTwBootOrder->topLevelItemCount(); ++i)
-    {
-        QTreeWidgetItem *pItem = mTwBootOrder->topLevelItem(i);
+    for (int i = 0; i < mTwBootOrder->count(); ++i)
+    {
+        QListWidgetItem *pItem = mTwBootOrder->item(i);
         UIBootItemData data;
-        data.m_type = (KDeviceType)pItem->data(0, ITEM_TYPE_ROLE).toInt();
-        data.m_fEnabled = pItem->checkState(0) == Qt::Checked;
+        data.m_type = static_cast<UIBootTableItem*>(pItem)->type();
+        data.m_fEnabled = pItem->checkState() == Qt::Checked;
         m_cache.m_bootItems << data;
     }
@@ -450 +435 @@
     Ui::UIMachineSettingsSystem::retranslateUi (this);
 
-    /* Adjust the boot order tree widget */
-    mTwBootOrder->header()->setResizeMode (QHeaderView::ResizeToContents);
-    mTwBootOrder->resizeColumnToContents (0);
-    mTwBootOrder->updateGeometry();
-    /* Retranslate the boot order items */
-    QTreeWidgetItemIterator it (mTwBootOrder);
-    while (*it)
-    {
-        QTreeWidgetItem *item = (*it);
-        item->setText (0, vboxGlobal().toString (
-             static_cast <KDeviceType> (item->data (0, ITEM_TYPE_ROLE).toInt())));
-        ++ it;
-    }
     /* Readjust the tree widget items size */
     adjustBootOrderTWSize();
@@ -487 +459 @@
 }
 
-void UIMachineSettingsSystem::moveBootItemUp()
-{
-    QTreeWidgetItem *item = mTwBootOrder->currentItem();
-    Assert (item);
-    if (!mTwBootOrder->itemAbove (item))
-        return;
-
-    int index = mTwBootOrder->indexOfTopLevelItem (item);
-    QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index);
-    Assert (takenItem == item);
-
-    mTwBootOrder->insertTopLevelItem (index - 1, takenItem);
-    mTwBootOrder->setCurrentItem (item);
-
-    emit tableChanged();
-}
-
-void UIMachineSettingsSystem::moveBootItemDown()
-{
-    QTreeWidgetItem *item = mTwBootOrder->currentItem();
-    Assert (item);
-    if (!mTwBootOrder->itemBelow (item))
-        return;
-
-    int index = mTwBootOrder->indexOfTopLevelItem (item);
-    QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index);
-    Assert (takenItem == item);
-
-    mTwBootOrder->insertTopLevelItem (index + 1, takenItem);
-    mTwBootOrder->setCurrentItem (item);
-
-    emit tableChanged();
-}
-
-void UIMachineSettingsSystem::onCurrentBootItemChanged (QTreeWidgetItem *aItem,
-                                                     QTreeWidgetItem *)
-{
-    bool upEnabled   = aItem && mTwBootOrder->itemAbove (aItem);
-    bool downEnabled = aItem && mTwBootOrder->itemBelow (aItem);
+void UIMachineSettingsSystem::onCurrentBootItemChanged (int i)
+{
+    bool upEnabled   = i > 0;
+    bool downEnabled = i < mTwBootOrder->count() - 1;
     if ((mTbBootItemUp->hasFocus() && !upEnabled) ||
         (mTbBootItemDown->hasFocus() && !downEnabled))
@@ -535 +472 @@
 void UIMachineSettingsSystem::adjustBootOrderTWSize()
 {
-    /* Calculate the optimal size of the tree widget & set it as fixed
-     * size. */
-
-    QAbstractItemView *iv = qobject_cast <QAbstractItemView*> (mTwBootOrder);
-
-    int h = 2 * mTwBootOrder->frameWidth();
-    int w = h;
-#if QT_VERSION < 0x040700
-# ifdef Q_WS_MAC
-    int left, top, right, bottom;
-    mTwBootOrder->getContentsMargins (&left, &top, &right, &bottom);
-    h += top + bottom;
-    w += left + right;
-# else /* Q_WS_MAC */
-    w += 4;
-# endif /* !Q_WS_MAC */
-#endif /* QT_VERSION < 0x040700 */
-    mTwBootOrder->setFixedSize(
-        iv->sizeHintForColumn(0) + w,
-        iv->sizeHintForRow(0) * mTwBootOrder->topLevelItemCount() + h);
+    mTwBootOrder->adjustSizeToFitContent();
 
     /* Update the layout system */
@@ -591 +509 @@
             {
                 if (!mTwBootOrder->currentItem())
-                    mTwBootOrder->setCurrentItem (mTwBootOrder->topLevelItem (0));
+                    mTwBootOrder->setCurrentItem (mTwBootOrder->item (0));
                 else
-                    onCurrentBootItemChanged (mTwBootOrder->currentItem());
+                    onCurrentBootItemChanged (mTwBootOrder->currentRow());
                 mTwBootOrder->currentItem()->setSelected (true);
             }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -96 +96 @@
     void textChangedRAM (const QString &aText);
 
-    void moveBootItemUp();
-    void moveBootItemDown();
-    void onCurrentBootItemChanged (QTreeWidgetItem *aItem,
-                                   QTreeWidgetItem *aPrev = 0);
+    void onCurrentBootItemChanged (int);
 
     void valueChangedCPU (int aVal);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui

@@ -172 +172 @@
          </property>
          <item>
-          <widget class="VBoxBootTable" name="mTwBootOrder">
+          <widget class="UIBootTable" name="mTwBootOrder">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -189 +189 @@
            </property>
            <property name="alternatingRowColors">
-            <bool>true</bool>
-           </property>
-           <property name="rootIsDecorated">
-            <bool>false</bool>
-           </property>
-           <property name="uniformRowHeights">
             <bool>true</bool>
            </property>
@@ -639 +633 @@
  <customwidgets>
   <customwidget>
-   <class>VBoxBootTable</class>
-   <extends>QTreeWidget</extends>
-   <header>VBoxBootTable.h</header>
+   <class>UIBootTable</class>
+   <extends>QListWidget</extends>
+   <header>UIBootTable.h</header>
   </customwidget>
   <customwidget>

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp

@@ -3 +3 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxBootTable class implementation
+ * UIBootTable class implementation
  */
 
@@ -19 +19 @@
 
 /* Global include */
-#include <QHeaderView>
-#include <QKeyEvent>
+#include <QScrollBar>
 
 /* Local includes */
-#include "VBoxBootTable.h"
+#include "UIBootTable.h"
 #include "VBoxGlobal.h"
 
-VBoxBootTable::VBoxBootTable(QWidget *pParent)
-    : QTreeWidget(pParent)
+UIBootTableItem::UIBootTableItem(KDeviceType type)
+  : m_type(type)
 {
-    header()->hide();
-    connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(onItemChanged()));
+    setCheckState(Qt::Unchecked);
+    switch(type)
+    {
+        case KDeviceType_Floppy:
+        {
+            setIcon(QIcon(":fd_16px.png"));
+            break;
+        }
+        case KDeviceType_DVD:
+        {
+            setIcon(QIcon(":cd_16px.png"));
+            break;
+        }
+        case KDeviceType_HardDisk:
+        {
+            setIcon(QIcon(":hd_16px.png"));
+            break;
+        }
+        case KDeviceType_Network:
+        {
+            setIcon(QIcon(":nw_16px.png"));
+            break;
+        }
+    }
+    retranslateUi();
 }
 
-void VBoxBootTable::onItemChanged()
+KDeviceType UIBootTableItem::type() const
 {
-    emit itemToggled();
+    return m_type;
 }
 
-void VBoxBootTable::keyPressEvent(QKeyEvent *pEvent)
+void UIBootTableItem::retranslateUi()
 {
-    if (pEvent->QInputEvent::modifiers() == Qt::ControlModifier)
+    setText(vboxGlobal().toString(m_type));
+}
+
+UIBootTable::UIBootTable(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QListWidget>(pParent)
+{
+    setDragDropMode(QAbstractItemView::InternalMove);
+    setSelectionMode(QAbstractItemView::SingleSelection);
+    setDropIndicatorShown(true);
+    setUniformItemSizes(true);
+    connect(this, SIGNAL(currentRowChanged(int)),
+            this, SIGNAL(sigRowChanged(int)));
+}
+
+void UIBootTable::adjustSizeToFitContent()
+{
+    int h = 2 * frameWidth();
+    int w = h;
+#if QT_VERSION < 0x040700
+# ifdef Q_WS_MAC
+    int left, top, right, bottom;
+    getContentsMargins(&left, &top, &right, &bottom);
+    h += top + bottom;
+    w += left + right;
+# else /* Q_WS_MAC */
+    w += 4;
+# endif /* !Q_WS_MAC */
+#endif /* QT_VERSION < 0x040700 */
+    setFixedSize(sizeHintForColumn(0) + w,
+                 sizeHintForRow(0) * count() + h);
+}
+
+void UIBootTable::sltMoveItemUp()
+{
+    QModelIndex index = currentIndex();
+    moveItemTo(index, index.row() - 1);
+}
+
+void UIBootTable::sltMoveItemDown()
+{
+    QModelIndex index = currentIndex();
+    moveItemTo(index, index.row() + 2);
+}
+
+void UIBootTable::retranslateUi()
+{
+    for (int i = 0; i < count(); ++i)
+        static_cast<UIBootTableItem*>(item(i))->retranslateUi();
+
+    adjustSizeToFitContent();
+}
+
+void UIBootTable::dropEvent(QDropEvent *pEvent)
+{
+    QListWidget::dropEvent(pEvent);
+    emit sigRowChanged(currentRow());
+}
+
+QModelIndex UIBootTable::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
+{
+    if (modifiers.testFlag(Qt::ControlModifier))
     {
-        switch (pEvent->key())
+        switch (cursorAction)
         {
-            case Qt::Key_Up:
-                emit moveItemUp();
-                return;
-            case Qt::Key_Down:
-                emit moveItemDown();
-                return;
+            case QAbstractItemView::MoveUp:
+            {
+                QModelIndex index = currentIndex();
+                return moveItemTo(index, index.row() - 1);
+            }
+            case QAbstractItemView::MoveDown:
+            {
+                QModelIndex index = currentIndex();
+                return moveItemTo(index, index.row() + 2);
+            }
+            case QAbstractItemView::MovePageUp:
+            {
+                QModelIndex index = currentIndex();
+                return moveItemTo(index, qMax(0, index.row() - verticalScrollBar()->pageStep()));
+            }
+            case QAbstractItemView::MovePageDown:
+            {
+                QModelIndex index = currentIndex();
+                return moveItemTo(index, qMin(model()->rowCount(), index.row() + verticalScrollBar()->pageStep() + 1));
+            }
+            case QAbstractItemView::MoveHome:
+                return moveItemTo(currentIndex(), 0);
+            case QAbstractItemView::MoveEnd:
+                return moveItemTo(currentIndex(), model()->rowCount());
             default:
                 break;
         }
     }
-    QTreeWidget::keyPressEvent(pEvent);
+    return QListWidget::moveCursor(cursorAction, modifiers);
 }
 
+QModelIndex UIBootTable::moveItemTo(const QModelIndex &index, int row)
+{
+    if (!index.isValid())
+        return QModelIndex();
+
+    if (row < 0 || row > model()->rowCount())
+        return QModelIndex();
+
+    QPersistentModelIndex oldIndex(index);
+    UIBootTableItem *pItem = static_cast<UIBootTableItem*>(itemFromIndex(oldIndex));
+    insertItem(row, new UIBootTableItem(*pItem));
+    QPersistentModelIndex newIndex = model()->index(row, 0);
+    delete takeItem(oldIndex.row());
+    setCurrentRow(newIndex.row());
+    return newIndex;
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxBootTable class declaration
+ * UIBootTable class declaration
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
  */
 
-#ifndef __VBoxBootTable_h__
-#define __VBoxBootTable_h__
+#ifndef __UIBootTable_h__
+#define __UIBootTable_h__
+
+/* Local includes */
+#include <COMDefs.h>
+#include "QIWithRetranslateUI.h"
 
 /* Global includes */
-#include <QTreeWidget>
+#include <QListWidget>
 
-/**
- *  QTreeWidget class reimplementation to use as boot items table.
- *  It has one unsorted column without header.
- *  Keymapping handlers for ctrl-up & ctrl-down are translated into
- *  boot-items up/down moving signals.
- *  Emits itemToggled() signal when the item changed.
- */
-class VBoxBootTable : public QTreeWidget
+class UIBootTableItem : public QListWidgetItem
+{
+public:
+
+    UIBootTableItem(KDeviceType type);
+
+    KDeviceType type() const;
+
+    void retranslateUi();
+
+private:
+
+    /* Private member vars */
+    KDeviceType m_type;
+
+};
+
+class UIBootTable : public QIWithRetranslateUI<QListWidget>
 {
     Q_OBJECT;
@@ -36 +50 @@
 public:
 
-    VBoxBootTable(QWidget *pParent);
+    UIBootTable(QWidget *pParent = 0);
+
+    void adjustSizeToFitContent();
+
+public slots:
+
+    void sltMoveItemUp();
+    void sltMoveItemDown();
 
 signals:
 
-    void moveItemUp();
-    void moveItemDown();
-    void itemToggled();
+    void sigRowChanged(int);
 
 protected:
 
-    void keyPressEvent(QKeyEvent *pEvent);
-
-private slots:
-
-    void onItemChanged();
+    void retranslateUi();
+    void dropEvent(QDropEvent *pEvent);
+    QModelIndex moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers);
+    QModelIndex moveItemTo(const QModelIndex &index, int row);
 };
 
-#endif // __VBoxBootTable_h__
+#endif // __UIBootTable_h__