summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-10-02 00:19:45 (UTC)
committer ulf69 <ulf69>2004-10-02 00:19:45 (UTC)
commitba1176743a536e19bb8b9d68b1c0c0023a0f3101 (patch) (unidiff)
tree352e97763d1b90eca9884651ab5533ef8ae8affc
parent7810fe355bd75c83bcdaed646cd1dde8d3c94fcb (diff)
downloadkdepimpi-ba1176743a536e19bb8b9d68b1c0c0023a0f3101.zip
kdepimpi-ba1176743a536e19bb8b9d68b1c0c0023a0f3101.tar.gz
kdepimpi-ba1176743a536e19bb8b9d68b1c0c0023a0f3101.tar.bz2
fixed a crash when pressing return(enter) in the syncprofilenames combobox
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp3
-rw-r--r--libkdepim/ksyncprofile.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 6e6e631..28aac45 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -129,12 +129,13 @@ void KSyncPrefsDialog::setupSyncAlgTab()
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 connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) ); 136 connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) );
136 connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) ); 137 connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) );
137 138
138 lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame); 139 lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame);
139 topLayout->addWidget(lab ,iii,0); 140 topLayout->addWidget(lab ,iii,0);
140 topLayout->addWidget(mProfileBox, iii,1); 141 topLayout->addWidget(mProfileBox, iii,1);
@@ -344,13 +345,13 @@ void KSyncPrefsDialog::textChanged( const QString & s )
344 KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ; 345 KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
345 prof->setName( s ); 346 prof->setName( s );
346 mSyncProfileNames[mProfileBox-> currentItem ()] = s; 347 mSyncProfileNames[mProfileBox-> currentItem ()] = s;
347} 348}
348void KSyncPrefsDialog::profileChanged( int item ) 349void KSyncPrefsDialog::profileChanged( int item )
349{ 350{
350 //qDebug("KSyncPrefsDialog::profileChanged %d ", item ); 351 //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() );
351 KSyncProfile* prof; 352 KSyncProfile* prof;
352 saveProfile(); 353 saveProfile();
353 currentSelection = item; 354 currentSelection = item;
354 prof = mSyncProfiles.at(item) ; 355 prof = mSyncProfiles.at(item) ;
355 mRemotePrecommand->setText(prof->getPreSyncCommand()); 356 mRemotePrecommand->setText(prof->getPreSyncCommand());
356 mRemotePostcommand->setText(prof->getPostSyncCommand()); 357 mRemotePostcommand->setText(prof->getPostSyncCommand());
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index a43ebe2..2bf4e6c 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -80,13 +80,13 @@ void KSyncProfile::setDefault()
80 mPostSyncCommand = i18n("command for uploading local temp file to remote device"); 80 mPostSyncCommand = i18n("command for uploading local temp file to remote device");
81 mLocalTempFile = "/tmp/mycalendar.ics"; 81 mLocalTempFile = "/tmp/mycalendar.ics";
82 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics"; 82 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics";
83 mPreSyncCommandAB = i18n("command for downloading remote file to local device"); 83 mPreSyncCommandAB = i18n("command for downloading remote file to local device");
84 mPostSyncCommandAB = i18n("command for uploading local temp file to remote device"); 84 mPostSyncCommandAB = i18n("command for uploading local temp file to remote device");
85 mLocalTempFileAB = "/tmp/std.vcf"; 85 mLocalTempFileAB = "/tmp/std.vcf";
86 mRemoteFileNamePWM = "/home/polo/kdepim/apps/kabc/localfile.vcf"; 86 mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf";
87 mPreSyncCommandPWM = i18n("command for downloading remote file to local device"); 87 mPreSyncCommandPWM = i18n("command for downloading remote file to local device");
88 mPostSyncCommandPWM = i18n("command for uploading local temp file to remote device"); 88 mPostSyncCommandPWM = i18n("command for uploading local temp file to remote device");
89 mLocalTempFilePWM = "/tmp/passwords.pwm"; 89 mLocalTempFilePWM = "/tmp/passwords.pwm";
90 mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm"; 90 mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm";
91 mShowSummaryAfterSync = true; 91 mShowSummaryAfterSync = true;
92 mAskForPreferences = true; 92 mAskForPreferences = true;