Diffstat (limited to 'libkdepim/ksyncprefsdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 2f38c83..59c8418 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -522,90 +522,89 @@ void KSyncPrefsDialog::cloneProfile() | |||
522 | if ( currentSelection >= 0 ) | 522 | if ( currentSelection >= 0 ) |
523 | addProfile (mSyncProfiles.at(currentSelection)->clone()) ; | 523 | addProfile (mSyncProfiles.at(currentSelection)->clone()) ; |
524 | else | 524 | else |
525 | newProfile(); | 525 | newProfile(); |
526 | } | 526 | } |
527 | 527 | ||
528 | void KSyncPrefsDialog::setLocalMachineName ( const QString& name ) | 528 | void KSyncPrefsDialog::setLocalMachineName ( const QString& name ) |
529 | { | 529 | { |
530 | mMyMachineName->setText( name ); | 530 | mMyMachineName->setText( name ); |
531 | 531 | ||
532 | } | 532 | } |
533 | QString KSyncPrefsDialog::getLocalMachineName ( ) | 533 | QString KSyncPrefsDialog::getLocalMachineName ( ) |
534 | { | 534 | { |
535 | return mMyMachineName->text(); | 535 | return mMyMachineName->text(); |
536 | } | 536 | } |
537 | 537 | ||
538 | QStringList KSyncPrefsDialog::getSyncProfileNames() | 538 | QStringList KSyncPrefsDialog::getSyncProfileNames() |
539 | { | 539 | { |
540 | return mSyncProfileNames; | 540 | return mSyncProfileNames; |
541 | } | 541 | } |
542 | void KSyncPrefsDialog::usrReadConfig() | 542 | void KSyncPrefsDialog::usrReadConfig() |
543 | { | 543 | { |
544 | //KConfig *config = KOGlobals::config(); | 544 | //KConfig *config = KOGlobals::config(); |
545 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 545 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); |
546 | config.setGroup("SyncProfiles"); | 546 | config.setGroup("General"); |
547 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); | 547 | mSyncProfileNames =config.readListEntry("SyncProfileNames"); |
548 | mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); | 548 | mMyMachineName->setText(config.readEntry("LocalMachineName","undefined")); |
549 | int i; | 549 | int i; |
550 | KSyncProfile* temp ; | 550 | KSyncProfile* temp ; |
551 | mSyncProfiles.clear(); | 551 | mSyncProfiles.clear(); |
552 | for ( i = 0; i < mSyncProfileNames.count();++i ) { | 552 | for ( i = 0; i < mSyncProfileNames.count();++i ) { |
553 | temp = new KSyncProfile (); | 553 | temp = new KSyncProfile (); |
554 | temp->setName( mSyncProfileNames[i] ); | 554 | temp->setName( mSyncProfileNames[i] ); |
555 | temp->readConfig( &config ); | 555 | temp->readConfig( &config ); |
556 | mSyncProfiles.append( temp ); | 556 | mSyncProfiles.append( temp ); |
557 | } | 557 | } |
558 | insertProfiles(); | 558 | insertProfiles(); |
559 | //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName ); | 559 | //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName ); |
560 | } | 560 | } |
561 | 561 | ||
562 | 562 | ||
563 | void KSyncPrefsDialog::usrWriteConfig() | 563 | void KSyncPrefsDialog::usrWriteConfig() |
564 | { | 564 | { |
565 | saveProfile(); | 565 | saveProfile(); |
566 | if ( currentSelection >= 0 ) | 566 | if ( currentSelection >= 0 ) |
567 | profileChanged(currentSelection); | 567 | profileChanged(currentSelection); |
568 | //KConfig *config = KOGlobals::config(); | 568 | //KConfig *config = KOGlobals::config(); |
569 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 569 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); |
570 | config.setGroup("SyncProfiles"); | ||
571 | KSyncProfile* prof = mSyncProfiles.first(); | 570 | KSyncProfile* prof = mSyncProfiles.first(); |
572 | while ( prof ) { | 571 | while ( prof ) { |
573 | prof->writeConfig(&config); | 572 | prof->writeConfig(&config); |
574 | prof = mSyncProfiles.next(); | 573 | prof = mSyncProfiles.next(); |
575 | } | 574 | } |
576 | //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; | 575 | //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; |
577 | //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); | 576 | //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); |
577 | config.setGroup("General"); | ||
578 | config.writeEntry("SyncProfileNames",mSyncProfileNames); | 578 | config.writeEntry("SyncProfileNames",mSyncProfileNames); |
579 | QString name = mMyMachineName->text(); | 579 | config.writeEntry("LocalMachineName",mMyMachineName->text()); |
580 | config.writeEntry("LocalMachineName",name); | ||
581 | } | 580 | } |
582 | 581 | ||
583 | void KSyncPrefsDialog::helpDevice() | 582 | void KSyncPrefsDialog::helpDevice() |
584 | { | 583 | { |
585 | QString hint = i18n("Insert device where\nphone is connected. E.g.:\n"); | 584 | QString hint = i18n("Insert device where\nphone is connected. E.g.:\n"); |
586 | #ifdef _WIN32_ | 585 | #ifdef _WIN32_ |
587 | hint += "leave empty for Irda\n" | 586 | hint += "Leave empty for Irda.\n" |
588 | "com1:\n(first serial port)\n" | 587 | "com1:\n(first serial port)\n" |
589 | "usb not supported\n" | 588 | "usb not supported\n" |
590 | "???\n(bluetooth device address)\n"; | 589 | "???\n(bluetooth device address)\n"; |
591 | 590 | ||
592 | #else | 591 | #else |
593 | hint += "/dev/ircomm\n(Irda)\n" | 592 | hint += "/dev/ircomm\n(Irda)\n" |
594 | "/dev/ttyS0\n(first serial port)\n" | 593 | "/dev/ttyS0\n(first serial port)\n" |
595 | "/dev/ttyUSB0\n(first device usb port)\n" | 594 | "/dev/ttyUSB0\n(first device usb port)\n" |
596 | "???\n(bluetooth device address)\n"; | 595 | "???\n(bluetooth device address)\n"; |
597 | #endif | 596 | #endif |
598 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | 597 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); |
599 | } | 598 | } |
600 | void KSyncPrefsDialog::helpModel() | 599 | void KSyncPrefsDialog::helpModel() |
601 | { | 600 | { |
602 | QString hint = i18n("Leave empty or\ninsert name of phone model:\n"); | 601 | QString hint = i18n("Leave empty or\ninsert name of phone model:\n"); |
603 | hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection"; | 602 | hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection"; |
604 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | 603 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); |
605 | 604 | ||
606 | } | 605 | } |
607 | void KSyncPrefsDialog::helpConnection() | 606 | void KSyncPrefsDialog::helpConnection() |
608 | { | 607 | { |
609 | QString hint = i18n("Insert kind of connection,e.g.:\n"); | 608 | QString hint = i18n("Insert kind of connection,e.g.:\n"); |
610 | hint += "irda | Nokia FBUS over infrared\n" | 609 | hint += "irda | Nokia FBUS over infrared\n" |
611 | "irdaat | AT commands infrared\n(for Siemens/Sony-Erricsson)\n" | 610 | "irdaat | AT commands infrared\n(for Siemens/Sony-Erricsson)\n" |