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/today | |
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,6 +1,10 @@ +0.5.1 + +* icons scalable and clickable again + 0.5 * now fully plugin based 0.3.4 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 @@ -1,12 +1,12 @@ Files: bin/today apps/1Pim/today.desktop pics/today/* Priority: optional Section: opie/applications 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) License: GPL Description: today screen This today screen app gives an overview of appointments and todos. It also shows incoming and outgoing mails from opiemail. 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 @@ -27,13 +27,13 @@ DatebookPlugin::DatebookPlugin() { } DatebookPlugin::~DatebookPlugin() { } QString DatebookPlugin::pluginName() const { - return "Datebook plugin"; + return QObject::tr( "Datebook plugin"); } double DatebookPlugin::versionNumber() const { return 1.0; } @@ -51,9 +51,9 @@ QString DatebookPlugin::pixmapNameConfig() const { TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { return new DatebookPluginConfig( wid , "Datebook" ); } 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 @@ -23,17 +23,17 @@ MailPlugin::MailPlugin() { } MailPlugin::~MailPlugin() { } QString MailPlugin::pluginName() const { - return "Mail plugin"; + return QObject::tr( "Mail plugin" ); } double MailPlugin::versionNumber() const { - return 0.5; + return 0.6; } QString MailPlugin::pixmapNameWidget() const { return "mail/desktopicon"; } @@ -47,10 +47,10 @@ QString MailPlugin::pixmapNameConfig() const { TodayConfigWidget* MailPlugin::configWidget( QWidget* wid ) { return 0l; } 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 @@ -25,13 +25,13 @@ TodolistPlugin::TodolistPlugin() { } TodolistPlugin::~TodolistPlugin() { } QString TodolistPlugin::pluginName() const { - return "Todolist plugin"; + return QObject::tr( "Todolist plugin" ); } double TodolistPlugin::versionNumber() const { return 0.7; } @@ -49,10 +49,10 @@ QString TodolistPlugin::pixmapNameConfig() const { TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) { return new TodolistPluginConfig( wid , "Todolist" ); } 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 @@ -111,12 +111,14 @@ void Today::init() { // read config Config cfg( "today" ); cfg.setGroup( "Plugins" ); m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); m_allApplets = cfg.readListEntry( "AllApplets", ',' ); + cfg.setGroup( "General" ); + m_iconSize = cfg.readNumEntry( "IconSize", 18 ); } /** * Load the plugins */ @@ -132,13 +134,12 @@ void Today::loadPlugins() { QString path = QPEApplication::qpeDir() + "/plugins/today"; QDir dir( path, "lib*.so" ); QStringList list = dir.entryList(); QStringList::Iterator it; - QMap<QString, TodayPlugin> tempList; for ( it = list.begin(); it != list.end(); ++it ) { TodayPluginInterface *iface = 0; QLibrary *lib = new QLibrary( path + "/" + *it ); @@ -160,15 +161,17 @@ void Today::loadPlugins() { plugin.guiPart = plugin.iface->guiPart(); // package the whole thing into a qwidget so it can be shown and hidden plugin.guiBox = new QWidget( this ); QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); 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 QScrollView* sv = new QScrollView( plugin.guiBox ); QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); // not sure if that is good .-) sv->setMinimumHeight( 10 ); sv->setResizePolicy( QScrollView::AutoOneFit ); @@ -308,12 +311,17 @@ void Today::refresh() { void Today::startAddressbook() { QCopEnvelope e( "QPE/System", "execute(QString)" ); e << QString( "addressbook" ); } +void Today::startApplication() { + QCopEnvelope e( "QPE/System", "execute(QString)" ); + e << QString( sender()->name() ); +} + /** * launch addressbook (personal card) */ void Today::editCard() { startAddressbook(); while( !QCopChannel::isRegistered( "QPE/Addressbook" ) ) { 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 @@ -29,13 +29,13 @@ #include "todayconfig.h" #include "todaybase.h" #include <opie/todayplugininterface.h> class QVBoxLayout; - +class OClickableLabel; class Today : public TodayBase { Q_OBJECT @@ -43,12 +43,13 @@ class Today : public TodayBase { Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Today(); private slots: void startConfig(); void startAddressbook(); + void startApplication(); void editCard(); void refresh(); private: void init(); void setOwnerField(); @@ -61,13 +62,12 @@ private slots: private: TodayConfig *conf; QStringList m_excludeApplets; QStringList m_allApplets; - // QString m_autoStartTimer; int m_newStart; - // int m_autoStart; + int m_iconSize; int m_maxCharClip; }; #endif 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 @@ -26,12 +26,13 @@ #include <qtabwidget.h> #include <qlayout.h> #include <qheader.h> #include <qhbox.h> #include <qvbox.h> #include <qtoolbutton.h> +#include <qtooltip.h> class ToolButton : public QToolButton { public: ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) : QToolButton( parent, name ) { @@ -81,14 +82,22 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) ); CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" ); QHBox *hbox_inactive = new QHBox( tab_3 ); TimeLabel = new QLabel( hbox_inactive , "TimeLabel" ); TimeLabel->setText( tr( "minutes inactive" ) ); 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" ) ); m_applets_changed = false; connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); @@ -124,12 +133,16 @@ void TodayConfig::readConfig() { cfg.setGroup( "Autostart" ); m_autoStart = cfg.readNumEntry( "autostart", 1 ); CheckBoxAuto->setChecked( m_autoStart ); m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 ); SpinBoxTime->setValue( m_autoStartTimer ); + cfg.setGroup( "General" ); + m_iconSize = cfg.readNumEntry( "IconSize", 18 ); + SpinBoxIconSize->setValue( m_iconSize ); + cfg.setGroup( "Plugins" ); m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); } /** * Write the config part @@ -165,12 +178,17 @@ void TodayConfig::writeConfig() { cfg.setGroup( "Autostart" ); m_autoStart = CheckBoxAuto->isChecked(); cfg.writeEntry( "autostart", m_autoStart ); m_autoStartTimer = SpinBoxTime->value(); cfg.writeEntry( "autostartdelay", m_autoStartTimer ); + m_iconSize = SpinBoxIconSize->value(); + + cfg.setGroup( "General" ); + cfg.writeEntry( "IconSize", m_iconSize ); + // set autostart settings 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 @@ -52,20 +52,22 @@ private: QListView* m_appletListView; QMap<QString,QCheckListItem*> m_applets; int m_autoStart; int m_autoStartTimer; + int m_iconSize; QStringList m_excludeApplets; bool m_applets_changed; QLabel* TextLabel2; QCheckBox* CheckBoxAuto; QWidget* tab_2; QWidget* tab_3; QLabel* TextLabel1; QSpinBox* SpinBox7; QLabel* TimeLabel; QSpinBox* SpinBoxTime; + QSpinBox* SpinBoxIconSize; }; #endif |