From 84b8157a8529c3326f128b51c11c9cb5a2b2e5d4 Mon Sep 17 00:00:00 2001
From: Will Stephenson <wstephenson@kde.org>
Date: Mon, 13 Aug 2007 14:20:33 +0000
Subject: [PATCH] backport r699549 - correct placement of whatsthis

svn path=/trunk/KDE/kdepim/; revision=699563
---
 configuredialog.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/configuredialog.cpp b/configuredialog.cpp
index 02c593565..3dd8edc9b 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -4957,6 +4957,23 @@ MiscPageFolderTab::MiscPageFolderTab( QWidget * parent )
                   "Flat Files (\"mbox\" format)")
           << i18nc("continuation of \"By default, &message folders on disk are\"",
                   "Directories (\"maildir\" format)") );
+  // and now: add QWhatsThis:
+  QString msg = i18nc( "what's this help",
+                      "<qt><p>This selects which mailbox format will be "
+                      "the default for local folders:</p>"
+                      "<p><b>mbox:</b> KMail's mail "
+                      "folders are represented by a single file each. "
+                      "Individual messages are separated from each other by a "
+                      "line starting with \"From \". This saves space on "
+                      "disk, but may be less robust, e.g. when moving messages "
+                      "between folders.</p>"
+                      "<p><b>maildir:</b> KMail's mail folders are "
+                      "represented by real folders on disk. Individual messages "
+                      "are separate files. This may waste a bit of space on "
+                      "disk, but should be more robust, e.g. when moving "
+                      "messages between folders.</p></qt>");
+  QWhatsThis::add( mMailboxPrefCombo, msg );
+  QWhatsThis::add( label, msg );
   hlay->addWidget( label );
   hlay->addWidget( mMailboxPrefCombo, 1 );
   connect( mMailboxPrefCombo, SIGNAL( activated( int ) ),
@@ -5000,23 +5017,6 @@ MiscPageFolderTab::MiscPageFolderTab( QWidget * parent )
 
   vlay->addStretch( 1 );
 
-  // and now: add QWhatsThis:
-  QString msg = i18nc( "what's this help",
-                      "<qt><p>This selects which mailbox format will be "
-                      "the default for local folders:</p>"
-                      "<p><b>mbox:</b> KMail's mail "
-                      "folders are represented by a single file each. "
-                      "Individual messages are separated from each other by a "
-                      "line starting with \"From \". This saves space on "
-                      "disk, but may be less robust, e.g. when moving messages "
-                      "between folders.</p>"
-                      "<p><b>maildir:</b> KMail's mail folders are "
-                      "represented by real folders on disk. Individual messages "
-                      "are separate files. This may waste a bit of space on "
-                      "disk, but should be more robust, e.g. when moving "
-                      "messages between folders.</p></qt>");
-  mMailboxPrefCombo->setWhatsThis( msg );
-  label->setWhatsThis( msg );
   // @TODO: Till, move into .kcgc file
   msg = i18nc( "what's this help",
             "<qt><p>When jumping to the next unread message, it may occur "