summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-21 22:28:56 (UTC)
committer harlekin <harlekin>2002-08-21 22:28:56 (UTC)
commit0dc65f8d04c392448731bc11a4b66f26ac9c5bc4 (patch) (unidiff)
tree2216499e2c3d8d7bc66dec755ec7d9cc1a3d6c43
parent104db9a1858142972d2f41442e5416ab5d304da9 (diff)
downloadopie-0dc65f8d04c392448731bc11a4b66f26ac9c5bc4.zip
opie-0dc65f8d04c392448731bc11a4b66f26ac9c5bc4.tar.gz
opie-0dc65f8d04c392448731bc11a4b66f26ac9c5bc4.tar.bz2
the right license also in the header
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabinfo.h2
-rw-r--r--libopie/otabwidget.cpp2
-rw-r--r--libopie/otabwidget.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libopie/otabinfo.h b/libopie/otabinfo.h
index afdd225..8dbbcc2 100644
--- a/libopie/otabinfo.h
+++ b/libopie/otabinfo.h
@@ -1,116 +1,116 @@
1/* 1/*
2                This file is part of the Opie Project 2                This file is part of the Opie Project
3 3
4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#ifndef OTABINFO_H 32#ifndef OTABINFO_H
33#define OTABINFO_H 33#define OTABINFO_H
34 34
35#include <qlist.h> 35#include <qlist.h>
36#include <qstring.h> 36#include <qstring.h>
37 37
38class QWidget; 38class QWidget;
39 39
40/** 40/**
41 * @class OTabInfo 41 * @class OTabInfo
42 * @brief The OTabInfo class is used internally by OTabWidget to keep track 42 * @brief The OTabInfo class is used internally by OTabWidget to keep track
43 * of widgets added to the control. 43 * of widgets added to the control.
44 * 44 *
45 * OTabInfo provides the following information about a widget added to an 45 * OTabInfo provides the following information about a widget added to an
46 * OTabWidget control: 46 * OTabWidget control:
47 * 47 *
48 * ID - integer tab bar ID 48 * ID - integer tab bar ID
49 * Control - QWidget pointer to child widget 49 * Control - QWidget pointer to child widget
50 * Label - QString text label for OTabWidget selection control 50 * Label - QString text label for OTabWidget selection control
51 * Icon - QString name of icon file 51 * Icon - QString name of icon file
52 */ 52 */
53class OTabInfo 53class OTabInfo
54{ 54{
55public: 55public:
56/** 56/**
57 * @fn OTabInfo() 57 * @fn OTabInfo()
58 * @brief Object constructor. 58 * @brief Object constructor.
59 * 59 *
60 * @param parent Pointer to parent of this control. 60 * @param parent Pointer to parent of this control.
61 * @param name Name of control. 61 * @param name Name of control.
62 * @param s Style of widget selection control. 62 * @param s Style of widget selection control.
63 * @param p Position of the widget selection control. 63 * @param p Position of the widget selection control.
64 */ 64 */
65 OTabInfo() : i( -1 ), c( 0 ), p( 0 ), l( QString::null ) {} 65 OTabInfo() : i( -1 ), c( 0 ), p( 0 ), l( QString::null ) {}
66 66
67/** 67/**
68 * @fn OTabInfo( int id, QWidget *control, const QString &icon, const QString &label ) 68 * @fn OTabInfo( int id, QWidget *control, const QString &icon, const QString &label )
69 * @brief Object constructor. 69 * @brief Object constructor.
70 * 70 *
71 * @param id TabBar identifier for widget. 71 * @param id TabBar identifier for widget.
72 * @param control QWidget pointer to widget. 72 * @param control QWidget pointer to widget.
73 * @param icon QString name of icon file. 73 * @param icon QString name of icon file.
74 * @param label QString text label for OTabWidget selection control. 74 * @param label QString text label for OTabWidget selection control.
75 */ 75 */
76 OTabInfo( int id, QWidget *control, const QString &icon, const QString &label ) 76 OTabInfo( int id, QWidget *control, const QString &icon, const QString &label )
77 : i( id ), c( control ), p( icon ), l( label ) {} 77 : i( id ), c( control ), p( icon ), l( label ) {}
78 78
79/** 79/**
80 * @fn id() 80 * @fn id()
81 * @brief Returns TabBar ID. 81 * @brief Returns TabBar ID.
82 */ 82 */
83 int id() const { return i; } 83 int id() const { return i; }
84 84
85/** 85/**
86 * @fn label() 86 * @fn label()
87 * @brief Returns text label for widget. 87 * @brief Returns text label for widget.
88 */ 88 */
89 const QString &label() const { return l; } 89 const QString &label() const { return l; }
90 90
91/** 91/**
92 * @fn control() 92 * @fn control()
93 * @brief Returns pointer to widget. 93 * @brief Returns pointer to widget.
94 */ 94 */
95 QWidget *control() const { return c; } 95 QWidget *control() const { return c; }
96 96
97/** 97/**
98 * @fn icon() 98 * @fn icon()
99 * @brief Returns name of icon file. 99 * @brief Returns name of icon file.
100 */ 100 */
101 const QString &icon() const { return p; } 101 const QString &icon() const { return p; }
102 102
103private: 103private:
104 int i; 104 int i;
105 QWidget *c; 105 QWidget *c;
106 QString p; 106 QString p;
107 QString l; 107 QString l;
108}; 108};
109 109
110/** 110/**
111 * @class OTabInfoList 111 * @class OTabInfoList
112 * @brief A list of OTabInfo objects used by OTabWidget. 112 * @brief A list of OTabInfo objects used by OTabWidget.
113 */ 113 */
114typedef QList<OTabInfo> OTabInfoList; 114typedef QList<OTabInfo> OTabInfoList;
115 115
116#endif 116#endif
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 6e10be9..b60d472 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -1,267 +1,267 @@
1/* 1/*
2                This file is part of the Opie Project 2                This file is part of the Opie Project
3 3
4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
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 36
37#include <qcombobox.h> 37#include <qcombobox.h>
38#include <qtabbar.h> 38#include <qtabbar.h>
39#include <qwidgetstack.h> 39#include <qwidgetstack.h>
40 40
41OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) 41OTabWidget::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 )
45 { 45 {
46 Config config( "qpe" ); 46 Config config( "qpe" );
47 config.setGroup( "Appearance" ); 47 config.setGroup( "Appearance" );
48 tabBarStyle = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab ); 48 tabBarStyle = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
49 if ( tabBarStyle <= Global || tabBarStyle > IconList) 49 if ( tabBarStyle <= Global || tabBarStyle > IconList)
50 { 50 {
51 tabBarStyle = IconTab; 51 tabBarStyle = IconTab;
52 } 52 }
53 QString pos = config.readEntry( "TabPosition", "Top"); 53 QString pos = config.readEntry( "TabPosition", "Top");
54 if ( pos == "Bottom" ) 54 if ( pos == "Bottom" )
55 { 55 {
56 tabBarPosition = Bottom; 56 tabBarPosition = Bottom;
57 } 57 }
58 else 58 else
59 { 59 {
60 tabBarPosition = Top; 60 tabBarPosition = Top;
61 } 61 }
62 } 62 }
63 else 63 else
64 { 64 {
65 tabBarStyle = s; 65 tabBarStyle = s;
66 tabBarPosition = p; 66 tabBarPosition = p;
67 } 67 }
68 68
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 QTabBar( 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 ) ) );
82 82
83 if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) 83 if ( tabBarStyle == TextTab || tabBarStyle == IconTab )
84 { 84 {
85 tabBarStack->raiseWidget( tabBar ); 85 tabBarStack->raiseWidget( tabBar );
86 } 86 }
87 else if ( tabBarStyle == TextList || tabBarStyle == IconList ) 87 else if ( tabBarStyle == TextList || tabBarStyle == IconList )
88 { 88 {
89 tabBarStack->raiseWidget( tabList ); 89 tabBarStack->raiseWidget( tabList );
90 } 90 }
91 91
92 if ( tabBarPosition == Bottom ) 92 if ( tabBarPosition == Bottom )
93 { 93 {
94 tabBar->setShape( QTabBar::RoundedBelow ); 94 tabBar->setShape( QTabBar::RoundedBelow );
95 } 95 }
96 96
97 currentTab= 0x0; 97 currentTab= 0x0;
98} 98}
99 99
100OTabWidget::~OTabWidget() 100OTabWidget::~OTabWidget()
101{ 101{
102} 102}
103 103
104void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label ) 104void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
105{ 105{
106 QPixmap iconset = loadSmooth( icon ); 106 QPixmap iconset = loadSmooth( icon );
107 107
108 QTab * tab = new QTab(); 108 QTab * tab = new QTab();
109 if ( tabBarStyle == IconTab ) 109 if ( tabBarStyle == IconTab )
110 { 110 {
111 tab->label = QString::null; 111 tab->label = QString::null;
112 } 112 }
113 else 113 else
114 { 114 {
115 tab->label = label; 115 tab->label = label;
116 } 116 }
117 if ( tabBarStyle == IconTab || tabBarStyle == IconList) 117 if ( tabBarStyle == IconTab || tabBarStyle == IconList)
118 { 118 {
119 tab->iconset = new QIconSet( iconset ); 119 tab->iconset = new QIconSet( iconset );
120 } 120 }
121 int tabid = tabBar->addTab( tab ); 121 int tabid = tabBar->addTab( tab );
122 122
123 if ( tabBarStyle == IconTab || tabBarStyle == IconList ) 123 if ( tabBarStyle == IconTab || tabBarStyle == IconList )
124 { 124 {
125 tabList->insertItem( iconset, label, -1 ); 125 tabList->insertItem( iconset, label, -1 );
126 } 126 }
127 else 127 else
128 { 128 {
129 tabList->insertItem( label ); 129 tabList->insertItem( label );
130 } 130 }
131 131
132 widgetStack->addWidget( child, tabid ); 132 widgetStack->addWidget( child, tabid );
133 widgetStack->raiseWidget( child ); 133 widgetStack->raiseWidget( child );
134 134
135 OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); 135 OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label );
136 tabs.append( tabinfo ); 136 tabs.append( tabinfo );
137 selectTab( tabinfo ); 137 selectTab( tabinfo );
138} 138}
139 139
140void OTabWidget::setCurrentTab( QWidget *childwidget ) 140void OTabWidget::setCurrentTab( QWidget *childwidget )
141{ 141{
142 OTabInfo *newtab = tabs.first(); 142 OTabInfo *newtab = tabs.first();
143 while ( newtab && newtab->control() != childwidget ) 143 while ( newtab && newtab->control() != childwidget )
144 { 144 {
145 newtab = tabs.next(); 145 newtab = tabs.next();
146 } 146 }
147 if ( newtab && newtab->control() == childwidget ) 147 if ( newtab && newtab->control() == childwidget )
148 { 148 {
149 selectTab( newtab ); 149 selectTab( newtab );
150 } 150 }
151} 151}
152 152
153void OTabWidget::setCurrentTab( const QString &tabname ) 153void OTabWidget::setCurrentTab( const QString &tabname )
154{ 154{
155 OTabInfo *newtab = tabs.first(); 155 OTabInfo *newtab = tabs.first();
156 while ( newtab && newtab->label() != tabname ) 156 while ( newtab && newtab->label() != tabname )
157 { 157 {
158 newtab = tabs.next(); 158 newtab = tabs.next();
159 } 159 }
160 if ( newtab && newtab->label() == tabname ) 160 if ( newtab && newtab->label() == tabname )
161 { 161 {
162 selectTab( newtab ); 162 selectTab( newtab );
163 } 163 }
164} 164}
165 165
166OTabWidget::TabStyle OTabWidget::tabStyle() const 166OTabWidget::TabStyle OTabWidget::tabStyle() const
167{ 167{
168 return tabBarStyle; 168 return tabBarStyle;
169} 169}
170 170
171void OTabWidget::setTabStyle( TabStyle s ) 171void OTabWidget::setTabStyle( TabStyle s )
172{ 172{
173 tabBarStyle = s; 173 tabBarStyle = s;
174} 174}
175 175
176OTabWidget::TabPosition OTabWidget::tabPosition() const 176OTabWidget::TabPosition OTabWidget::tabPosition() const
177{ 177{
178 return tabBarPosition; 178 return tabBarPosition;
179} 179}
180 180
181void OTabWidget::setTabPosition( TabPosition p ) 181void OTabWidget::setTabPosition( TabPosition p )
182{ 182{
183 tabBarPosition = p; 183 tabBarPosition = p;
184} 184}
185 185
186void OTabWidget::slotTabBarSelected( int id ) 186void OTabWidget::slotTabBarSelected( int id )
187{ 187{
188 OTabInfo *newtab = tabs.first(); 188 OTabInfo *newtab = tabs.first();
189 while ( newtab && newtab->id() != id ) 189 while ( newtab && newtab->id() != id )
190 { 190 {
191 newtab = tabs.next(); 191 newtab = tabs.next();
192 } 192 }
193 if ( newtab && newtab->id() == id ) 193 if ( newtab && newtab->id() == id )
194 { 194 {
195 selectTab( newtab ); 195 selectTab( newtab );
196 } 196 }
197} 197}
198 198
199void OTabWidget::slotTabListSelected( int index ) 199void OTabWidget::slotTabListSelected( int index )
200{ 200{
201 OTabInfo *newtab = tabs.at( index ); 201 OTabInfo *newtab = tabs.at( index );
202 if ( newtab ) 202 if ( newtab )
203 { 203 {
204 selectTab( newtab ); 204 selectTab( newtab );
205 } 205 }
206} 206}
207 207
208QPixmap OTabWidget::loadSmooth( const QString &name ) 208QPixmap OTabWidget::loadSmooth( const QString &name )
209{ 209{
210 QImage image = Resource::loadImage( name ); 210 QImage image = Resource::loadImage( name );
211 QPixmap pixmap; 211 QPixmap pixmap;
212 pixmap.convertFromImage( image.smoothScale( 16, 16 ) ); 212 pixmap.convertFromImage( image.smoothScale( 16, 16 ) );
213 return pixmap; 213 return pixmap;
214} 214}
215 215
216void OTabWidget::selectTab( OTabInfo *tab ) 216void OTabWidget::selectTab( OTabInfo *tab )
217{ 217{
218 if ( tabBarStyle == IconTab ) 218 if ( tabBarStyle == IconTab )
219 { 219 {
220 if ( currentTab ) 220 if ( currentTab )
221 { 221 {
222 tabBar->tab( currentTab->id() )->setText( QString::null ); 222 tabBar->tab( currentTab->id() )->setText( QString::null );
223 setUpLayout(); 223 setUpLayout();
224 } 224 }
225 tabBar->tab( tab->id() )->setText( tab->label() ); 225 tabBar->tab( tab->id() )->setText( tab->label() );
226 currentTab = tab; 226 currentTab = tab;
227 } 227 }
228 tabBar->setCurrentTab( tab->id() ); 228 tabBar->setCurrentTab( tab->id() );
229 setUpLayout(); 229 setUpLayout();
230 tabBar->update(); 230 tabBar->update();
231 231
232 widgetStack->raiseWidget( tab->control() ); 232 widgetStack->raiseWidget( tab->control() );
233} 233}
234 234
235void OTabWidget::setUpLayout() 235void OTabWidget::setUpLayout()
236{ 236{
237 tabBar->layoutTabs(); 237 tabBar->layoutTabs();
238 QSize t( tabBarStack->sizeHint() ); 238 QSize t( tabBarStack->sizeHint() );
239 if ( t.width() > width() ) 239 if ( t.width() > width() )
240 t.setWidth( width() ); 240 t.setWidth( width() );
241 int lw = widgetStack->lineWidth(); 241 int lw = widgetStack->lineWidth();
242 if ( tabBarPosition == Bottom ) 242 if ( tabBarPosition == Bottom )
243 { 243 {
244 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); 244 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() );
245 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); 245 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) );
246 } 246 }
247 else 247 else
248 { 248 {
249 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); 249 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() );
250 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); 250 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2));
251 } 251 }
252 252
253 if ( autoMask() ) 253 if ( autoMask() )
254 updateMask(); 254 updateMask();
255} 255}
256 256
257QSize OTabWidget::sizeHint() const 257QSize OTabWidget::sizeHint() const
258{ 258{
259 QSize s( widgetStack->sizeHint() ); 259 QSize s( widgetStack->sizeHint() );
260 QSize t( tabBarStack->sizeHint() ); 260 QSize t( tabBarStack->sizeHint() );
261 return QSize( QMAX( s.width(), t.width()), s.height() + t.height() ); 261 return QSize( QMAX( s.width(), t.width()), s.height() + t.height() );
262} 262}
263 263
264void OTabWidget::resizeEvent( QResizeEvent * ) 264void OTabWidget::resizeEvent( QResizeEvent * )
265{ 265{
266 setUpLayout(); 266 setUpLayout();
267} 267}
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 9f16f14..6a0fbe8 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -1,232 +1,232 @@
1/* 1/*
2                This file is part of the Opie Project 2                This file is part of the Opie Project
3 3
4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4              Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#ifndef OTABWIDGET_H 32#ifndef OTABWIDGET_H
33#define OTABWIDGET_H 33#define OTABWIDGET_H
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
40class QComboBox; 40class QComboBox;
41class QPixmap; 41class QPixmap;
42class QTabBar; 42class QTabBar;
43class QWidgetStack; 43class QWidgetStack;
44 44
45/** 45/**
46 * @class OTabWidget 46 * @class OTabWidget
47 * @brief The OTabWidget class provides a stack of widgets. 47 * @brief The OTabWidget class provides a stack of widgets.
48 * 48 *
49 * OTabWidget is a derivation of TrollTech's QTabWidget which provides 49 * OTabWidget is a derivation of TrollTech's QTabWidget which provides
50 * a stack of widgets. Widgets can be selected using either a tab bar or 50 * a stack of widgets. Widgets can be selected using either a tab bar or
51 * drop down list box. 51 * drop down list box.
52 * 52 *
53 * The normal way to use OTabWidget is to do the following in the 53 * The normal way to use OTabWidget is to do the following in the
54 * constructor: 54 * constructor:
55 * - Create a OTabWidget. 55 * - Create a OTabWidget.
56 * - Create a QWidget for each of the pages in the control, insert 56 * - Create a QWidget for each of the pages in the control, insert
57 * children into it, set up geometry management for it, and use addTab() 57 * children into it, set up geometry management for it, and use addTab()
58 * to add the widget. 58 * to add the widget.
59 */ 59 */
60class OTabWidget : public QWidget 60class OTabWidget : public QWidget
61{ 61{
62 Q_OBJECT 62 Q_OBJECT
63public: 63public:
64 64
65/** 65/**
66 * @enum TabStyle 66 * @enum TabStyle
67 * @brief Defines how the widget selection control is displayed. 67 * @brief Defines how the widget selection control is displayed.
68 * 68 *
69 * Valid values: 69 * Valid values:
70 * - Global: use globally selected options (qpe.conf - TabStyle & TabPosition) 70 * - Global: use globally selected options (qpe.conf - TabStyle & TabPosition)
71 * - TextTab: Tabbed widget selection with text labels 71 * - TextTab: Tabbed widget selection with text labels
72 * - IconTab: Tabbed widget selection with icon labels, text label for active widget 72 * - IconTab: Tabbed widget selection with icon labels, text label for active widget
73 * (similar to Opie launcher) 73 * (similar to Opie launcher)
74 * - TextList: Drop down list widget selection with text labels 74 * - TextList: Drop down list widget selection with text labels
75 * - IconList: Drop down list widget selection with icon & text labels 75 * - IconList: Drop down list widget selection with icon & text labels
76 */ 76 */
77 enum TabStyle { Global, TextTab, IconTab, TextList, IconList }; 77 enum TabStyle { Global, TextTab, IconTab, TextList, IconList };
78 78
79/** 79/**
80 * @enum TabPosition 80 * @enum TabPosition
81 * @brief Defines where the widget selection control is drawn. 81 * @brief Defines where the widget selection control is drawn.
82 * 82 *
83 * Valid values: 83 * Valid values:
84 * - Top: Widget selection control is drawn above widgets 84 * - Top: Widget selection control is drawn above widgets
85 * - Bottom: Widget selection control is drawn below widgets 85 * - Bottom: Widget selection control is drawn below widgets
86 */ 86 */
87 enum TabPosition { Top, Bottom }; 87 enum TabPosition { Top, Bottom };
88 88
89/** 89/**
90 * @fn OTabWidget( QWidget *parent = 0, const char *name = 0, TabStyle s = Global, TabPosition p = Top ) 90 * @fn OTabWidget( QWidget *parent = 0, const char *name = 0, TabStyle s = Global, TabPosition p = Top )
91 * @brief Object constructor. 91 * @brief Object constructor.
92 * 92 *
93 * @param parent Pointer to parent of this control. 93 * @param parent Pointer to parent of this control.
94 * @param name Name of control. 94 * @param name Name of control.
95 * @param s Style of widget selection control. 95 * @param s Style of widget selection control.
96 * @param p Position of the widget selection control. 96 * @param p Position of the widget selection control.
97 * 97 *
98 * Constructs a new OTabWidget control with parent and name. The style and position parameters 98 * Constructs a new OTabWidget control with parent and name. The style and position parameters
99 * determine how the widget selection control will be displayed. 99 * determine how the widget selection control will be displayed.
100 */ 100 */
101 OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top ); 101 OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top );
102 102
103/** 103/**
104 * @fn ~OTabWidget() 104 * @fn ~OTabWidget()
105 * @brief Object destructor. 105 * @brief Object destructor.
106 */ 106 */
107 ~OTabWidget(); 107 ~OTabWidget();
108 108
109/** 109/**
110 * @fn addTab( QWidget *child, const QString &icon, const QString &label ) 110 * @fn addTab( QWidget *child, const QString &icon, const QString &label )
111 * @brief Add new widget to control. 111 * @brief Add new widget to control.
112 * 112 *
113 * @param child Widget control. 113 * @param child Widget control.
114 * @param icon Path to icon. 114 * @param icon Path to icon.
115 * @param label Text label. 115 * @param label Text label.
116 */ 116 */
117 void addTab( QWidget *, const QString &, const QString & ); 117 void addTab( QWidget *, const QString &, const QString & );
118 118
119/** 119/**
120 * @fn tabStyle() 120 * @fn tabStyle()
121 * @brief Returns current widget selection control style. 121 * @brief Returns current widget selection control style.
122 */ 122 */
123 TabStyle tabStyle() const; 123 TabStyle tabStyle() const;
124 124
125/** 125/**
126 * @fn setTabStyle( TabStyle s ) 126 * @fn setTabStyle( TabStyle s )
127 * @brief Set the current widget selection control style. 127 * @brief Set the current widget selection control style.
128 * 128 *
129 * @param s New style to be used. 129 * @param s New style to be used.
130 */ 130 */
131 void setTabStyle( TabStyle ); 131 void setTabStyle( TabStyle );
132 132
133/** 133/**
134 * @fn tabPosition() 134 * @fn tabPosition()
135 * @brief Returns current widget selection control position. 135 * @brief Returns current widget selection control position.
136 */ 136 */
137 TabPosition tabPosition() const; 137 TabPosition tabPosition() const;
138 138
139/** 139/**
140 * @fn setTabPosition( TabPosition p ) 140 * @fn setTabPosition( TabPosition p )
141 * @brief Set the current widget selection control position. 141 * @brief Set the current widget selection control position.
142 * 142 *
143 * @param p New position of widget selection control. 143 * @param p New position of widget selection control.
144 */ 144 */
145 void setTabPosition( TabPosition ); 145 void setTabPosition( TabPosition );
146 146
147/** 147/**
148 * @fn setCurrentTab( QWidget *childwidget ) 148 * @fn setCurrentTab( QWidget *childwidget )
149 * @brief Selects and brings to top the desired widget by using widget pointer. 149 * @brief Selects and brings to top the desired widget by using widget pointer.
150 * 150 *
151 * @param childwidget Widget to select. 151 * @param childwidget Widget to select.
152 */ 152 */
153 void setCurrentTab( QWidget * ); 153 void setCurrentTab( QWidget * );
154 154
155/** 155/**
156 * @fn setCurrentTab( const QString &tabname ) 156 * @fn setCurrentTab( const QString &tabname )
157 * @brief Selects and brings to top the desired widget, by using label. 157 * @brief Selects and brings to top the desired widget, by using label.
158 * 158 *
159 * @param tabname Text label for widget to select. 159 * @param tabname Text label for widget to select.
160 */ 160 */
161 void setCurrentTab( const QString & ); 161 void setCurrentTab( const QString & );
162 162
163/** 163/**
164 * @fn sizeHint() 164 * @fn sizeHint()
165 * @brief Reimplemented for internal purposes. 165 * @brief Reimplemented for internal purposes.
166 */ 166 */
167 QSize sizeHint() const; 167 QSize sizeHint() const;
168 168
169 169
170protected: 170protected:
171 171
172/** 172/**
173 * @fn resizeEvent( QResizeEvent * ) 173 * @fn resizeEvent( QResizeEvent * )
174 * @brief Reimplemented for internal purposes. 174 * @brief Reimplemented for internal purposes.
175 */ 175 */
176 void resizeEvent( QResizeEvent * ); 176 void resizeEvent( QResizeEvent * );
177 177
178private: 178private:
179 OTabInfoList tabs; 179 OTabInfoList tabs;
180 OTabInfo *currentTab; 180 OTabInfo *currentTab;
181 181
182 TabStyle tabBarStyle; 182 TabStyle tabBarStyle;
183 TabPosition tabBarPosition; 183 TabPosition tabBarPosition;
184 184
185 QWidgetStack *tabBarStack; 185 QWidgetStack *tabBarStack;
186 QTabBar *tabBar; 186 QTabBar *tabBar;
187 QComboBox *tabList; 187 QComboBox *tabList;
188 188
189 QWidgetStack *widgetStack; 189 QWidgetStack *widgetStack;
190 190
191/** 191/**
192 * @fn loadSmooth( const QString &name ) 192 * @fn loadSmooth( const QString &name )
193 * @brief Loads icon for widget. 193 * @brief Loads icon for widget.
194 * 194 *
195 * @param name Name of icon image file. 195 * @param name Name of icon image file.
196 */ 196 */
197 QPixmap loadSmooth( const QString & ); 197 QPixmap loadSmooth( const QString & );
198 198
199/** 199/**
200 * @fn selectTab( OTabInfo *tab ) 200 * @fn selectTab( OTabInfo *tab )
201 * @brief Internal function to select desired widget. 201 * @brief Internal function to select desired widget.
202 * 202 *
203 * @param tab Pointer to data for widget. 203 * @param tab Pointer to data for widget.
204 */ 204 */
205 void selectTab( OTabInfo * ); 205 void selectTab( OTabInfo * );
206 206
207/** 207/**
208 * @fn setUpLayout() 208 * @fn setUpLayout()
209 * @brief Internal function to adjust layout. 209 * @brief Internal function to adjust layout.
210 */ 210 */
211 void setUpLayout(); 211 void setUpLayout();
212 212
213private slots: 213private slots:
214 214
215/** 215/**
216 * @fn slotTabBarSelected( int id ) 216 * @fn slotTabBarSelected( int id )
217 * @brief Slot which is called when a tab is selected. 217 * @brief Slot which is called when a tab is selected.
218 * 218 *
219 * @param id ID of widget selected. 219 * @param id ID of widget selected.
220 */ 220 */
221 void slotTabBarSelected( int ); 221 void slotTabBarSelected( int );
222 222
223/** 223/**
224 * @fn slotTabListSelected( int index ) 224 * @fn slotTabListSelected( int index )
225 * @brief Slot which is called when a drop down selection is made. 225 * @brief Slot which is called when a drop down selection is made.
226 * 226 *
227 * @param id Index of widget selected. 227 * @param id Index of widget selected.
228 */ 228 */
229 void slotTabListSelected( int ); 229 void slotTabListSelected( int );
230}; 230};
231 231
232#endif 232#endif