Commit f77121a5 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Fixed compatibility with wxWidegets 2.9.1. 

Added hotkeys editor from David Turner, with a lot of enhancements and fixes
Added pins connections info in intermediate netlist for each compoment. This is redundant, but some netlist formats (ORCADPCB, PSPICE) are very easy to create with this redundant info.
parent 91530e7a

common/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ set(COMMON_SRCS 
    confirm.cpp

    copy_to_clipboard.cpp

    dialog_display_info_HTML_base.cpp

    dialog_hotkeys_editor.cpp

    dialog_hotkeys_editor_base.cpp

    dialog_load_error.cpp

    dcsvg.cpp

    dialog_page_settings_base.cpp
@@ -42,6 +44,7 @@ set(COMMON_SRCS 
    get_component_dialog.cpp

    gr_basic.cpp

    hotkeys_basic.cpp

    hotkey_grid_table.cpp

    msgpanel.cpp

    netlist_keywords.cpp

    newstroke_font.cpp

common/basicframe.cpp

+9 −1
Original line number Diff line number Diff line
@@ -355,13 +355,21 @@ void WinEDA_BasicFrame::CopyVersionInfoToClipboard( wxCommandEvent& WXUNUSED( ev 
    #define __BO_COMPILER ",unknown"

#endif



#if wxCHECK_VERSION( 2, 9, 0 )

#define KICAD_BUILD_OPTIONS_SIGNATURE \

    " (" __WX_BO_UNICODE \

     __ABI_VERSION __BO_COMPILER \

     __WX_BO_STL \

     __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \

     ")"

#else

#define KICAD_BUILD_OPTIONS_SIGNATURE \

    " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \

     __ABI_VERSION __BO_COMPILER \

     __WX_BO_STL \

     __WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 \

     ")"



#endif

    tmp = wxT( "Application: " ) + wxGetApp().GetTitle() + wxT( "\n" );

    tmp += wxT( "Version: " ) + GetBuildVersion() + wxT( "\n" );

    tmp << wxT( "Build: " ) << wxVERSION_STRING

common/dialog_hotkeys_editor.cpp

0 → 100644
+191 −0
Original line number Diff line number Diff line 
#include <wx/tooltip.h>

#include <algorithm>



#include "fctsys.h"

#include "appl_wxstruct.h"

#include "gr_basic.h"

#include "common.h"

#include "class_drawpanel.h"

#include "confirm.h"



#include "dialog_hotkeys_editor.h"



void InstallHotkeyFrame( WinEDA_DrawFrame*               parent,

                         Ki_HotkeyInfoSectionDescriptor* hotkeys )

{

    HOTKEYS_EDITOR_DIALOG dialog( parent, hotkeys );



    int diag = dialog.ShowModal();

    if( diag == wxID_OK )

    {

        parent->ReCreateMenuBar();

        parent->Refresh();

    }

}





HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( WinEDA_DrawFrame*               parent,

                                              Ki_HotkeyInfoSectionDescriptor* hotkeys ) :

    HOTKEYS_EDITOR_DIALOG_BASE( parent )

{

    m_parent  = parent;

    m_hotkeys = hotkeys;



    m_table = new HotkeyGridTable( hotkeys );

    m_hotkeyGrid->SetTable( m_table, true );



    m_hotkeyGrid->AutoSizeColumn( 0 );

    m_hotkeyGrid->EnableDragGridSize( false );



    for( int i = 0; i < m_hotkeyGrid->GetNumberRows(); ++i )

    {

        m_hotkeyGrid->SetReadOnly( i, 0, true );

        m_hotkeyGrid->SetReadOnly( i, 1, true );

    }



    SetFocus();

    GetSizer()->SetSizeHints( this );

    Center();

}





void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event )

{

    /* edit the live hotkey table */

    HotkeyGridTable::hotkey_spec_vector& hotkey_vec = m_table->getHotkeys();



    Ki_HotkeyInfoSectionDescriptor*      section;



    for( section = m_hotkeys; section->m_HK_InfoList; section++ )

    {

        wxString        sectionTag = *section->m_SectionTag;



        Ki_HotkeyInfo** info_ptr;

        for( info_ptr = section->m_HK_InfoList; *info_ptr; info_ptr++ )

        {

            Ki_HotkeyInfo* info = *info_ptr;

            /* find the corresponding hotkey */

            HotkeyGridTable::hotkey_spec_vector::iterator i;

            for( i = hotkey_vec.begin(); i != hotkey_vec.end(); ++i )

            {

                if( i->first == sectionTag

                    && i->second

                    && i->second->m_Idcommand == info->m_Idcommand )

                {

                    info->m_KeyCode = i->second->m_KeyCode;

                    break;

                }

            }

        }

    }



    /* save the hotkeys */

    m_parent->WriteHotkeyConfig( m_hotkeys );



    Close( TRUE );

}





void HOTKEYS_EDITOR_DIALOG::CancelClicked( wxCommandEvent& event )

{

    Close( TRUE );

}





void HOTKEYS_EDITOR_DIALOG::UndoClicked( wxCommandEvent& event )

{

    m_table->RestoreFrom( m_hotkeys );

    m_hotkeyGrid->Refresh();

    Update();

}





void HOTKEYS_EDITOR_DIALOG::SetHotkeyCellState( int aRow, bool aHightlight )

{

    if( aHightlight )

    {

        m_hotkeyGrid->SetCellTextColour( aRow, 1, *wxRED );

        wxFont bold_font(m_hotkeyGrid->GetDefaultCellFont() );

        bold_font.SetWeight(wxFONTWEIGHT_BOLD);

        m_hotkeyGrid->SetCellFont( aRow, 1, bold_font );

    }

    else

    {

        m_hotkeyGrid->SetCellTextColour( aRow, 1, m_hotkeyGrid->GetDefaultCellTextColour() );

        m_hotkeyGrid->SetCellFont( aRow, 1, m_hotkeyGrid->GetDefaultCellFont() );

    }

}





void HOTKEYS_EDITOR_DIALOG::StartEditing( wxGridEvent& event )

{

    if( m_curEditingRow != -1 )

        SetHotkeyCellState( m_curEditingRow, false );



    int newRow = event.GetRow();

    if( m_curEditingRow == newRow || m_table->isHeader( newRow ) )

    {

        m_curEditingRow = -1;

    }

    else

    {

        m_curEditingRow = newRow;

        SetHotkeyCellState( m_curEditingRow, true );

    }

    m_hotkeyGrid->Refresh();

    Update();

}





void HOTKEYS_EDITOR_DIALOG::KeyPressed( wxKeyEvent& event )

{

    if( m_curEditingRow != -1 )

    {

        long key = event.GetKeyCode();



        switch( key )

        {

        case WXK_ESCAPE:

            SetHotkeyCellState( m_curEditingRow, false );

            m_curEditingRow = -1;

            break;



        default:



            if( event.ControlDown() )

                key |= GR_KB_CTRL;

            if( event.AltDown() )

                key |= GR_KB_ALT;

            if( event.ShiftDown() && (key > 256) )

                key |= GR_KB_SHIFT;



            // Remap Ctrl A (=1+GR_KB_CTRL) to Ctrl Z(=26+GR_KB_CTRL)

            // to GR_KB_CTRL+'A' .. GR_KB_CTRL+'Z'

            if( (key > GR_KB_CTRL) && (key <= GR_KB_CTRL+26) )

                key += ('A' - 1);



            if( key >= 'a' && key <= 'z' ) //upcase key

                key = key + ('A' - 'a');



#if 0       // For debug

            wxString msg;

            msg.Printf(wxT("key %X, keycode %X"),event.GetKeyCode(), key);

            wxMessageBox(msg);

#endif

            // See if this key code is handled in hotkeys list

            bool exists;

            ReturnKeyNameFromKeyCode( key, &exists );

            if( !exists )   // not handled, see s_Hotkey_Name_List[] in hotkeys_basic.cpp

                wxMessageBox( _("Hotkey value not handled" ) );

            else

            {

                m_table->SetKeyCode( m_curEditingRow, key );

                SetHotkeyCellState( m_curEditingRow, false );

            }

            break;

        }

    }



    m_hotkeyGrid->Refresh();

    Update();

}

common/dialog_hotkeys_editor_base.cpp

0 → 100644
+79 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////



#include "dialog_hotkeys_editor_base.h"



///////////////////////////////////////////////////////////////////////////



HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

{

	this->SetSizeHints( wxDefaultSize, wxDefaultSize );

	

	wxBoxSizer* bMainSizer;

	bMainSizer = new wxBoxSizer( wxHORIZONTAL );

	

	m_hotkeyGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );

	

	// Grid

	m_hotkeyGrid->CreateGrid( 5, 2 );

	m_hotkeyGrid->EnableEditing( true );

	m_hotkeyGrid->EnableGridLines( true );

	m_hotkeyGrid->EnableDragGridSize( false );

	m_hotkeyGrid->SetMargins( 0, 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 );

	

	wxBoxSizer* bSizer2;

	bSizer2 = new wxBoxSizer( wxVERTICAL );

	

	m_OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer2->Add( m_OKButton, 0, wxALL|wxEXPAND, 5 );

	

	 m_cancelButton = new wxButton( this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer2->Add(  m_cancelButton, 0, wxALL|wxEXPAND, 5 );

	

	m_undoButton = new wxButton( this, wxID_CANCEL, _("Undo"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer2->Add( m_undoButton, 0, wxALL|wxEXPAND, 5 );

	

	bMainSizer->Add( bSizer2, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	this->SetSizer( bMainSizer );

	this->Layout();

	

	// Connect Events

	m_hotkeyGrid->Connect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::KeyPressed ), NULL, this );

	m_hotkeyGrid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::StartEditing ), 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 );

}



HOTKEYS_EDITOR_DIALOG_BASE::~HOTKEYS_EDITOR_DIALOG_BASE()

{

	// Disconnect Events

	m_hotkeyGrid->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::KeyPressed ), NULL, this );

	m_hotkeyGrid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::StartEditing ), 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 );

}