* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 21 insertions, 2 deletions

diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 61c75db88..93478d13f 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   snippet feature from kdevelop/plugins/snippet/                        *
- *                                                                         * 
+ *                                                                         *
  *   Copyright (C) 2007 by Robert Gruber                                   *
  *   [email protected]                                         *
  *                                                                         *
@@ -14,6 +14,7 @@
 #include "snippetdlg.h"
 
 #include <kdialog.h>
+#include <klineedit.h>
 #include <klocale.h>
 
 #include <tqlabel.h>
@@ -42,6 +43,12 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
     connect( keyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
              this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) );
 
+    btnAdd->setEnabled( false );
+    connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)),
+             this, TQT_SLOT(slotTextChanged(const TQString &)) );
+    connect( snippetName, TQT_SIGNAL(returnPressed()),
+             this, TQT_SLOT(slotReturnPressed()) );
+
     layout3->addWidget( textLabel3, 7, 0 );
     layout3->addWidget( keyButton, 7, 1 );
 
@@ -68,7 +75,7 @@ SnippetDlg::~SnippetDlg()
  */
 void SnippetDlg::languageChange()
 {
-    textLabel3->setText( tr2i18n( "Sh&ortcut:" ) );
+    textLabel3->setText( i18n( "Sh&ortcut:" ) );
 }
 
 static bool shortcutIsValid( const KActionCollection* actionCollection, const KShortcut &sc )
@@ -105,4 +112,16 @@ void SnippetDlg::setShowShortcut( bool show )
     keyButton->setShown( show );
 }
 
+void SnippetDlg::slotTextChanged( const TQString &text )
+{
+  btnAdd->setEnabled( !text.isEmpty() );
+}
+
+void SnippetDlg::slotReturnPressed()
+{
+  if ( !snippetName->text().isEmpty() ) {
+    accept();
+  }
+}
+
 #include "snippetdlg.moc"