author | zautrix <zautrix> | 2004-10-08 11:49:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-08 11:49:34 (UTC) |
commit | 1f050320cfec5fd7d32ff5bb8216780b94d5a56a (patch) (unidiff) | |
tree | 51c160adf1a10d85a83be95913d89cd15243bc3f | |
parent | 98987418d89d1334c0c2961ca4d6bc295d6fb021 (diff) | |
download | kdepimpi-1f050320cfec5fd7d32ff5bb8216780b94d5a56a.zip kdepimpi-1f050320cfec5fd7d32ff5bb8216780b94d5a56a.tar.gz kdepimpi-1f050320cfec5fd7d32ff5bb8216780b94d5a56a.tar.bz2 |
syncdialog fix
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index ee092b9..84cc448 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -128,40 +128,39 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
128 | connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) ); | 128 | connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) ); |
129 | 129 | ||
130 | button = new QPushButton( i18n("Delete profile"), buttonbox ); | 130 | button = new QPushButton( i18n("Delete profile"), buttonbox ); |
131 | connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) ); | 131 | connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) ); |
132 | 132 | ||
133 | mProfileBox = new QComboBox(topFrame); | 133 | mProfileBox = new QComboBox(topFrame); |
134 | mProfileBox->setEditable ( true ); | 134 | mProfileBox->setEditable ( true ); |
135 | mProfileBox->setInsertionPolicy(QComboBox::NoInsertion); | 135 | mProfileBox->setInsertionPolicy(QComboBox::NoInsertion); |
136 | connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) ); | 136 | connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) ); |
137 | connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) ); | 137 | connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) ); |
138 | 138 | ||
139 | lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame); | 139 | lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame); |
140 | topLayout->addWidget(lab ,iii,0); | 140 | topLayout->addWidget(lab ,iii,0); |
141 | topLayout->addWidget(mProfileBox, iii,1); | 141 | topLayout->addWidget(mProfileBox, iii,1); |
142 | ++iii; | 142 | ++iii; |
143 | 143 | ||
144 | mIncludeInRing = new QCheckBox( i18n("Include in multiple calendar sync"), topFrame ); | 144 | QHBox *iims = new QHBox( topFrame ); |
145 | topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1); | 145 | new QLabel( i18n("Include in multiple "), iims ); |
146 | ++iii; | 146 | mIncludeInRing = new QCheckBox( i18n("calendar "), iims ); |
147 | mIncludeInRingAB = new QCheckBox( i18n("Include in multiple addressbook sync"), topFrame ); | 147 | mIncludeInRingAB = new QCheckBox( i18n("addressbook "), iims ); |
148 | topLayout->addMultiCellWidget(mIncludeInRingAB, iii,iii,0,1); | 148 | mIncludeInRingPWM = new QCheckBox( i18n("pwmanager"), iims ); |
149 | ++iii; | 149 | new QLabel( i18n(" sync"), iims ); |
150 | mIncludeInRingPWM = new QCheckBox( i18n("Include in multiple pwmanager sync"), topFrame ); | 150 | topLayout->addMultiCellWidget(iims, iii,iii,0,1); |
151 | topLayout->addMultiCellWidget(mIncludeInRingPWM, iii,iii,0,1); | ||
152 | ++iii; | 151 | ++iii; |
153 | 152 | ||
154 | mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame ); | 153 | mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame ); |
155 | topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1); | 154 | topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1); |
156 | ++iii; | 155 | ++iii; |
157 | QButtonGroup* gr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Sync preferences"), topFrame); | 156 | QButtonGroup* gr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Sync preferences"), topFrame); |
158 | topLayout->addMultiCellWidget(gr, iii,iii,0,1); | 157 | topLayout->addMultiCellWidget(gr, iii,iii,0,1); |
159 | ++iii; | 158 | ++iii; |
160 | loc = new QRadioButton ( i18n("Take local entry on conflict"), gr ); | 159 | loc = new QRadioButton ( i18n("Take local entry on conflict"), gr ); |
161 | rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr ); | 160 | rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr ); |
162 | newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr ); | 161 | newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr ); |
163 | ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr ); | 162 | ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr ); |
164 | f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr ); | 163 | f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr ); |
165 | f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr ); | 164 | f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr ); |
166 | // both = new QRadioButton ( i18n("Take both on conflict"), gr ); | 165 | // both = new QRadioButton ( i18n("Take both on conflict"), gr ); |
167 | 166 | ||