summaryrefslogtreecommitdiff
Unidiff
Diffstat (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/plugins/datebook/datebookplugin.cpp4
-rw-r--r--core/pim/today/plugins/mail/mailplugin.cpp6
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp4
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.cpp2
-rw-r--r--core/pim/today/today.cpp14
-rw-r--r--core/pim/today/today.h6
-rw-r--r--core/pim/today/todayconfig.cpp22
-rw-r--r--core/pim/today/todayconfig.h2
10 files changed, 49 insertions, 17 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 5fd3284..25d63ef 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,3 +1,7 @@
10.5.1
2
3* icons scalable and clickable again
4
10.5 50.5
2 6
3* now fully plugin based 7* now fully plugin based
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 6ea5090..28087f9 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-$SUB_VERSION 6Version: 0.5.1-$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/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 4ebb178..cacdb65 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -30,7 +30,7 @@ DatebookPlugin::~DatebookPlugin() {
30} 30}
31 31
32QString DatebookPlugin::pluginName() const { 32QString DatebookPlugin::pluginName() const {
33 return "Datebook plugin"; 33 return QObject::tr( "Datebook plugin");
34} 34}
35 35
36double DatebookPlugin::versionNumber() const { 36double DatebookPlugin::versionNumber() const {
@@ -54,6 +54,6 @@ TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
54} 54}
55 55
56QString DatebookPlugin::appName() const { 56QString DatebookPlugin::appName() const {
57 return QObject::tr( "Datebook" ); 57 return "datebook";
58} 58}
59 59
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp
index 3ddf16e..1c90df4 100644
--- a/core/pim/today/plugins/mail/mailplugin.cpp
+++ b/core/pim/today/plugins/mail/mailplugin.cpp
@@ -26,11 +26,11 @@ MailPlugin::~MailPlugin() {
26} 26}
27 27
28QString MailPlugin::pluginName() const { 28QString MailPlugin::pluginName() const {
29 return "Mail plugin"; 29 return QObject::tr( "Mail plugin" );
30} 30}
31 31
32double MailPlugin::versionNumber() const { 32double MailPlugin::versionNumber() const {
33 return 0.5; 33 return 0.6;
34} 34}
35 35
36QString MailPlugin::pixmapNameWidget() const { 36QString MailPlugin::pixmapNameWidget() const {
@@ -50,7 +50,7 @@ TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
50} 50}
51 51
52QString MailPlugin::appName() const { 52QString MailPlugin::appName() const {
53 return "Mail"; 53 return "mail";
54} 54}
55 55
56 56
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 19d9f37..09b54af 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -28,7 +28,7 @@ TodolistPlugin::~TodolistPlugin() {
28} 28}
29 29
30QString TodolistPlugin::pluginName() const { 30QString TodolistPlugin::pluginName() const {
31 return "Todolist plugin"; 31 return QObject::tr( "Todolist plugin" );
32} 32}
33 33
34double TodolistPlugin::versionNumber() const { 34double TodolistPlugin::versionNumber() const {
@@ -52,7 +52,7 @@ TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
52} 52}
53 53
54QString TodolistPlugin::appName() const { 54QString TodolistPlugin::appName() const {
55 return QObject::tr( "Todolist" ); 55 return "todolist";
56} 56}
57 57
58 58
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index d793aae..320969e 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -30,7 +30,7 @@
30TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) 30TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
31 : QWidget( parent, name ) { 31 : QWidget( parent, name ) {
32 32
33 todoLabel= 0l; 33 todoLabel = 0l;
34 todo = 0l; 34 todo = 0l;
35 35
36 if ( todo ) { 36 if ( todo ) {
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 35758d5..34ec3cb 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -114,6 +114,8 @@ void Today::init() {
114 114
115 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); 115 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
116 m_allApplets = cfg.readListEntry( "AllApplets", ',' ); 116 m_allApplets = cfg.readListEntry( "AllApplets", ',' );
117 cfg.setGroup( "General" );
118 m_iconSize = cfg.readNumEntry( "IconSize", 18 );
117} 119}
118 120
119 121
@@ -135,7 +137,6 @@ void Today::loadPlugins() {
135 QStringList list = dir.entryList(); 137 QStringList list = dir.entryList();
136 QStringList::Iterator it; 138 QStringList::Iterator it;
137 139
138
139 QMap<QString, TodayPlugin> tempList; 140 QMap<QString, TodayPlugin> tempList;
140 141
141 for ( it = list.begin(); it != list.end(); ++it ) { 142 for ( it = list.begin(); it != list.end(); ++it ) {
@@ -163,9 +164,11 @@ void Today::loadPlugins() {
163 plugin.guiBox = new QWidget( this ); 164 plugin.guiBox = new QWidget( this );
164 QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); 165 QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
165 QPixmap plugPix; 166 QPixmap plugPix;
166 plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); 167 plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
167 OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); 168 OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
168 plugIcon->setPixmap( plugPix ); 169 plugIcon->setPixmap( plugPix );
170 plugIcon->setName( plugin.guiPart->appName() );
171 connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) );
169 // a scrollview for each plugin 172 // a scrollview for each plugin
170 QScrollView* sv = new QScrollView( plugin.guiBox ); 173 QScrollView* sv = new QScrollView( plugin.guiBox );
171 QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); 174 QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() );
@@ -251,7 +254,7 @@ void Today::startConfig() {
251 254
252 TodayConfig conf( this, "dialog", true ); 255 TodayConfig conf( this, "dialog", true );
253 256
254 TodayPlugin plugin; 257 TodayPlugin plugin;
255 QList<TodayConfigWidget> configWidgetList; 258 QList<TodayConfigWidget> configWidgetList;
256 259
257 for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) { 260 for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) {
@@ -311,6 +314,11 @@ void Today::startAddressbook() {
311} 314}
312 315
313 316
317void Today::startApplication() {
318 QCopEnvelope e( "QPE/System", "execute(QString)" );
319 e << QString( sender()->name() );
320}
321
314/** 322/**
315 * launch addressbook (personal card) 323 * launch addressbook (personal card)
316 */ 324 */
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 92512b9..6f13df6 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -32,7 +32,7 @@
32#include <opie/todayplugininterface.h> 32#include <opie/todayplugininterface.h>
33 33
34class QVBoxLayout; 34class QVBoxLayout;
35 35class OClickableLabel;
36 36
37 37
38class Today : public TodayBase { 38class Today : public TodayBase {
@@ -46,6 +46,7 @@ class Today : public TodayBase {
46private slots: 46private slots:
47 void startConfig(); 47 void startConfig();
48 void startAddressbook(); 48 void startAddressbook();
49 void startApplication();
49 void editCard(); 50 void editCard();
50 void refresh(); 51 void refresh();
51 52
@@ -64,9 +65,8 @@ private slots:
64 QStringList m_excludeApplets; 65 QStringList m_excludeApplets;
65 QStringList m_allApplets; 66 QStringList m_allApplets;
66 67
67 // QString m_autoStartTimer;
68 int m_newStart; 68 int m_newStart;
69 // int m_autoStart; 69 int m_iconSize;
70 int m_maxCharClip; 70 int m_maxCharClip;
71}; 71};
72 72
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 3fc5830..097965b 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -29,6 +29,7 @@
29#include <qhbox.h> 29#include <qhbox.h>
30#include <qvbox.h> 30#include <qvbox.h>
31#include <qtoolbutton.h> 31#include <qtoolbutton.h>
32#include <qtooltip.h>
32 33
33class ToolButton : public QToolButton { 34class ToolButton : public QToolButton {
34 35
@@ -81,11 +82,19 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
81 TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) ); 82 TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) );
82 CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" ); 83 CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
83 QHBox *hbox_inactive = new QHBox( tab_3 ); 84 QHBox *hbox_inactive = new QHBox( tab_3 );
84 TimeLabel = new QLabel( hbox_inactive , "TimeLabel" ); 85 TimeLabel = new QLabel( hbox_inactive, "TimeLabel" );
85 TimeLabel->setText( tr( "minutes inactive" ) ); 86 TimeLabel->setText( tr( "minutes inactive" ) );
86 SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" ); 87 SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
88 QHBox *hbox_iconSize = new QHBox( tab_3 );
89 QLabel *iconSizeLabel = new QLabel( hbox_iconSize, "iconSizeLabel" );
90 iconSizeLabel->setText( tr( "Icon size" ) );
91 // iconSizeLabel->setToolTip( tr( "Set the icon size in pixel" ) );
92 SpinBoxIconSize = new QSpinBox( hbox_iconSize, "TimeSpinner" );
93 SpinBoxIconSize->setMaxValue( 32 );
94
87 tab3Layout->addWidget( hbox_auto ); 95 tab3Layout->addWidget( hbox_auto );
88 tab3Layout->addWidget( hbox_inactive ); 96 tab3Layout->addWidget( hbox_inactive );
97 tab3Layout->addWidget( hbox_iconSize );
89 TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); 98 TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
90 99
91 m_applets_changed = false; 100 m_applets_changed = false;
@@ -108,7 +117,7 @@ void TodayConfig::setAutoStart() {
108 QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" ); 117 QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
109 e << QString( "add" ); 118 e << QString( "add" );
110 e << QString( "today" ); 119 e << QString( "today" );
111 e << QString("%1").arg( m_autoStartTimer ); 120 e << QString( "%1" ).arg( m_autoStartTimer );
112 } else { 121 } else {
113 QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" ); 122 QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
114 e << QString( "remove" ); 123 e << QString( "remove" );
@@ -127,6 +136,10 @@ void TodayConfig::readConfig() {
127 m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 ); 136 m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 );
128 SpinBoxTime->setValue( m_autoStartTimer ); 137 SpinBoxTime->setValue( m_autoStartTimer );
129 138
139 cfg.setGroup( "General" );
140 m_iconSize = cfg.readNumEntry( "IconSize", 18 );
141 SpinBoxIconSize->setValue( m_iconSize );
142
130 cfg.setGroup( "Plugins" ); 143 cfg.setGroup( "Plugins" );
131 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); 144 m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
132} 145}
@@ -168,6 +181,11 @@ void TodayConfig::writeConfig() {
168 cfg.writeEntry( "autostart", m_autoStart ); 181 cfg.writeEntry( "autostart", m_autoStart );
169 m_autoStartTimer = SpinBoxTime->value(); 182 m_autoStartTimer = SpinBoxTime->value();
170 cfg.writeEntry( "autostartdelay", m_autoStartTimer ); 183 cfg.writeEntry( "autostartdelay", m_autoStartTimer );
184 m_iconSize = SpinBoxIconSize->value();
185
186 cfg.setGroup( "General" );
187 cfg.writeEntry( "IconSize", m_iconSize );
188
171 189
172 // set autostart settings 190 // set autostart settings
173 setAutoStart(); 191 setAutoStart();
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index f23b850..aa227dd 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -55,6 +55,7 @@ private:
55 55
56 int m_autoStart; 56 int m_autoStart;
57 int m_autoStartTimer; 57 int m_autoStartTimer;
58 int m_iconSize;
58 QStringList m_excludeApplets; 59 QStringList m_excludeApplets;
59 bool m_applets_changed; 60 bool m_applets_changed;
60 61
@@ -66,6 +67,7 @@ private:
66 QSpinBox* SpinBox7; 67 QSpinBox* SpinBox7;
67 QLabel* TimeLabel; 68 QLabel* TimeLabel;
68 QSpinBox* SpinBoxTime; 69 QSpinBox* SpinBoxTime;
70 QSpinBox* SpinBoxIconSize;
69}; 71};
70 72
71#endif 73#endif