author | harlekin <harlekin> | 2002-10-15 12:00:44 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-15 12:00:44 (UTC) |
commit | de2932def475a128e68fff23395b0ed5c41026f5 (patch) (unidiff) | |
tree | fc526521b4540535cf80fd222c15c4054c481aca | |
parent | b6fb59110629634056be3dd5c3091e6ed3271fd0 (diff) | |
download | opie-de2932def475a128e68fff23395b0ed5c41026f5.zip opie-de2932def475a128e68fff23395b0ed5c41026f5.tar.gz opie-de2932def475a128e68fff23395b0ed5c41026f5.tar.bz2 |
update by drw to make appearance nicer when no tab is added
-rw-r--r-- | libopie/otabwidget.cpp | 8 |
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 | |||
@@ -54,33 +54,33 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi | |||
54 | if ( pos == "Bottom" ) | 54 | if ( pos == "Bottom" ) |
55 | { | 55 | { |
56 | tabBarPosition = Bottom; | 56 | tabBarPosition = Bottom; |
57 | } | 57 | } |
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 | ||
83 | if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) | 83 | if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) |
84 | { | 84 | { |
85 | tabBarStack->raiseWidget( tabBar ); | 85 | tabBarStack->raiseWidget( tabBar ); |
86 | } | 86 | } |
@@ -119,64 +119,70 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
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 ); |
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 | ||
141 | void OTabWidget::removePage( QWidget *childwidget ) | 142 | void 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 ) |
147 | { | 148 | { |
148 | tab = tabs.next(); | 149 | tab = tabs.next(); |
149 | } | 150 | } |
150 | if ( tab && tab->control() == childwidget ) | 151 | if ( tab && tab->control() == childwidget ) |
151 | { | 152 | { |
152 | tabBar->setTabEnabled( tab->id(), FALSE ); | 153 | tabBar->setTabEnabled( tab->id(), FALSE ); |
153 | tabBar->removeTab( tabBar->tab( tab->id() ) ); | 154 | tabBar->removeTab( tabBar->tab( tab->id() ) ); |
154 | int i = 0; | 155 | int i = 0; |
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 | ||
172 | void OTabWidget::setCurrentTab( QWidget *childwidget ) | 178 | void 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 | } |
179 | if ( newtab && newtab->control() == childwidget ) | 185 | if ( newtab && newtab->control() == childwidget ) |
180 | { | 186 | { |
181 | selectTab( newtab ); | 187 | selectTab( newtab ); |
182 | } | 188 | } |