From: guillaume <guillaume@a7884b65-44f6-0310-8a51-81a127f17b15>
Date: Thu, 3 Dec 2009 08:54:54 +0000 (+0000)
Subject: Replace Alt-F4 with Ctrl-Q and Ctrl-W.
X-Git-Url: http://git.postgresql.org/gitweb/static/%7B%7Bpgdulink%28?a=commitdiff_plain;h=8de5db866e904d0dde79059f7a27377548e13f0b;p=users%2Fquan74%2Fpgadmin-import.git

Replace Alt-F4 with Ctrl-Q and Ctrl-W.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8102 a7884b65-44f6-0310-8a51-81a127f17b15
---

diff --git a/pgadmin/frm/frmConfig.cpp b/pgadmin/frm/frmConfig.cpp
index 5867e1a63..aae22274f 100644
--- a/pgadmin/frm/frmConfig.cpp
+++ b/pgadmin/frm/frmConfig.cpp
@@ -128,7 +128,7 @@ void frmConfig::InitFrame(const wxChar *frameName)
     toolBar->AddSeparator();
 
     fileMenu->Append(MNU_RECENT, _("&Recent files"), recentFileMenu);
-    fileMenu->Append(MNU_EXIT, _("E&xit\tAlt-F4"), _("Exit configuration tool"));
+    fileMenu->Append(MNU_EXIT, _("E&xit\tCtrl-W"), _("Exit configuration tool"));
 
     editMenu->Append(MNU_UNDO, _("&Undo\tCtrl-Z"), _("Undo last action"), wxITEM_NORMAL);
     toolBar->AddTool(MNU_UNDO, _("Undo"), wxBitmap(edit_undo_xpm), _("Undo last action"), wxITEM_NORMAL);
diff --git a/pgadmin/frm/frmMain.cpp b/pgadmin/frm/frmMain.cpp
index e9c4a2212..8069faae9 100644
--- a/pgadmin/frm/frmMain.cpp
+++ b/pgadmin/frm/frmMain.cpp
@@ -305,7 +305,7 @@ void frmMain::CreateMenus()
     new pgpassConfigFileFactory(menuFactories, fileMenu, 0);
 
     fileMenu->AppendSeparator();
-    fileMenu->Append(MNU_EXIT, _("E&xit\tAlt-F4"),                _("Quit this program."));
+    fileMenu->Append(MNU_EXIT, _("E&xit\tCtrl-Q"),                _("Quit this program."));
 
     new slonyRestartFactory(menuFactories, slonyMenu, 0);
     new slonyUpgradeFactory(menuFactories, slonyMenu, 0);
diff --git a/pgadmin/frm/frmQuery.cpp b/pgadmin/frm/frmQuery.cpp
index f93926e03..93fe8f802 100644
--- a/pgadmin/frm/frmQuery.cpp
+++ b/pgadmin/frm/frmQuery.cpp
@@ -232,7 +232,7 @@ pgsTimer(new pgScriptTimer(this))
     fileMenu->Append(MNU_QUICKREPORT, _("&Quick report..."),  _("Run a quick report..."));
     fileMenu->AppendSeparator();
     fileMenu->Append(MNU_RECENT, _("&Recent files"), recentFileMenu);
-    fileMenu->Append(MNU_EXIT, _("E&xit\tAlt-F4"), _("Exit query window"));
+    fileMenu->Append(MNU_EXIT, _("E&xit\tCtrl-W"), _("Exit query window"));
 
     menuBar->Append(fileMenu, _("&File"));
 
diff --git a/pgadmin/frm/frmStatus.cpp b/pgadmin/frm/frmStatus.cpp
index ab3a54586..51b26f3d5 100644
--- a/pgadmin/frm/frmStatus.cpp
+++ b/pgadmin/frm/frmStatus.cpp
@@ -191,7 +191,7 @@ frmStatus::frmStatus(frmMain *form, const wxString& _title, pgConn *conn) : pgFr
     menuBar = new wxMenuBar();
 
     fileMenu = new wxMenu();
-    fileMenu->Append(MNU_EXIT, _("E&xit\tAlt-F4"), _("Exit query window"));
+    fileMenu->Append(MNU_EXIT, _("E&xit\tCtrl-W"), _("Exit query window"));
 
     menuBar->Append(fileMenu, _("&File"));