author | harlekin <harlekin> | 2002-10-31 17:09:01 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-31 17:09:01 (UTC) |
commit | 16fcb285f9ba7c514fc3f2695768a82feeb7182b (patch) (unidiff) | |
tree | 4b1b09287dd339e7138608464c309f938f89e257 /core | |
parent | ba60ce32edbad5e743494c0de33534258ee5d80c (diff) | |
download | opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.zip opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.tar.gz opie-16fcb285f9ba7c514fc3f2695768a82feeb7182b.tar.bz2 |
started support for plugins without refresh, not finished yet
-rw-r--r-- | core/pim/today/changelog | 5 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 159 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 6 |
10 files changed, 119 insertions, 70 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 93abdcb..ba3cdbc 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog | |||
@@ -1,3 +1,8 @@ | |||
1 | 0.6 | ||
2 | |||
3 | * longer refresh intervals possible | ||
4 | * plugins can decide now if they want to take part in refresh cycles | ||
5 | |||
1 | 0.5.2 | 6 | 0.5.2 |
2 | 7 | ||
3 | * refresh settings | 8 | * refresh settings |
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 267a195..acdcf8e 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control | |||
@@ -3,7 +3,7 @@ Priority: optional | |||
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: 0.5.2-$SUB_VERSION | 6 | Version: 0.6-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) |
8 | License: GPL | 8 | License: GPL |
9 | Description: today screen | 9 | Description: today screen |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index cacdb65..eda84be 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -57,3 +57,6 @@ QString DatebookPlugin::appName() const { | |||
57 | return "datebook"; | 57 | return "datebook"; |
58 | } | 58 | } |
59 | 59 | ||
60 | bool DatebookPlugin::excludeFromRefresh() const { | ||
61 | return false; | ||
62 | } | ||
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 4d0f8e6..13c62a9 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -36,7 +36,7 @@ public: | |||
36 | QString pixmapNameConfig() const; | 36 | QString pixmapNameConfig() const; |
37 | TodayConfigWidget* configWidget( QWidget *); | 37 | TodayConfigWidget* configWidget( QWidget *); |
38 | QString appName() const; | 38 | QString appName() const; |
39 | 39 | bool excludeFromRefresh() const; | |
40 | }; | 40 | }; |
41 | 41 | ||
42 | 42 | ||
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp index 1c90df4..d497970 100644 --- a/core/pim/today/plugins/mail/mailplugin.cpp +++ b/core/pim/today/plugins/mail/mailplugin.cpp | |||
@@ -54,3 +54,7 @@ QString MailPlugin::appName() const { | |||
54 | } | 54 | } |
55 | 55 | ||
56 | 56 | ||
57 | bool MailPlugin::excludeFromRefresh() const { | ||
58 | return false; | ||
59 | } | ||
60 | |||
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index d2a3dcb..c937b9e 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -40,8 +40,7 @@ public: | |||
40 | QString pixmapNameConfig() const; | 40 | QString pixmapNameConfig() const; |
41 | TodayConfigWidget* configWidget(QWidget *); | 41 | TodayConfigWidget* configWidget(QWidget *); |
42 | QString appName() const; | 42 | QString appName() const; |
43 | 43 | bool excludeFromRefresh() const; | |
44 | |||
45 | }; | 44 | }; |
46 | 45 | ||
47 | #endif | 46 | #endif |
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 09b54af..e10b414 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp | |||
@@ -56,3 +56,6 @@ QString TodolistPlugin::appName() const { | |||
56 | } | 56 | } |
57 | 57 | ||
58 | 58 | ||
59 | bool TodolistPlugin::excludeFromRefresh() const { | ||
60 | return false; | ||
61 | } | ||
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 0a6669f..f98afdb 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -37,7 +37,7 @@ public: | |||
37 | QString pixmapNameConfig() const; | 37 | QString pixmapNameConfig() const; |
38 | TodayConfigWidget* configWidget(QWidget *); | 38 | TodayConfigWidget* configWidget(QWidget *); |
39 | QString appName() const; | 39 | QString appName() const; |
40 | 40 | bool excludeFromRefresh() const; | |
41 | }; | 41 | }; |
42 | 42 | ||
43 | #endif | 43 | #endif |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 8184730..3eda5c0 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -45,6 +45,7 @@ struct TodayPlugin { | |||
45 | QWidget *guiBox; | 45 | QWidget *guiBox; |
46 | QString name; | 46 | QString name; |
47 | bool active; | 47 | bool active; |
48 | bool excludeRefresh; | ||
48 | int pos; | 49 | int pos; |
49 | }; | 50 | }; |
50 | 51 | ||
@@ -76,17 +77,22 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) | |||
76 | * Qcop receive method. | 77 | * Qcop receive method. |
77 | */ | 78 | */ |
78 | void Today::channelReceived( const QCString &msg, const QByteArray & data ) { | 79 | void Today::channelReceived( const QCString &msg, const QByteArray & data ) { |
79 | QDataStream stream( data, IO_ReadOnly ); | 80 | QDataStream stream( data, IO_ReadOnly ); |
80 | if ( msg == "message(QString)" ) { | 81 | if ( msg == "message(QString)" ) { |
81 | QString message; | 82 | QString message; |
82 | stream >> message; | 83 | stream >> message; |
83 | setOwnerField( message ); | 84 | setOwnerField( message ); |
84 | } | 85 | } |
85 | } | 86 | } |
86 | 87 | ||
87 | void Today::setRefreshTimer( int interval ) { | 88 | void Today::setRefreshTimer( int interval ) { |
88 | 89 | ||
89 | if ( m_refreshTimerEnabled ) { | 90 | |
91 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
92 | |||
93 | // 0 is "never" case | ||
94 | if ( !interval == 0 ) { | ||
95 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
90 | m_refreshTimer->changeInterval( interval ); | 96 | m_refreshTimer->changeInterval( interval ); |
91 | } | 97 | } |
92 | } | 98 | } |
@@ -98,12 +104,12 @@ void Today::setRefreshTimer( int interval ) { | |||
98 | void Today::setOwnerField() { | 104 | void Today::setOwnerField() { |
99 | QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" ); | 105 | QString file = Global::applicationFileName( "addressbook", "businesscard.vcf" ); |
100 | if ( QFile::exists( file ) ) { | 106 | if ( QFile::exists( file ) ) { |
101 | Contact cont = Contact::readVCard( file )[0]; | 107 | Contact cont = Contact::readVCard( file )[0]; |
102 | QString returnString = cont.fullName(); | 108 | QString returnString = cont.fullName(); |
103 | OwnerField->setText( "<b>" + tr ( "Owned by " ) + returnString + "</b>" ); | 109 | OwnerField->setText( "<b>" + tr ( "Owned by " ) + returnString + "</b>" ); |
104 | } else { | 110 | } else { |
105 | OwnerField->setText( "<b>" + tr ( "Please fill out the business card" ) + " </b>" ); | 111 | OwnerField->setText( "<b>" + tr ( "Please fill out the business card" ) + " </b>" ); |
106 | } | 112 | } |
107 | } | 113 | } |
108 | 114 | ||
109 | /** | 115 | /** |
@@ -129,8 +135,7 @@ void Today::init() { | |||
129 | 135 | ||
130 | cfg.setGroup( "General" ); | 136 | cfg.setGroup( "General" ); |
131 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); | 137 | m_iconSize = cfg.readNumEntry( "IconSize", 18 ); |
132 | m_refreshTimer->changeInterval( cfg.readNumEntry( "checkinterval", 15000 ) ); | 138 | setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); |
133 | |||
134 | } | 139 | } |
135 | 140 | ||
136 | 141 | ||
@@ -139,12 +144,23 @@ void Today::init() { | |||
139 | */ | 144 | */ |
140 | void Today::loadPlugins() { | 145 | void Today::loadPlugins() { |
141 | 146 | ||
147 | // extra list for plugins that exclude themself from periodic refresh | ||
148 | QMap<QString, TodayPlugin> pluginListRefreshExclude; | ||
149 | |||
142 | QValueList<TodayPlugin>::Iterator tit; | 150 | QValueList<TodayPlugin>::Iterator tit; |
143 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { | 151 | if ( !pluginList.isEmpty() ) { |
144 | (*tit).library->unload(); | 152 | for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { |
145 | delete (*tit).library; | 153 | if ( (*tit).excludeRefresh ) { |
154 | pluginListRefreshExclude.insert( (*tit).name , (*tit) ); | ||
155 | qDebug( "Found an plug that does not want refresh feature" ); | ||
156 | } else { | ||
157 | (*tit).library->unload(); | ||
158 | delete (*tit).library; | ||
159 | } | ||
160 | } | ||
161 | pluginList.clear(); | ||
146 | } | 162 | } |
147 | pluginList.clear(); | 163 | |
148 | 164 | ||
149 | QString path = QPEApplication::qpeDir() + "/plugins/today"; | 165 | QString path = QPEApplication::qpeDir() + "/plugins/today"; |
150 | QDir dir( path, "lib*.so" ); | 166 | QDir dir( path, "lib*.so" ); |
@@ -162,50 +178,60 @@ void Today::loadPlugins() { | |||
162 | if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { | 178 | if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { |
163 | qDebug( "loading: %s", QString( path + "/" + *it ).latin1() ); | 179 | qDebug( "loading: %s", QString( path + "/" + *it ).latin1() ); |
164 | qDebug( QString(*it) ); | 180 | qDebug( QString(*it) ); |
165 | TodayPlugin plugin; | 181 | |
166 | plugin.library = lib; | 182 | // If plugin is exludes from refresh, get it in the list again here. |
167 | plugin.iface = iface; | 183 | |
168 | plugin.name = QString(*it); | 184 | if ( pluginListRefreshExclude.contains( (*it) ) ) { |
169 | 185 | tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] ); | |
170 | // find out if plugins should be shown | 186 | qDebug( "TEST2 " + pluginListRefreshExclude[(*it)].name ); |
171 | if ( m_excludeApplets.grep( *it ).isEmpty() ) { | ||
172 | plugin.active = true; | ||
173 | } else { | 187 | } else { |
174 | plugin.active = false; | 188 | |
175 | } | 189 | TodayPlugin plugin; |
176 | plugin.guiPart = plugin.iface->guiPart(); | 190 | plugin.library = lib; |
177 | 191 | plugin.iface = iface; | |
178 | // package the whole thing into a qwidget so it can be shown and hidden | 192 | plugin.name = QString(*it); |
179 | plugin.guiBox = new QWidget( this ); | 193 | |
180 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); | 194 | // find out if plugins should be shown |
181 | QPixmap plugPix; | 195 | if ( m_excludeApplets.grep( *it ).isEmpty() ) { |
182 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); | 196 | plugin.active = true; |
183 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); | 197 | } else { |
184 | plugIcon->setPixmap( plugPix ); | 198 | plugin.active = false; |
185 | QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") ); | 199 | } |
186 | plugIcon->setName( plugin.guiPart->appName() ); | 200 | plugin.guiPart = plugin.iface->guiPart(); |
187 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); | 201 | plugin.excludeRefresh = plugin.guiPart->excludeFromRefresh(); |
188 | // a scrollview for each plugin | 202 | |
189 | QScrollView* sv = new QScrollView( plugin.guiBox ); | 203 | // package the whole thing into a qwidget so it can be shown and hidden |
190 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); | 204 | plugin.guiBox = new QWidget( this ); |
191 | // not sure if that is good .-) | 205 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); |
192 | sv->setMinimumHeight( 10 ); | 206 | QPixmap plugPix; |
193 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 207 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); |
194 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 208 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); |
195 | sv->setFrameShape( QFrame::NoFrame ); | 209 | plugIcon->setPixmap( plugPix ); |
196 | sv->addChild( plugWidget ); | 210 | QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") ); |
197 | // make sure the icon is on the top alligned | 211 | plugIcon->setName( plugin.guiPart->appName() ); |
198 | boxLayout->addWidget( plugIcon, 0, AlignTop ); | 212 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); |
199 | boxLayout->addWidget( sv, 0, AlignTop ); | 213 | // a scrollview for each plugin |
200 | boxLayout->setStretchFactor( plugIcon, 1 ); | 214 | QScrollView* sv = new QScrollView( plugin.guiBox ); |
201 | boxLayout->setStretchFactor( sv, 9 ); | 215 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); |
202 | // "prebuffer" it in one more list, to get the sorting done | 216 | // not sure if that is good .-) |
203 | tempList.insert( plugin.name, plugin ); | 217 | sv->setMinimumHeight( 10 ); |
204 | 218 | sv->setResizePolicy( QScrollView::AutoOneFit ); | |
205 | // on first start the list is off course empty | 219 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
206 | if ( m_allApplets.isEmpty() ) { | 220 | sv->setFrameShape( QFrame::NoFrame ); |
207 | layout->addWidget( plugin.guiBox ); | 221 | sv->addChild( plugWidget ); |
208 | pluginList.append( plugin ); | 222 | // make sure the icon is on the top alligned |
223 | boxLayout->addWidget( plugIcon, 0, AlignTop ); | ||
224 | boxLayout->addWidget( sv, 0, AlignTop ); | ||
225 | boxLayout->setStretchFactor( plugIcon, 1 ); | ||
226 | boxLayout->setStretchFactor( sv, 9 ); | ||
227 | // "prebuffer" it in one more list, to get the sorting done | ||
228 | tempList.insert( plugin.name, plugin ); | ||
229 | |||
230 | // on first start the list is off course empty | ||
231 | if ( m_allApplets.isEmpty() ) { | ||
232 | layout->addWidget( plugin.guiBox ); | ||
233 | pluginList.append( plugin ); | ||
234 | } | ||
209 | } | 235 | } |
210 | } else { | 236 | } else { |
211 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); | 237 | qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); |
@@ -216,6 +242,7 @@ void Today::loadPlugins() { | |||
216 | if ( !m_allApplets.isEmpty() ) { | 242 | if ( !m_allApplets.isEmpty() ) { |
217 | TodayPlugin tempPlugin; | 243 | TodayPlugin tempPlugin; |
218 | QStringList::Iterator stringit; | 244 | QStringList::Iterator stringit; |
245 | |||
219 | for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { | 246 | for( stringit = m_allApplets.begin(); stringit != m_allApplets.end(); ++stringit ) { |
220 | tempPlugin = ( tempList.find( *stringit ) ).data(); | 247 | tempPlugin = ( tempList.find( *stringit ) ).data(); |
221 | if ( !( (tempPlugin.name).isEmpty() ) ) { | 248 | if ( !( (tempPlugin.name).isEmpty() ) ) { |
@@ -268,9 +295,12 @@ void Today::draw() { | |||
268 | */ | 295 | */ |
269 | void Today::startConfig() { | 296 | void Today::startConfig() { |
270 | 297 | ||
298 | // disconnect timer to prevent problems while being on config dialog | ||
299 | disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
300 | |||
271 | TodayConfig conf( this, "dialog", true ); | 301 | TodayConfig conf( this, "dialog", true ); |
272 | 302 | ||
273 | TodayPlugin plugin; | 303 | TodayPlugin plugin; |
274 | QList<TodayConfigWidget> configWidgetList; | 304 | QList<TodayConfigWidget> configWidgetList; |
275 | 305 | ||
276 | for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) { | 306 | for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) { |
@@ -296,6 +326,9 @@ void Today::startConfig() { | |||
296 | confWidget->writeConfig(); | 326 | confWidget->writeConfig(); |
297 | } | 327 | } |
298 | refresh(); | 328 | refresh(); |
329 | } else { | ||
330 | // since refresh is not called in that case , reconnect the signal | ||
331 | connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); | ||
299 | } | 332 | } |
300 | } | 333 | } |
301 | 334 | ||
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index db1141a..8d0b069 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -104,8 +104,10 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) | |||
104 | refreshLabel->setText( tr( "Refresh" ) ); | 104 | refreshLabel->setText( tr( "Refresh" ) ); |
105 | QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) ); | 105 | QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) ); |
106 | SpinRefresh = new QSpinBox( hbox_refresh ); | 106 | SpinRefresh = new QSpinBox( hbox_refresh ); |
107 | SpinRefresh->setMinValue( 2 ); | 107 | SpinRefresh->setMinValue( 0 ); |
108 | SpinRefresh->setSuffix( tr( " seconds" ) ); | 108 | SpinRefresh->setSuffix( tr( " sec" ) ); |
109 | SpinRefresh->setMaxValue ( 7200 ); | ||
110 | SpinRefresh->setSpecialValueText ( tr("never") ); | ||
109 | QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) ); | 111 | QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) ); |
110 | 112 | ||
111 | tab3Layout->addWidget( hbox_auto ); | 113 | tab3Layout->addWidget( hbox_auto ); |