summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp35
-rw-r--r--core/pim/today/today.h2
2 files changed, 6 insertions, 31 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 1f758f2..2f6907d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,7 +1,7 @@
1/* 1/*
2 * today.cpp 2 * today.cpp
3 * 3 *
4 * copyright : (c) 2002 by Maximilian Reiß 4 * copyright : (c) 2002,2003 by Maximilian Reiß
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */
@@ -70,7 +70,7 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
70 m_refreshTimer = new QTimer( this ); 70 m_refreshTimer = new QTimer( this );
71 connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) ); 71 connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
72 m_refreshTimer->start( 15000 ); 72 m_refreshTimer->start( 15000 );
73 init(); 73 //init();
74 loadPlugins(); 74 loadPlugins();
75 showMaximized(); 75 showMaximized();
76} 76}
@@ -122,7 +122,6 @@ void Today::setOwnerField( QString &message ) {
122 } 122 }
123} 123}
124 124
125
126/** 125/**
127 * Init stuff needed for today. Reads the config file. 126 * Init stuff needed for today. Reads the config file.
128 */ 127 */
@@ -138,12 +137,9 @@ void Today::init() {
138 m_iconSize = cfg.readNumEntry( "IconSize", 18 ); 137 m_iconSize = cfg.readNumEntry( "IconSize", 18 );
139 setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) ); 138 setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
140 139
141
142 // qDebug(" refresh ");
143 // set the date in top label 140 // set the date in top label
144 QDate date = QDate::currentDate(); 141 QDate date = QDate::currentDate();
145 QString time = ( tr( date.toString() ) ); 142 QString time = ( tr( date.toString() ) );
146
147 DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) ); 143 DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
148 144
149 if ( layout ) { 145 if ( layout ) {
@@ -154,29 +150,21 @@ void Today::init() {
154 layout->addWidget( OwnerField ); 150 layout->addWidget( OwnerField );
155} 151}
156 152
157
158/** 153/**
159 * Load the plugins 154 * Load the plugins
160 */ 155 */
161void Today::loadPlugins() { 156void Today::loadPlugins() {
162 157
163 // extra list for plugins that exclude themself from periodic refresh 158 init();
164 QMap<QString, TodayPlugin> pluginListRefreshExclude;
165
166 QValueList<TodayPlugin>::Iterator tit; 159 QValueList<TodayPlugin>::Iterator tit;
167 if ( !pluginList.isEmpty() ) { 160 if ( !pluginList.isEmpty() ) {
168 for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { 161 for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
169 if ( (*tit).excludeRefresh ) {
170 pluginListRefreshExclude.insert( (*tit).name , (*tit) );
171 qDebug( "Found a plugin that does not want refresh feature" );
172 } else {
173 (*tit).guiBox->hide(); 162 (*tit).guiBox->hide();
174 (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) ); 163 (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) );
175 (*tit).library->unload(); 164 (*tit).library->unload();
176 delete (*tit).guiBox; 165 delete (*tit).guiBox;
177 delete (*tit).library; 166 delete (*tit).library;
178 } 167 }
179 }
180 pluginList.clear(); 168 pluginList.clear();
181 } 169 }
182 170
@@ -189,7 +177,6 @@ void Today::loadPlugins() {
189 QMap<QString, TodayPlugin> tempList; 177 QMap<QString, TodayPlugin> tempList;
190 178
191 for ( it = list.begin(); it != list.end(); ++it ) { 179 for ( it = list.begin(); it != list.end(); ++it ) {
192 //TodayPluginInterface *iface = 0;
193 QInterfacePtr<TodayPluginInterface> iface; 180 QInterfacePtr<TodayPluginInterface> iface;
194 QLibrary *lib = new QLibrary( path + "/" + *it ); 181 QLibrary *lib = new QLibrary( path + "/" + *it );
195 182
@@ -198,18 +185,6 @@ void Today::loadPlugins() {
198 qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); 185 qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() );
199 qDebug( QString(*it) ); 186 qDebug( QString(*it) );
200 187
201 // If plugin is exludes from refresh, get it in the list again here.
202
203 if ( pluginListRefreshExclude.contains( (*it) ) ) {
204 // if its not in allApplets list, add it to a layout
205 if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) {
206 layout->addWidget( pluginListRefreshExclude[(*it)].guiBox );
207 pluginList.append( pluginListRefreshExclude[(*it)] );
208 } else {
209 tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] );
210 }
211 } else {
212
213 TodayPlugin plugin; 188 TodayPlugin plugin;
214 plugin.library = lib; 189 plugin.library = lib;
215 plugin.iface = iface; 190 plugin.iface = iface;
@@ -239,7 +214,7 @@ void Today::loadPlugins() {
239 QScrollView* sv = new QScrollView( plugin.guiBox ); 214 QScrollView* sv = new QScrollView( plugin.guiBox );
240 QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); 215 QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() );
241 // not sure if that is good .-) 216 // not sure if that is good .-)
242 sv->setMinimumHeight( 10 ); 217 sv->setMinimumHeight( 12 );
243 sv->setResizePolicy( QScrollView::AutoOneFit ); 218 sv->setResizePolicy( QScrollView::AutoOneFit );
244 sv->setHScrollBarMode( QScrollView::AlwaysOff ); 219 sv->setHScrollBarMode( QScrollView::AlwaysOff );
245 sv->setFrameShape( QFrame::NoFrame ); 220 sv->setFrameShape( QFrame::NoFrame );
@@ -263,7 +238,6 @@ void Today::loadPlugins() {
263 layout->addWidget( plugin.guiBox ); 238 layout->addWidget( plugin.guiBox );
264 pluginList.append( plugin ); 239 pluginList.append( plugin );
265 } 240 }
266 }
267 } else { 241 } else {
268 qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); 242 qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
269 delete lib; 243 delete lib;
@@ -370,6 +344,7 @@ void Today::startConfig() {
370 * 344 *
371 */ 345 */
372void Today::refresh() { 346void Today::refresh() {
347
373 init(); 348 init();
374 349
375 QValueList<TodayPlugin>::Iterator it; 350 QValueList<TodayPlugin>::Iterator it;
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 35b7ee3..24f5611 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * today.h 2 * today.h
3 * 3 *
4 * copyright : (c) 2002 by Maximilian Reiß 4 * copyright : (c) 2002,2003 by Maximilian Reiß
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */