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 +1,5 @@
10.5.1
2
3* icons scalable and clickable again
4
10.5 50.5
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
@@ -5,3 +5,3 @@ Maintainer: 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)
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
@@ -32,3 +32,3 @@ DatebookPlugin::~DatebookPlugin() {
32QString DatebookPlugin::pluginName() const { 32QString DatebookPlugin::pluginName() const {
33 return "Datebook plugin"; 33 return QObject::tr( "Datebook plugin");
34} 34}
@@ -56,3 +56,3 @@ TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
56QString DatebookPlugin::appName() const { 56QString DatebookPlugin::appName() const {
57 return QObject::tr( "Datebook" ); 57 return "datebook";
58} 58}
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
@@ -28,3 +28,3 @@ MailPlugin::~MailPlugin() {
28QString MailPlugin::pluginName() const { 28QString MailPlugin::pluginName() const {
29 return "Mail plugin"; 29 return QObject::tr( "Mail plugin" );
30} 30}
@@ -32,3 +32,3 @@ QString MailPlugin::pluginName() const {
32double MailPlugin::versionNumber() const { 32double MailPlugin::versionNumber() const {
33 return 0.5; 33 return 0.6;
34} 34}
@@ -52,3 +52,3 @@ TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) {
52QString MailPlugin::appName() const { 52QString MailPlugin::appName() const {
53 return "Mail"; 53 return "mail";
54} 54}
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
@@ -30,3 +30,3 @@ TodolistPlugin::~TodolistPlugin() {
30QString TodolistPlugin::pluginName() const { 30QString TodolistPlugin::pluginName() const {
31 return "Todolist plugin"; 31 return QObject::tr( "Todolist plugin" );
32} 32}
@@ -54,3 +54,3 @@ TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
54QString TodolistPlugin::appName() const { 54QString TodolistPlugin::appName() const {
55 return QObject::tr( "Todolist" ); 55 return "todolist";
56} 56}
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
@@ -32,3 +32,3 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
32 32
33 todoLabel= 0l; 33 todoLabel = 0l;
34 todo = 0l; 34 todo = 0l;
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
@@ -116,2 +116,4 @@ void Today::init() {
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}
@@ -137,3 +139,2 @@ void Today::loadPlugins() {
137 139
138
139 QMap<QString, TodayPlugin> tempList; 140 QMap<QString, TodayPlugin> tempList;
@@ -165,5 +166,7 @@ void Today::loadPlugins() {
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
@@ -253,3 +256,3 @@ void Today::startConfig() {
253 256
254 TodayPlugin plugin; 257 TodayPlugin plugin;
255 QList<TodayConfigWidget> configWidgetList; 258 QList<TodayConfigWidget> configWidgetList;
@@ -313,2 +316,7 @@ void Today::startAddressbook() {
313 316
317void Today::startApplication() {
318 QCopEnvelope e( "QPE/System", "execute(QString)" );
319 e << QString( sender()->name() );
320}
321
314/** 322/**
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
@@ -34,3 +34,3 @@
34class QVBoxLayout; 34class QVBoxLayout;
35 35class OClickableLabel;
36 36
@@ -48,2 +48,3 @@ private slots:
48 void startAddressbook(); 48 void startAddressbook();
49 void startApplication();
49 void editCard(); 50 void editCard();
@@ -66,5 +67,4 @@ private slots:
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;
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
@@ -31,2 +31,3 @@
31#include <qtoolbutton.h> 31#include <qtoolbutton.h>
32#include <qtooltip.h>
32 33
@@ -83,7 +84,15 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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" ) );
@@ -110,3 +119,3 @@ void TodayConfig::setAutoStart() {
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 {
@@ -129,2 +138,6 @@ void TodayConfig::readConfig() {
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" );
@@ -170,2 +183,7 @@ void TodayConfig::writeConfig() {
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
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
@@ -57,2 +57,3 @@ private:
57 int m_autoStartTimer; 57 int m_autoStartTimer;
58 int m_iconSize;
58 QStringList m_excludeApplets; 59 QStringList m_excludeApplets;
@@ -68,2 +69,3 @@ private:
68 QSpinBox* SpinBoxTime; 69 QSpinBox* SpinBoxTime;
70 QSpinBox* SpinBoxIconSize;
69}; 71};