author | zautrix <zautrix> | 2004-09-08 10:12:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 10:12:21 (UTC) |
commit | cdff4506a9148c47406af86968da73c0dbfca0ba (patch) (unidiff) | |
tree | 10cf9302bfd14d768005e7ac3192f936364bd77d /korganizer | |
parent | 848c77f86b7105095b27a6034a0fefac8a7a0891 (diff) | |
download | kdepimpi-cdff4506a9148c47406af86968da73c0dbfca0ba.zip kdepimpi-cdff4506a9148c47406af86968da73c0dbfca0ba.tar.gz kdepimpi-cdff4506a9148c47406af86968da73c0dbfca0ba.tar.bz2 |
Changing sync profiles filename
-rw-r--r-- | korganizer/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7978b46..9e326a1 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -827,108 +827,108 @@ void MainWindow::initActions() | |||
827 | if (p-> mShowIconForward) | 827 | if (p-> mShowIconForward) |
828 | configureToolBarMenu->setItemChecked( 220, true ); | 828 | configureToolBarMenu->setItemChecked( 220, true ); |
829 | if (p-> mShowIconForwardFast) | 829 | if (p-> mShowIconForwardFast) |
830 | configureToolBarMenu->setItemChecked( 230, true ); | 830 | configureToolBarMenu->setItemChecked( 230, true ); |
831 | if (p-> mShowIconNextDays) | 831 | if (p-> mShowIconNextDays) |
832 | configureToolBarMenu->setItemChecked( 100, true ); | 832 | configureToolBarMenu->setItemChecked( 100, true ); |
833 | if (p-> mShowIconNext) | 833 | if (p-> mShowIconNext) |
834 | configureToolBarMenu->setItemChecked( 110, true ); | 834 | configureToolBarMenu->setItemChecked( 110, true ); |
835 | if (p-> mShowIconJournal) | 835 | if (p-> mShowIconJournal) |
836 | configureToolBarMenu->setItemChecked( 90, true ); | 836 | configureToolBarMenu->setItemChecked( 90, true ); |
837 | if (p-> mShowIconWhatsThis) | 837 | if (p-> mShowIconWhatsThis) |
838 | configureToolBarMenu->setItemChecked( 300, true ); | 838 | configureToolBarMenu->setItemChecked( 300, true ); |
839 | 839 | ||
840 | QLabel* dummy = new QLabel( iconToolBar ); | 840 | QLabel* dummy = new QLabel( iconToolBar ); |
841 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 841 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
842 | if (!p-> mShowIconStretch) | 842 | if (!p-> mShowIconStretch) |
843 | iconToolBar->setStretchableWidget ( dummy ) ; | 843 | iconToolBar->setStretchableWidget ( dummy ) ; |
844 | else | 844 | else |
845 | configureToolBarMenu->setItemChecked( 5, true ); | 845 | configureToolBarMenu->setItemChecked( 5, true ); |
846 | if (p-> mShowIconWhatsThis) | 846 | if (p-> mShowIconWhatsThis) |
847 | QWhatsThis::whatsThisButton ( iconToolBar ); | 847 | QWhatsThis::whatsThisButton ( iconToolBar ); |
848 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 848 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
849 | configureAgenda( p->mHourSize ); | 849 | configureAgenda( p->mHourSize ); |
850 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 850 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
851 | } | 851 | } |
852 | void MainWindow::fillSyncMenu() | 852 | void MainWindow::fillSyncMenu() |
853 | { | 853 | { |
854 | syncMenu->clear(); | 854 | syncMenu->clear(); |
855 | syncMenu->insertItem( i18n("Configure..."), 0 ); | 855 | syncMenu->insertItem( i18n("Configure..."), 0 ); |
856 | syncMenu->insertSeparator(); | 856 | syncMenu->insertSeparator(); |
857 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); | 857 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); |
858 | syncMenu->insertSeparator(); | 858 | syncMenu->insertSeparator(); |
859 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 859 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
860 | config.setGroup("General"); | 860 | config.setGroup("General"); |
861 | QStringList prof = config.readListEntry("SyncProfileNames"); | 861 | QStringList prof = config.readListEntry("SyncProfileNames"); |
862 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 862 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
863 | if ( prof.count() < 3 ) { | 863 | if ( prof.count() < 3 ) { |
864 | prof.clear(); | 864 | prof.clear(); |
865 | prof << i18n("Sharp_DTM"); | 865 | prof << i18n("Sharp_DTM"); |
866 | prof << i18n("Local_file"); | 866 | prof << i18n("Local_file"); |
867 | prof << i18n("Last_file"); | 867 | prof << i18n("Last_file"); |
868 | KSyncProfile* temp = new KSyncProfile (); | 868 | KSyncProfile* temp = new KSyncProfile (); |
869 | temp->setName( prof[0] ); | 869 | temp->setName( prof[0] ); |
870 | temp->writeConfig(&config); | 870 | temp->writeConfig(&config); |
871 | temp->setName( prof[1] ); | 871 | temp->setName( prof[1] ); |
872 | temp->writeConfig(&config); | 872 | temp->writeConfig(&config); |
873 | temp->setName( prof[2] ); | 873 | temp->setName( prof[2] ); |
874 | temp->writeConfig(&config); | 874 | temp->writeConfig(&config); |
875 | config.setGroup("General"); | 875 | config.setGroup("General"); |
876 | config.writeEntry("SyncProfileNames",prof); | 876 | config.writeEntry("SyncProfileNames",prof); |
877 | config.writeEntry("ExternSyncProfiles","Sharp_DTM"); | 877 | config.writeEntry("ExternSyncProfiles","Sharp_DTM"); |
878 | config.sync(); | 878 | config.sync(); |
879 | delete temp; | 879 | delete temp; |
880 | } | 880 | } |
881 | KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); | 881 | KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); |
882 | KOPrefs::instance()->mSyncProfileNames = prof; | 882 | KOPrefs::instance()->mSyncProfileNames = prof; |
883 | int i; | 883 | int i; |
884 | for ( i = 0; i < prof.count(); ++i ) { | 884 | for ( i = 0; i < prof.count(); ++i ) { |
885 | 885 | ||
886 | syncMenu->insertItem( prof[i], 1000+i ); | 886 | syncMenu->insertItem( prof[i], 1000+i ); |
887 | if ( i == 2 ) | 887 | if ( i == 2 ) |
888 | syncMenu->insertSeparator(); | 888 | syncMenu->insertSeparator(); |
889 | } | 889 | } |
890 | QDir app_dir; | 890 | QDir app_dir; |
891 | if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { | 891 | if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { |
892 | syncMenu->setItemEnabled( false , 1000 ); | 892 | syncMenu->setItemEnabled( false , 1000 ); |
893 | } | 893 | } |
894 | mView->setupExternSyncProfiles(); | 894 | mView->setupExternSyncProfiles(); |
895 | } | 895 | } |
896 | 896 | ||
897 | int MainWindow::ringSync() | 897 | int MainWindow::ringSync() |
898 | { | 898 | { |
899 | int syncedProfiles = 0; | 899 | int syncedProfiles = 0; |
900 | int i; | 900 | int i; |
901 | QTime timer; | 901 | QTime timer; |
902 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 902 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
903 | QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames; | 903 | QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames; |
904 | KSyncProfile* temp = new KSyncProfile (); | 904 | KSyncProfile* temp = new KSyncProfile (); |
905 | KOPrefs::instance()->mAskForPreferences = false; | 905 | KOPrefs::instance()->mAskForPreferences = false; |
906 | for ( i = 0; i < syncProfileNames.count(); ++i ) { | 906 | for ( i = 0; i < syncProfileNames.count(); ++i ) { |
907 | mCurrentSyncProfile = i; | 907 | mCurrentSyncProfile = i; |
908 | temp->setName(syncProfileNames[mCurrentSyncProfile]); | 908 | temp->setName(syncProfileNames[mCurrentSyncProfile]); |
909 | temp->readConfig(&config); | 909 | temp->readConfig(&config); |
910 | if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2 )) { | 910 | if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2 )) { |
911 | setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); | 911 | setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); |
912 | ++syncedProfiles; | 912 | ++syncedProfiles; |
913 | // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); | 913 | // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); |
914 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); | 914 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); |
915 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); | 915 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); |
916 | KOPrefs::instance()->mShowSyncSummary = false; | 916 | KOPrefs::instance()->mShowSyncSummary = false; |
917 | mView->setSyncDevice(syncProfileNames[i] ); | 917 | mView->setSyncDevice(syncProfileNames[i] ); |
918 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); | 918 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); |
919 | if ( i == 0 ) { | 919 | if ( i == 0 ) { |
920 | syncSharp(); | 920 | syncSharp(); |
921 | } else { | 921 | } else { |
922 | if ( temp->getIsLocalFileSync() ) { | 922 | if ( temp->getIsLocalFileSync() ) { |
923 | if ( syncWithFile( temp->getRemoteFileName( ), true ) ) | 923 | if ( syncWithFile( temp->getRemoteFileName( ), true ) ) |
924 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); | 924 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); |
925 | } else { | 925 | } else { |
926 | if ( temp->getIsPhoneSync() ) { | 926 | if ( temp->getIsPhoneSync() ) { |
927 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | 927 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; |
928 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | 928 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); |
929 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | 929 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); |
930 | syncPhone(); | 930 | syncPhone(); |
931 | } else | 931 | } else |
932 | syncRemote( temp, false ); | 932 | syncRemote( temp, false ); |
933 | 933 | ||
934 | } | 934 | } |
@@ -974,65 +974,65 @@ void MainWindow::multiSync( bool askforPrefs ) | |||
974 | int num = ringSync() ; | 974 | int num = ringSync() ; |
975 | if ( num > 1 ) | 975 | if ( num > 1 ) |
976 | ringSync(); | 976 | ringSync(); |
977 | mBlockSaveFlag = false; | 977 | mBlockSaveFlag = false; |
978 | if ( num ) | 978 | if ( num ) |
979 | save(); | 979 | save(); |
980 | if ( num ) | 980 | if ( num ) |
981 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); | 981 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); |
982 | else | 982 | else |
983 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 983 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
984 | return; | 984 | return; |
985 | } | 985 | } |
986 | void MainWindow::slotSyncMenu( int action ) | 986 | void MainWindow::slotSyncMenu( int action ) |
987 | { | 987 | { |
988 | //qDebug("syncaction %d ", action); | 988 | //qDebug("syncaction %d ", action); |
989 | if ( action == 0 ) { | 989 | if ( action == 0 ) { |
990 | 990 | ||
991 | confSync(); | 991 | confSync(); |
992 | 992 | ||
993 | return; | 993 | return; |
994 | } | 994 | } |
995 | if ( action == 1 ) { | 995 | if ( action == 1 ) { |
996 | multiSync( true ); | 996 | multiSync( true ); |
997 | return; | 997 | return; |
998 | } | 998 | } |
999 | 999 | ||
1000 | if (mBlockSaveFlag) | 1000 | if (mBlockSaveFlag) |
1001 | return; | 1001 | return; |
1002 | mBlockSaveFlag = true; | 1002 | mBlockSaveFlag = true; |
1003 | mCurrentSyncProfile = action - 1000 ; | 1003 | mCurrentSyncProfile = action - 1000 ; |
1004 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); | 1004 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); |
1005 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); | 1005 | mView->setSyncName( KOPrefs::instance()->mLocalMachineName ); |
1006 | KConfig config ( locateLocal( "config","syncprofilesrc" ) ); | 1006 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
1007 | KSyncProfile* temp = new KSyncProfile (); | 1007 | KSyncProfile* temp = new KSyncProfile (); |
1008 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 1008 | temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
1009 | temp->readConfig(&config); | 1009 | temp->readConfig(&config); |
1010 | KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); | 1010 | KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); |
1011 | KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); | 1011 | KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); |
1012 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); | 1012 | KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); |
1013 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); | 1013 | KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); |
1014 | KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); | 1014 | KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); |
1015 | if ( action == 1000 ) { | 1015 | if ( action == 1000 ) { |
1016 | syncSharp(); | 1016 | syncSharp(); |
1017 | 1017 | ||
1018 | } else if ( action == 1001 ) { | 1018 | } else if ( action == 1001 ) { |
1019 | syncLocalFile(); | 1019 | syncLocalFile(); |
1020 | 1020 | ||
1021 | } else if ( action == 1002 ) { | 1021 | } else if ( action == 1002 ) { |
1022 | quickSyncLocalFile(); | 1022 | quickSyncLocalFile(); |
1023 | 1023 | ||
1024 | } else if ( action >= 1003 ) { | 1024 | } else if ( action >= 1003 ) { |
1025 | if ( temp->getIsLocalFileSync() ) { | 1025 | if ( temp->getIsLocalFileSync() ) { |
1026 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 1026 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
1027 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); | 1027 | KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName(); |
1028 | } else { | 1028 | } else { |
1029 | if ( temp->getIsPhoneSync() ) { | 1029 | if ( temp->getIsPhoneSync() ) { |
1030 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | 1030 | KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; |
1031 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | 1031 | KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); |
1032 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | 1032 | KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); |
1033 | syncPhone(); | 1033 | syncPhone(); |
1034 | } else | 1034 | } else |
1035 | syncRemote( temp ); | 1035 | syncRemote( temp ); |
1036 | 1036 | ||
1037 | } | 1037 | } |
1038 | } | 1038 | } |