Changeset 4864

Timestamp:

03/12/07 04:59:02 (19 months ago)

Author:

flynd

Message:

Patch by hammer to close tabs on middle click. Closes #1486

Location:

trunk/qt-gui/src

Files:

• ewidgets.cpp (modified) (3 diffs)
• ewidgets.h (modified) (2 diffs)
• usereventdlg.cpp (modified) (1 diff)
• usereventdlg.h (modified) (2 diffs)

trunk/qt-gui/src/ewidgets.cpp

@@ -541 +541 @@
     setNextTab();
 }
-         
+
+void CETabBar::mousePressEvent(QMouseEvent* e)
+{
+  if ((e->button() & Qt::MouseButtonMask) == Qt::MidButton)
+  {
+    QTab* tab = selectTab(e->pos());
+    if (tab != 0)
+      clickedTab = indexOf(tab->identifier());
+  }
+
+  QTabBar::mousePressEvent(e);
+}
+
+void CETabBar::mouseReleaseEvent(QMouseEvent* e)
+{
+  if ((e->button() & Qt::MouseButtonMask) == Qt::MidButton)
+  {
+    QTab* tab = selectTab(e->pos());
+    if (tab != 0)
+    {
+      int t = indexOf(tab->identifier());
+      if (t == clickedTab)
+        emit middleClick(t);
+    }
+  }
+
+  clickedTab = -1;
+  QTabBar::mouseReleaseEvent(e);
+}
 
 //CETabWidget
@@ -547 +575 @@
   : QTabWidget(parent, name, f)
 {
-  setTabBar(new CETabBar(this, "tabbar"));
+  CETabBar* tb = new CETabBar(this, "tabbar");
+  setTabBar(tb);
+  connect(tb, SIGNAL(middleClick(int)), this, SLOT(slot_middleClick(int)));
 }
 
@@ -588 +618 @@
   else
     setNextPage();
+}
+
+void CETabWidget::slot_middleClick(int t)
+{
+  QWidget* p = page(t);
+  if (p)
+    emit middleClick(p);
 }
 

trunk/qt-gui/src/ewidgets.h

@@ -130 +130 @@
   void setPreviousTab();
   void setNextTab();
-  
+
+signals:
+  void middleClick(int t);
+
 protected:
   virtual void paintLabel(QPainter *, const QRect &, QTab *, bool) const;
   virtual void wheelEvent(QWheelEvent *e);
-  
+  virtual void mousePressEvent(QMouseEvent* e);
+  virtual void mouseReleaseEvent(QMouseEvent* e);
+
 private:
   QMap<int, QColor> mTabColors;
+  int clickedTab;
 };
 
@@ -149 +155 @@
   void setNextPage();
 
+signals:
+  void middleClick(QWidget *p);
+
 protected:
   virtual void wheelEvent(QWheelEvent *e);
+
+protected slots:
+  void slot_middleClick(int t);
 };
 

trunk/qt-gui/src/usereventdlg.cpp

@@ -249 +249 @@
   connect(tabw, SIGNAL(currentChanged(QWidget *)),
           this, SLOT(slot_currentChanged(QWidget *)));
+  connect(tabw, SIGNAL(middleClick(QWidget*)), this, SLOT(removeTab(QWidget*)));
 }
 

trunk/qt-gui/src/usereventdlg.h

@@ -95 +95 @@
 
   void addTab(UserEventCommon *tab, int index = -1);
-  void removeTab(QWidget *tab);
   void selectTab(QWidget *tab);
   void replaceTab(QWidget *oldTab, UserEventCommon *newTab);
@@ -120 +119 @@
   void moveLeft();
   void moveRight();
+  void removeTab(QWidget* tab);
 
 protected slots: