[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.18,1.19 krslots.h,1.10,1.11 krusader.cpp,1.33,1.34 krusaderui.rc,1.10,1.11

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

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv15359/krusader_kde3/krusader

Modified Files:
	krslots.cpp krslots.h krusader.cpp krusaderui.rc 
Log Message:

ADDED: creating new files with Shift+F4


Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** krslots.cpp	22 Sep 2003 23:49:44 -0000	1.18
--- krslots.cpp	26 Sep 2003 21:46:09 -0000	1.19
***************
*** 423,427 ****
    QString dest = chooser->dest;
    if ( dest == QString::null ) return ; // the usr canceled
!   else KrViewer::view( KURL::fromPathOrURL(dest) ); // view the file
    // nothing more to it!
  }
--- 423,461 ----
    QString dest = chooser->dest;
    if ( dest == QString::null ) return ; // the usr canceled
!   else
!   {
!     /* KURL::fromPathOrURL requires fullpath, so we check whether it is relative  */
!     if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
!       dest = ACTIVE_FUNC->files()->vfs_getOrigin() + "/" + dest; /* it's full path now */
!     
!     KrViewer::view( KURL::fromPathOrURL(dest) ); // view the file
!   }
!   // nothing more to it!
! }
! 
! // Shift F4
! void KRslots::editDlg(){
!   // ask the user for the filename to edit
!   KChooseDir *chooser = new KChooseDir( 0,i18n("Enter the filename to edit:"), QString::null);
!   QString dest = chooser->dest;
!   if ( dest == QString::null ) return ; // the usr canceled
!   else
!   {
!     /* KURL::fromPathOrURL requires fullpath, so we check whether it is relative  */
!     if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
!       dest = ACTIVE_FUNC->files()->vfs_getOrigin() + "/" + dest; /* it's full path now */
!     
!     krConfig->setGroup( "General" );
!     QString edit = krConfig->readEntry( "Editor", _Editor );
! 
!     if ( edit == "internal editor" )
!       KrViewer::edit( KURL::fromPathOrURL( dest ), true );
!     else {
!       KProcess proc;
!       proc << edit << dest;
!       if ( !proc.start( KProcess::DontCare ) )
!         KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + edit + "\"" );
!     }
!   }
    // nothing more to it!
  }

Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krslots.h	22 Sep 2003 23:49:44 -0000	1.10
--- krslots.h	26 Sep 2003 21:46:09 -0000	1.11
***************
*** 117,120 ****
--- 117,122 ----
      // F4
      void edit();
+     // Shift F4
+     void editDlg();
      // F5
      void copyFiles();

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** krusader.cpp	22 Sep 2003 21:21:51 -0000	1.33
--- krusader.cpp	26 Sep 2003 21:46:09 -0000	1.34
***************
*** 274,277 ****
--- 274,280 ----
    accels->insert( "F4_Edit", i18n( "F4 Edit" ), QString::null,
                    Key_F4, SLOTS, SLOT( edit() ) );
+   // SHIFT+F4
+   accels->insert( "F4_EditDlg", i18n( "F4 Edit Dialog" ), QString::null,
+                   SHIFT+Key_F4, SLOTS, SLOT( editDlg() ) );
    // F5
    accels->insert( "F5_Copy", i18n( "F5 Copy" ), QString::null,
***************
*** 310,313 ****
--- 313,317 ----
    //KStdAction::up( SLOTS, SLOT( dirUp() ), actionCollection(), "std_up" )->setShortcut(Key_Backspace);
    KStdAction::home( SLOTS, SLOT( home() ), actionCollection(), "std_home" )->setShortcut(Key_QuoteLeft);
+   KStdAction::openNew( SLOTS, SLOT( editDlg() ), actionCollection(), "std_open_new" );
    KAction *actRedisplay = KStdAction::redisplay( SLOTS, SLOT( refresh() ), actionCollection(), "std_redisplay" );
    actRedisplay->setText( "Reload" );

Index: krusaderui.rc
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krusaderui.rc	18 Sep 2003 15:33:29 -0000	1.10
--- krusaderui.rc	26 Sep 2003 21:46:09 -0000	1.11
***************
*** 8,11 ****
--- 8,12 ----
     <Action name="test archives" />
     <Action name="compare" />
+    <Action name="std_open_new" />
     <Action name="multirename" />
     <Action name="calculate" />
***************
*** 81,84 ****
--- 82,86 ----
    <Action name="select all" />
    <Action name="unselect all" />
+   <Action name="std_open_new" />
    <Action name="unpack" />
    <Action name="pack" />