summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index bed7ef1..5fc3e8e 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -85,49 +85,49 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
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 //tabs.setAutoDelete( TRUE ); 97 //tabs.setAutoDelete( TRUE );
98 currentTab= 0x0; 98 currentTab= 0x0;
99} 99}
100 100
101OTabWidget::~OTabWidget() 101OTabWidget::~OTabWidget()
102{ 102{
103} 103}
104 104
105void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label ) 105void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
106{ 106{
107 QPixmap iconset = loadSmooth( icon ); 107 QPixmap iconset = loadSmooth( icon );
108 108
109 QTab * tab = new QTab(); 109 QTab *tab = new QTab();
110 if ( tabBarStyle == IconTab ) 110 if ( tabBarStyle == IconTab )
111 { 111 {
112 tab->label = QString::null; 112 tab->label = QString::null;
113 } 113 }
114 else 114 else
115 { 115 {
116 tab->label = label; 116 tab->label = label;
117 } 117 }
118 if ( tabBarStyle == IconTab || tabBarStyle == IconList) 118 if ( tabBarStyle == IconTab || tabBarStyle == IconList)
119 { 119 {
120 tab->iconset = new QIconSet( iconset ); 120 tab->iconset = new QIconSet( iconset );
121 } 121 }
122 int tabid = tabBar->addTab( tab ); 122 int tabid = tabBar->addTab( tab );
123 123
124 if ( tabBarStyle == IconTab || tabBarStyle == IconList ) 124 if ( tabBarStyle == IconTab || tabBarStyle == IconList )
125 { 125 {
126 tabList->insertItem( iconset, label, -1 ); 126 tabList->insertItem( iconset, label, -1 );
127 } 127 }
128 else 128 else
129 { 129 {
130 tabList->insertItem( label ); 130 tabList->insertItem( label );
131 } 131 }
132 132
133 widgetStack->addWidget( child, tabid ); 133 widgetStack->addWidget( child, tabid );
@@ -253,57 +253,62 @@ void OTabWidget::slotTabListSelected( int index )
253 if ( newtab ) 253 if ( newtab )
254 { 254 {
255 selectTab( newtab ); 255 selectTab( newtab );
256 } 256 }
257} 257}
258 258
259QPixmap OTabWidget::loadSmooth( const QString &name ) 259QPixmap OTabWidget::loadSmooth( const QString &name )
260{ 260{
261 QImage image = Resource::loadImage( name ); 261 QImage image = Resource::loadImage( name );
262 QPixmap pixmap; 262 QPixmap pixmap;
263 pixmap.convertFromImage( image.smoothScale( 16, 16 ) ); 263 pixmap.convertFromImage( image.smoothScale( 16, 16 ) );
264 return pixmap; 264 return pixmap;
265} 265}
266 266
267void OTabWidget::selectTab( OTabInfo *tab ) 267void OTabWidget::selectTab( OTabInfo *tab )
268{ 268{
269 if ( tabBarStyle == IconTab ) 269 if ( tabBarStyle == IconTab )
270 { 270 {
271 if ( currentTab ) 271 if ( currentTab )
272 { 272 {
273 tabBar->tab( currentTab->id() )->setText( "" ); 273 tabBar->tab( currentTab->id() )->setText( "" );
274 setUpLayout(); 274 setUpLayout();
275 } 275 }
276 tabBar->tab( tab->id() )->setText( tab->label() ); 276 tabBar->tab( tab->id() )->setText( tab->label() );
277 currentTab = tab; 277 tabBar->setCurrentTab( tab->id() );
278 setUpLayout();
279 tabBar->update();
280 }
281 else
282 {
283 tabBar->setCurrentTab( tab->id() );
278 } 284 }
279 tabBar->setCurrentTab( tab->id() );
280 setUpLayout();
281 tabBar->update();
282 285
283 widgetStack->raiseWidget( tab->control() ); 286 widgetStack->raiseWidget( tab->control() );
284 287
285 emit currentChanged( tab->control() ); 288 emit currentChanged( tab->control() );
289
290 currentTab = tab;
286} 291}
287 292
288void OTabWidget::setUpLayout() 293void OTabWidget::setUpLayout()
289{ 294{
290 tabBar->layoutTabs(); 295 tabBar->layoutTabs();
291 QSize t( tabBarStack->sizeHint() ); 296 QSize t( tabBarStack->sizeHint() );
292 if ( t.width() > width() ) 297 if ( t.width() > width() )
293 t.setWidth( width() ); 298 t.setWidth( width() );
294 int lw = widgetStack->lineWidth(); 299 int lw = widgetStack->lineWidth();
295 if ( tabBarPosition == Bottom ) 300 if ( tabBarPosition == Bottom )
296 { 301 {
297 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); 302 tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() );
298 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); 303 widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) );
299 } 304 }
300 else 305 else
301 { 306 {
302 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); 307 tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() );
303 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2)); 308 widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX(0, lw-2));
304 } 309 }
305 310
306 if ( autoMask() ) 311 if ( autoMask() )
307 updateMask(); 312 updateMask();
308} 313}
309 314