[rkward-cvs] rkward/rkward rkconsole.cpp,1.23,1.24

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12584/rkward

Modified Files:
	rkconsole.cpp 
Log Message:
Some fixes to pasting in the console

Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** rkconsole.cpp	12 Apr 2006 12:36:03 -0000	1.23
--- rkconsole.cpp	17 Apr 2006 17:03:22 -0000	1.24
***************
*** 61,66 ****
  
  	
! 	setFocusProxy(view);
! 	setFocusPolicy(QWidget::WheelFocus);
  	
  	/* We need to unplug kactions that were pluged to the KateViewInternal in kateview.cpp.
--- 61,66 ----
  
  	
! 	setFocusProxy (view);
! 	setFocusPolicy (QWidget::WheelFocus);
  	
  	/* We need to unplug kactions that were pluged to the KateViewInternal in kateview.cpp.
***************
*** 111,124 ****
  		unplugAction("to_matching_bracket", ac);
  		unplugAction("select_matching_bracket", ac);
! 		
! 
  	} else {
! 		qDebug("Warning: could not retrieve the view's action collection");
  	}
  
- 	
  	view->focusProxy()->installEventFilter(this);
  	view->installEventFilter(this);
- 	
  
  	setRHighlighting ();
--- 111,121 ----
  		unplugAction("to_matching_bracket", ac);
  		unplugAction("select_matching_bracket", ac);
! 		unplugAction("paste", ac);
  	} else {
! 		RK_DO (qDebug ("Could not retrieve the view's action collection"), APP, DL_WARNING);
  	}
  
  	view->focusProxy()->installEventFilter(this);
  	view->installEventFilter(this);
  
  	setRHighlighting ();
***************
*** 207,212 ****
  	}
  
- 
- 	
  	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
  		submitCommand ();
--- 204,207 ----
***************
*** 224,228 ****
  			return TRUE;
  		} else {
! 			view->  shiftCursorLeft ();
  			return FALSE;
  		}
--- 219,223 ----
  			return TRUE;
  		} else {
! 			view->shiftCursorLeft ();
  			return FALSE;
  		}
***************
*** 261,277 ****
  	}
  
- 	
- 
- 
  	return FALSE;
- 	
  }
  
  bool RKConsole::eventFilter( QObject *o, QEvent *e )
  {
! 	if ( (e->type() == QEvent::KeyPress) ) {
  		QKeyEvent *k = (QKeyEvent *)e;
! 		return handleKeyPress(k); 
! 	} else if ( (e->type() == QEvent::MouseButtonPress) ){
  		QMouseEvent *m = (QMouseEvent *)e;
  		if (m->button() == Qt::RightButton) {
--- 256,268 ----
  	}
  
  	return FALSE;
  }
  
  bool RKConsole::eventFilter( QObject *o, QEvent *e )
  {
! 	if (e->type () == QEvent::KeyPress) {
  		QKeyEvent *k = (QKeyEvent *)e;
! 		return handleKeyPress (k);
! 	} else if (e->type () == QEvent::MouseButtonPress){
  		QMouseEvent *m = (QMouseEvent *)e;
  		if (m->button() == Qt::RightButton) {
***************
*** 280,288 ****
  		}
  		return(FALSE);
! 	} else if ( (e->type() == QEvent::MouseButtonRelease) ){
  		QMouseEvent *m = (QMouseEvent *)e;
  		if (m->button() == Qt::MidButton) {
! 			paste();
! 			return(TRUE);
  		}
  		return(FALSE);
--- 271,280 ----
  		}
  		return(FALSE);
! 	} else if (e->type () == QEvent::MouseButtonRelease){
  		QMouseEvent *m = (QMouseEvent *)e;
  		if (m->button() == Qt::MidButton) {
! 			QClipboard *cb = QApplication::clipboard ();
! 			submitBatch (cb->text (QClipboard::Selection));
! 			return (true);
  		}
  		return(FALSE);
***************
*** 570,574 ****
  void RKConsolePart::showContextHelp () {
  	RK_TRACE (APP);
! 	RKGlobals::helpDialog ()->getContextHelp (console->currentCommand (), console->currentCursorPositionInCommand() );
  }
  
--- 562,566 ----
  void RKConsolePart::showContextHelp () {
  	RK_TRACE (APP);
! 	RKGlobals::helpDialog ()->getContextHelp (console->currentCommand (), console->currentCursorPositionInCommand ());
  }