author | harlekin <harlekin> | 2002-09-03 11:10:28 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-03 11:10:28 (UTC) |
commit | c52ae29638c92381e4c84aee4d798a1c11361b53 (patch) (unidiff) | |
tree | 606c5bcb6d5594454104f8083cdfca6845362745 | |
parent | 0eb35a5148ae1e513785de32842bce61037b9657 (diff) | |
download | opie-c52ae29638c92381e4c84aee4d798a1c11361b53.zip opie-c52ae29638c92381e4c84aee4d798a1c11361b53.tar.gz opie-c52ae29638c92381e4c84aee4d798a1c11361b53.tar.bz2 |
otabwidget changes by drw , like getting rid of the dotted line etc
-rw-r--r-- | libopie/libopie.pro | 4 | ||||
-rw-r--r-- | libopie/otabwidget.cpp | 4 | ||||
-rw-r--r-- | libopie/otabwidget.h | 3 | ||||
-rw-r--r-- | libopie/otimepickerbase.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index d5b4836..891c03e 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -1,7 +1,7 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h oprocctrl.h oprocess.h odevice.h otimepicker.h otabwidget.h otabinfo.h | 3 | HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h oprocctrl.h oprocess.h odevice.h otimepicker.h otabwidget.h otabbar.h otabinfo.h |
4 | SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp oprocctrl.cpp oprocess.cpp odevice.cpp otimepicker.cpp otabwidget.cpp | 4 | SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp oprocctrl.cpp oprocess.cpp odevice.cpp otimepicker.cpp otabwidget.cpp otabbar.cpp |
5 | TARGET = opie | 5 | TARGET = opie |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 7 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index b60d472..d5b963b 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -33,9 +33,9 @@ | |||
33 | 33 | ||
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <opie/otabbar.h> | ||
36 | 37 | ||
37 | #include <qcombobox.h> | 38 | #include <qcombobox.h> |
38 | #include <qtabbar.h> | ||
39 | #include <qwidgetstack.h> | 39 | #include <qwidgetstack.h> |
40 | 40 | ||
41 | OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) | 41 | OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) |
@@ -72,7 +72,7 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi | |||
72 | 72 | ||
73 | tabBarStack = new QWidgetStack( this, "tabbarstack" ); | 73 | tabBarStack = new QWidgetStack( this, "tabbarstack" ); |
74 | 74 | ||
75 | tabBar = new QTabBar( tabBarStack, "tabbar" ); | 75 | tabBar = new OTabBar( tabBarStack, "tabbar" ); |
76 | tabBarStack->addWidget( tabBar, 0 ); | 76 | tabBarStack->addWidget( tabBar, 0 ); |
77 | connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) ); | 77 | connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) ); |
78 | 78 | ||
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index 6a0fbe8..bacda07 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <qwidget.h> | 37 | #include <qwidget.h> |
38 | #include <qlist.h> | 38 | #include <qlist.h> |
39 | 39 | ||
40 | class OTabBar; | ||
40 | class QComboBox; | 41 | class QComboBox; |
41 | class QPixmap; | 42 | class QPixmap; |
42 | class QTabBar; | 43 | class QTabBar; |
@@ -183,7 +184,7 @@ private: | |||
183 | TabPosition tabBarPosition; | 184 | TabPosition tabBarPosition; |
184 | 185 | ||
185 | QWidgetStack *tabBarStack; | 186 | QWidgetStack *tabBarStack; |
186 | QTabBar *tabBar; | 187 | OTabBar *tabBar; |
187 | QComboBox *tabList; | 188 | QComboBox *tabList; |
188 | 189 | ||
189 | QWidgetStack *widgetStack; | 190 | QWidgetStack *widgetStack; |
diff --git a/libopie/otimepickerbase.h b/libopie/otimepickerbase.h index bac2b06..09598f9 100644 --- a/libopie/otimepickerbase.h +++ b/libopie/otimepickerbase.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form interface generated from reading ui file 'otimepickerbase.ui' | 2 | ** Form interface generated from reading ui file 'otimepickerbase.ui' |
3 | ** | 3 | ** |
4 | ** Created: Tue Aug 20 10:04:21 2002 | 4 | ** Created: Tue Sep 3 13:12:19 2002 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |