author | harlekin <harlekin> | 2002-10-05 20:46:18 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-05 20:46:18 (UTC) |
commit | d7f9d00fcc9261db9c4af4f1b4afde9d50e8a2a2 (patch) (side-by-side diff) | |
tree | 3afa0409bea98ca92ebfa269485f0845b3c96b6a /core/pim | |
parent | ab196dbed05f9e534709a9c0b7f44eca65a72929 (diff) | |
download | opie-d7f9d00fcc9261db9c4af4f1b4afde9d50e8a2a2.zip opie-d7f9d00fcc9261db9c4af4f1b4afde9d50e8a2a2.tar.gz opie-d7f9d00fcc9261db9c4af4f1b4afde9d50e8a2a2.tar.bz2 |
buttons resizable and clickable again
-rw-r--r-- | core/pim/today/changelog | 4 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.cpp | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.cpp | 0 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 12 | ||||
-rw-r--r-- | core/pim/today/today.h | 6 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 18 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 2 |
10 files changed, 45 insertions, 13 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 @@ +0.5.1 + +* icons scalable and clickable again + 0.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> Architecture: arm -Version: 0.5-$SUB_VERSION +Version: 0.5.1-$SUB_VERSION Depends: 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() { QString DatebookPlugin::pluginName() const { - return "Datebook plugin"; + return QObject::tr( "Datebook plugin"); } @@ -56,3 +56,3 @@ TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { QString DatebookPlugin::appName() const { - return QObject::tr( "Datebook" ); + return "datebook"; } 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() { QString MailPlugin::pluginName() const { - return "Mail plugin"; + return QObject::tr( "Mail plugin" ); } @@ -32,3 +32,3 @@ QString MailPlugin::pluginName() const { double MailPlugin::versionNumber() const { - return 0.5; + return 0.6; } @@ -52,3 +52,3 @@ TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) { QString MailPlugin::appName() const { - return "Mail"; + return "mail"; } 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() { QString TodolistPlugin::pluginName() const { - return "Todolist plugin"; + return QObject::tr( "Todolist plugin" ); } @@ -54,3 +54,3 @@ TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { QString TodolistPlugin::appName() const { - return QObject::tr( "Todolist" ); + return "todolist"; } 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 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() { m_allApplets = cfg.readListEntry( "AllApplets", ',' ); + cfg.setGroup( "General" ); + m_iconSize = cfg.readNumEntry( "IconSize", 18 ); } @@ -137,3 +139,2 @@ void Today::loadPlugins() { - QMap<QString, TodayPlugin> tempList; @@ -165,5 +166,7 @@ void Today::loadPlugins() { QPixmap plugPix; - plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); + plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); plugIcon->setPixmap( plugPix ); + plugIcon->setName( plugin.guiPart->appName() ); + connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); // a scrollview for each plugin @@ -313,2 +316,7 @@ void Today::startAddressbook() { +void Today::startApplication() { + QCopEnvelope e( "QPE/System", "execute(QString)" ); + e << QString( sender()->name() ); +} + /** 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 @@ class QVBoxLayout; - +class OClickableLabel; @@ -48,2 +48,3 @@ private slots: void startAddressbook(); + void startApplication(); void editCard(); @@ -66,5 +67,4 @@ private slots: - // QString m_autoStartTimer; int m_newStart; - // int m_autoStart; + int m_iconSize; 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 @@ #include <qtoolbutton.h> +#include <qtooltip.h> @@ -86,4 +87,12 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" ); + QHBox *hbox_iconSize = new QHBox( tab_3 ); + QLabel *iconSizeLabel = new QLabel( hbox_iconSize, "iconSizeLabel" ); + iconSizeLabel->setText( tr( "Icon size" ) ); + // iconSizeLabel->setToolTip( tr( "Set the icon size in pixel" ) ); + SpinBoxIconSize = new QSpinBox( hbox_iconSize, "TimeSpinner" ); + SpinBoxIconSize->setMaxValue( 32 ); + tab3Layout->addWidget( hbox_auto ); tab3Layout->addWidget( hbox_inactive ); + tab3Layout->addWidget( hbox_iconSize ); TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); @@ -129,2 +138,6 @@ void TodayConfig::readConfig() { + cfg.setGroup( "General" ); + m_iconSize = cfg.readNumEntry( "IconSize", 18 ); + SpinBoxIconSize->setValue( m_iconSize ); + cfg.setGroup( "Plugins" ); @@ -170,2 +183,7 @@ void TodayConfig::writeConfig() { cfg.writeEntry( "autostartdelay", m_autoStartTimer ); + m_iconSize = SpinBoxIconSize->value(); + + cfg.setGroup( "General" ); + cfg.writeEntry( "IconSize", m_iconSize ); + 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: int m_autoStartTimer; + int m_iconSize; QStringList m_excludeApplets; @@ -68,2 +69,3 @@ private: QSpinBox* SpinBoxTime; + QSpinBox* SpinBoxIconSize; }; |