-rw-r--r-- | libopie/otabwidget.cpp | 9 | ||||
-rw-r--r-- | libopie/otabwidget.h | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index fe2c60f..1b8c085 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -387,24 +387,33 @@ void OTabWidget::setUpLayout() | |||
387 | updateMask(); | 387 | updateMask(); |
388 | } | 388 | } |
389 | 389 | ||
390 | QSize OTabWidget::sizeHint() const | 390 | QSize OTabWidget::sizeHint() const |
391 | { | 391 | { |
392 | QSize s( widgetStack->sizeHint() ); | 392 | QSize s( widgetStack->sizeHint() ); |
393 | QSize t( tabBarStack->sizeHint() ); | 393 | QSize t( tabBarStack->sizeHint() ); |
394 | return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); | 394 | return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); |
395 | } | 395 | } |
396 | 396 | ||
397 | void OTabWidget::resizeEvent( QResizeEvent * ) | 397 | void OTabWidget::resizeEvent( QResizeEvent * ) |
398 | { | 398 | { |
399 | setUpLayout(); | 399 | setUpLayout(); |
400 | } | 400 | } |
401 | 401 | ||
402 | int OTabWidget::currentTab() | 402 | int OTabWidget::currentTab() |
403 | { | 403 | { |
404 | if ( currTab ) | 404 | if ( currTab ) |
405 | { | 405 | { |
406 | return currTab->id(); | 406 | return currTab->id(); |
407 | } | 407 | } |
408 | return -1; | 408 | return -1; |
409 | } | 409 | } |
410 | 410 | ||
411 | QWidget* OTabWidget::currentWidget()const | ||
412 | { | ||
413 | if ( currTab ) | ||
414 | { | ||
415 | return currTab->control(); | ||
416 | } | ||
417 | |||
418 | return 0; | ||
419 | } | ||
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index c140c0b..acb9223 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h | |||
@@ -103,48 +103,49 @@ public: | |||
103 | OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top ); | 103 | OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top ); |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * @fn ~OTabWidget() | 106 | * @fn ~OTabWidget() |
107 | * @brief Object destructor. | 107 | * @brief Object destructor. |
108 | */ | 108 | */ |
109 | ~OTabWidget(); | 109 | ~OTabWidget(); |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * @fn addTab( QWidget *child, const QString &icon, const QString &label ) | 112 | * @fn addTab( QWidget *child, const QString &icon, const QString &label ) |
113 | * @brief Add new widget to control. | 113 | * @brief Add new widget to control. |
114 | * | 114 | * |
115 | * @param child Widget control. | 115 | * @param child Widget control. |
116 | * @param icon Path to icon. | 116 | * @param icon Path to icon. |
117 | * @param label Text label. | 117 | * @param label Text label. |
118 | */ | 118 | */ |
119 | void addTab( QWidget *, const QString &, const QString & ); | 119 | void addTab( QWidget *, const QString &, const QString & ); |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * @fn removePage( QWidget *widget ) | 122 | * @fn removePage( QWidget *widget ) |
123 | * @brief Remove widget from control. Does not delete widget. | 123 | * @brief Remove widget from control. Does not delete widget. |
124 | * | 124 | * |
125 | * @param widget Widget control to be removed. | 125 | * @param widget Widget control to be removed. |
126 | */ | 126 | */ |
127 | /* ### Page vs. Tab.. yes the widget is a Page but then is addTab wrong -zecke */ | ||
127 | void removePage( QWidget * ); | 128 | void removePage( QWidget * ); |
128 | 129 | ||
129 | /** | 130 | /** |
130 | * @fn changeTab( QWidget *widget, const QString &icon, const QString &label ) | 131 | * @fn changeTab( QWidget *widget, const QString &icon, const QString &label ) |
131 | * @brief Change text and/or icon for existing tab | 132 | * @brief Change text and/or icon for existing tab |
132 | * | 133 | * |
133 | * @param child Widget control. | 134 | * @param child Widget control. |
134 | * @param icon Path to icon. | 135 | * @param icon Path to icon. |
135 | * @param label Text label. | 136 | * @param label Text label. |
136 | */ | 137 | */ |
137 | void changeTab( QWidget *, const QString &, const QString & ); | 138 | void changeTab( QWidget *, const QString &, const QString & ); |
138 | 139 | ||
139 | /** | 140 | /** |
140 | * @fn tabStyle()const | 141 | * @fn tabStyle()const |
141 | * @brief Returns current widget selection control style. | 142 | * @brief Returns current widget selection control style. |
142 | */ | 143 | */ |
143 | TabStyle tabStyle() const; | 144 | TabStyle tabStyle() const; |
144 | 145 | ||
145 | /** | 146 | /** |
146 | * @fn setTabStyle( TabStyle s ) | 147 | * @fn setTabStyle( TabStyle s ) |
147 | * @brief Set the current widget selection control style. | 148 | * @brief Set the current widget selection control style. |
148 | * | 149 | * |
149 | * @param s New style to be used. | 150 | * @param s New style to be used. |
150 | */ | 151 | */ |
@@ -177,50 +178,56 @@ public: | |||
177 | * @brief Selects and brings to top the desired widget, by using label. | 178 | * @brief Selects and brings to top the desired widget, by using label. |
178 | * | 179 | * |
179 | * @param tabname Text label for widget to select. | 180 | * @param tabname Text label for widget to select. |
180 | */ | 181 | */ |
181 | void setCurrentTab( const QString & ); | 182 | void setCurrentTab( const QString & ); |
182 | 183 | ||
183 | /** | 184 | /** |
184 | * @fn setCurrentTab( int ) | 185 | * @fn setCurrentTab( int ) |
185 | * @brief Selects and brings to top the desired widget, by using id. | 186 | * @brief Selects and brings to top the desired widget, by using id. |
186 | * | 187 | * |
187 | * @param tab id for widget to select. | 188 | * @param tab id for widget to select. |
188 | */ | 189 | */ |
189 | void setCurrentTab(int); | 190 | void setCurrentTab(int); |
190 | 191 | ||
191 | /** | 192 | /** |
192 | * @fn sizeHint()const | 193 | * @fn sizeHint()const |
193 | * @brief Reimplemented for internal purposes. | 194 | * @brief Reimplemented for internal purposes. |
194 | */ | 195 | */ |
195 | QSize sizeHint() const; | 196 | QSize sizeHint() const; |
196 | 197 | ||
197 | /** | 198 | /** |
198 | * @fn currentTab( ) | 199 | * @fn currentTab( ) |
199 | * @brief returns current tab id. | 200 | * @brief returns current tab id. |
200 | */ | 201 | */ |
201 | int currentTab(); | 202 | // ### make const |
202 | 203 | int currentTab()/* const */; | |
204 | /** | ||
205 | * @brief returns the current page of the active tab | ||
206 | * | ||
207 | * @since 1.2 | ||
208 | */ | ||
209 | QWidget* currentWidget()const; | ||
203 | 210 | ||
204 | protected: | 211 | protected: |
205 | 212 | ||
206 | /** | 213 | /** |
207 | * @fn resizeEvent( QResizeEvent * ) | 214 | * @fn resizeEvent( QResizeEvent * ) |
208 | * @brief Reimplemented for internal purposes. | 215 | * @brief Reimplemented for internal purposes. |
209 | */ | 216 | */ |
210 | void resizeEvent( QResizeEvent * ); | 217 | void resizeEvent( QResizeEvent * ); |
211 | 218 | ||
212 | private: | 219 | private: |
213 | OTabInfoList tabs; | 220 | OTabInfoList tabs; |
214 | OTabInfo *currTab; | 221 | OTabInfo *currTab; |
215 | 222 | ||
216 | TabStyle tabBarStyle; | 223 | TabStyle tabBarStyle; |
217 | TabPosition tabBarPosition; | 224 | TabPosition tabBarPosition; |
218 | 225 | ||
219 | QWidgetStack *tabBarStack; | 226 | QWidgetStack *tabBarStack; |
220 | OTabBar *tabBar; | 227 | OTabBar *tabBar; |
221 | QComboBox *tabList; | 228 | QComboBox *tabList; |
222 | 229 | ||
223 | QWidgetStack *widgetStack; | 230 | QWidgetStack *widgetStack; |
224 | class Private; | 231 | class Private; |
225 | Private* d; | 232 | Private* d; |
226 | 233 | ||