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

List:       kde-commits
Subject:    kdeutils/kjots
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2004-03-03 7:01:12
Message-ID: 20040303070112.67C83996F () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

make book renaming work properly. fix for BR75068


  M +14 -10    kjotsentry.cpp   1.18
  M +0 -2      kjotsentry.h   1.12


--- kdeutils/kjots/kjotsentry.cpp  #1.17:1.18
@@ -100,4 +100,5 @@ KJotsBook::KJotsBook(KListView* parent, 
 {
     KJotsEntryBase::setSubject(subj);
+    m_beforeRename = subject();
     setExpandable(true);
     setPixmap(0, kapp->iconLoader()->loadIcon(QString("contents"),KIcon::Small));
@@ -300,7 +301,7 @@ void KJotsBook::closeBook(bool saveOnly)
     }
 
+    folder.close();
     if (!saveOnly)
     {
-        folder.close();
         listView()->setUpdatesEnabled(true);
         m_open = false;
@@ -316,7 +317,5 @@ void KJotsBook::annihilateBook()
 void KJotsBook::rename()
 {
-    m_beforeRename = text(0);
     bool ok;
-
     QString name = KInputDialog::getText(i18n( "Rename Book" ),
                                          i18n( "Book name:" ),
@@ -329,10 +327,4 @@ void KJotsBook::rename()
 }
 
-void KJotsBook::startRename(int col)
-{
-    m_beforeRename = text(0);
-    KListViewItem::startRename(col);
-}
-
 void KJotsBook::setSubject(const QString& newSubject)
 {
@@ -348,4 +340,10 @@ void KJotsBook::setSubject(const QString
     }
 
+    bool wasOpen = m_open;
+    if (wasOpen)
+    {
+        closeBook();
+    }
+
     if (!dir.rename(m_beforeRename, newSubject))
     {
@@ -355,5 +353,11 @@ void KJotsBook::setSubject(const QString
     }
 
+    if (wasOpen)
+    {
+        openBook();
+    }
+
     KJotsEntryBase::setSubject(newSubject);
+    m_beforeRename = text(0);
 }
 

--- kdeutils/kjots/kjotsentry.h  #1.11:1.12
@@ -74,6 +74,4 @@ class KJotsBook : public KJotsEntryBase
         void setSubject(const QString&);
         void rename();
-        void startRename(int);
-        QString beforeRename() { return m_beforeRename; }
         void setDeleteFlag() { m_deleteFlag = true; }
         void saveToFile(KURL, bool plainText);


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