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

List:       kde-commits
Subject:    kdewebdev/quanta
From:       Jens Herden <jens () kdewebdev ! org>
Date:       2004-07-30 3:46:02
Message-ID: 20040730034602.E5EB39A02 () office ! kde ! org
[Download RAW message or body]

CVS commit by jens: 

bugfix: added the lost cut/copy/paste actions to the popup menu of the editor again


  M +6 -2      data/config/quantaui.rc   1.131
  M +0 -42     src/quanta.cpp   1.619
  M +0 -2      src/quanta.h   1.260
  M +0 -1      src/quanta_init.cpp   1.554


--- kdewebdev/quanta/data/config/quantaui.rc  #1.130:1.131
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="quanta" version="32061">
+<kpartgui name="quanta" version="32062">
   <MenuBar noMerge="1">
 
@@ -126,5 +126,5 @@
 
   <Merge/>
-  
+
   <Menu name="tools"><text>T&amp;ools</text>
     <Merge/>
@@ -216,4 +216,8 @@
 
   <Menu name="popup_editor">
+    <Action name="edit_cut" />
+    <Action name="edit_copy" />
+    <Action name="edit_paste" />
+    <Separator/>
     <Action name="edit_current_tag"/>
     <Action name="select_tag_area"/>

--- kdewebdev/quanta/src/quanta.cpp  #1.618:1.619
@@ -240,7 +240,4 @@ QuantaApp::QuantaApp(int mdiMode) : DCOP
   connect(tabWidget(), SIGNAL(initiateDrag(QWidget *)), this, SLOT(slotTabDragged(QWidget*)));
 
-  m_oldContextCut = 0L;
-  m_oldContextCopy = 0L;
-  m_oldContextPaste = 0L;
   m_oldKTextEditor = 0L;
   m_previewToolView = 0L;
@@ -1837,27 +1834,4 @@ void QuantaApp::slotContextMenuAboutToSh
   {
     QPopupMenu *popup = static_cast<QPopupMenu*>(factory()->container("popup_editor",this));
-    if (popup) {
-      if (m_oldContextCut) {
-        m_oldContextCut->unplug(popup);
-      }
-      KTextEditor::View* view = w->view();
-      m_oldContextCut = view->actionCollection()->action("edit_cut");
-      if (m_oldContextCut)
-        m_oldContextCut->plug(popup, 0);
-
-      if (m_oldContextCopy) {
-        m_oldContextCopy->unplug(popup);
-      }
-      m_oldContextCopy = view->actionCollection()->action("edit_copy");
-      if (m_oldContextCopy)
-        m_oldContextCopy->plug(popup, 1);
-
-      if (m_oldContextPaste) {
-        m_oldContextPaste->unplug(popup);
-      }
-      m_oldContextPaste = view->actionCollection()->action("edit_paste");
-      if (m_oldContextPaste)
-        m_oldContextPaste->plug(popup, 2);
-    }
     QString name;
     uint line, col;
@@ -4712,20 +4686,4 @@ void QuantaApp::initTabWidget(bool close
 void QuantaApp::slotFileClosed()
 {
-   QPopupMenu *popup = static_cast<QPopupMenu*>(factory()->container("popup_editor",this));
-   if (popup)
-   {
-      if (m_oldContextCut) {
-          m_oldContextCut->unplug(popup);
-      }
-      if (m_oldContextCopy) {
-          m_oldContextCopy->unplug(popup);
-      }
-        if (m_oldContextPaste) {
-          m_oldContextPaste->unplug(popup);
-      }
-   }
-   m_oldContextCopy = 0L;
-   m_oldContextCut = 0L;
-   m_oldContextPaste = 0L;
 }
 

--- kdewebdev/quanta/src/quanta.h  #1.259:1.260
@@ -545,6 +545,4 @@ private:
   KProcess* m_execCommandPS;
   QString m_scriptOutput;
-  // remember the old actions for the context menu
-  KAction *m_oldContextCut, *m_oldContextCopy, *m_oldContextPaste;
 
 protected: // Protected attributes

--- kdewebdev/quanta/src/quanta_init.cpp  #1.553:1.554
@@ -250,5 +250,4 @@ void QuantaInit::initQuanta()
   QPopupMenu *contextMenu = (QPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta);
   connect(contextMenu, SIGNAL(aboutToShow()), m_quanta, SLOT(slotContextMenuAboutToShow()));
-  contextMenu->insertSeparator(0);  // XML gui does not support a separator at the beginning
 
   connect(m_quanta->m_messageOutput, SIGNAL(clicked(const QString&, int, int)),


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