summaryrefslogtreecommitdiff
path: root/core/pim
Unidiff
Diffstat (limited to 'core/pim') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/changelog4
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/today.cpp17
-rw-r--r--core/pim/today/today.h4
-rw-r--r--core/pim/today/todayconfig.cpp14
-rw-r--r--core/pim/today/todayconfig.h1
6 files changed, 39 insertions, 3 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 25d63ef..eb2496a 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,3 +1,7 @@
10.5.2
2
3* refresh settings
4
10.5.1 50.5.1
2 6
3* icons scalable and clickable again 7* icons scalable and clickable again
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 28087f9..267a195 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -3,7 +3,7 @@ Priority: optional
3Section: opie/applications 3Section: opie/applications
4Maintainer: Maximilian Reiß <harlekin@handhelds.org> 4Maintainer: Maximilian Reiß <harlekin@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: 0.5.1-$SUB_VERSION 6Version: 0.5.2-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
8License: GPL 8License: GPL
9Description: today screen 9Description: today screen
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index dd98824..8184730 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -65,6 +65,9 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
65#endif 65#endif
66 66
67 setOwnerField(); 67 setOwnerField();
68 m_refreshTimer = new QTimer( this );
69 connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
70 m_refreshTimer->start( 15000 );
68 refresh(); 71 refresh();
69 showMaximized(); 72 showMaximized();
70} 73}
@@ -81,6 +84,14 @@ void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
81 } 84 }
82} 85}
83 86
87void Today::setRefreshTimer( int interval ) {
88
89 if ( m_refreshTimerEnabled ) {
90 m_refreshTimer->changeInterval( interval );
91 }
92}
93
94
84/** 95/**
85 * Initialises the owner field with the default value, the username 96 * Initialises the owner field with the default value, the username
86 */ 97 */
@@ -111,12 +122,15 @@ void Today::setOwnerField( QString &message ) {
111void Today::init() { 122void Today::init() {
112 // read config 123 // read config
113 Config cfg( "today" ); 124 Config cfg( "today" );
114 cfg.setGroup( "Plugins" );
115 125
126 cfg.setGroup( "Plugins" );
116 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); 127 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
117 m_allApplets = cfg.readListEntry( "AllApplets", ',' ); 128 m_allApplets = cfg.readListEntry( "AllApplets", ',' );
129
118 cfg.setGroup( "General" ); 130 cfg.setGroup( "General" );
119 m_iconSize = cfg.readNumEntry( "IconSize", 18 ); 131 m_iconSize = cfg.readNumEntry( "IconSize", 18 );
132 m_refreshTimer->changeInterval( cfg.readNumEntry( "checkinterval", 15000 ) );
133
120} 134}
121 135
122 136
@@ -293,6 +307,7 @@ void Today::startConfig() {
293void Today::refresh() { 307void Today::refresh() {
294 init(); 308 init();
295 309
310 qDebug(" refresh ");
296 // set the date in top label 311 // set the date in top label
297 QDate date = QDate::currentDate(); 312 QDate date = QDate::currentDate();
298 QString time = ( tr( date.toString() ) ); 313 QString time = ( tr( date.toString() ) );
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 6f13df6..4485a0b 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -56,6 +56,7 @@ private:
56 void setOwnerField(QString &string); 56 void setOwnerField(QString &string);
57 void loadPlugins(); 57 void loadPlugins();
58 void draw(); 58 void draw();
59 void setRefreshTimer( int );
59 60
60private slots: 61private slots:
61 void channelReceived(const QCString &msg, const QByteArray & data); 62 void channelReceived(const QCString &msg, const QByteArray & data);
@@ -65,6 +66,9 @@ private slots:
65 QStringList m_excludeApplets; 66 QStringList m_excludeApplets;
66 QStringList m_allApplets; 67 QStringList m_allApplets;
67 68
69 QTimer *m_refreshTimer;
70
71 bool m_refreshTimerEnabled;
68 int m_newStart; 72 int m_newStart;
69 int m_iconSize; 73 int m_iconSize;
70 int m_maxCharClip; 74 int m_maxCharClip;
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index f9dd8f7..db1141a 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -99,9 +99,19 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
99 SpinBoxIconSize->setMaxValue( 32 ); 99 SpinBoxIconSize->setMaxValue( 32 );
100 QWhatsThis::add( SpinBoxIconSize, tr( "Set the icon size in pixel" ) ); 100 QWhatsThis::add( SpinBoxIconSize, tr( "Set the icon size in pixel" ) );
101 101
102 QHBox *hbox_refresh = new QHBox( tab_3 );
103 QLabel *refreshLabel = new QLabel( hbox_refresh );
104 refreshLabel->setText( tr( "Refresh" ) );
105 QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) );
106 SpinRefresh = new QSpinBox( hbox_refresh );
107 SpinRefresh->setMinValue( 2 );
108 SpinRefresh->setSuffix( tr( " seconds" ) );
109 QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) );
110
102 tab3Layout->addWidget( hbox_auto ); 111 tab3Layout->addWidget( hbox_auto );
103 tab3Layout->addWidget( hbox_inactive ); 112 tab3Layout->addWidget( hbox_inactive );
104 tab3Layout->addWidget( hbox_iconSize ); 113 tab3Layout->addWidget( hbox_iconSize );
114 tab3Layout->addWidget( hbox_refresh );
105 TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); 115 TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
106 116
107 m_applets_changed = false; 117 m_applets_changed = false;
@@ -146,6 +156,8 @@ void TodayConfig::readConfig() {
146 cfg.setGroup( "General" ); 156 cfg.setGroup( "General" );
147 m_iconSize = cfg.readNumEntry( "IconSize", 18 ); 157 m_iconSize = cfg.readNumEntry( "IconSize", 18 );
148 SpinBoxIconSize->setValue( m_iconSize ); 158 SpinBoxIconSize->setValue( m_iconSize );
159 SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
160
149 161
150 cfg.setGroup( "Plugins" ); 162 cfg.setGroup( "Plugins" );
151 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); 163 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
@@ -192,7 +204,7 @@ void TodayConfig::writeConfig() {
192 204
193 cfg.setGroup( "General" ); 205 cfg.setGroup( "General" );
194 cfg.writeEntry( "IconSize", m_iconSize ); 206 cfg.writeEntry( "IconSize", m_iconSize );
195 207 cfg.writeEntry( "checkinterval", SpinRefresh->value()*1000 );
196 208
197 // set autostart settings 209 // set autostart settings
198 setAutoStart(); 210 setAutoStart();
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 827e106..68483c2 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -67,6 +67,7 @@ private:
67 QSpinBox* SpinBox7; 67 QSpinBox* SpinBox7;
68 QLabel* TimeLabel; 68 QLabel* TimeLabel;
69 QSpinBox* SpinBoxTime; 69 QSpinBox* SpinBoxTime;
70 QSpinBox* SpinRefresh;
70 QSpinBox* SpinBoxIconSize; 71 QSpinBox* SpinBoxIconSize;
71}; 72};
72 73