From 3ccbe14ff4afef1a3bb4ec3d3aaf617566ff84a5 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 31 Mar 2009 08:57:49 +0000 Subject: [PATCH] Sieve doesn't accept empty script => disable ok button and avoid to have warning svn path=/trunk/KDE/kdepim/; revision=947258 --- managesievescriptsdialog.cpp | 9 ++++++--- managesievescriptsdialog.h | 1 - managesievescriptsdialog_p.h | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/managesievescriptsdialog.cpp b/managesievescriptsdialog.cpp index 6eea9a443..4a73489e8 100644 --- a/managesievescriptsdialog.cpp +++ b/managesievescriptsdialog.cpp @@ -321,7 +321,6 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { KStandardGuiItem::del() ) != KMessageBox::Continue ) return; - SieveJob * job = SieveJob::del( u ); connect( job, SIGNAL(result(KMail::SieveJob*,bool,const QString&,bool)), this, SLOT(slotRefresh()) ); @@ -370,7 +369,6 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() { QTreeWidgetItem *newItem = new QTreeWidgetItem( mContextMenuItem ); addRadioButton( newItem, name ); - mCurrentURL = u; slotGetResult( 0, true, QString(), false ); } @@ -394,12 +392,17 @@ KMail::SieveEditor::SieveEditor( QWidget * parent, const char * name ) mTextEdit->setAcceptRichText( false ); mTextEdit->setWordWrapMode ( QTextOption::NoWrap ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); - + connect( mTextEdit, SIGNAL( textChanged () ), SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } KMail::SieveEditor::~SieveEditor() {} +void KMail::SieveEditor::slotTextChanged() +{ + enableButtonOk( !script().isEmpty() ); +} + void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool success, const QString & script, bool isActive ) { if ( !success ) return; diff --git a/managesievescriptsdialog.h b/managesievescriptsdialog.h index 14ee690fd..b7f45f531 100644 --- a/managesievescriptsdialog.h +++ b/managesievescriptsdialog.h @@ -35,7 +35,6 @@ private slots: void slotPutResult( KMail::SieveJob *, bool ); void slotSieveEditorOkClicked(); void slotSieveEditorCancelClicked(); - private: void killAllJobs(); void changeActiveScript( QTreeWidgetItem* ); diff --git a/managesievescriptsdialog_p.h b/managesievescriptsdialog_p.h index af79e3b0c..566654ff4 100644 --- a/managesievescriptsdialog_p.h +++ b/managesievescriptsdialog_p.h @@ -19,7 +19,8 @@ public: QString script() const { return mTextEdit->toPlainText(); } void setScript( const QString & script ) { mTextEdit->setText( script ); } - +private slots: + void slotTextChanged(); private: KTextEdit * mTextEdit; };