[Krusader-commits] krusader_kde3/krusader krusader.cpp, 1.220, 1.221 krusader.h, 1.71, 1.72 krusaderview.cpp, 1.38, 1.39

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13950/krusader_kde3/krusader

Modified Files:
	krusader.cpp krusader.h krusaderview.cpp 
Log Message:
ADDED: Terminal Emulator, paste with SHIFT+INSERT and CTRL+V


Index: krusader.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** krusader.h	20 Mar 2007 11:24:25 -0000	1.71
--- krusader.h	27 Mar 2007 20:10:18 -0000	1.72
***************
*** 134,138 ****
      static KAction *actF2, *actF3, *actF4, *actF5, *actF6, *actF7, *actF8, *actF9, *actF10;
      static KAction *actPopularUrls, *actLocationBar, *actJumpBack, *actSetJumpBack, *actCreateChecksum, *actMatchChecksum;
!     static KAction *actDetailedView, *actBriefView, *actCopy;
      static KToggleAction *actToggleTerminal, *actVerticalMode;
      static KRadioAction *actSelectNewerAndSingle, *actSelectNewer, *actSelectSingle, 
--- 134,138 ----
      static KAction *actF2, *actF3, *actF4, *actF5, *actF6, *actF7, *actF8, *actF9, *actF10;
      static KAction *actPopularUrls, *actLocationBar, *actJumpBack, *actSetJumpBack, *actCreateChecksum, *actMatchChecksum;
!     static KAction *actDetailedView, *actBriefView, *actCopy, *actPaste;
      static KToggleAction *actToggleTerminal, *actVerticalMode;
      static KRadioAction *actSelectNewerAndSingle, *actSelectNewer, *actSelectSingle, 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -C2 -d -r1.220 -r1.221
*** krusader.cpp	25 Mar 2007 14:47:51 -0000	1.220
--- krusader.cpp	27 Mar 2007 20:10:18 -0000	1.221
***************
*** 108,111 ****
--- 108,112 ----
  KAction *Krusader::actTest = 0;
  KAction *Krusader::actCopy = 0;
+ KAction *Krusader::actPaste = 0;
  KAction *Krusader::actCompare = 0;
  KAction *Krusader::actCalculate = 0;
***************
*** 543,547 ****
     KStdAction::cut( SLOTS, SLOT( cut() ), actionCollection(), "std_cut" )->setText( i18n("Cut to Clipboard") );
     (actCopy = KStdAction::copy( SLOTS, SLOT( copy() ), actionCollection(), "std_copy" ))->setText( i18n("Copy to Clipboard") );
!    KStdAction::paste( SLOTS, SLOT( paste() ), actionCollection(), "std_paste" )->setText( i18n("Paste from Clipboard") );
  
     // the toggle actions
--- 544,548 ----
     KStdAction::cut( SLOTS, SLOT( cut() ), actionCollection(), "std_cut" )->setText( i18n("Cut to Clipboard") );
     (actCopy = KStdAction::copy( SLOTS, SLOT( copy() ), actionCollection(), "std_copy" ))->setText( i18n("Copy to Clipboard") );
!    (actPaste = KStdAction::paste( SLOTS, SLOT( paste() ), actionCollection(), "std_paste" ))->setText( i18n("Paste from Clipboard") );
  
     // the toggle actions

Index: krusaderview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** krusaderview.cpp	18 Mar 2007 20:27:29 -0000	1.38
--- krusaderview.cpp	27 Mar 2007 20:10:18 -0000	1.39
***************
*** 49,52 ****
--- 49,53 ----
  #include "Dialogs/percentalsplitter.h"
  #include "krservices.h"
+ #include <qclipboard.h>
  
  KrusaderView::KrusaderView( QWidget *parent ) : QWidget( parent, "KrusaderView" ), activePanel(0), 
***************
*** 280,284 ****
  
  bool KrusaderView::eventFilter ( QObject * watched, QEvent * e ) {
!   if( e->type() == QEvent::KeyPress && konsole_part && konsole_part->widget() == watched ) {
      QKeyEvent *ke = (QKeyEvent *)e;
      KKey pressedKey( ke );
--- 281,292 ----
  
  bool KrusaderView::eventFilter ( QObject * watched, QEvent * e ) {
!   if( e->type() == QEvent::AccelOverride && konsole_part && konsole_part->widget() == watched ) {
!     QKeyEvent *ke = (QKeyEvent *)e;
!     if( ( ke->key() ==  Key_Insert ) && ( ke->state()  == ShiftButton ) ) {
!       ke->accept();
!       return true;
!     }
!   }
!   else if( e->type() == QEvent::KeyPress && konsole_part && konsole_part->widget() == watched ) {
      QKeyEvent *ke = (QKeyEvent *)e;
      KKey pressedKey( ke );
***************
*** 317,320 ****
--- 325,337 ----
        ACTIVE_PANEL->slotFocusOnMe();
        return true;
+     } else if( Krusader::actPaste->shortcut().contains( pressedKey ) ) {
+       QString text = QApplication::clipboard()->text();
+       if ( ! text.isEmpty() )
+       {
+         text.replace("\n", "\r");
+         QKeyEvent keyEvent(QEvent::KeyPress, 0,-1,0, text);
+         QApplication::sendEvent( konsole_part->widget(), &keyEvent );
+       }
+       return true;
      }
    }