Commit 8a53aa46 authored by charras's avatar charras
Browse files

solved some problems in hotkeys files access when spaces are used in names,... 

solved some problems in hotkeys files access when spaces are used in names, and udtated paths according to the new tree used in kicad
Added wxWidgets version in about dialog
parent 97c3de7a

common/about_kicad.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ void InitKiCadAbout(wxAboutDialogInfo& info) 
#else

#else

   description << (wxT(" 32 bits"));

   description << (wxT(" 32 bits"));

#endif

#endif

    description << (wxT("\n with wxWidgets "));

    description << wxMAJOR_VERSION << wxT(".") << wxMINOR_VERSION << wxT(".") << wxRELEASE_NUMBER;





    description << wxT("\n\nWeb sites:\n");

    description << wxT("\n\nWeb sites:\n");

    description << wxT("http://iut-tice.ujf-grenoble.fr/kicad/" );

    description << wxT("http://iut-tice.ujf-grenoble.fr/kicad/" );

common/hotkeys_basic.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -576,7 +576,7 @@ wxString ReturnHotkeyConfigFilePath( int choice ) 
/****************************************************/

/****************************************************/





/* return the hotkey config file path

/* return the hotkey config file path

 * @param choice : 0 = home, 1 = kicad/template

 * @param choice : 0 = home, 1 = kicad/share/template

 */

 */

{

{

    wxString path;

    wxString path;
@@ -584,11 +584,11 @@ wxString ReturnHotkeyConfigFilePath( int choice ) 
    switch( choice )

    switch( choice )

    {

    {

    case 0:

    case 0:

        path = DEFAULT_HOTKEY_FILENAME_PATH_IS_HOME;

        path = wxGetHomeDir() + wxT( "/" );

        break;

        break;





    case 1:

    case 1:

        path = DEFAULT_HOTKEY_FILENAME_PATH_IS_KICAD;

        path = ReturnKicadDatasPath() + wxT( "template/" );

        break;

        break;





    default:

    default:

eeschema/eeconfig.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ void WinEDA_SchematicFrame::Process_Config( wxCommandEvent& event ) 
        FullFileName  = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );

        FullFileName  = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );

        FullFileName += HOTKEY_FILENAME;

        FullFileName += HOTKEY_FILENAME;

        FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;

        FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;

        AddDelimiterString(FullFileName);

        wxString editorname = GetEditorName();

        wxString editorname = GetEditorName();

        if( !editorname.IsEmpty() )

        if( !editorname.IsEmpty() )

            ExecuteFile( this, editorname, FullFileName );

            ExecuteFile( this, editorname, FullFileName );

eeschema/plugins/makefile.gtk

+2 −2
Original line number Original line Diff line number Diff line 
# File:		makefile for eeschema, mingw

# File:		makefile for eeschema, mingw





#used only to define (KICAD_BIN) and (LIBSTDC) :

#used only to define (KICAD_PLUGINS) :

include ../../libs.linux

include ../../libs.linux





all: netlist_form_pads-pcb

all: netlist_form_pads-pcb
@@ -11,7 +11,7 @@ deps: 
-include *.d

-include *.d





netlist_form_pads-pcb: netlist_form_pads-pcb.cpp makefile.gtk

netlist_form_pads-pcb: netlist_form_pads-pcb.cpp makefile.gtk

	gcc -D__UNIX__  -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)

	g++ -D__UNIX__  -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb





install: netlist_form_pads-pcb

install: netlist_form_pads-pcb

	mkdir -p $(KICAD_PLUGINS)

	mkdir -p $(KICAD_PLUGINS)

gerbview/gerbview_config.cpp

+16 −0
Original line number Original line Diff line number Diff line
@@ -71,11 +71,27 @@ void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event ) 
        Read_Hotkey_Config( this, true );

        Read_Hotkey_Config( this, true );

        break;

        break;





    case ID_PREFERENCES_EDIT_CONFIG_HOTKEYS:

    {

        FullFileName  = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );

        FullFileName += HOTKEY_FILENAME;

        FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;

        AddDelimiterString(FullFileName);

        wxString editorname = GetEditorName();

        if( !editorname.IsEmpty() )

            ExecuteFile( this, editorname, FullFileName );

    }

        break;



    case ID_PREFERENCES_HOTKEY_PATH_IS_HOME:

    case ID_PREFERENCES_HOTKEY_PATH_IS_HOME:

    case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD:

    case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD:

        HandleHotkeyConfigMenuSelection( this, id );

        HandleHotkeyConfigMenuSelection( this, id );

        break;

        break;





    case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:           // Display Current hotkey list for gerbview

        DisplayHotkeyList( this, s_Gerbview_Hokeys_Descr );

        break;



    default:

    default:

        DisplayError( this, wxT( "WinEDA_GerberFrame::Process_Config internal error" ) );

        DisplayError( this, wxT( "WinEDA_GerberFrame::Process_Config internal error" ) );

    }

    }