-rw-r--r-- | libopie/otabwidget.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index d5b963b..1f3fbb0 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -91,12 +91,13 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi | |||
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 | currentTab= 0x0; | 98 | currentTab= 0x0; |
98 | } | 99 | } |
99 | 100 | ||
100 | OTabWidget::~OTabWidget() | 101 | OTabWidget::~OTabWidget() |
101 | { | 102 | { |
102 | } | 103 | } |
@@ -134,12 +135,41 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
134 | 135 | ||
135 | OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); | 136 | OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); |
136 | tabs.append( tabinfo ); | 137 | tabs.append( tabinfo ); |
137 | selectTab( tabinfo ); | 138 | selectTab( tabinfo ); |
138 | } | 139 | } |
139 | 140 | ||
141 | void OTabWidget::removePage( QWidget *childwidget ) | ||
142 | { | ||
143 | if ( childwidget ) | ||
144 | { | ||
145 | OTabInfo *tab = tabs.first(); | ||
146 | while ( tab && tab->control() != childwidget ) | ||
147 | { | ||
148 | tab = tabs.next(); | ||
149 | } | ||
150 | if ( tab && tab->control() == childwidget ) | ||
151 | { | ||
152 | tabBar->setTabEnabled( tab->id(), FALSE ); | ||
153 | tabBar->removeTab( tabBar->tab( tab->id() ) ); | ||
154 | int i = 0; | ||
155 | while ( i < tabList->count() && tabList->text( i ) != tab->label() ) | ||
156 | { | ||
157 | i++; | ||
158 | } | ||
159 | if ( tabList->text( i ) == tab->label() ) | ||
160 | { | ||
161 | tabList->removeItem( i ); | ||
162 | } | ||
163 | widgetStack->removeWidget( childwidget ); | ||
164 | tabs.remove( tab ); | ||
165 | setUpLayout(); | ||
166 | } | ||
167 | } | ||
168 | } | ||
169 | |||
140 | void OTabWidget::setCurrentTab( QWidget *childwidget ) | 170 | void OTabWidget::setCurrentTab( QWidget *childwidget ) |
141 | { | 171 | { |
142 | OTabInfo *newtab = tabs.first(); | 172 | OTabInfo *newtab = tabs.first(); |
143 | while ( newtab && newtab->control() != childwidget ) | 173 | while ( newtab && newtab->control() != childwidget ) |
144 | { | 174 | { |
145 | newtab = tabs.next(); | 175 | newtab = tabs.next(); |
@@ -227,12 +257,14 @@ void OTabWidget::selectTab( OTabInfo *tab ) | |||
227 | } | 257 | } |
228 | tabBar->setCurrentTab( tab->id() ); | 258 | tabBar->setCurrentTab( tab->id() ); |
229 | setUpLayout(); | 259 | setUpLayout(); |
230 | tabBar->update(); | 260 | tabBar->update(); |
231 | 261 | ||
232 | widgetStack->raiseWidget( tab->control() ); | 262 | widgetStack->raiseWidget( tab->control() ); |
263 | |||
264 | emit currentChanged( tab->control() ); | ||
233 | } | 265 | } |
234 | 266 | ||
235 | void OTabWidget::setUpLayout() | 267 | void OTabWidget::setUpLayout() |
236 | { | 268 | { |
237 | tabBar->layoutTabs(); | 269 | tabBar->layoutTabs(); |
238 | QSize t( tabBarStack->sizeHint() ); | 270 | QSize t( tabBarStack->sizeHint() ); |