author | zautrix <zautrix> | 2004-09-22 01:13:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 01:13:09 (UTC) |
commit | ed2feaa9f7e2064e5b26ff678a25eb79ceae599b (patch) (unidiff) | |
tree | bd698d689aa16ce8c52c5060402d9560f95a713e /libkdepim | |
parent | 01572248367c63119514d15d7401a5b2b83349a0 (diff) | |
download | kdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.zip kdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.tar.gz kdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.tar.bz2 |
Sync dialog fixes
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 6 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 23 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.h | 15 |
4 files changed, 17 insertions, 28 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 857ceac..a1eebec 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -194,7 +194,8 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
194 | 194 | ||
195 | phoneWidget = new QVBox( topFrame); | 195 | phoneWidget = new QVBox( topFrame); |
196 | topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); | 196 | topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); |
197 | ++iii; | 197 | ++iii; |
198 | mWriteContactToSIM= new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget ); | ||
198 | QHBox* temphb = new QHBox( phoneWidget ); | 199 | QHBox* temphb = new QHBox( phoneWidget ); |
199 | new QLabel( i18n("I/O device: "), temphb ); | 200 | new QLabel( i18n("I/O device: "), temphb ); |
200 | mPhoneDevice = new QLineEdit( temphb); | 201 | mPhoneDevice = new QLineEdit( temphb); |
@@ -340,6 +341,7 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
340 | mLocalTempFileAB->setText(prof->getLocalTempFileAB()); | 341 | mLocalTempFileAB->setText(prof->getLocalTempFileAB()); |
341 | mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; | 342 | mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; |
342 | 343 | ||
344 | mWriteContactToSIM->setChecked( prof->getWriteContactToSIM()); | ||
343 | mPhoneDevice->setText(prof->getPhoneDevice()); | 345 | mPhoneDevice->setText(prof->getPhoneDevice()); |
344 | mPhoneConnection->setText(prof->getPhoneConnection()); | 346 | mPhoneConnection->setText(prof->getPhoneConnection()); |
345 | mPhoneModel->setText(prof->getPhoneModel()); | 347 | mPhoneModel->setText(prof->getPhoneModel()); |
@@ -471,6 +473,8 @@ void KSyncPrefsDialog::saveProfile() | |||
471 | prof->setIsPhoneSync( mIsPhone->isChecked() ); | 473 | prof->setIsPhoneSync( mIsPhone->isChecked() ); |
472 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); | 474 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); |
473 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); | 475 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); |
476 | |||
477 | prof->setWriteContactToSIM(mWriteContactToSIM->isChecked()); | ||
474 | prof->setPhoneDevice( mPhoneDevice->text() ); | 478 | prof->setPhoneDevice( mPhoneDevice->text() ); |
475 | prof->setPhoneConnection( mPhoneConnection->text() ); | 479 | prof->setPhoneConnection( mPhoneConnection->text() ); |
476 | prof->setPhoneModel( mPhoneModel->text() ); | 480 | prof->setPhoneModel( mPhoneModel->text() ); |
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 3060e78..d4e1559 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -123,6 +123,7 @@ class KSyncPrefsDialog : public KDialog | |||
123 | QCheckBox* mWriteBackExisting; | 123 | QCheckBox* mWriteBackExisting; |
124 | QCheckBox* mAskForPreferences; | 124 | QCheckBox* mAskForPreferences; |
125 | QCheckBox* mShowSummaryAfterSync; | 125 | QCheckBox* mShowSummaryAfterSync; |
126 | QCheckBox* mWriteContactToSIM; | ||
126 | }; | 127 | }; |
127 | 128 | ||
128 | #endif | 129 | #endif |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index e7c35fb..c599208 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KDE-Pim/Pi. |
3 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> | 3 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
@@ -62,6 +62,7 @@ KSyncProfile* KSyncProfile::clone() | |||
62 | myClone->setSyncPrefs( mSyncPrefs); | 62 | myClone->setSyncPrefs( mSyncPrefs); |
63 | myClone->setIsLocalFileSync( mIsLocalFileSync ); | 63 | myClone->setIsLocalFileSync( mIsLocalFileSync ); |
64 | myClone->setIsPhoneSync( mIsPhoneSync ); | 64 | myClone->setIsPhoneSync( mIsPhoneSync ); |
65 | myClone->setWriteContactToSIM( mWriteContactToSIM ); | ||
65 | myClone->setName( "noName" ); | 66 | myClone->setName( "noName" ); |
66 | //myClone->setIdentifier( "noID" ); | 67 | //myClone->setIdentifier( "noID" ); |
67 | return myClone; | 68 | return myClone; |
@@ -90,6 +91,7 @@ void KSyncProfile::setDefault() | |||
90 | mIsLocalFileSync = true; | 91 | mIsLocalFileSync = true; |
91 | mName = "noName"; | 92 | mName = "noName"; |
92 | mIsPhoneSync = false; | 93 | mIsPhoneSync = false; |
94 | mWriteContactToSIM = false; | ||
93 | mPhoneDevice = "/dev/ircomm"; | 95 | mPhoneDevice = "/dev/ircomm"; |
94 | mPhoneConnection = "irda"; | 96 | mPhoneConnection = "irda"; |
95 | mPhoneModel = "6310i"; | 97 | mPhoneModel = "6310i"; |
@@ -122,6 +124,8 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
122 | mAskForPreferences = config->readBoolEntry( "AskForPreferences",mAskForPreferences ); | 124 | mAskForPreferences = config->readBoolEntry( "AskForPreferences",mAskForPreferences ); |
123 | mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting ); | 125 | mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting ); |
124 | mWriteBackFuture = config->readBoolEntry( "WriteBackFuture",mWriteBackFuture ); | 126 | mWriteBackFuture = config->readBoolEntry( "WriteBackFuture",mWriteBackFuture ); |
127 | mWriteBackFile = config->readBoolEntry( "WriteBackFile",mWriteBackFile ); | ||
128 | mWriteContactToSIM = config->readBoolEntry( "WriteContactToSIM",mWriteContactToSIM ); | ||
125 | mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs ); | 129 | mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs ); |
126 | mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks ); | 130 | mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks ); |
127 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); | 131 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); |
@@ -163,24 +167,11 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
163 | config->writeEntry( "AskForPreferences",mAskForPreferences ); | 167 | config->writeEntry( "AskForPreferences",mAskForPreferences ); |
164 | config->writeEntry( "WriteBackExisting",mWriteBackExisting ); | 168 | config->writeEntry( "WriteBackExisting",mWriteBackExisting ); |
165 | config->writeEntry( "WriteBackFuture",mWriteBackFuture ); | 169 | config->writeEntry( "WriteBackFuture",mWriteBackFuture ); |
170 | config->writeEntry( "WriteBackFile",mWriteBackFile ); | ||
171 | config->writeEntry( "WriteContactToSIM",mWriteContactToSIM ); | ||
166 | config->writeEntry( "SyncPrefs", mSyncPrefs ); | 172 | config->writeEntry( "SyncPrefs", mSyncPrefs ); |
167 | config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks); | 173 | config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks); |
168 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); | 174 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); |
169 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); | 175 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); |
170 | } | 176 | } |
171 | 177 | ||
172 | /* | ||
173 | class KPrefsItemInt : public KPrefsItem { | ||
174 | public: | ||
175 | KPrefsItemInt(const QString &group,const QString &name,int *,int defaultValue=0); | ||
176 | virtual ~KPrefsItemInt() {} | ||
177 | |||
178 | void setDefault(); | ||
179 | void readConfig(KConfig *); | ||
180 | void writeConfig(KConfig *); | ||
181 | |||
182 | private: | ||
183 | int *mReference; | ||
184 | int mDefault; | ||
185 | }; | ||
186 | */ | ||
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index a0cfb71..0039a4b 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KDE-Pim/Pi. |
3 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> | 3 | Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
@@ -33,17 +33,7 @@ | |||
33 | 33 | ||
34 | class KConfig; | 34 | class KConfig; |
35 | 35 | ||
36 | /** | ||
37 | @short Class for storing a preferences setting | ||
38 | @author Cornelius Schumacher | ||
39 | @see KPref | ||
40 | 36 | ||
41 | This class represents one preferences setting as used by @ref KPrefs. | ||
42 | Subclasses of KPrefsItem implement storage functions for a certain type of | ||
43 | setting. Normally you don't have to use this class directly. Use the special | ||
44 | addItem() functions of KPrefs instead. If you subclass this class you will | ||
45 | have to register instances with the function KPrefs::addItem(). | ||
46 | */ | ||
47 | class KSyncProfile : public QObject { | 37 | class KSyncProfile : public QObject { |
48 | public: | 38 | public: |
49 | KSyncProfile(); | 39 | KSyncProfile(); |
@@ -96,6 +86,8 @@ class KSyncProfile : public QObject { | |||
96 | bool getWriteBackFuture( ) { return mWriteBackFuture;} | 86 | bool getWriteBackFuture( ) { return mWriteBackFuture;} |
97 | void setWriteBackFile( bool b ) { mWriteBackFile= b;} | 87 | void setWriteBackFile( bool b ) { mWriteBackFile= b;} |
98 | bool getWriteBackFile( ) { return mWriteBackFile;} | 88 | bool getWriteBackFile( ) { return mWriteBackFile;} |
89 | void setWriteContactToSIM( bool b ) { mWriteContactToSIM= b;} | ||
90 | bool getWriteContactToSIM( ) { return mWriteContactToSIM;} | ||
99 | void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} | 91 | void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} |
100 | bool getIncludeInRingSync( ) { return mIncludeInRingSync;} | 92 | bool getIncludeInRingSync( ) { return mIncludeInRingSync;} |
101 | void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;} | 93 | void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;} |
@@ -134,6 +126,7 @@ class KSyncProfile : public QObject { | |||
134 | bool mShowSummaryAfterSync; | 126 | bool mShowSummaryAfterSync; |
135 | bool mIsLocalFileSync; | 127 | bool mIsLocalFileSync; |
136 | bool mIsPhoneSync; | 128 | bool mIsPhoneSync; |
129 | bool mWriteContactToSIM; | ||
137 | }; | 130 | }; |
138 | 131 | ||
139 | #endif | 132 | #endif |