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

List:       kde-commits
Subject:    kdeutils/kjots
From:       Stanislav Kljuhhin <crz () starman ! ee>
Date:       2004-08-24 18:40:09
Message-ID: 20040824184009.8CDB71D90 () office ! kde ! org
[Download RAW message or body]

CVS commit by crzcrz: 

fix for 80631


  M +31 -7     KJotsMain.cpp   1.135
  M +3 -0      KJotsMain.h   1.49
  M +11 -0     kjotsentry.cpp   1.20
  M +3 -0      kjotsentry.h   1.13


--- kdeutils/kjots/KJotsMain.cpp  #1.134:1.135
@@ -311,4 +311,5 @@ void KJotsMain::slotRenameEntry()
 {
     KJotsEntryBase* entry = dynamic_cast<KJotsEntryBase*>(subjectList->currentItem());
+    
     if (entry)
     {
@@ -931,5 +932,4 @@ void KJotsMain::jumpToEntry(QListViewIte
     if (entry == 0)
     {
-        setCaption(kapp->makeStdCaption(QString::null));
         me_text->clear();
         currentEntry = 0;
@@ -939,5 +939,4 @@ void KJotsMain::jumpToEntry(QListViewIte
         KJotsBook* book = static_cast<KJotsBook*>(entry);
 
-        setCaption(kapp->makeStdCaption(book->subject()));
         QString TOC;
         QString pageText;
@@ -978,15 +978,38 @@ void KJotsMain::jumpToEntry(QListViewIte
         syncTextWithEntry(dynamic_cast<KJotsSubject*>(entry));
 
-        // TODO: this will have to be fixed if/when we allow arbitrary depth pages
-        QString caption = dynamic_cast<KJotsEntryBase*>(entry->parent())->subject() +
-                          " / " +
-                          dynamic_cast<KJotsEntryBase*>(entry)->subject();
-        setCaption(kapp->makeStdCaption(caption));
         currentEntry = static_cast<KJotsEntryBase*>(entry);
     }
 
+    updateCaption();
     updateMenu();
 }
 
+void KJotsMain::updateCaption()
+{
+    // TODO: this will have to be fixed if/when we allow arbitrary depth pages
+    
+    QListViewItem* e = subjectList->currentItem();
+   
+    if (!e)
+    {
+        setCaption(kapp->makeStdCaption(QString::null));
+
+        return;
+    }
+
+    if (dynamic_cast<KJotsBook*>(e))
+    {
+        setCaption(kapp->makeStdCaption(static_cast<KJotsBook*>(e)->subject()));
+    }
+    else if (dynamic_cast<KJotsSubject*>(e))
+    {
+        QString caption = static_cast<KJotsEntryBase*>(e->parent())->subject() +
+                          " / " +
+                          static_cast<KJotsEntryBase*>(e)->subject();
+
+        setCaption(kapp->makeStdCaption(caption));
+    }
+}
+
 void KJotsMain::slotItemRenamed(QListViewItem* item, const QString& str, int  /*col*/)
 {
@@ -996,4 +1019,5 @@ void KJotsMain::slotItemRenamed(QListVie
     {
         entry->setSubject(str);
+        updateCaption();
     }
 }

--- kdeutils/kjots/KJotsMain.h  #1.48:1.49
@@ -63,4 +63,7 @@ class KJotsMain : public KMainWindow
         QString currentBookmarkURL();
 
+    public:
+        void updateCaption();
+
     protected slots:
         void slotSetupInterface();

--- kdeutils/kjots/kjotsentry.cpp  #1.19:1.20
@@ -35,4 +35,5 @@
 #include <kio/job.h>
 
+#include "KJotsMain.h"
 #include "kjotsentry.h"
 
@@ -324,4 +325,9 @@ void KJotsBook::rename()
     {
         setSubject(name);
+
+        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+
+        if (m)
+            m->updateCaption();
     }
 }
@@ -584,4 +590,9 @@ void KJotsSubject::rename()
     {
         setSubject(name);
+
+        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+
+        if (m)
+            m->updateCaption();
     }
 }

--- kdeutils/kjots/kjotsentry.h  #1.12:1.13
@@ -55,4 +55,7 @@ class KJotsEntryBase : public QObject, p
         virtual QString defaultSubject() = 0;
         virtual void rename() = 0;
+
+    signals:
+        void nameChanged();
 };
 


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