summaryrefslogtreecommitdiff
path: root/libopie
Unidiff
Diffstat (limited to 'libopie') (more/less context) (show whitespace changes)
-rw-r--r--libopie/otabwidget.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 6ef4034..aaf14ce 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -58,25 +58,25 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
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::NoFrame );
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 OTabBar( 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 ) ) );
82 82
@@ -123,24 +123,25 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
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 );
134 widgetStack->raiseWidget( child ); 134 widgetStack->raiseWidget( child );
135 widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
135 136
136 OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); 137 OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label );
137 tabs.append( tabinfo ); 138 tabs.append( tabinfo );
138 selectTab( tabinfo ); 139 selectTab( tabinfo );
139} 140}
140 141
141void OTabWidget::removePage( QWidget *childwidget ) 142void OTabWidget::removePage( QWidget *childwidget )
142{ 143{
143 if ( childwidget ) 144 if ( childwidget )
144 { 145 {
145 OTabInfo *tab = tabs.first(); 146 OTabInfo *tab = tabs.first();
146 while ( tab && tab->control() != childwidget ) 147 while ( tab && tab->control() != childwidget )
@@ -155,24 +156,29 @@ void OTabWidget::removePage( QWidget *childwidget )
155 while ( i < tabList->count() && tabList->text( i ) != tab->label() ) 156 while ( i < tabList->count() && tabList->text( i ) != tab->label() )
156 { 157 {
157 i++; 158 i++;
158 } 159 }
159 if ( tabList->text( i ) == tab->label() ) 160 if ( tabList->text( i ) == tab->label() )
160 { 161 {
161 tabList->removeItem( i ); 162 tabList->removeItem( i );
162 } 163 }
163 widgetStack->removeWidget( childwidget ); 164 widgetStack->removeWidget( childwidget );
164 tabs.remove( tab ); 165 tabs.remove( tab );
165 delete tab; 166 delete tab;
166 currentTab = tabs.current(); 167 currentTab = tabs.current();
168 if ( !currentTab )
169 {
170 widgetStack->setFrameStyle( QFrame::NoFrame );
171 }
172
167 setUpLayout(); 173 setUpLayout();
168 } 174 }
169 } 175 }
170} 176}
171 177
172void OTabWidget::setCurrentTab( QWidget *childwidget ) 178void OTabWidget::setCurrentTab( QWidget *childwidget )
173{ 179{
174 OTabInfo *newtab = tabs.first(); 180 OTabInfo *newtab = tabs.first();
175 while ( newtab && newtab->control() != childwidget ) 181 while ( newtab && newtab->control() != childwidget )
176 { 182 {
177 newtab = tabs.next(); 183 newtab = tabs.next();
178 } 184 }