This is a multi-part message in MIME format.
--------------010506060906020605000000
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Content-Transfer-Encoding: quoted-printable



-------- Original Message --------
Subject: [PATCH] "close" action shortcut
Date: Sat, 03 Dec 2005 00:36:42 +0100
From: Jaros=B3aw Staniek <js@iidea.pl>
Reply-To: kde-core-devel@kde.org
Organization: Open Office Polska
Newsgroups: gmane.comp.kde.devel.core

A patch for 3.5.1 and trunk:

FIX1. win32 only:
CTRL+F4 shortcut is well known and expected to work on win32: added it as=

default shortcut; CTRL+W moved as alternative.

FIX2. After FIX1, "close_window" action in KMDI can just use KStdAccel::c=
lose()


OK to commit?

--=20
regards / pozdrawiam,
   Jaroslaw Staniek / OpenOffice Polska
   Kexi Developer:
       http://www.kexi-project.org | http://koffice.org/kexi
   Kexi support:
       http://www.kexi-project.org/support.html
   KDE3, KDE4 libraries for developing MS Windows applications:
       http://wiki.kde.org/tiki-index.php?page=3DKDElibs+for+win32


--=20
regards / pozdrawiam,
  Jaroslaw Staniek / OpenOffice Polska
  Kexi Developer:
      http://www.kexi-project.org | http://koffice.org/kexi
  Kexi support:
      http://www.kexi-project.org/support.html
  KDE3, KDE4 libraries for developing MS Windows applications:
      http://wiki.kde.org/tiki-index.php?page=3DKDElibs+for+win32

--------------010506060906020605000000
Content-Type: text/plain;
 name="close_window_shortcut.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="close_window_shortcut.patch"

Index: kmdi/kmdimainfrm.cpp
===================================================================
--- kmdi/kmdimainfrm.cpp	(revision 485120)
+++ kmdi/kmdimainfrm.cpp	(working copy)
@@ -49,6 +49,7 @@
 #include <kdeversion.h>
 #include <qtabwidget.h>
 #include <klocale.h>
+#include <kstdaccel.h>
 
 #include <kiconloader.h>
 #include <kmdidockcontainer.h>
@@ -216,12 +217,7 @@
 
 	m_pPlacingMenu = new QPopupMenu( this, "placing_menu" );
 
-	d->closeWindowAction = new KAction(i18n("&Close"),
-#ifdef Q_WS_WIN
-		CTRL|Key_F4,
-#else
-		0,
-#endif
+	d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(),
 		this, SLOT(closeActiveView()), actionCollection(), "window_close");
 
 	// the MDI view taskbar
Index: kdecore/kstdaccel.cpp
===================================================================
--- kdecore/kstdaccel.cpp	(revision 485122)
+++ kdecore/kstdaccel.cpp	(working copy)
@@ -52,7 +52,12 @@
 	{AccelNone,            "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, KShortcut(), false },
 	{ Open,                I18N_NOOP("Open"), 0,     Qt::CTRL+Qt::Key_O, 0, 0, 0, KShortcut(), false },
 	{ New,                 I18N_NOOP("New"), 0,      Qt::CTRL+Qt::Key_N, 0, 0, 0, KShortcut(), false },
-	{ Close,               I18N_NOOP("Close"), 0,    Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false },
+	{ Close,               I18N_NOOP("Close"), 0,    
+#ifdef Q_WS_WIN
+		Qt::CTRL+Qt::Key_F4, 0, Qt::CTRL+Qt::Key_W, 0, KShortcut(), false },
+#else
+		Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false },
+#endif
 	{ Save,                I18N_NOOP("Save"), 0,     Qt::CTRL+Qt::Key_S, 0, 0, 0, KShortcut(), false },
 	{ Print,               I18N_NOOP("Print"), 0,    Qt::CTRL+Qt::Key_P, 0, 0, 0, KShortcut(), false },
 	{ Quit,                I18N_NOOP("Quit"), 0,     Qt::CTRL+Qt::Key_Q, 0, 0, 0, KShortcut(), false },


--------------010506060906020605000000
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Kde-windows mailing list
Kde-windows@kde.org
https://mail.kde.org/mailman/listinfo/kde-windows

--------------010506060906020605000000--