| -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() connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) ); button = new QPushButton( i18n("Delete profile"), buttonbox ); connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) ); mProfileBox = new QComboBox(topFrame); mProfileBox->setEditable ( true ); mProfileBox->setInsertionPolicy(QComboBox::NoInsertion); connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) ); connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) ); lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame); topLayout->addWidget(lab ,iii,0); topLayout->addWidget(mProfileBox, iii,1); ++iii; - mIncludeInRing = new QCheckBox( i18n("Include in multiple calendar sync"), topFrame ); - topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1); - ++iii; - mIncludeInRingAB = new QCheckBox( i18n("Include in multiple addressbook sync"), topFrame ); - topLayout->addMultiCellWidget(mIncludeInRingAB, iii,iii,0,1); - ++iii; - mIncludeInRingPWM = new QCheckBox( i18n("Include in multiple pwmanager sync"), topFrame ); - topLayout->addMultiCellWidget(mIncludeInRingPWM, iii,iii,0,1); + QHBox *iims = new QHBox( topFrame ); + new QLabel( i18n("Include in multiple "), iims ); + mIncludeInRing = new QCheckBox( i18n("calendar "), iims ); + mIncludeInRingAB = new QCheckBox( i18n("addressbook "), iims ); + mIncludeInRingPWM = new QCheckBox( i18n("pwmanager"), iims ); + new QLabel( i18n(" sync"), iims ); + topLayout->addMultiCellWidget(iims, iii,iii,0,1); ++iii; mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame ); topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1); ++iii; QButtonGroup* gr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Sync preferences"), topFrame); topLayout->addMultiCellWidget(gr, iii,iii,0,1); ++iii; loc = new QRadioButton ( i18n("Take local entry on conflict"), gr ); rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr ); newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr ); ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr ); f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr ); f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr ); // both = new QRadioButton ( i18n("Take both on conflict"), gr ); |