Hotkey Editor Polishing

Refactor hotkey editor to use tab control instead of one giant list.
Each tab is a separate hotkey section.
Modify EDA_HOTKEY_CONFIG to change the m_Comment member to m_Title for a new purpose.
We want a pretty title in the hotkey editor. We use m_Title for the key export comment which
still conveys the purpose just as easily.
Refactored usage of wxGrid into wxListCtrl which allows capturing navigation characters
and also works better (single selection is built in).
Add hotkey overwrite prompts that are paired with "Common" section. It will check if a hotkey
overlaps with the proper sections. i.e. Common with the all other sections; or Section 1 with just Common.
Right-click menu removed due to wxListCtrl being able to catch the special keys properly.

common/CMakeLists.txt

@@ -179,7 +179,6 @@ set( COMMON_SRCS
     grid_tricks.cpp
     gr_basic.cpp
     hotkeys_basic.cpp
-    hotkey_grid_table.cpp
     html_messagebox.cpp
     kiface_i.cpp
     kiway.cpp

common/dialogs/dialog_hotkeys_editor_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,37 +14,18 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
 	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
 	
-	m_hotkeyGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL|wxWANTS_CHARS );
+	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select a row and press a new key combination to alter the binding."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1->Wrap( 400 );
+	bMainSizer->Add( m_staticText1, 0, wxALL|wxEXPAND, 5 );
 	
-	// Grid
-	m_hotkeyGrid->CreateGrid( 1, 2 );
-	m_hotkeyGrid->EnableEditing( false );
-	m_hotkeyGrid->EnableGridLines( true );
-	m_hotkeyGrid->EnableDragGridSize( false );
-	m_hotkeyGrid->SetMargins( 0, 0 );
+	m_hotkeySections = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	
-	// Columns
-	m_hotkeyGrid->AutoSizeColumns();
-	m_hotkeyGrid->EnableDragColMove( false );
-	m_hotkeyGrid->EnableDragColSize( true );
-	m_hotkeyGrid->SetColLabelSize( 30 );
-	m_hotkeyGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_hotkeyGrid->EnableDragRowSize( true );
-	m_hotkeyGrid->SetRowLabelSize( 0 );
-	m_hotkeyGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_hotkeyGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bMainSizer->Add( m_hotkeyGrid, 1, wxALL|wxEXPAND, 5 );
+	bMainSizer->Add( m_hotkeySections, 1, wxEXPAND | wxALL, 5 );
 	
 	wxBoxSizer* b_buttonsSizer;
-	b_buttonsSizer = new wxBoxSizer( wxVERTICAL );
+	b_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
 	b_buttonsSizer->Add( m_OKButton, 0, wxALL|wxEXPAND, 5 );
@@ -56,16 +37,13 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 	b_buttonsSizer->Add( m_undoButton, 0, wxALL|wxEXPAND, 5 );
 	
 	
-	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER|wxALIGN_RIGHT, 5 );
 	
 	
 	this->SetSizer( bMainSizer );
 	this->Layout();
 	
 	// Connect Events
-	m_hotkeyGrid->Connect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnKeyPressed ), NULL, this );
-	m_hotkeyGrid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnRightClickOnCell ), NULL, this );
-	m_hotkeyGrid->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnClickOnCell ), NULL, this );
 	m_OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
 	 m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
 	m_undoButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );
@@ -74,9 +52,6 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 HOTKEYS_EDITOR_DIALOG_BASE::~HOTKEYS_EDITOR_DIALOG_BASE()
 {
 	// Disconnect Events
-	m_hotkeyGrid->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnKeyPressed ), NULL, this );
-	m_hotkeyGrid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnRightClickOnCell ), NULL, this );
-	m_hotkeyGrid->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnClickOnCell ), NULL, this );
 	m_OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
 	 m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
 	m_undoButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );

common/dialogs/dialog_hotkeys_editor_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,12 +14,13 @@
 class DIALOG_SHIM;
 
 #include "dialog_shim.h"
-#include <wx/colour.h>
-#include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
+#include <wx/stattext.h>
 #include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/notebook.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/dialog.h>
@@ -35,15 +36,13 @@ class HOTKEYS_EDITOR_DIALOG_BASE : public DIALOG_SHIM
 	private:
 	
 	protected:
-		wxGrid* m_hotkeyGrid;
+		wxStaticText* m_staticText1;
+		wxNotebook* m_hotkeySections;
 		wxButton* m_OKButton;
 		wxButton*  m_cancelButton;
 		wxButton* m_undoButton;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnKeyPressed( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnRightClickOnCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnClickOnCell( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnOKClicked( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CancelClicked( wxCommandEvent& event ) { event.Skip(); }
 		virtual void UndoClicked( wxCommandEvent& event ) { event.Skip(); }
@@ -51,7 +50,7 @@ class HOTKEYS_EDITOR_DIALOG_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Hotkeys Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 304,235 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Hotkeys Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 450,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~HOTKEYS_EDITOR_DIALOG_BASE();
 	
 };

common/hotkey_grid_table.cpp

-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright (C) 1992-2014 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include <hotkey_grid_table.h>
-
-/*
- *  Reads the hotkey table from its stored format into a format suitable
- *  for a wxGrid.
- */
-HOTKEY_EDITOR_GRID_TABLE::HOTKEY_EDITOR_GRID_TABLE( struct EDA_HOTKEY_CONFIG* origin ) :
-    wxGridTableBase(), m_hotkeys()
-{
-    EDA_HOTKEY_CONFIG* section;
-
-    for( section = origin; section->m_HK_InfoList; section++ )
-    {
-        // Add a dummy hotkey_spec which is a header before each hotkey list
-        hotkey_spec spec( *section->m_SectionTag, NULL );
-        m_hotkeys.push_back( spec );
-
-        EDA_HOTKEY** hotkey_descr_list;
-
-        // Add hotkeys descr
-        for( hotkey_descr_list = section->m_HK_InfoList; *hotkey_descr_list;
-             hotkey_descr_list++ )
-        {
-            EDA_HOTKEY* hotkey_descr = *hotkey_descr_list;
-            hotkey_spec    spec( *section->m_SectionTag, new EDA_HOTKEY( hotkey_descr ) );
-            m_hotkeys.push_back( spec );
-        }
-    }
-}
-
-
-HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector& HOTKEY_EDITOR_GRID_TABLE::getHotkeys()
-{
-    return m_hotkeys;
-}
-
-
-int HOTKEY_EDITOR_GRID_TABLE::GetNumberRows()
-{
-    return m_hotkeys.size();
-}
-
-
-int HOTKEY_EDITOR_GRID_TABLE::GetNumberCols()
-{
-    return 2;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::IsEmptyCell( int row, int col )
-{
-    return col == 1 && m_hotkeys[row].second == NULL;
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetValue( int row, int col )
-{
-    EDA_HOTKEY* hotkey_descr = m_hotkeys[row].second;
-
-    if( col == 0 )
-    {
-        if( hotkey_descr == NULL )
-        {
-            // section header
-            return m_hotkeys[row].first;
-        }
-        else
-        {
-            return hotkey_descr->m_InfoMsg;
-        }
-    }
-    else
-    {
-        if( hotkey_descr == NULL )
-        {
-            // section header
-            return wxEmptyString;
-        }
-        else
-        {
-            return KeyNameFromKeyCode( hotkey_descr->m_KeyCode );
-        }
-    }
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValue( int row, int col, const wxString& value )
-{
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetTypeName( int row, int col )
-{
-    return wxGRID_VALUE_STRING;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::CanGetValueAs( int row, int col, const wxString& typeName )
-{
-    return typeName == wxGRID_VALUE_STRING && col == 2;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::CanSetValueAs( int row, int col, const wxString& typeName )
-{
-    return false;
-}
-
-
-long HOTKEY_EDITOR_GRID_TABLE::GetValueAsLong( int row, int col )
-{
-    return -1L;
-}
-
-
-double HOTKEY_EDITOR_GRID_TABLE::GetValueAsDouble( int row, int col )
-{
-    return 0.0;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::GetValueAsBool( int row, int col )
-{
-    return false;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsLong( int row, int col, long value )
-{
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsDouble( int row, int col, double value )
-{
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsBool( int row, int col, bool value )
-{
-}
-
-
-void* HOTKEY_EDITOR_GRID_TABLE::GetValueAsCustom( int row, int col )
-{
-    return 0;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsCustom( int row, int col, void* value )
-{
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetColLabelValue( int col )
-{
-    return col == 0 ? _( "Command" ) : _( "Hotkey" );
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::IsHeader( int row )
-{
-    return m_hotkeys[row].second == NULL;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetKeyCode( int row, long key )
-{
-    m_hotkeys[row].second->m_KeyCode = key;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::RestoreFrom( struct EDA_HOTKEY_CONFIG* origin )
-{
-    int row = 0;
-    EDA_HOTKEY_CONFIG* section;
-
-    for( section = origin; section->m_HK_InfoList; section++ )
-    {
-        ++row;      // Skip header
-        EDA_HOTKEY** info_ptr;
-
-        for( info_ptr = section->m_HK_InfoList; *info_ptr; info_ptr++ )
-        {
-            EDA_HOTKEY* info = *info_ptr;
-            m_hotkeys[row++].second->m_KeyCode = info->m_KeyCode;
-        }
-    }
-}
-
-
-HOTKEY_EDITOR_GRID_TABLE::~HOTKEY_EDITOR_GRID_TABLE()
-{
-    hotkey_spec_vector::iterator i;
-
-    for( i = m_hotkeys.begin(); i != m_hotkeys.end(); ++i )
-        delete i->second;
-}

common/hotkeys_basic.cpp

@@ -52,6 +52,12 @@ wxString g_LibEditSectionTag( wxT( "[libedit]" ) );
 wxString g_BoardEditorSectionTag( wxT( "[pcbnew]" ) );
 wxString g_ModuleEditSectionTag( wxT( "[footprinteditor]" ) );
 
+wxString g_CommonSectionTitle( wxT( "Common" ) );
+wxString g_SchematicSectionTitle( wxT( "Schematic Editor" ) );
+wxString g_LibEditSectionTitle( wxT( "Library Editor" ) );
+wxString g_BoardEditorSectionTitle( wxT( "Board Editor" ) );
+wxString g_ModuleEditSectionTitle( wxT( "Footprint Editor" ) );
+
 
 /* Class to handle hotkey commnands. hotkeys have a default value
  * This class allows the real key code changed by user from a key code list
@@ -490,10 +496,10 @@ int EDA_BASE_FRAME::WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList,
 
     for( ; aDescList->m_HK_InfoList != NULL; aDescList++ )
     {
-        if( aDescList->m_Comment )
+        if( aDescList->m_Title )
         {
             msg += wxT( "# " );
-            msg += wxString( aDescList->m_Comment );
+            msg += *aDescList->m_Title;
             msg += wxT( "\n" );
         }
 

eeschema/hotkeys.cpp

@@ -305,9 +305,9 @@ static EDA_HOTKEY* viewlib_Hotkey_List[] =
 // an hotkey config file)
 struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    common_Hotkey_List,    L"Common keys"           },
-    { &g_SchematicSectionTag, schematic_Hotkey_List, L"Schematic editor keys" },
-    { &g_LibEditSectionTag,   libEdit_Hotkey_List,   L"library editor keys"   },
+    { &g_CommonSectionTag,    common_Hotkey_List,    &g_CommonSectionTitle    },
+    { &g_SchematicSectionTag, schematic_Hotkey_List, &g_SchematicSectionTitle },
+    { &g_LibEditSectionTag,   libEdit_Hotkey_List,   &g_LibEditSectionTitle   },
     { NULL,                   NULL,                  NULL                     }
 };
 
@@ -315,8 +315,8 @@ struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] =
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    common_Hotkey_List,    NULL },
-    { &g_SchematicSectionTag, schematic_Hotkey_List, NULL },
+    { &g_CommonSectionTag,    common_Hotkey_List,    &g_CommonSectionTitle },
+    { &g_SchematicSectionTag, schematic_Hotkey_List, &g_SchematicSectionTitle },
     { NULL,                   NULL,                    NULL }
 };
 
@@ -324,8 +324,8 @@ struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] =
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,  common_Hotkey_List,  NULL },
-    { &g_LibEditSectionTag, libEdit_Hotkey_List, NULL },
+    { &g_CommonSectionTag,  common_Hotkey_List,  &g_CommonSectionTitle },
+    { &g_LibEditSectionTag, libEdit_Hotkey_List, &g_LibEditSectionTitle },
     { NULL,                 NULL,                NULL }
 };
 
@@ -333,7 +333,7 @@ struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] =
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Viewlib_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag, common_basic_Hotkey_List, NULL },
+    { &g_CommonSectionTag, common_basic_Hotkey_List, &g_CommonSectionTitle },
     { NULL,                NULL,                 NULL }
 };
 

include/dialog_hotkeys_editor.h

@@ -17,34 +17,82 @@
 #include <wx/grid.h>
 
 #include <hotkeys_basic.h>
-#include <hotkey_grid_table.h>
 #include <draw_frame.h>
 #include <../common/dialogs/dialog_hotkeys_editor_base.h>
 
+class HOTKEYS_EDITOR_DIALOG;
+
+class HOTKEY_LIST_CTRL : public wxListCtrl
+{
+public:
+    HOTKEY_LIST_CTRL( wxWindow* aParent, struct EDA_HOTKEY_CONFIG* aSection );
+    ~HOTKEY_LIST_CTRL() {};
+
+    void DeselectRow( int aRow );
+    std::vector< EDA_HOTKEY* >& GetHotkeys() { return m_hotkeys; }
+    void RestoreFrom( struct EDA_HOTKEY_CONFIG* aSection );
+
+private:
+    int m_curEditingRow;
+    wxString* m_sectionTag;
+    std::vector< EDA_HOTKEY* > m_hotkeys;
+
+protected:
+    wxString OnGetItemText( long aRow, long aColumn ) const;
+    void OnChar( wxKeyEvent& aEvent );
+    void OnListItemSelected( wxListEvent& aEvent );
+    void OnSize( wxSizeEvent& aEvent );
+};
+
+class HOTKEY_SECTION_PAGE : public wxPanel
+{
+public:
+private:
+    EDA_HOTKEY_CONFIG*  m_hotkeySection;
+    HOTKEY_LIST_CTRL *m_hotkeyList;
+    HOTKEYS_EDITOR_DIALOG* m_dialog;
+
+public:
+    /** Constructor to create a setup page for one netlist format.
+     * Used in Netlist format Dialog box creation
+     * @param parent = wxNotebook * parent
+     * @param title = title (name) of the notebook page
+     * @param id_NetType = netlist type id
+     */
+    HOTKEY_SECTION_PAGE( HOTKEYS_EDITOR_DIALOG* aDialog, wxNotebook* aParent, 
+                         const wxString& aTitle,
+                         EDA_HOTKEY_CONFIG* aSection );
+    ~HOTKEY_SECTION_PAGE() {};
+    void Restore();
+
+    std::vector< EDA_HOTKEY* >& GetHotkeys() { return m_hotkeyList->GetHotkeys(); }
+    EDA_HOTKEY_CONFIG* GetHotkeySection() { return m_hotkeySection; }
+
+    HOTKEYS_EDITOR_DIALOG* GetDialog() { return m_dialog; }
+};
+
+
 class HOTKEYS_EDITOR_DIALOG : public HOTKEYS_EDITOR_DIALOG_BASE
 {
 protected:
     EDA_DRAW_FRAME* m_parent;
     struct EDA_HOTKEY_CONFIG* m_hotkeys;
-    HOTKEY_EDITOR_GRID_TABLE* m_table;
     
-    int m_curEditingRow;
+    std::vector<HOTKEY_SECTION_PAGE*> m_hotkeySectionPages;
 
 public:
-    HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys );
+    HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* aParent, EDA_HOTKEY_CONFIG* aHotkeys );
 
     ~HOTKEYS_EDITOR_DIALOG() {};
 
+    bool CanSetKey( long aKey, const wxString* aSectionTag );
+
 private:
-    void OnOKClicked( wxCommandEvent& event );
-    void CancelClicked( wxCommandEvent& event );
-    void UndoClicked( wxCommandEvent& event );
-    void OnClickOnCell( wxGridEvent& event );
-    void OnRightClickOnCell( wxGridEvent& event );
-    void OnKeyPressed( wxKeyEvent& event );
-    void SetHotkeyCellState( int aRow, bool aHightlight );
+    void OnOKClicked( wxCommandEvent& aEvent );
+    void CancelClicked( wxCommandEvent& aEvent );
+    void UndoClicked( wxCommandEvent& aEvent );
 };
 
-void InstallHotkeyFrame( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys );
+void InstallHotkeyFrame( EDA_DRAW_FRAME* aParent, EDA_HOTKEY_CONFIG* aHotkeys );
 
 #endif

include/hotkey_grid_table.h

-#ifndef __hotkeys_grid_table__
-#define __hotkeys_grid_table__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/grid.h>
-
-#include <vector>
-#include <utility>
-
-#include <fctsys.h>
-#include <pgm_base.h>
-#include <common.h>
-#include <hotkeys_basic.h>
-
-class HOTKEY_EDITOR_GRID_TABLE : public wxGridTableBase
-{
-
-public:
-    typedef std::pair< wxString, EDA_HOTKEY* > hotkey_spec;
-    typedef std::vector< hotkey_spec > hotkey_spec_vector;
-
-    HOTKEY_EDITOR_GRID_TABLE( struct EDA_HOTKEY_CONFIG* origin );
-    virtual ~HOTKEY_EDITOR_GRID_TABLE();
-    hotkey_spec_vector& getHotkeys();
-
-private:
-    virtual int GetNumberRows();
-    virtual int GetNumberCols();
-    virtual bool IsEmptyCell( int row, int col );
-    virtual wxString GetValue( int row, int col );
-    virtual void SetValue( int row, int col, const wxString& value );
-    virtual wxString  GetTypeName( int row, int col );
-    virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
-    virtual bool CanSetValueAs( int row, int col, const wxString& typeName );
-    virtual long GetValueAsLong( int row, int col );
-    virtual double GetValueAsDouble( int row, int col );
-    virtual bool GetValueAsBool( int row, int col );
-    virtual void SetValueAsLong( int row, int col, long value );
-    virtual void SetValueAsDouble( int row, int col, double value );
-    virtual void SetValueAsBool( int row, int col, bool value );
-    virtual void* GetValueAsCustom( int row, int col );
-    virtual void SetValueAsCustom( int row, int col, void* value );
-    virtual wxString GetColLabelValue( int col );
-
-public:
-    virtual bool IsHeader( int row );
-    virtual void SetKeyCode( int row, long key );
-    virtual void RestoreFrom( struct EDA_HOTKEY_CONFIG* origin );
-
-protected:
-   std::vector< hotkey_spec > m_hotkeys;
-
-};
-
-#endif

include/hotkeys_basic.h

@@ -44,6 +44,12 @@ extern wxString g_LibEditSectionTag;
 extern wxString g_BoardEditorSectionTag;
 extern wxString g_ModuleEditSectionTag;
 
+extern wxString g_CommonSectionTitle;
+extern wxString g_SchematicSectionTitle;
+extern wxString g_LibEditSectionTitle;
+extern wxString g_BoardEditorSectionTitle;
+extern wxString g_ModuleEditSectionTitle;
+
 
 /**
  * class EDA_HOTKEY
@@ -81,7 +87,7 @@ struct EDA_HOTKEY_CONFIG
 public:
     wxString*       m_SectionTag;     // The configuration file section name.
     EDA_HOTKEY**    m_HK_InfoList;    // List of EDA_HOTKEY pointers
-    const wchar_t*  m_Comment;        // Will be printed in the config file only.
+    wxString*  m_Title;        // Title displayed in hotkey editor and used as comment in file
 };
 
 

pagelayout_editor/hotkeys.cpp

@@ -107,11 +107,12 @@ EDA_HOTKEY* s_PlEditor_Hotkey_List[] =
 // list of sections and corresponding hotkey list for Pl_Editor
 // (used to create an hotkey config file)
 wxString s_PlEditorSectionTag( wxT( "[pl_editor]" ) );
+wxString s_PlEditorSectionTitle( wxT( "Part Layout Editor" ) );
 
 struct EDA_HOTKEY_CONFIG s_PlEditor_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    s_Common_Hotkey_List,     L"Common keys"    },
-    { &s_PlEditorSectionTag,  s_PlEditor_Hotkey_List,   L"pl_editor keys" },
+    { &g_CommonSectionTag,    s_Common_Hotkey_List,     &g_CommonSectionTitle    },
+    { &s_PlEditorSectionTag,  s_PlEditor_Hotkey_List,   &s_PlEditorSectionTitle  },
     { NULL,                   NULL,                     NULL                     }
 };
 

pcbnew/hotkeys.cpp

@@ -285,32 +285,32 @@ EDA_HOTKEY* module_viewer_Hotkey_List[] = {
 // list of sections and corresponding hotkey list for Pcbnew
  // (used to create an hotkey config file, and edit hotkeys )
 struct EDA_HOTKEY_CONFIG g_Pcbnew_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, L"Common keys" },
-    { &g_BoardEditorSectionTag, board_edit_Hotkey_List, L"Board editor keys" },
-    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, L"Footprint editor keys" },
+    { &g_CommonSectionTag,      common_Hotkey_List,         &g_CommonSectionTitle      },
+    { &g_BoardEditorSectionTag, board_edit_Hotkey_List,     &g_BoardEditorSectionTitle },
+    { &g_ModuleEditSectionTag,  module_edit_Hotkey_List,    &g_ModuleEditSectionTitle  },
     { NULL,                     NULL,                       NULL                       }
 };
 
 // list of sections and corresponding hotkey list for the board editor
 // (used to list current hotkeys in the board editor)
 struct EDA_HOTKEY_CONFIG g_Board_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, NULL },
-    { &g_BoardEditorSectionTag, board_edit_Hotkey_List, NULL },
+    { &g_CommonSectionTag,      common_Hotkey_List,      &g_CommonSectionTitle },
+    { &g_BoardEditorSectionTag, board_edit_Hotkey_List,  &g_BoardEditorSectionTitle },
     { NULL, NULL, NULL }
 };
 
 // list of sections and corresponding hotkey list for the footprint editor
 // (used to list current hotkeys in the module editor)
 struct EDA_HOTKEY_CONFIG g_Module_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, NULL },
-    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, NULL },
+    { &g_CommonSectionTag,     common_Hotkey_List,      &g_CommonSectionTitle },
+    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, &g_ModuleEditSectionTitle },
     { NULL,                    NULL,                    NULL }
 };
 
 // list of sections and corresponding hotkey list for the footprint viewer
 // (used to list current hotkeys in the module viewer)
 struct EDA_HOTKEY_CONFIG g_Module_Viewer_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_basic_Hotkey_List, NULL },
+    { &g_CommonSectionTag, common_basic_Hotkey_List, &g_CommonSectionTitle },
     { NULL,                NULL,                     NULL }
 };