Ticket #1486: midclick.patch

plugins/qt-gui/src/ewidgets.cpp

@@ -541 +541 @@
     setNextTab();
 }
          
+void CETabBar::mouseReleaseEvent(QMouseEvent* e)
+{
+  if(e->button() == MidButton)
+  {
+    QPoint pt = e->pos();
+    QTab *tab = selectTab(pt);
+    int t = indexOf(tab->identifier());
+    emit middleClick(t);
+  }
+  else
+    QTabBar::mousePressEvent(e);
+}
 
 //CETabWidget
 CETabWidget::CETabWidget(QWidget *parent, const char *name, WFlags f)
   : QTabWidget(parent, name, f)
 {
-  setTabBar(new CETabBar(this, "tabbar"));
+  CETabBar * tmpp = new CETabBar(this, "tabbar");
+  setTabBar(tmpp);
+  connect(tmpp, SIGNAL(middleClick(int)), this, SLOT(slot_middleClick(int)));
 }
 
 void CETabWidget::setTabColor(QWidget *w, const QColor &color)
@@ -589 +603 @@
     setNextPage();
 }
 
+void CETabWidget::slot_middleClick(int t)
+{
+  QWidget *p = page(t);
+  if(p)
+    emit sig_middleClick(p);
+}
+
 //-----CInfoField::constructor--------------------------------------------------
 CInfoField::CInfoField(QWidget *parent, bool readonly)
   : QLineEdit(parent)

plugins/qt-gui/src/ewidgets.h

@@ -129 +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 mouseReleaseEvent(QMouseEvent *);
+  
   
 private:
   QMap<int, QColor> mTabColors;
@@ -144 +149 @@
 public:
   CETabWidget(QWidget * = 0, const char * = 0, WFlags = 0);
   void setTabColor(QWidget *, const QColor &);
-
   void setPreviousPage();
   void setNextPage();
-
+public slots:
+  void slot_middleClick(int t);
+signals:
+  void sig_middleClick(QWidget *p);
 protected:
   virtual void wheelEvent(QWheelEvent *e);
 };

plugins/qt-gui/src/usereventdlg.cpp

@@ -248 +248 @@
   lay->addWidget(tabw);
   connect(tabw, SIGNAL(currentChanged(QWidget *)),
           this, SLOT(slot_currentChanged(QWidget *)));
+   connect(tabw, SIGNAL(sig_middleClick(QWidget*)), this, SLOT(closeTab(QWidget*)));
+}
+
+void UserEventTabDlg::closeTab(QWidget *p)
+{
+  removeTab(p);
 }
 
 UserEventTabDlg::~UserEventTabDlg()
@@ -2577 +2583 @@
 void UserSendCommon::slot_close()
 {
   server->ProtoTypingNotification(m_lUsers.front().c_str(), m_nPPID, false, m_nConvoId);
-  
+//   printf("tab closed\n");
   if (mainwin->m_bMsgChatView)
   {
     // the window is at the front, if the timer has not expired and we close

plugins/qt-gui/src/usereventdlg.h

@@ -119 +119 @@
   void slot_currentChanged(QWidget *tab);
   void moveLeft();
   void moveRight();
+  void closeTab(QWidget *p);
 
 protected slots:
   void setMsgWinSticky();