-rw-r--r-- | core/pim/today/today.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 7673df5..f5f88f8 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -13,13 +13,13 @@ | |||
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | #include "today.h" | 18 | #include "today.h" |
19 | #include "configwidget.h" | 19 | #include "todayconfigwidget.h" |
20 | 20 | ||
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/global.h> | 24 | #include <qpe/global.h> |
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
@@ -166,13 +166,14 @@ void Today::loadPlugins() { | |||
166 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); | 166 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); |
167 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); | 167 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); |
168 | plugIcon->setPixmap( plugPix ); | 168 | plugIcon->setPixmap( plugPix ); |
169 | // a scrollview for each plugin | 169 | // a scrollview for each plugin |
170 | QScrollView* sv = new QScrollView( plugin.guiBox ); | 170 | QScrollView* sv = new QScrollView( plugin.guiBox ); |
171 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); | 171 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); |
172 | sv->setMinimumHeight( plugin.guiPart->minHeight() ); | 172 | // not sure if that is good .-) |
173 | sv->setMinimumHeight( 10 ); | ||
173 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 174 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
174 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 175 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
175 | sv->setFrameShape( QFrame::NoFrame ); | 176 | sv->setFrameShape( QFrame::NoFrame ); |
176 | sv->addChild( plugWidget ); | 177 | sv->addChild( plugWidget ); |
177 | // make sure the icon is on the top alligned | 178 | // make sure the icon is on the top alligned |
178 | boxLayout->addWidget( plugIcon, 0, AlignTop ); | 179 | boxLayout->addWidget( plugIcon, 0, AlignTop ); |
@@ -248,32 +249,32 @@ void Today::draw() { | |||
248 | */ | 249 | */ |
249 | void Today::startConfig() { | 250 | void Today::startConfig() { |
250 | 251 | ||
251 | TodayConfig conf( this, "dialog", true ); | 252 | TodayConfig conf( this, "dialog", true ); |
252 | 253 | ||
253 | TodayPlugin plugin; | 254 | TodayPlugin plugin; |
254 | QList<ConfigWidget> configWidgetList; | 255 | QList<TodayConfigWidget> configWidgetList; |
255 | 256 | ||
256 | for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) { | 257 | for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) { |
257 | plugin = pluginList[i]; | 258 | plugin = pluginList[i]; |
258 | 259 | ||
259 | // load the config widgets in the tabs | 260 | // load the config widgets in the tabs |
260 | if ( plugin.guiPart->configWidget( this ) != 0l ) { | 261 | if ( plugin.guiPart->configWidget( this ) != 0l ) { |
261 | ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); | 262 | TodayConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); |
262 | configWidgetList.append( widget ); | 263 | configWidgetList.append( widget ); |
263 | conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig() | 264 | conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig() |
264 | , plugin.guiPart->appName() ); | 265 | , plugin.guiPart->appName() ); |
265 | } | 266 | } |
266 | // set the order/activate tab | 267 | // set the order/activate tab |
267 | conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), | 268 | conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), |
268 | Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); | 269 | Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); |
269 | } | 270 | } |
270 | 271 | ||
271 | if ( conf.exec() == QDialog::Accepted ) { | 272 | if ( conf.exec() == QDialog::Accepted ) { |
272 | conf.writeConfig(); | 273 | conf.writeConfig(); |
273 | ConfigWidget *confWidget; | 274 | TodayConfigWidget *confWidget; |
274 | for ( confWidget = configWidgetList.first(); confWidget != 0; | 275 | for ( confWidget = configWidgetList.first(); confWidget != 0; |
275 | confWidget = configWidgetList.next() ) { | 276 | confWidget = configWidgetList.next() ) { |
276 | confWidget->writeConfig(); | 277 | confWidget->writeConfig(); |
277 | } | 278 | } |
278 | refresh(); | 279 | refresh(); |
279 | } | 280 | } |