Fixed and improved Widget Box signals/slot handling. Moved Doxygen comments to .cpp file.

Author: Aleksey Kontsevich

Sources/widgetbox.cpp

@@ -1,8 +1,13 @@
+#include <QDebug>
 #include <QBoxLayout>
 #include <QHeaderView>
 #include "widgetbox.h"
 
 
+/**
+ * @class PageButton
+ * @brief The PageButton class: page (category) button for widget box
+ */
 PageButton::PageButton(const QString &text, QTreeWidget* parent,
                        QTreeWidgetItem *item)
   : QPushButton(text, parent)
@@ -26,15 +31,25 @@ void PageButton::setTitle(QString const &title)
 
 void PageButton::buttonPressed()
 {
-  mItem->treeWidget()->setCurrentItem(mItem);
   mItem->setExpanded(!mItem->isExpanded());
+  int index = mItem->treeWidget()->indexOfTopLevelItem(mItem);
+  ((WidgetBox *)mItem->treeWidget()->parent())->setCurrentIndex(index);
+
   if(mItem->isExpanded()) {
     setIcon(QIcon(":/plugins/widgetbox/expanded.png"));
   } else {
     setIcon(QIcon(":/plugins/widgetbox/collapsed.png"));
   }
 }
 
+/*!
+ * \class WidgetBox
+ * \brief The WidgetBox class: Widget similar to the Widget Box in the Qt Designer.
+ * It contains a list of widgets (pages) separated by categories. Each category
+ * button can be clicked in order to expand and collapse the list below the button.
+ *
+*/
+
 WidgetBox::WidgetBox(QWidget *parent) : QWidget(parent)
 {
   // Set default tree widget settings
@@ -56,11 +71,16 @@ WidgetBox::WidgetBox(QWidget *parent) : QWidget(parent)
   QBoxLayout* layout = new QVBoxLayout(this);
   layout->setContentsMargins(0, 0, 0, 0);
   layout->addWidget(mTreeWidget);
+
+  connect(mTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
+          SLOT(onItemClicked(QTreeWidgetItem*,int)));
+  connect(mTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*, int)),
+          SLOT(onItemClicked(QTreeWidgetItem*,int)));
 }
 
 QSize WidgetBox::sizeHint() const
 {
-    return QSize(130, 210);
+  return QSize(130, 210);
 }
 
 void WidgetBox::createCategoryButton(QTreeWidgetItem* page, QString pageName)
@@ -118,8 +138,8 @@ void WidgetBox::insertPage(int index, QWidget *widget)
   QString pageName = widget->windowTitle();
   if (pageName.isEmpty())
   {
-      pageName = tr("Page %1").arg(count() + 1);
-      widget->setWindowTitle(pageName);
+    pageName = tr("Page %1").arg(count() + 1);
+    widget->setWindowTitle(pageName);
   }
 
   QTreeWidgetItem* page = insertCategory(index, pageName);
@@ -213,3 +233,24 @@ void WidgetBox::setPageExpanded(bool expanded)
     categoryButton(currentIndex())->setExpanded(expanded);
   }
 }
+
+int WidgetBox::getPageIndex(QTreeWidgetItem *item)
+{
+  if (!item) return -1;
+
+  QTreeWidgetItem *parent = item->parent();
+  if(parent)  // Parent is top level item
+  {
+    return mTreeWidget->indexOfTopLevelItem(parent);
+  }
+  else        // Current item is top level
+  {
+    return item->treeWidget()->indexOfTopLevelItem(item);
+  }
+}
+
+void WidgetBox::onItemClicked(QTreeWidgetItem *item, int )
+{
+  int index = getPageIndex(item);
+  setCurrentIndex(index);
+}

Sources/widgetbox.h

@@ -5,9 +5,7 @@
 #include <QPushButton>
 #include <QTreeWidget>
 
-/**
- * @brief The PageButton class: page (category) button for widget box
- */
+
 class PageButton : public QPushButton
 {
   Q_OBJECT
@@ -26,11 +24,7 @@ private slots:
   QTreeWidgetItem* mItem;
 };
 
-/**
- * @brief The WidgetBox class: Widget similar to the Widget Box in the Qt Designer.
-  It contains a list of widgets (pages) separated by categories. Each category
-  button can be clicked in order to expand and collapse the list below the button.
- */
+
 class WidgetBox : public QWidget
 {
   Q_OBJECT
@@ -69,13 +63,17 @@ public slots:
   void createContainerWidget(QTreeWidgetItem* page, QWidget *widget);
   void createCategoryButton(QTreeWidgetItem* page, QString pageName);
 
+protected slots:
+  void onItemClicked(QTreeWidgetItem *item, int);
+
 signals:
     void currentIndexChanged(int index);
     void pageTitleChanged(const QString &title);
 
 private:
   bool checkIndex(int index) const;
   void setupWidget(QWidget *widget);
+  int getPageIndex(QTreeWidgetItem *item);
 
   QTreeWidget *mTreeWidget;
 };

Sources/widgetboxplugin.cpp

@@ -112,6 +112,7 @@ QString WidgetBoxPlugin::includeFile() const
 {
   return QLatin1String("widgetbox.h");
 }
+
 void WidgetBoxPlugin::currentIndexChanged(int index)
 {
   Q_UNUSED(index);