author | harlekin <harlekin> | 2002-10-02 11:27:35 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-02 11:27:35 (UTC) |
commit | ff02919c1d2e83c3cb0dc1c726bf1eb636d1eb38 (patch) (side-by-side diff) | |
tree | 6fab13be118de545153d3081dba989864ba3b57c | |
parent | 8f904d99e7b6e04b6043226a63f6c417171a7cad (diff) | |
download | opie-ff02919c1d2e83c3cb0dc1c726bf1eb636d1eb38.zip opie-ff02919c1d2e83c3cb0dc1c726bf1eb636d1eb38.tar.gz opie-ff02919c1d2e83c3cb0dc1c726bf1eb636d1eb38.tar.bz2 |
fixed broken autostart handling
-rw-r--r-- | core/pim/today/TODO | 6 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 14 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO index 6634cad..49503bd 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO @@ -1,9 +1,15 @@ TODO for today: +- all icons clickable + +- retail rom mail plugin (z) + +- autostart on retail rom (Z) + * show "upcoming appointents the next days * show alarm icons on alarm events (partly done) * qcop integration for updating events? diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 9ff9ba6..3fc5830 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -59,161 +59,163 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags layout->addWidget( TabWidget3 ); tab_2 = new QWidget( TabWidget3, "tab_2" ); QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 ); QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 ); tab2Layout->addWidget( l ); QHBox *hbox1 = new QHBox( tab_2 ); m_appletListView = new QListView( hbox1 ); m_appletListView->addColumn( "PluginList" ); m_appletListView->header()->hide(); m_appletListView->setSorting( -1 ); QVBox *vbox1 = new QVBox( hbox1 ); new ToolButton( vbox1, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) ); new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) ); tab2Layout->addWidget( hbox1 ); TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) ); tab_3 = new QWidget( TabWidget3, "tab_3" ); QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 ); tab3Layout->setMargin( 20 ); QHBox *hbox_auto = new QHBox( tab_3 ); TextLabel2 = new QLabel( hbox_auto, "AutoStart" ); 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" ); tab3Layout->addWidget( hbox_auto ); tab3Layout->addWidget( hbox_inactive ); TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) ); m_applets_changed = false; connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); readConfig(); showMaximized(); } /** * Autostart, uses the new (opie only) autostart method in the launcher code. * If registered against that today ist started on each resume. */ void TodayConfig::setAutoStart() { Config cfg( "today" ); cfg.setGroup( "Autostart" ); - int autostart = cfg.readNumEntry( "autostart", 1 ); - if ( autostart ) { + if ( m_autoStart ) { QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" ); e << QString( "add" ); e << QString( "today" ); - e << m_autoStartTimer; + e << QString("%1").arg( m_autoStartTimer ); } else { QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" ); e << QString( "remove" ); e << QString( "today" ); } } /** * Read the config part */ void TodayConfig::readConfig() { Config cfg( "today" ); cfg.setGroup( "Autostart" ); m_autoStart = cfg.readNumEntry( "autostart", 1 ); CheckBoxAuto->setChecked( m_autoStart ); - m_autoStartTimer = cfg.readEntry( "autostartdelay", "0" ); - SpinBoxTime->setValue( m_autoStartTimer.toInt() ); + m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 ); + SpinBoxTime->setValue( m_autoStartTimer ); cfg.setGroup( "Plugins" ); m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' ); } /** * Write the config part */ void TodayConfig::writeConfig() { Config cfg( "today" ); cfg.setGroup( "Plugins" ); if ( m_applets_changed ) { QStringList exclude; QStringList include; QStringList all_applets; QListViewItemIterator list_it( m_appletListView ); // this makes sure the names get saved in the order selected for ( ; list_it.current(); ++list_it ) { QMap <QString, QCheckListItem *>::Iterator it; for ( it = m_applets.begin(); it != m_applets. end (); ++it ) { if ( list_it.current() == (*it) && !(*it)-> isOn () ) { exclude << it.key(); } else if ( list_it.current() == (*it) && (*it)-> isOn () ){ include << it.key(); } if ( list_it.current() == (*it) ) { all_applets << it.key(); } } } cfg.writeEntry( "ExcludeApplets", exclude, ',' ); cfg.writeEntry( "IncludeApplets", include, ',' ); cfg.writeEntry( "AllApplets", all_applets, ',' ); } cfg.setGroup( "Autostart" ); m_autoStart = CheckBoxAuto->isChecked(); cfg.writeEntry( "autostart", m_autoStart ); m_autoStartTimer = SpinBoxTime->value(); - cfg.readEntry( "autostartdelay", m_autoStartTimer ); + cfg.writeEntry( "autostartdelay", m_autoStartTimer ); + + // set autostart settings + setAutoStart(); } void TodayConfig::moveSelectedUp() { QListViewItem *item = m_appletListView->selectedItem(); if ( item && item->itemAbove() ) { item->itemAbove()->moveItem( item ); } } void TodayConfig::moveSelectedDown() { QListViewItem *item = m_appletListView->selectedItem(); if ( item && item->itemBelow() ) { item->moveItem( item->itemBelow() ); } } /** * Set up the icons in the order/active tab */ void TodayConfig::pluginManagement( QString libName, QString name, QPixmap icon ) { QCheckListItem *item; item = new QCheckListItem( m_appletListView, name, QCheckListItem::CheckBox ); if ( !icon.isNull() ) { item->setPixmap( 0, icon ); } if ( m_excludeApplets.find( libName ) == m_excludeApplets.end() ) { item->setOn( TRUE ); } m_applets[libName] = item; // kind of hack to get the first tab as default. TabWidget3->setCurrentTab( tab_2 ); } void TodayConfig::appletChanged() { m_applets_changed = true; } TodayConfig::~TodayConfig() { } diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 7c261bd..f23b850 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h @@ -9,63 +9,63 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef TODAYCONFIG_H #define TODAYCONFIG_H #include <qvariant.h> #include <qdialog.h> #include <qlistview.h> #include <opie/otabwidget.h> class QCheckBox; class QLabel; class QSpinBox; class QTabWidget; class TodayConfig : public QDialog { Q_OBJECT public: TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~TodayConfig(); OTabWidget* TabWidget3; void writeConfig(); void pluginManagement( QString libName, QString name, QPixmap icon ); protected slots: void appletChanged(); void moveSelectedUp(); void moveSelectedDown(); private: void setAutoStart(); void readConfig(); QListView* m_appletListView; QMap<QString,QCheckListItem*> m_applets; int m_autoStart; - QString m_autoStartTimer; + int m_autoStartTimer; 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; }; #endif |