From 81144c247607b5df8f0f7c8dff3751f2b01ce5ed Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Sat, 11 Jun 2016 21:22:13 -0400 Subject: [PATCH] Move hotkey list from Preferences menu to Help menu --- common/hotkeys_basic.cpp | 9 +-------- eeschema/menubar.cpp | 6 ++++++ eeschema/menubar_libedit.cpp | 8 +++++++- gerbview/menubar.cpp | 8 +++++++- kicad/menubar.cpp | 8 +++++++- pagelayout_editor/menubar.cpp | 6 ++++++ pcbnew/menubar_modedit.cpp | 8 ++++++-- pcbnew/menubar_pcbframe.cpp | 5 +++++ 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index b9d86449b4..c2f775ef77 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2015 Jean-Pierre Charras, j-p.charras at wanadoo.fr * Copyright (C) 2010-2011 Wayne Stambaugh - * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -805,13 +805,6 @@ void AddHotkeyConfigMenu( wxMenu* aMenu ) wxMenu* HotkeySubmenu = new wxMenu(); - // List existing hotkey menu - AddMenuItem( HotkeySubmenu, - ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, - _( "&List Current Keys" ), - _( "Displays the current hotkeys list and corresponding commands" ), - KiBitmap( info_xpm ) ); - // Call hotkeys editor AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_EDITOR, _( "&Edit Hotkeys" ), diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 2f9425e764..162c4cd4a0 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -507,6 +507,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, + ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + helpMenu->AppendSeparator(); AddMenuItem( helpMenu, wxID_ABOUT, diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index 8e5adcb810..3c9cc0a3fb 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2009-2011 Wayne Stambaugh - * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -260,6 +260,12 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() _( "Open the \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, + ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + // About Eeschema helpMenu->AppendSeparator(); diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index b16d90ac62..6b27f23a46 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2009-2013 Wayne Stambaugh - * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -228,6 +228,12 @@ void GERBVIEW_FRAME::ReCreateMenuBar() _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, + ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + // Separator helpMenu->AppendSeparator(); diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 1b17d2c737..e7cd9460e5 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2009-2015 Wayne Stambaugh - * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -413,6 +413,12 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, + ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + // Separator helpMenu->AppendSeparator(); diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index 957febfbb6..ceadfee71f 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -1,6 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * + * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2013 CERN * @author Jean-Pierre Charras, jp.charras at wanadoo.fr * @@ -155,6 +156,11 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + // Separator helpMenu->AppendSeparator(); diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index f8668c3734..53d202f031 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -1,11 +1,10 @@ - /* * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2015 Wayne Stambaugh - * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -344,6 +343,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() _( "Open the \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + // About Pcbnew helpMenu->AppendSeparator(); AddMenuItem( helpMenu, wxID_ABOUT, diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 8a31f77554..5cc34377aa 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -646,6 +646,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() _( "Open the \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); + AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, + _( "&List Hotkeys" ), + _( "Displays the current hotkeys list and corresponding commands" ), + KiBitmap( hotkeys_xpm ) ); + helpMenu->AppendSeparator(); AddMenuItem( helpMenu, wxID_ABOUT, _( "&About KiCad" ),