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 /libopie | |
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 | 6 | ||||
-rw-r--r-- | libopie/otabwidget.cpp | 4 | ||||
-rw-r--r-- | libopie/otabwidget.h | 3 | ||||
-rw-r--r-- | libopie/otimepickerbase.h | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index d5b4836..891c03e 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -1,13 +1,13 @@ | |||
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) |
8 | #VERSION = 1.0.0 | 8 | #VERSION = 1.0.0 |
9 | 9 | ||
10 | INTERFACES = otimepickerbase.ui | 10 | INTERFACES = otimepickerbase.ui |
11 | 11 | ||
12 | TRANSLATIONS = ../i18n/de/libopie.ts \ | 12 | TRANSLATIONS = ../i18n/de/libopie.ts \ |
13 | ../i18n/en/libopie.ts \ | 13 | ../i18n/en/libopie.ts \ |
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index b60d472..d5b963b 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -30,15 +30,15 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "otabwidget.h" | 32 | #include "otabwidget.h" |
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 ) |
42 | : QWidget( parent, name ) | 42 | : QWidget( parent, name ) |
43 | { | 43 | { |
44 | if ( s == Global ) | 44 | if ( s == Global ) |
@@ -69,13 +69,13 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi | |||
69 | widgetStack = new QWidgetStack( this, "widgetstack" ); | 69 | widgetStack = new QWidgetStack( this, "widgetstack" ); |
70 | widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); | 70 | widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); |
71 | widgetStack->setLineWidth( style().defaultFrameWidth() ); | 71 | widgetStack->setLineWidth( style().defaultFrameWidth() ); |
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 | ||
79 | tabList = new QComboBox( false, tabBarStack, "tablist" ); | 79 | tabList = new QComboBox( false, tabBarStack, "tablist" ); |
80 | tabBarStack->addWidget( tabList, 1 ); | 80 | tabBarStack->addWidget( tabList, 1 ); |
81 | connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); | 81 | connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); |
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index 6a0fbe8..bacda07 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h | |||
@@ -34,12 +34,13 @@ | |||
34 | 34 | ||
35 | #include "otabinfo.h" | 35 | #include "otabinfo.h" |
36 | 36 | ||
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; |
43 | class QWidgetStack; | 44 | class QWidgetStack; |
44 | 45 | ||
45 | /** | 46 | /** |
@@ -180,13 +181,13 @@ private: | |||
180 | OTabInfo *currentTab; | 181 | OTabInfo *currentTab; |
181 | 182 | ||
182 | TabStyle tabBarStyle; | 183 | TabStyle tabBarStyle; |
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; |
190 | 191 | ||
191 | /** | 192 | /** |
192 | * @fn loadSmooth( const QString &name ) | 193 | * @fn loadSmooth( const QString &name ) |
diff --git a/libopie/otimepickerbase.h b/libopie/otimepickerbase.h index bac2b06..09598f9 100644 --- a/libopie/otimepickerbase.h +++ b/libopie/otimepickerbase.h | |||
@@ -1,10 +1,10 @@ | |||
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! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #ifndef OTIMEPICKERDIALOGBASE_H | 9 | #ifndef OTIMEPICKERDIALOGBASE_H |
10 | #define OTIMEPICKERDIALOGBASE_H | 10 | #define OTIMEPICKERDIALOGBASE_H |