[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 63400] Search folder name field doesn't work
From:       Don Sanders <don () sanders ! org>
Date:       2003-12-03 10:20:49
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=63400     
don@sanders.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From don@sanders.org  2003-12-03 11:20 -------
Subject: kdepim/kmail

CVS commit by sanders: 

Fix 63400, quite trivial.

CCMAIL:63400-done@bugs.kde.org


  M +18 -9     kmfldsearch.cpp   1.115


--- kdepim/kmail/kmfldsearch.cpp  #1.114:1.115
@@ -386,5 +386,7 @@ void KMFldSearch::slotSearch()
     if (!mFolder) {
       KMFolderMgr *mgr = kmkernel->searchFolderMgr();
-      QString baseName = "search";
+      if (mSearchFolderEdt->text().isEmpty())
+          mSearchFolderEdt->setText("search");
+      QString baseName = mSearchFolderEdt->text();
       QString fullName = baseName;
       int count = 0;
@@ -536,12 +538,17 @@ void KMFldSearch::updateCreateButton( co
 void KMFldSearch::renameSearchFolder()
 {
-    KMFolderDialog *props;
-    if (mFolder) {
-        mFolder->rename(mSearchFolderEdt->text());
-        props = new KMFolderDialog( mFolder.operator->(), mFolder->parent(), 0,
-                                    i18n("Properties of Folder %1").arg( mFolder->label() ),
-                                    mSearchFolderEdt->text() );
-        props->exec();
+    if (mFolder && (mFolder->name() !=mSearchFolderEdt->text())) {
+        int i = 1;
+        QString name =  mSearchFolderEdt->text();
+        while (i < 100) {
+            if (!kmkernel->searchFolderMgr()->find( name )) {
+                mFolder->rename( name );
         kmkernel->searchFolderMgr()->contentsChanged();
+                break;
+            }
+            name.setNum( i );
+            name = mSearchFolderEdt->text() + " " + name;
+            ++i;
+        }
     }
 }
@@ -549,7 +556,9 @@ void KMFldSearch::renameSearchFolder()
 void KMFldSearch::openSearchFolder()
 {
+    renameSearchFolder();
     KMFolderTree *folderTree = mKMMainWidget->folderTree();
     QListViewItem *index = folderTree->indexOfFolder((KMFolder*)mFolder);
     if (index) {
+        folderTree->ensureItemVisible(index);
         folderTree->doFolderSelected(index);
         slotClose();
[prev in list] [next in list] [prev in thread] [next in thread]