[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] Re: patch: khelpcenter close/quit
From:       Martijn Klingens <mklingens () yahoo ! com>
Date:       2001-07-25 11:29:17
[Download RAW message or body]

On Wednesday 25 July 2001 12:34, Cornelius Schumacher wrote:
> > Hmm... then Konqueror should call the "quit" action "close" as well ;-)
>
> No, it's the other way around. The patch is fine and Konqueror as well ;-)

Huh? Indeed the patch is fine, but you don't quit konqi if you select quit, 
you only close the active window. So that entry should change as well then...

See attached patch. Ok to commit this? The ctrl-q StdAccel is of course gone, 
because it IMO doesn't belong there, the ctrl-esc is added for 'close 
document' (in the 4-key scheme, don't know the default 3-key accel).

Martijn

["konqueror.diff" (text/x-diff)]

Index: konq_mainwindow.cc
===================================================================
RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
retrieving revision 1.909
diff -b -u -p -r1.909 konq_mainwindow.cc
--- konq_mainwindow.cc	2001/07/17 11:29:32	1.909
+++ konq_mainwindow.cc	2001/07/25 11:22:53
@@ -2611,7 +2611,7 @@ void KonqMainWindow::initActions()
   m_paFindFiles = new KAction( i18n( "&Find file..." ), "filefind", 0 /*not \
KStdAccel::find!*/, this, SLOT( slotToolFind() ), actionCollection(), "findfile" );  
   m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
-  (void) KStdAction::quit( this, SLOT( close() ), actionCollection(), "quit" );
+  (void) KStdAction::close( this, SLOT( close() ), actionCollection(), "close" );
 
   m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, SLOT( \
slotShowHTML() ), actionCollection(), "usehtml" );  m_paLockView = new KAction( i18n( \
"Lock to current location"), 0, this, SLOT( slotLockView() ), actionCollection(), \
"lock" ); @@ -2986,7 +2986,7 @@ void KonqMainWindow::enableAllActions( b
       }
 
   }
-  actionCollection()->action( "quit" )->setEnabled( true );
+  actionCollection()->action( "close" )->setEnabled( true );
 }
 
 void KonqMainWindow::disableActionsNoView()
Index: konqueror.rc
===================================================================
RCS file: /home/kde/kdebase/konqueror/konqueror.rc,v
retrieving revision 1.89
diff -b -u -p -r1.89 konqueror.rc
--- konqueror.rc	2001/07/13 17:59:51	1.89
+++ konqueror.rc	2001/07/25 11:22:53
@@ -13,7 +13,7 @@
   <DefineGroup name="print" />
   <Separator/>
   <ActionList name="openwith" /> <!--Includes termination separator-->
-  <Action name="quit"/>
+  <Action name="close"/>
  </Menu>
  <Menu name="edit" noMerge="1"><text>&amp;Edit</text>  <!--Here is what applies to a \
selection-->  <Action name="undo" />



[prev in list] [next in list] [prev in thread] [next in thread]