author | harlekin <harlekin> | 2002-06-11 21:51:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-11 21:51:34 (UTC) |
commit | 7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8 (patch) (unidiff) | |
tree | cd2782f9be46e59cb49867bb9221e4e6d7b27d01 /core | |
parent | 53cbd5404cea16ec1ddbd2e264fcc42acfb453c8 (diff) | |
download | opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.zip opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.tar.gz opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.tar.bz2 |
attempt to fix remove from autostart
-rw-r--r-- | core/launcher/launcher.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/changelog | 1 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index a0f04f1..59b38e3 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -866,26 +866,25 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
866 | //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1()); | 866 | //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1()); |
867 | } else if ( msg == "startSync(QString)" ) { | 867 | } else if ( msg == "startSync(QString)" ) { |
868 | QString what; | 868 | QString what; |
869 | stream >> what; | 869 | stream >> what; |
870 | delete syncDialog; syncDialog = 0; | 870 | delete syncDialog; syncDialog = 0; |
871 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, | 871 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, |
872 | WStyle_Tool | WStyle_Customize | | 872 | WStyle_Tool | WStyle_Customize | |
873 | Qt::WStyle_StaysOnTop ); | 873 | Qt::WStyle_StaysOnTop ); |
874 | syncDialog->showMaximized(); | 874 | syncDialog->showMaximized(); |
875 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); | 875 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); |
876 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), | 876 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), |
877 | SLOT( cancelSync() ) ); | 877 | SLOT( cancelSync() ) ); |
878 | } | 878 | } else if ( msg == "stopSync()") { |
879 | else if ( msg == "stopSync()") { | ||
880 | delete syncDialog; syncDialog = 0; | 879 | delete syncDialog; syncDialog = 0; |
881 | } else if ( msg == "getAllDocLinks()" ) { | 880 | } else if ( msg == "getAllDocLinks()" ) { |
882 | loadDocs(); | 881 | loadDocs(); |
883 | 882 | ||
884 | QString contents; | 883 | QString contents; |
885 | 884 | ||
886 | for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) { | 885 | for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) { |
887 | DocLnk *doc = it.current(); | 886 | DocLnk *doc = it.current(); |
888 | QFileInfo fi( doc->file() ); | 887 | QFileInfo fi( doc->file() ); |
889 | if ( !fi.exists() ) | 888 | if ( !fi.exists() ) |
890 | continue; | 889 | continue; |
891 | 890 | ||
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 93bbcac..73de50d 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog | |||
@@ -1,14 +1,15 @@ | |||
1 | 0.3.4 | 1 | 0.3.4 |
2 | 2 | ||
3 | * "fill our business card now a clickable label" | ||
3 | * Several bugfixes regarding todo section. | 4 | * Several bugfixes regarding todo section. |
4 | 5 | ||
5 | 0.3.3 | 6 | 0.3.3 |
6 | 7 | ||
7 | * Changed the logo so it better scales to bigger display and also | 8 | * Changed the logo so it better scales to bigger display and also |
8 | made the "Today" string translatable. | 9 | made the "Today" string translatable. |
9 | * some am/pm fixes | 10 | * some am/pm fixes |
10 | * clickable labels now in libopie | 11 | * clickable labels now in libopie |
11 | 12 | ||
12 | 0.3.2 | 13 | 0.3.2 |
13 | 14 | ||
14 | * Autostart is now more configurable. You can decide how long | 15 | * Autostart is now more configurable. You can decide how long |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 06cfa01..9e9d31f 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -412,32 +412,32 @@ void Today::getTodo() { | |||
412 | output = tr("There is <b> 1</b> active task: <br>" ); | 412 | output = tr("There is <b> 1</b> active task: <br>" ); |
413 | } else { | 413 | } else { |
414 | output = tr("There are <b> %1</b> active tasks: <br>").arg(count); | 414 | output = tr("There are <b> %1</b> active tasks: <br>").arg(count); |
415 | } | 415 | } |
416 | output += tmpout; | 416 | output += tmpout; |
417 | } else { | 417 | } else { |
418 | output = tr("No active tasks"); | 418 | output = tr("No active tasks"); |
419 | } | 419 | } |
420 | 420 | ||
421 | TodoField->setText(tr(output)); | 421 | TodoField->setText(tr(output)); |
422 | } | 422 | } |
423 | 423 | ||
424 | |||
425 | /* | 424 | /* |
426 | * launch addressbook (personal card) | 425 | * launch addressbook (personal card) |
427 | */ | 426 | */ |
428 | void Today::editCard() { | 427 | void Today::editCard() { |
429 | QCopEnvelope w("QPE/System", "execute(QString)"); | 428 | QCopEnvelope w("QPE/System", "execute(QString)"); |
430 | w << QString("addressbook"); | 429 | w << QString("addressbook"); |
431 | 430 | ||
431 | // while( !QCopChannel::isRegistered("QPE/Addressbook")) | ||
432 | QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()"); | 432 | QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()"); |
433 | } | 433 | } |
434 | 434 | ||
435 | /* | 435 | /* |
436 | * launches datebook | 436 | * launches datebook |
437 | */ | 437 | */ |
438 | void Today::startDatebook() { | 438 | void Today::startDatebook() { |
439 | QCopEnvelope e("QPE/System", "execute(QString)"); | 439 | QCopEnvelope e("QPE/System", "execute(QString)"); |
440 | e << QString("datebook"); | 440 | e << QString("datebook"); |
441 | } | 441 | } |
442 | 442 | ||
443 | /* | 443 | /* |