Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader krusader.cpp, 1.204, 1.205 krusaderui.rc, 1.36, 1.37
|
From: Dirk E. <des...@us...> - 2006-09-15 11:32:47
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6581/krusader Modified Files: krusader.cpp krusaderui.rc Log Message: - Added function key actions to the menubar - Changed text for standard actions Cut, Copy and Paste for better distinction (adapted from context menu) Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.204 retrieving revision 1.205 diff -C2 -d -r1.204 -r1.205 *** krusader.cpp 11 Sep 2006 20:10:01 -0000 1.204 --- krusader.cpp 15 Sep 2006 11:32:44 -0000 1.205 *************** *** 506,512 **** KStdAction::keyBindings( SLOTS, SLOT( configKeys() ), actionCollection(), "std_config_keys" ); ! KStdAction::cut( SLOTS, SLOT( cut() ), actionCollection(), "std_cut" ); ! KStdAction::copy( SLOTS, SLOT( copy() ), actionCollection(), "std_copy" ); ! KStdAction::paste( SLOTS, SLOT( paste() ), actionCollection(), "std_paste" ); // the toggle actions --- 506,512 ---- KStdAction::keyBindings( SLOTS, SLOT( configKeys() ), actionCollection(), "std_config_keys" ); ! KStdAction::cut( SLOTS, SLOT( cut() ), actionCollection(), "std_cut" )->setText( i18n("Cut to Clipboard") ); ! 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 *************** *** 534,538 **** /* Shortcut disabled because of the Terminal Emulator bug. */ actDirUp = new KAction( i18n( "Up" ), "up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, SLOT( dirUp() ), actionCollection(), "dirUp" ); ! new KAction( i18n( "&Edit New File..." ), "filenew", SHIFT + Key_F4, SLOTS, SLOT( editDlg() ), actionCollection(), "edit_new_file" ); new KAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, SLOT( rootKrusader() ), actionCollection(), "root krusader" ); --- 534,538 ---- /* Shortcut disabled because of the Terminal Emulator bug. */ actDirUp = new KAction( i18n( "Up" ), "up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, SLOT( dirUp() ), actionCollection(), "dirUp" ); ! new KAction( i18n( "&New Text File..." ), "filenew", SHIFT + Key_F4, SLOTS, SLOT( editDlg() ), actionCollection(), "edit_new_file" ); new KAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, SLOT( rootKrusader() ), actionCollection(), "root krusader" ); *************** *** 590,594 **** if( compareMode < (int)( sizeof( compareArray ) / sizeof( KRadioAction ** ) ) -1 ) (*compareArray[ compareMode ])->setChecked( true ); ! actHomeTerminal = new KAction( i18n( "Start &Terminal" ), "konsole", 0, SLOTS, SLOT( homeTerminal() ), actionCollection(), "terminal@home" ); actFTPDisconnect = new KAction( i18n( "Disconnect &from Net" ), "kr_ftp_disconnect", SHIFT + CTRL + Key_F, --- 590,594 ---- if( compareMode < (int)( sizeof( compareArray ) / sizeof( KRadioAction ** ) ) -1 ) (*compareArray[ compareMode ])->setChecked( true ); ! actHomeTerminal = new KAction( i18n( "Start &Terminal" ), "terminal", 0, SLOTS, SLOT( homeTerminal() ), actionCollection(), "terminal@home" ); actFTPDisconnect = new KAction( i18n( "Disconnect &from Net" ), "kr_ftp_disconnect", SHIFT + CTRL + Key_F, *************** *** 681,701 **** // setup the Fn keys ! actF2 = new KAction( i18n( "F2 - Open a terminal" ), Key_F2, SLOTS, SLOT( terminal() ) , actionCollection(), "F2_Terminal" ); ! actF3 = new KAction( i18n( "F3 - View a file" ), Key_F3, SLOTS, SLOT( view() ) , actionCollection(), "F3_View" ); ! actF4 = new KAction( i18n( "F4 - Edit a file" ), Key_F4, SLOTS, SLOT( edit() ) , actionCollection(), "F4_Edit" ); ! actF5 = new KAction( i18n( "F5 - Copy" ), Key_F5, SLOTS, SLOT( copyFiles() ) , actionCollection(), "F5_Copy" ); ! actF6 = new KAction( i18n( "F6 - Move" ), Key_F6, SLOTS, SLOT( moveFiles() ) , actionCollection(), "F6_Move" ); ! actF7 = new KAction( i18n( "F7 - Mkdir" ), Key_F7, SLOTS, SLOT( mkdir() ) , actionCollection(), "F7_Mkdir" ); ! actF8 = new KAction( i18n( "F8 - Delete" ), Key_F8, SLOTS, SLOT( deleteFiles() ) , actionCollection(), "F8_Delete" ); ! actF9 = new KAction( i18n( "F9 - Rename" ), Key_F9, SLOTS, SLOT( rename() ) , actionCollection(), "F9_Rename" ); ! actF10 = new KAction( i18n( "F10 - Quit" ), Key_F10, this, SLOT( slotClose() ) , actionCollection(), "F10_Quit" ); actPopularUrls = new KAction( i18n("Popular URLs..."), CTRL+Key_Z, --- 681,701 ---- // setup the Fn keys ! actF2 = new KAction( i18n( "Start Terminal Here" ), "terminal", Key_F2, SLOTS, SLOT( terminal() ) , actionCollection(), "F2_Terminal" ); ! actF3 = new KAction( i18n( "View File" ), Key_F3, SLOTS, SLOT( view() ) , actionCollection(), "F3_View" ); ! actF4 = new KAction( i18n( "Edit File" ), Key_F4, SLOTS, SLOT( edit() ) , actionCollection(), "F4_Edit" ); ! actF5 = new KAction( i18n( "Copy..." ), Key_F5, SLOTS, SLOT( copyFiles() ) , actionCollection(), "F5_Copy" ); ! actF6 = new KAction( i18n( "Move..." ), Key_F6, SLOTS, SLOT( moveFiles() ) , actionCollection(), "F6_Move" ); ! actF7 = new KAction( i18n( "New Directory..." ), "folder_new", Key_F7, SLOTS, SLOT( mkdir() ) , actionCollection(), "F7_Mkdir" ); ! actF8 = new KAction( i18n( "Delete" ), "editdelete", Key_F8, SLOTS, SLOT( deleteFiles() ) , actionCollection(), "F8_Delete" ); ! actF9 = new KAction( i18n( "Rename" ), Key_F9, SLOTS, SLOT( rename() ) , actionCollection(), "F9_Rename" ); ! actF10 = new KAction( i18n( "Quit" ), Key_F10, this, SLOT( slotClose() ) , actionCollection(), "F10_Quit" ); actPopularUrls = new KAction( i18n("Popular URLs..."), CTRL+Key_Z, Index: krusaderui.rc =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** krusaderui.rc 9 Sep 2006 19:29:33 -0000 1.36 --- krusaderui.rc 15 Sep 2006 11:32:44 -0000 1.37 *************** *** 1,9 **** ! <!DOCTYPE kpartgui ><kpartgui version="11" name="krusader" > <MenuBar> <Menu name="file" > <text>&File</text> <Action name="edit_new_file" /> <Action name="new symlink" /> <Separator/> <Action name="pack" /> <Action name="unpack" /> --- 1,15 ---- ! <!DOCTYPE kpartgui ><kpartgui version="12" name="krusader" > <MenuBar> <Menu name="file" > <text>&File</text> <Action name="edit_new_file" /> + <Action name="F7_Mkdir" /> <Action name="new symlink" /> <Separator/> + <Action name="F3_View" /> + <Action name="F4_Edit" /> + <Action name="F5_Copy" /> + <Action name="F6_Move" /> + <Separator/> <Action name="pack" /> <Action name="unpack" /> *************** *** 15,26 **** <Action name="create checksum" /> <Action name="match checksum" /> - <!-- - <Separator/> - <Action name="std_print" /> - --> <Separator/> <Action name="split" /> <Action name="combine" /> <Separator/> <Action name="std_quit" /> </Menu> --- 21,32 ---- <Action name="create checksum" /> <Action name="match checksum" /> <Separator/> <Action name="split" /> <Action name="combine" /> <Separator/> + <!-- + <Action name="std_print" /> + <Separator/> + --> <Action name="std_quit" /> </Menu> *************** *** 32,35 **** --- 38,43 ---- <Action name="std_copy" /> <Action name="std_paste" /> + <Action name="F9_Rename" /> + <Action name="F8_Delete" /> <Separator/> <Action name="select group" /> *************** *** 92,95 **** --- 100,104 ---- <Separator/> <Action name="terminal@home" /> + <Action name="F2_Terminal" /> <Action name="root krusader" /> <Separator/> |