IPAL9013: Undo/Redo disabled and removed from context popup menu of Python Console.

diff --git a/src/PythonConsole/PythonConsole_PyEditor.cxx b/src/PythonConsole/PythonConsole_PyEditor.cxx
index ba55b25ca3e2ad99d427102bfa77edc6c6e72f59..7ba34c58d0542e75d6cf7f752535102332e70df0 100755 (executable)
--- a/src/PythonConsole/PythonConsole_PyEditor.cxx
+++ b/src/PythonConsole/PythonConsole_PyEditor.cxx
@@ -24,21 +24,20 @@
 //  File   : PythonConsole_PyEditor.cxx
 //  Author : Nicolas REJNERI
 //  Module : SALOME
-//  $Header$
 
 #include <PythonConsole_PyEditor.h> // this include must be first (see PyInterp_base.h)!
+
 #include <PyInterp_Dispatcher.h>
+
 #include <SUIT_Tools.h>
 
-#include <qapplication.h>
 #include <qmap.h>
 #include <qclipboard.h>
 #include <qdragobject.h>
+#include <qapplication.h>
 
-//#include "utilities.h"
 using namespace std;
 
-
 //#ifdef _DEBUG_
 //static int MYDEBUG = 1;
 //#else
@@ -105,6 +104,7 @@ PythonConsole_PyEditor::PythonConsole_PyEditor(PyInterp_base* theInterp, QWidget
   QFont aFont = SUIT_Tools::stringToFont( fntSet );
   setFont(aFont);
   setTextFormat(QTextEdit::PlainText);
+  setUndoRedoEnabled( false );
 
   _currentPrompt = READY_PROMPT;
   setWordWrap(NoWrap);
@@ -307,8 +307,6 @@ void PythonConsole_PyEditor::keyPressEvent( QKeyEvent* e )
   bool ctrlPressed = e->state() & ControlButton;
   // check if <Shift> is pressed
   bool shftPressed = e->state() & ShiftButton;
-  // check if <Alt> is pressed
-  bool altPressed = e->state() & AltButton;
 
   // process <Ctrl>+<C> key-bindings
   if ( aKey == Key_C && ctrlPressed ) {
@@ -701,3 +699,22 @@ void PythonConsole_PyEditor::onPyInterpChanged( PyInterp_base* interp )
     }
   }
 }
+
+QPopupMenu* PythonConsole_PyEditor::createPopupMenu( const QPoint& pos )
+{
+  QPopupMenu* popup = QTextEdit::createPopupMenu( pos );
+
+  QValueList<int> ids;
+  for ( int i = 0; popup && i < popup->count(); i++ )
+  {
+    if ( !popup->isItemEnabled( popup->idAt( i ) ) )
+      ids.append( popup->idAt( i ) );
+  }
+
+  for ( QValueList<int>::const_iterator it = ids.begin(); it != ids.end(); ++it )
+    popup->removeItem( *it );
+
+  SUIT_Tools::simplifySeparators( popup );
+
+  return popup;
+}

diff --git a/src/PythonConsole/PythonConsole_PyEditor.h b/src/PythonConsole/PythonConsole_PyEditor.h
index 821fdec8752ee218884d4236e130b63776764cf4..b5d303a60e41545e2c5768801c3de6f489028495 100755 (executable)
--- a/src/PythonConsole/PythonConsole_PyEditor.h
+++ b/src/PythonConsole/PythonConsole_PyEditor.h
@@ -24,7 +24,6 @@
 //  File   : PythonConsole_PyEditor.h
 //  Author : Nicolas REJNERI
 //  Module : SALOME
-//  $Header$
 
 #ifndef PythonConsole_PyEditor_H
 #define PythonConsole_PyEditor_H
@@ -59,6 +58,8 @@ protected:
 public slots:
   void handleReturn();
   void onPyInterpChanged( PyInterp_base* );
+
+  virtual QPopupMenu* createPopupMenu( const QPoint& );
   
 private:
   QString        _buf;