Changeset 6082 for trunk/qt4-gui/src/widgets

Timestamp:

03/03/08 04:41:37 (9 months ago)

Author:

flynd

Message:

Make use of KTabWidget.

Location:

trunk/qt4-gui/src/widgets

Files:

• tabwidget.cpp (modified) (5 diffs)
• tabwidget.h (modified) (5 diffs)

trunk/qt4-gui/src/widgets/tabwidget.cpp

@@ -18 +18 @@
  */
 
+#include "config.h"
+
 #include "tabwidget.h"
 
-#include <QWheelEvent>
+#ifdef USE_KDE
+# include <QTabBar>
+#else
+# include <QWheelEvent>
+#endif
 
 using namespace LicqQtGui;
 
+#ifndef USE_KDE
 TabBar::TabBar(QWidget* parent)
   : QTabBar(parent)
@@ -78 +85 @@
     int t = tabAt(e->pos());
     if (t > -1 && t == myClickedTab)
-      emit middleClick(t);
+      emit mouseMiddleClick(t);
   }
 
@@ -84 +91 @@
   QTabBar::mouseReleaseEvent(e);
 }
+#endif
 
 
 TabWidget::TabWidget(QWidget* parent)
-  : QTabWidget(parent)
+  : TABWIDGET_BASE(parent)
 {
+#ifndef USE_KDE
   TabBar* tb = new TabBar(this);
   setTabBar(tb);
-  connect(tb, SIGNAL(middleClick(int)), SLOT(slot_middleClick(int)));
+  connect(tb, SIGNAL(mouseMiddleClick(int)), SLOT(slot_middleClick(int)));
+#endif
 }
 
@@ -98 +108 @@
   int index = indexOf(tab);
   if (index != -1)
+#ifdef USE_KDE
+    setTabTextColor(index, color);
+#else
     tabBar()->setTabTextColor(index, color);
+#endif
 }
 
 void TabWidget::setPreviousPage()
 {
-  dynamic_cast<TabBar*>(tabBar())->setPreviousTab();
+  int index = tabBar()->currentIndex() - 1;
+  if (index < 0)
+    index = tabBar()->count() - 1;
+
+  tabBar()->setCurrentIndex(index);
 }
 
 void TabWidget::setNextPage()
 {
-  dynamic_cast<TabBar*>(tabBar())->setNextTab();
+  int index = tabBar()->currentIndex() + 1;
+  if (index >= tabBar()->count())
+    index = 0;
+
+  tabBar()->setCurrentIndex(index);
 }
 
+#ifndef USE_KDE
 void TabWidget::wheelEvent(QWheelEvent* e)
 {
@@ -140 +163 @@
   QWidget* p = widget(t);
   if (p)
-    emit middleClick(p);
+    emit mouseMiddleClick(p);
 }
+#endif

trunk/qt4-gui/src/widgets/tabwidget.h

@@ -21 +21 @@
 #define TABWIDGET_H
 
-#include <QTabBar>
-#include <QTabWidget>
+#include "config.h"
+
+#ifdef USE_KDE
+# include <KDE/KTabWidget>
+# define TABWIDGET_BASE KTabWidget
+#else
+# include <QTabBar>
+# include <QTabWidget>
+# define TABWIDGET_BASE QTabWidget
+#endif
 
 namespace LicqQtGui
 {
 
+#ifndef USE_KDE
 class TabBar : public QTabBar
 {
@@ -38 +47 @@
 
 signals:
-  void middleClick(int t);
+  void mouseMiddleClick(int t);
 
 private:
@@ -47 +56 @@
   int myClickedTab;
 };
+#endif
 
 
-class TabWidget : public QTabWidget
+class TabWidget : public TABWIDGET_BASE
 {
   Q_OBJECT
@@ -60 +70 @@
   void setNextPage();
 
+#ifndef USE_KDE
 signals:
-  void middleClick(QWidget* p);
+  void mouseMiddleClick(QWidget* p);
 
 private slots:
@@ -68 +79 @@
 private:
   virtual void wheelEvent(QWheelEvent* e);
+#endif
 };