Changeset 10474 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 10, 2008 3:32:33 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Implemented the Toolbar settings selector. Currently turned on, on the mac only.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSettingsDialog.h (modified) (1 diff)
• include/VBoxSettingsDialogSpecific.h (modified) (3 diffs)
• include/VBoxSettingsSelector.h (modified) (4 diffs)
• src/VBoxSettingsDialog.cpp (modified) (5 diffs)
• src/VBoxSettingsDialogSpecific.cpp (modified) (10 diffs)
• src/VBoxSettingsSelector.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSettingsDialog.h

@@ -58 +58 @@
     virtual void retranslateUi();
 
+    virtual QString dialogTitle() const = 0;
+    QString titleExtension() const;
+
     void setWarning (const QString &aWarning);
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSettingsDialogSpecific.h

@@ -57 +57 @@
     void retranslateUi();
 
+    QString dialogTitle() const;
+
 private:
 
@@ -102 +104 @@
     void retranslateUi();
 
+    QString dialogTitle() const;
+
 private slots:
 
@@ -111 +115 @@
     void updateAvailability();
     VBoxSettingsPage* attachPage (VBoxSettingsPage *aPage);
-    QString dialogTitle() const;
 
     CMachine mMachine;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSettingsSelector.h

@@ -28 +28 @@
 
 class QITreeWidget;
+class VBoxToolBar;
+class SelectorAction;
 
 class QTreeWidget;
 class QTreeWidgetItem;
 class QIcon;
+class QAction;
+class QActionGroup;
 
 class VBoxSettingsSelector: public QObject
@@ -57 +61 @@
     virtual void clear() = 0;
 
-    virtual void retranslateUi() = 0;
+    virtual void polish() {};
+    virtual int minWidth () const { return 0; }
 
 signals:
@@ -87 +92 @@
     virtual void clear();
 
-    virtual void retranslateUi();
+    virtual void polish();
 
 private slots:
@@ -103 +108 @@
 };
 
+class VBoxSettingsToolBarSelector: public VBoxSettingsSelector
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxSettingsToolBarSelector (QWidget *aParent = NULL);
+
+    virtual QWidget *widget() const;
+
+    virtual void addItem (const QIcon &aIcon, const QString &aText, int aIndex, const QString &aLink);
+    virtual QString itemText (int aId) const;
+
+    virtual int currentId() const;
+    virtual int idToIndex (int aId) const;
+    virtual int indexToId (int aIndex) const;
+    virtual int linkToId (const QString &aLink) const;
+    virtual void selectById (int aId);
+    virtual void setVisibleById (int aId, bool aShow);
+
+    virtual void clear();
+
+    virtual int minWidth() const;
+
+private slots:
+
+    void settingsGroupChanged (QAction *aAction);
+
+private:
+
+    int findId (int aIndex) const;
+    int findIndex (int aId) const;
+    int findLink (const QString &aLink) const;
+    SelectorAction* findAction (int aId) const;
+
+    /* Private member vars */
+    VBoxToolBar *mTbSelector;
+    QActionGroup *mActionGroup;
+};
+
 #endif /* __VBoxSettingsSelector_h__ */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSettingsDialog.cpp

@@ -27 +27 @@
 #include "QIWidgetValidator.h"
 #include "VBoxSettingsSelector.h"
+#include "VBoxToolBar.h"
 
 #ifdef Q_WS_MAC
@@ -36 +37 @@
 #include <QPushButton>
 #include <QStackedWidget>
+
+
+#if MAC_LEOPARD_STYLE
+# define VBOX_GUI_WITH_TOOLBAR_SETTINGS
+#endif /* MAC_LEOPARD_STYLE */
 
 VBoxSettingsDialog::VBoxSettingsDialog (QWidget *aParent /* = NULL */)
@@ -61 +67 @@
     mLbTitle->setFont (f);
 
+    QGridLayout *mainLayout = static_cast<QGridLayout*> (mAllWidget->layout());
+#ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    mSelector = new VBoxSettingsToolBarSelector (this);
+    setUnifiedTitleAndToolBarOnMac (true);
+    addToolBar (qobject_cast<QToolBar*> (mSelector->widget()));
+    /* No title in this mode, we change the title of the window. */
+    mLbTitle->hide();
+    mainLayout->setColumnMinimumWidth (0, 0);
+    mainLayout->setHorizontalSpacing (0);
+#else
     /* Create the classical tree view selector */
     mSelector = new VBoxSettingsTreeSelector (mAllWidget);
-    QGridLayout *mainLayout = static_cast<QGridLayout*> (mAllWidget->layout());
     mainLayout->addWidget (mSelector->widget(), 0, 0, 3, 1);
     mSelector->widget()->setFocus();
+#endif
 
     /* Creating stack of pages */
@@ -165 +181 @@
 }
 
+QString VBoxSettingsDialog::titleExtension() const
+{
+#ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    return mSelector->itemText (mSelector->currentId());
+#else
+    return tr ("Settings");
+#endif
+}
+
 void VBoxSettingsDialog::categoryChanged (int aId)
 {
 //#ifndef Q_WS_MAC
 #if 1
-        mLbTitle->setText (mSelector->itemText (aId));
-        mStack->setCurrentIndex (aId);
+# ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    setWindowTitle (dialogTitle());
+# endif
+    mLbTitle->setText (mSelector->itemText (aId));
+    mStack->setCurrentIndex (aId);
 #else /* Q_WS_MAC */
-        /* We will update at once later */
-        setUpdatesEnabled (false);
-        /* Set all tab size policies to ignored */
-        for (int i = 0; i < mStack->count(); ++i)
-            mStack->widget (i)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Ignored);
-        /* Set the size policy of the current tab to preferred */
-        if (mStack->widget (id))
-            mStack->widget (id)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
-        /* Set the new current tab */
-        mLbTitle->setText (::path (aItem));
-        mStack->setCurrentIndex (id);
-        /* Activate the new layout */
-        layout()->activate();
-        setUpdatesEnabled (true);
-//        mAllWidget->hide();
-        /* Play the resize animation */
-        ::darwinWindowAnimateResize (this, QRect (x(), y(), 
-                                                  minimumSizeHint().width(), minimumSizeHint().height()));
-//        mAllWidget->show();
-        /* Set the new size to Qt also */
-        setFixedSize (minimumSizeHint());
+    int index = mSelector->idToIndex (aId);
+    /* We will update at once later */
+    setUpdatesEnabled (false);
+    /* Set all tab size policies to ignored */
+    for (int i = 0; i < mStack->count(); ++i)
+        mStack->widget (i)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Ignored);
+    /* Set the size policy of the current tab to preferred */
+    if (mStack->widget (index))
+        mStack->widget (index)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
+    /* Set the new current tab */
+    mLbTitle->setText (::path (aItem));
+    mStack->setCurrentIndex (index);
+    /* Activate the new layout */
+    layout()->activate();
+    setUpdatesEnabled (true);
+    //        mAllWidget->hide();
+    /* Play the resize animation */
+    ::darwinWindowAnimateResize (this, QRect (x(), y(), 
+                                              minimumSizeHint().width(), minimumSizeHint().height()));
+    //        mAllWidget->show();
+    /* Set the new size to Qt also */
+    setFixedSize (minimumSizeHint());
 #endif /* !Q_WS_MAC */
 }
@@ -303 +332 @@
 
     /* Resize to the minimum possible size */
-    resize (minimumSize());
+    int minWidth = mSelector->minWidth();
+    QSize s = minimumSize();
+    if (minWidth > s.width())
+        s.setWidth (minWidth);
+    resize (s);
 
     VBoxGlobal::centerWidget (this, parentWidget());

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSettingsDialogSpecific.cpp

@@ -55 +55 @@
 #endif /* Q_WS_MAC */
 
-    /* Applying language settings */
-    retranslateUi();
-
     /* Creating settings pages */
     attachPage (new VBoxGLSettingsGeneral());
@@ -71 +68 @@
     /* Update Selector with available items */
     updateAvailability();
+
+    /* Applying language settings */
+    retranslateUi();
 }
 
@@ -107 +107 @@
 {
     /* Set dialog's name */
-    setWindowTitle (tr ("VirtualBox Preferences"));
+    setWindowTitle (dialogTitle());
 
     /* Remember old index */
@@ -133 +133 @@
 
     /* Translate the selector */
-    mSelector->retranslateUi();
+    mSelector->polish();
     
     VBoxSettingsDialog::retranslateUi();
@@ -142 +142 @@
     /* Update Selector with available items */
     updateAvailability();
+}
+
+QString VBoxGLSettingsDlg::dialogTitle() const
+{
+    return tr ("VirtualBox - %1").arg (titleExtension());
 }
 
@@ -192 +197 @@
     connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
              this, SLOT (onMediaEnumerationDone()));
-
-    /* Applying language settings */
-    retranslateUi();
 
     /* Creating settings pages */
@@ -255 +257 @@
         }
     }
+    /* Applying language settings */
+    retranslateUi();
 }
 
@@ -376 +380 @@
 
     /* Translate the selector */
-    mSelector->retranslateUi();
+    mSelector->polish();
     
     VBoxSettingsDialog::retranslateUi();
@@ -391 +395 @@
         if (!wval->isValid())
             revalidate (wval);
+}
+
+QString VBoxVMSettingsDlg::dialogTitle() const
+{
+    QString dialogTitle;
+    if (!mMachine.isNull())
+        dialogTitle = tr ("%1 - %2").arg (mMachine.GetName())
+                                    .arg (titleExtension());
+    return dialogTitle;
 }
 
@@ -419 +432 @@
 
     return aPage;
-}
-
-QString VBoxVMSettingsDlg::dialogTitle() const
-{
-    QString dialogTitle;
-    if (!mMachine.isNull())
-        dialogTitle = tr ("%1 - Settings").arg (mMachine.GetName());
-    return dialogTitle;
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSettingsSelector.cpp

@@ -24 +24 @@
 #include "VBoxSettingsUtils.h"
 #include "QITreeWidget.h"
+#include "VBoxToolBar.h"
 
 enum
@@ -94 +95 @@
                                         const QString &aLink)
 {
-    QTreeWidgetItem *item = NULL;
-
-    item = new QTreeWidgetItem (mTwSelector, QStringList() << QString (" %1 ").arg (aText)
-                                                           << idToString (aId)
-                                                           << aLink);
+    QTreeWidgetItem *item = new QTreeWidgetItem (mTwSelector, QStringList() << QString (" %1 ").arg (aText)
+                                                                            << idToString (aId)
+                                                                            << aLink);
     item->setIcon (treeWidget_Category, aIcon);
 }
@@ -163 +162 @@
 }
 
-void VBoxSettingsTreeSelector::retranslateUi()
+void VBoxSettingsTreeSelector::polish()
 {
     mTwSelector->setFixedWidth (static_cast<QAbstractItemView*> (mTwSelector)
@@ -217 +216 @@
 }
 
+/* VBoxSettingsToolBarSelector */
+
+class SelectorAction: public QAction
+{
+public:
+    SelectorAction (const QIcon &aIcon, const QString &aText, int aId, const QString &aLink, QObject *aParent)
+        : QAction (aIcon, aText, aParent)
+        , mId (aId)
+        , mLink (aLink)
+    {
+        setCheckable (true);
+    }
+
+    int id() const { return mId; }
+    QString link() const { return mLink; }
+
+private:
+    int mId;
+    QString mLink;
+};
+
+VBoxSettingsToolBarSelector::VBoxSettingsToolBarSelector (QWidget *aParent /* = NULL */)
+    :VBoxSettingsSelector (aParent)
+{
+    /* Init the toolbar */
+    mTbSelector = new VBoxToolBar (aParent);
+    mTbSelector->setUsesTextLabel (true);
+    mTbSelector->setUsesBigPixmaps (true);
+    /* Init the action group for house keeping */
+    mActionGroup = new QActionGroup (this);
+    mActionGroup->setExclusive (true);
+    connect (mActionGroup, SIGNAL (triggered (QAction*)),
+             this, SLOT (settingsGroupChanged (QAction*)));
+}
+
+QWidget *VBoxSettingsToolBarSelector::widget() const
+{
+    return mTbSelector;
+}
+
+void VBoxSettingsToolBarSelector::addItem (const QIcon &aIcon, 
+                                        const QString &aText, 
+                                        int aId, 
+                                        const QString &aLink)
+{
+    SelectorAction *action = new SelectorAction (aIcon, aText, aId, aLink, this);
+
+    mActionGroup->addAction (action);
+    mTbSelector->addAction (action);
+}
+
+QString VBoxSettingsToolBarSelector::itemText (int aId) const
+{
+    QString result;
+    SelectorAction *action = findAction (aId);
+    if (action)
+        result = action->text();
+    return result;
+}
+
+int VBoxSettingsToolBarSelector::currentId () const
+{
+    SelectorAction *action = static_cast<SelectorAction*> (mActionGroup->checkedAction());
+    int id = -1;
+    if (action)
+        id = action->id();
+    return id;
+}
+
+int VBoxSettingsToolBarSelector::idToIndex (int aId) const
+{
+    return findIndex (aId);
+}
+
+int VBoxSettingsToolBarSelector::indexToId (int aIndex) const
+{
+    return findId (aIndex);
+}
+
+int VBoxSettingsToolBarSelector::linkToId (const QString &aLink) const
+{
+    return findLink (aLink);
+}
+
+
+void VBoxSettingsToolBarSelector::selectById (int aId)
+{
+    SelectorAction *action = findAction (aId);
+
+    if (action)
+        action->trigger();
+}
+
+void VBoxSettingsToolBarSelector::setVisibleById (int aId, bool aShow)
+{
+    SelectorAction *action = findAction (aId);
+
+    if (action)
+        action->setVisible (aShow);
+}
+
+void VBoxSettingsToolBarSelector::clear()
+{
+    QList<QAction*> list = mActionGroup->actions();
+    foreach (QAction *action, list)
+       delete action; 
+}
+
+int VBoxSettingsToolBarSelector::minWidth() const
+{
+    return mTbSelector->sizeHint().width() + 2 * 10;
+}
+
+void VBoxSettingsToolBarSelector::settingsGroupChanged (QAction *aAction)
+{
+    SelectorAction *action = static_cast<SelectorAction*> (aAction);
+    if (action)
+        emit categoryChanged (action->id());
+}
+
+int VBoxSettingsToolBarSelector::findId (int aIndex) const
+{
+    int id = -1;
+    QList<QAction*> list = mActionGroup->actions();
+    if (aIndex > -1 && 
+        aIndex < list.count())
+    {
+        SelectorAction *sa = static_cast<SelectorAction*> (list.at (aIndex));
+        if (sa)
+            id = sa->id();
+    }
+    return id;
+}
+
+int VBoxSettingsToolBarSelector::findIndex (int aId) const
+{
+    int index = -1;
+    QList<QAction*> list = mActionGroup->actions();
+    for (int a = 0; a < list.count(); ++a)
+    {
+        SelectorAction *sa = static_cast<SelectorAction*> (list.at(a));
+        if (sa &&
+            sa->id() == aId)
+        {
+            index = a;
+            break;
+        }
+    }
+    return index;
+}
+
+int VBoxSettingsToolBarSelector::findLink (const QString &aLink) const
+{
+    int id = -1;
+    QList<QAction*> list = mActionGroup->actions();
+    for (int a = 0; a < list.count(); ++a)
+    {
+        SelectorAction *sa = static_cast<SelectorAction*> (list.at(a));
+        if (sa &&
+            sa->link() == aLink)
+        {
+            id = sa->id();
+            break;
+        }
+    }
+    return id;
+}
+
+SelectorAction* VBoxSettingsToolBarSelector::findAction (int aId) const
+{
+    int index = findIndex (aId);
+    SelectorAction *sa = NULL;
+    QList<QAction*> list = mActionGroup->actions();
+    if (index > -1 &&
+        index < list.count())
+        sa = static_cast<SelectorAction*> (list.at (index));
+    return sa;
+}
+