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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kate/app
From:       Jan Villat <jan.villat () net2000 ! ch>
Date:       2004-05-29 10:21:01
Message-ID: 20040529102101.B177D126DB () office ! kde ! org
[Download RAW message or body]

CVS commit by villat: 

Backporting fix of bug 81696 ("Open With" option is sometimes not enabled)


  M +2 -0      katedocmanager.cpp   1.61.2.1
  M +1 -0      katedocmanager.h   1.33.2.1
  M +10 -6     katemainwindow.cpp   1.216.2.5
  M +1 -0      katemainwindow.h   1.78.2.2
  M +1 -0      kateviewmanager.cpp   1.144.2.2


--- kdebase/kate/app/katedocmanager.cpp  #1.61:1.61.2.1
@@ -204,4 +204,6 @@ Kate::Document *KateDocManager::openURL 
       *id=doc->documentNumber();
 
+    emit initialDocumentReplaced();
+
     return doc;
  }

--- kdebase/kate/app/katedocmanager.h  #1.33:1.33.2.1
@@ -106,4 +106,5 @@ class KateDocManager : public QObject
     void documentDeleted (uint documentNumber);
     void documentChanged ();
+    void initialDocumentReplaced ();
 
   private slots:

--- kdebase/kate/app/katemainwindow.cpp  #1.216.2.4:1.216.2.5
@@ -302,4 +302,5 @@ void KateMainWindow::setupActions()
 
   connect(m_viewManager,SIGNAL(viewChanged()),this,SLOT(slotWindowActivated()));
+  connect(m_viewManager,SIGNAL(viewChanged()),this,SLOT(slotUpdateOpenWith()));
   connect(m_docManager,SIGNAL(documentChanged()),this,SLOT(slotDocumentChanged()));
 
@@ -434,6 +435,4 @@ void KateMainWindow::slotWindowActivated
   if (m_viewManager->activeView())
   {
-    documentOpenWith->setEnabled (!m_viewManager->activeView()->document()->url().isEmpty());
-
     if (console && syncKonsole)
     {
@@ -449,8 +448,4 @@ void KateMainWindow::slotWindowActivated
     updateCaption (m_viewManager->activeView()->getDoc());
   }
-  else
-  {
-    documentOpenWith->setEnabled (false);
-  }
 
   if (m_viewManager->viewSpaceCount() == 1)
@@ -460,4 +455,12 @@ void KateMainWindow::slotWindowActivated
 }
 
+void KateMainWindow::slotUpdateOpenWith()
+{
+  if (m_viewManager->activeView())
+    documentOpenWith->setEnabled(!m_viewManager->activeView()->document()->url().isEmpty());
+  else
+    documentOpenWith->setEnabled(false);
+}
+
 void KateMainWindow::documentMenuAboutToShow()
 {
@@ -867,4 +870,5 @@ void KateMainWindow::slotDocumentCreated
   connect(doc,SIGNAL(modStateChanged(Kate::Document *)),this,SLOT(updateCaption(Kate::Document *)));
   connect(doc,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(updateCaption(Kate::Document *)));
+  connect(doc,SIGNAL(nameChanged(Kate::Document *)),this,SLOT(slotUpdateOpenWith()));
 
   updateCaption (doc);

--- kdebase/kate/app/katemainwindow.h  #1.78.2.1:1.78.2.2
@@ -188,4 +188,5 @@ class KateMainWindow : public KMdiMainFr
     void slotDocumentChanged();
     void slotWindowActivated ();
+    void slotUpdateOpenWith();
     void documentMenuAboutToShow();
     void slotDropEvent(QDropEvent *);

--- kdebase/kate/app/kateviewmanager.cpp  #1.144.2.1:1.144.2.2
@@ -84,4 +84,5 @@ KateViewManager::KateViewManager (QWidge
   m_viewSpaceList.append(vs);
   connect( this, SIGNAL(viewChanged()), this, SLOT(slotViewChanged()) );
+  connect(m_docManager, SIGNAL(initialDocumentReplaced()), this, SIGNAL(viewChanged()));
 }
 


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