summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp90
1 files changed, 61 insertions, 29 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 1fee919..bee3f35 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -45,26 +45,21 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
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 s = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
49 if ( tabBarStyle <= Global || tabBarStyle > IconList) 49 if ( s <= Global || s > IconList)
50 { 50 {
51 tabBarStyle = IconTab; 51 s = 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 p = Bottom;
57 } 57 }
58 else 58 else
59 { 59 {
60 tabBarPosition = Top; 60 p = Top;
61 } 61 }
62 } 62 }
63 else
64 {
65 tabBarStyle = s;
66 tabBarPosition = p;
67 }
68 63
69 widgetStack = new QWidgetStack( this, "widgetstack" ); 64 widgetStack = new QWidgetStack( this, "widgetstack" );
70 widgetStack->setFrameStyle( QFrame::NoFrame ); 65 widgetStack->setFrameStyle( QFrame::NoFrame );
@@ -80,21 +75,9 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
80 tabBarStack->addWidget( tabList, 1 ); 75 tabBarStack->addWidget( tabList, 1 );
81 connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); 76 connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
82 77
83 if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) 78 setTabStyle( s );
84 { 79 setTabPosition( p );
85 tabBarStack->raiseWidget( tabBar );
86 }
87 else if ( tabBarStyle == TextList || tabBarStyle == IconList )
88 {
89 tabBarStack->raiseWidget( tabList );
90 }
91
92 if ( tabBarPosition == Bottom )
93 {
94 tabBar->setShape( QTabBar::RoundedBelow );
95 }
96 80
97 //tabs.setAutoDelete( TRUE );
98 currentTab= 0x0; 81 currentTab= 0x0;
99} 82}
100 83
@@ -222,6 +205,45 @@ OTabWidget::TabStyle OTabWidget::tabStyle() const
222void OTabWidget::setTabStyle( TabStyle s ) 205void OTabWidget::setTabStyle( TabStyle s )
223{ 206{
224 tabBarStyle = s; 207 tabBarStyle = s;
208 if ( tabBarStyle == TextTab || tabBarStyle == IconTab )
209 {
210 QTab *currtab;
211 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() )
212 {
213 currtab = tabBar->tab( tabinfo->id() );
214 if ( tabBarStyle == IconTab )
215 {
216 currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) );
217 if ( tabinfo == currentTab )
218 currtab->setText( tabinfo->label() );
219 else
220 currtab->setText( QString::null );
221 }
222 else
223 {
224 currtab->iconset = 0x0;
225 currtab->setText( tabinfo->label() );
226 }
227 }
228 tabBarStack->raiseWidget( tabBar );
229 }
230 else if ( tabBarStyle == TextList || tabBarStyle == IconList )
231 {
232 tabList->clear();
233 for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() )
234 {
235 if ( tabBarStyle == IconList )
236 {
237 tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() );
238 }
239 else
240 {
241 tabList->insertItem( tabinfo->label() );
242 }
243 }
244 tabBarStack->raiseWidget( tabList );
245 }
246 setUpLayout();
225} 247}
226 248
227OTabWidget::TabPosition OTabWidget::tabPosition() const 249OTabWidget::TabPosition OTabWidget::tabPosition() const
@@ -232,6 +254,15 @@ OTabWidget::TabPosition OTabWidget::tabPosition() const
232void OTabWidget::setTabPosition( TabPosition p ) 254void OTabWidget::setTabPosition( TabPosition p )
233{ 255{
234 tabBarPosition = p; 256 tabBarPosition = p;
257 if ( tabBarPosition == Top )
258 {
259 tabBar->setShape( QTabBar::RoundedAbove );
260 }
261 else
262 {
263 tabBar->setShape( QTabBar::RoundedBelow );
264 }
265 setUpLayout();
235} 266}
236 267
237void OTabWidget::slotTabBarSelected( int id ) 268void OTabWidget::slotTabBarSelected( int id )
@@ -270,7 +301,7 @@ void OTabWidget::selectTab( OTabInfo *tab )
270 { 301 {
271 if ( currentTab ) 302 if ( currentTab )
272 { 303 {
273 tabBar->tab( currentTab->id() )->setText( "" ); 304 tabBar->tab( currentTab->id() )->setText( QString::null );
274 setUpLayout(); 305 setUpLayout();
275 } 306 }
276 tabBar->tab( tab->id() )->setText( tab->label() ); 307 tabBar->tab( tab->id() )->setText( tab->label() );
@@ -331,11 +362,12 @@ void OTabWidget::resizeEvent( QResizeEvent * )
331 setUpLayout(); 362 setUpLayout();
332} 363}
333 364
334int OTabWidget::getCurrentTab() { 365int OTabWidget::getCurrentTab()
366{
335 if ( currentTab ) 367 if ( currentTab )
336 { 368 {
337 return currentTab->id(); 369 return currentTab->id();
338 } 370 }
339 return -1; 371 return -1;
340} 372}
341 373