summaryrefslogtreecommitdiff
path: root/libopie
Unidiff
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp20
-rw-r--r--libopie/otabwidget.h7
2 files changed, 13 insertions, 14 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index a1fd2c0..05aafd4 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -57,49 +57,49 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
57 } 57 }
58 else 58 else
59 { 59 {
60 p = Top; 60 p = Top;
61 } 61 }
62 } 62 }
63 63
64 widgetStack = new QWidgetStack( this, "widgetstack" ); 64 widgetStack = new QWidgetStack( this, "widgetstack" );
65 widgetStack->setFrameStyle( QFrame::NoFrame ); 65 widgetStack->setFrameStyle( QFrame::NoFrame );
66 widgetStack->setLineWidth( style().defaultFrameWidth() ); 66 widgetStack->setLineWidth( style().defaultFrameWidth() );
67 67
68 tabBarStack = new QWidgetStack( this, "tabbarstack" ); 68 tabBarStack = new QWidgetStack( this, "tabbarstack" );
69 69
70 tabBar = new OTabBar( tabBarStack, "tabbar" ); 70 tabBar = new OTabBar( tabBarStack, "tabbar" );
71 tabBarStack->addWidget( tabBar, 0 ); 71 tabBarStack->addWidget( tabBar, 0 );
72 connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) ); 72 connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
73 73
74 tabList = new QComboBox( false, tabBarStack, "tablist" ); 74 tabList = new QComboBox( false, tabBarStack, "tablist" );
75 tabBarStack->addWidget( tabList, 1 ); 75 tabBarStack->addWidget( tabList, 1 );
76 connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); 76 connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
77 77
78 setTabStyle( s ); 78 setTabStyle( s );
79 setTabPosition( p ); 79 setTabPosition( p );
80 80
81 currentTab= 0x0; 81 currTab= 0x0;
82} 82}
83 83
84OTabWidget::~OTabWidget() 84OTabWidget::~OTabWidget()
85{ 85{
86} 86}
87 87
88void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label ) 88void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
89{ 89{
90 QPixmap iconset = loadSmooth( icon ); 90 QPixmap iconset = loadSmooth( icon );
91 91
92 QTab *tab = new QTab(); 92 QTab *tab = new QTab();
93 if ( tabBarStyle == IconTab ) 93 if ( tabBarStyle == IconTab )
94 { 94 {
95 tab->label = QString::null; 95 tab->label = QString::null;
96 } 96 }
97 else 97 else
98 { 98 {
99 tab->label = label; 99 tab->label = label;
100 } 100 }
101 if ( tabBarStyle == IconTab || tabBarStyle == IconList ) 101 if ( tabBarStyle == IconTab || tabBarStyle == IconList )
102 { 102 {
103 tab->iconset = new QIconSet( iconset ); 103 tab->iconset = new QIconSet( iconset );
104 } 104 }
105 int tabid = tabBar->addTab( tab ); 105 int tabid = tabBar->addTab( tab );
@@ -126,50 +126,50 @@ void OTabWidget::removePage( QWidget *childwidget )
126{ 126{
127 if ( childwidget ) 127 if ( childwidget )
128 { 128 {
129 OTabInfo *tab = tabs.first(); 129 OTabInfo *tab = tabs.first();
130 while ( tab && tab->control() != childwidget ) 130 while ( tab && tab->control() != childwidget )
131 { 131 {
132 tab = tabs.next(); 132 tab = tabs.next();
133 } 133 }
134 if ( tab && tab->control() == childwidget ) 134 if ( tab && tab->control() == childwidget )
135 { 135 {
136 tabBar->setTabEnabled( tab->id(), FALSE ); 136 tabBar->setTabEnabled( tab->id(), FALSE );
137 tabBar->removeTab( tabBar->tab( tab->id() ) ); 137 tabBar->removeTab( tabBar->tab( tab->id() ) );
138 int i = 0; 138 int i = 0;
139 while ( i < tabList->count() && tabList->text( i ) != tab->label() ) 139 while ( i < tabList->count() && tabList->text( i ) != tab->label() )
140 { 140 {
141 i++; 141 i++;
142 } 142 }
143 if ( tabList->text( i ) == tab->label() ) 143 if ( tabList->text( i ) == tab->label() )
144 { 144 {
145 tabList->removeItem( i ); 145 tabList->removeItem( i );
146 } 146 }
147 widgetStack->removeWidget( childwidget ); 147 widgetStack->removeWidget( childwidget );
148 tabs.remove( tab ); 148 tabs.remove( tab );
149 delete tab; 149 delete tab;
150 currentTab = tabs.current(); 150 currTab = tabs.current();
151 if ( !currentTab ) 151 if ( !currTab )
152 { 152 {
153 widgetStack->setFrameStyle( QFrame::NoFrame ); 153 widgetStack->setFrameStyle( QFrame::NoFrame );
154 } 154 }
155 155
156 setUpLayout(); 156 setUpLayout();
157 } 157 }
158 } 158 }
159} 159}
160 160
161void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label) 161void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label)
162{ 162{
163 OTabInfo *currtab = tabs.first(); 163 OTabInfo *currtab = tabs.first();
164 while ( currtab && currtab->control() != widget ) 164 while ( currtab && currtab->control() != widget )
165 { 165 {
166 currtab = tabs.next(); 166 currtab = tabs.next();
167 } 167 }
168 if ( currtab && currtab->control() == widget ) 168 if ( currtab && currtab->control() == widget )
169 { 169 {
170 QTab *tab = tabBar->tab( currtab->id() ); 170 QTab *tab = tabBar->tab( currtab->id() );
171 QPixmap icon( loadSmooth( iconset ) ); 171 QPixmap icon( loadSmooth( iconset ) );
172 tab->setText( label ); 172 tab->setText( label );
173 if ( tabBarStyle == IconTab ) 173 if ( tabBarStyle == IconTab )
174 tab->setIconSet( icon ); 174 tab->setIconSet( icon );
175 int i = 0; 175 int i = 0;
@@ -229,49 +229,49 @@ void OTabWidget::setCurrentTab(int tabindex) {
229 if ( newtab && newtab->id() == tabindex ) 229 if ( newtab && newtab->id() == tabindex )
230 { 230 {
231 selectTab( newtab ); 231 selectTab( newtab );
232 } 232 }
233} 233}
234 234
235 235
236OTabWidget::TabStyle OTabWidget::tabStyle() const 236OTabWidget::TabStyle OTabWidget::tabStyle() const
237{ 237{
238 return tabBarStyle; 238 return tabBarStyle;
239} 239}
240 240
241void OTabWidget::setTabStyle( TabStyle s ) 241void OTabWidget::setTabStyle( TabStyle s )
242{ 242{
243 tabBarStyle = s; 243 tabBarStyle = s;
244 if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) 244 if ( tabBarStyle == TextTab || tabBarStyle == IconTab )
245 { 245 {
246 QTab *currtab; 246 QTab *currtab;
247 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) 247 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() )
248 { 248 {
249 currtab = tabBar->tab( tabinfo->id() ); 249 currtab = tabBar->tab( tabinfo->id() );
250 if ( tabBarStyle == IconTab ) 250 if ( tabBarStyle == IconTab )
251 { 251 {
252 currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); 252 currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) );
253 if ( tabinfo == currentTab ) 253 if ( tabinfo == currTab )
254 currtab->setText( tabinfo->label() ); 254 currtab->setText( tabinfo->label() );
255 else 255 else
256 currtab->setText( QString::null ); 256 currtab->setText( QString::null );
257 } 257 }
258 else 258 else
259 { 259 {
260 currtab->iconset = 0x0; 260 currtab->iconset = 0x0;
261 currtab->setText( tabinfo->label() ); 261 currtab->setText( tabinfo->label() );
262 } 262 }
263 } 263 }
264 tabBarStack->raiseWidget( tabBar ); 264 tabBarStack->raiseWidget( tabBar );
265 } 265 }
266 else if ( tabBarStyle == TextList || tabBarStyle == IconList ) 266 else if ( tabBarStyle == TextList || tabBarStyle == IconList )
267 { 267 {
268 tabList->clear(); 268 tabList->clear();
269 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) 269 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() )
270 { 270 {
271 if ( tabBarStyle == IconList ) 271 if ( tabBarStyle == IconList )
272 { 272 {
273 tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() ); 273 tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() );
274 } 274 }
275 else 275 else
276 { 276 {
277 tabList->insertItem( tabinfo->label() ); 277 tabList->insertItem( tabinfo->label() );
@@ -314,96 +314,96 @@ void OTabWidget::slotTabBarSelected( int id )
314 } 314 }
315} 315}
316 316
317void OTabWidget::slotTabListSelected( int index ) 317void OTabWidget::slotTabListSelected( int index )
318{ 318{
319 OTabInfo *newtab = tabs.at( index ); 319 OTabInfo *newtab = tabs.at( index );
320 if ( newtab ) 320 if ( newtab )
321 { 321 {
322 selectTab( newtab ); 322 selectTab( newtab );
323 } 323 }
324} 324}
325 325
326QPixmap OTabWidget::loadSmooth( const QString &name ) 326QPixmap OTabWidget::loadSmooth( const QString &name )
327{ 327{
328 QImage image = Resource::loadImage( name ); 328 QImage image = Resource::loadImage( name );
329 QPixmap pixmap; 329 QPixmap pixmap;
330 pixmap.convertFromImage( image.smoothScale( 14, 14 ) ); 330 pixmap.convertFromImage( image.smoothScale( 14, 14 ) );
331 return pixmap; 331 return pixmap;
332} 332}
333 333
334void OTabWidget::selectTab( OTabInfo *tab ) 334void OTabWidget::selectTab( OTabInfo *tab )
335{ 335{
336 if ( tabBarStyle == IconTab ) 336 if ( tabBarStyle == IconTab )
337 { 337 {
338 if ( currentTab ) 338 if ( currTab )
339 { 339 {
340 tabBar->tab( currentTab->id() )->setText( QString::null ); 340 tabBar->tab( currTab->id() )->setText( QString::null );
341 setUpLayout(); 341 setUpLayout();
342 } 342 }
343 tabBar->tab( tab->id() )->setText( tab->label() ); 343 tabBar->tab( tab->id() )->setText( tab->label() );
344 tabBar->setCurrentTab( tab->id() ); 344 tabBar->setCurrentTab( tab->id() );
345 setUpLayout(); 345 setUpLayout();
346 tabBar->update(); 346 tabBar->update();
347 } 347 }
348 else 348 else
349 { 349 {
350 tabBar->setCurrentTab( tab->id() ); 350 tabBar->setCurrentTab( tab->id() );
351 } 351 }
352 352
353 widgetStack->raiseWidget( tab->control() ); 353 widgetStack->raiseWidget( tab->control() );
354 354
355 emit currentChanged( tab->control() ); 355 emit currentChanged( tab->control() );
356 356
357 currentTab = tab; 357 currTab = tab;
358} 358}
359 359
360void OTabWidget::setUpLayout() 360void OTabWidget::setUpLayout()
361{ 361{
362 tabBar->layoutTabs(); 362 tabBar->layoutTabs();
363 QSize t( tabBarStack->sizeHint() ); 363 QSize t( tabBarStack->sizeHint() );
364 if ( tabBarStyle == IconTab ) 364 if ( tabBarStyle == IconTab )
365 { 365 {
366 if ( t.width() > width() ) 366 if ( t.width() > width() )
367 t.setWidth( width() ); 367 t.setWidth( width() );
368 } 368 }
369 else 369 else
370 { 370 {
371 t.setWidth( width() ); 371 t.setWidth( width() );
372 } 372 }
373 int lw = widgetStack->lineWidth(); 373 int lw = widgetStack->lineWidth();
374 if ( tabBarPosition == Bottom ) 374 if ( tabBarPosition == Bottom )
375 { 375 {
376 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); 376 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() );
377 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); 377 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) );
378 } 378 }
379 else 379 else
380 { 380 {
381 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); 381 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() );
382 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) ); 382 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) );
383 } 383 }
384 384
385 if ( autoMask() ) 385 if ( autoMask() )
386 updateMask(); 386 updateMask();
387} 387}
388 388
389QSize OTabWidget::sizeHint() const 389QSize OTabWidget::sizeHint() const
390{ 390{
391 QSize s( widgetStack->sizeHint() ); 391 QSize s( widgetStack->sizeHint() );
392 QSize t( tabBarStack->sizeHint() ); 392 QSize t( tabBarStack->sizeHint() );
393 return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); 393 return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() );
394} 394}
395 395
396void OTabWidget::resizeEvent( QResizeEvent * ) 396void OTabWidget::resizeEvent( QResizeEvent * )
397{ 397{
398 setUpLayout(); 398 setUpLayout();
399} 399}
400 400
401int OTabWidget::getCurrentTab() 401int OTabWidget::currentTab()
402{ 402{
403 if ( currentTab ) 403 if ( currTab )
404 { 404 {
405 return currentTab->id(); 405 return currTab->id();
406 } 406 }
407 return -1; 407 return -1;
408} 408}
409 409
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 23fe774..bcd9a85 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -174,66 +174,65 @@ public:
174 174
175/** 175/**
176 * @fn setCurrentTab( const QString &tabname ) 176 * @fn setCurrentTab( const QString &tabname )
177 * @brief Selects and brings to top the desired widget, by using label. 177 * @brief Selects and brings to top the desired widget, by using label.
178 * 178 *
179 * @param tabname Text label for widget to select. 179 * @param tabname Text label for widget to select.
180 */ 180 */
181 void setCurrentTab( const QString & ); 181 void setCurrentTab( const QString & );
182 182
183/** 183/**
184 * @fn setCurrentTab( int ) 184 * @fn setCurrentTab( int )
185 * @brief Selects and brings to top the desired widget, by using id. 185 * @brief Selects and brings to top the desired widget, by using id.
186 * 186 *
187 * @param tab id for widget to select. 187 * @param tab id for widget to select.
188 */ 188 */
189 void setCurrentTab(int); 189 void setCurrentTab(int);
190 190
191/** 191/**
192 * @fn sizeHint() 192 * @fn sizeHint()
193 * @brief Reimplemented for internal purposes. 193 * @brief Reimplemented for internal purposes.
194 */ 194 */
195 QSize sizeHint() const; 195 QSize sizeHint() const;
196 196
197/** 197/**
198 * @fn getCurrentTab( ) 198 * @fn currentTab( )
199 * @brief returns current tab id. 199 * @brief returns current tab id.
200 */ 200 */
201 //FIXME TT coding style currentTab() -zecke 201 int currentTab();
202 int getCurrentTab();
203 202
204 203
205protected: 204protected:
206 205
207/** 206/**
208 * @fn resizeEvent( QResizeEvent * ) 207 * @fn resizeEvent( QResizeEvent * )
209 * @brief Reimplemented for internal purposes. 208 * @brief Reimplemented for internal purposes.
210 */ 209 */
211 void resizeEvent( QResizeEvent * ); 210 void resizeEvent( QResizeEvent * );
212 211
213private: 212private:
214 OTabInfoList tabs; 213 OTabInfoList tabs;
215 OTabInfo *currentTab; 214 OTabInfo *currTab;
216 215
217 TabStyle tabBarStyle; 216 TabStyle tabBarStyle;
218 TabPosition tabBarPosition; 217 TabPosition tabBarPosition;
219 218
220 QWidgetStack *tabBarStack; 219 QWidgetStack *tabBarStack;
221 OTabBar *tabBar; 220 OTabBar *tabBar;
222 QComboBox *tabList; 221 QComboBox *tabList;
223 222
224 QWidgetStack *widgetStack; 223 QWidgetStack *widgetStack;
225 224
226/** 225/**
227 * @fn loadSmooth( const QString &name ) 226 * @fn loadSmooth( const QString &name )
228 * @brief Loads icon for widget. 227 * @brief Loads icon for widget.
229 * 228 *
230 * @param name Name of icon image file. 229 * @param name Name of icon image file.
231 */ 230 */
232 QPixmap loadSmooth( const QString & ); 231 QPixmap loadSmooth( const QString & );
233 232
234/** 233/**
235 * @fn selectTab( OTabInfo *tab ) 234 * @fn selectTab( OTabInfo *tab )
236 * @brief Internal function to select desired widget. 235 * @brief Internal function to select desired widget.
237 * 236 *
238 * @param tab Pointer to data for widget. 237 * @param tab Pointer to data for widget.
239 */ 238 */