← Back to branch summary

~torstenhtr/kicad/kicad_via_stitching

« back to all changes in this revision

Viewing changes to common/hotkeys_basic.cpp

  • Committer: Torsten Hueter
  • Date: 2015-08-02 20:15:16 UTC
  • mfrom: (5572.1.463 kicad)
  • Revision ID: torstenhtr@gmx.de-20150802201516-2tm10nw4sx8qjwxx
Upstream merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/hotkeys_basic.cpp
50
50
wxString g_CommonSectionTag( wxT( "[common]" ) );
51
51
 
52
52
 
53
 
/* Class to handle hotkey commnands. hotkeys have a default value
 
53
/* Class to handle hotkey commands hotkeys have a default value
54
54
 * This class allows the real key code changed by user from a key code list
55
55
 * file.
56
56
 */
279
279
    }
280
280
 
281
281
#ifdef USING_MAC_CMD
282
 
    // On OSX, the modifier euqivalent to the Ctrl key of PCs
 
282
    // On OSX, the modifier equivalent to the Ctrl key of PCs
283
283
    // is the Cmd key, but in code we should use Ctrl as prefix in menus
284
284
    msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
285
285
#endif
337
337
    }
338
338
 
339
339
#ifdef USING_MAC_CMD
340
 
    // On OSX, the modifier euqivalent to the Ctrl key of PCs
 
340
    // On OSX, the modifier equivalent to the Ctrl key of PCs
341
341
    // is the Cmd key, but in code we should use Ctrl as prefix in menus
342
342
    msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
343
343
#endif
745
745
 
746
746
 
747
747
void EDA_BASE_FRAME::ImportHotkeyConfigFromFile( EDA_HOTKEY_CONFIG* aDescList,
748
 
                                            const wxString& aDefaultShortname )
 
748
                                                 const wxString& aDefaultShortname )
749
749
{
750
750
    wxString ext  = DEFAULT_HOTKEY_FILENAME_EXT;
751
751
    wxString mask = wxT( "*." ) + ext;
759
759
    fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
760
760
 
761
761
    wxString  filename = EDA_FileSelector( _( "Read Hotkey Configuration File:" ),
762
 
                                 path,
763
 
                                 fn.GetFullPath(),
764
 
                                 ext,
765
 
                                 mask,
766
 
                                 this,
767
 
                                 wxFD_OPEN,
768
 
                                 true );
 
762
                                           path,
 
763
                                           fn.GetFullPath(),
 
764
                                           ext,
 
765
                                           mask,
 
766
                                           this,
 
767
                                           wxFD_OPEN,
 
768
                                           true );
769
769
 
770
770
    if( filename.IsEmpty() )
771
771
        return;
775
775
 
776
776
 
777
777
void EDA_BASE_FRAME::ExportHotkeyConfigToFile( EDA_HOTKEY_CONFIG* aDescList,
778
 
                                        const wxString& aDefaultShortname )
 
778
                                               const wxString& aDefaultShortname )
779
779
{
780
780
    wxString ext  = DEFAULT_HOTKEY_FILENAME_EXT;
781
781
    wxString mask = wxT( "*." ) + ext;
789
789
    fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
790
790
 
791
791
    wxString filename = EDA_FileSelector( _( "Write Hotkey Configuration File:" ),
792
 
                                 path,
793
 
                                 fn.GetFullPath(),
794
 
                                 ext,
795
 
                                 mask,
796
 
                                 this,
797
 
                                 wxFD_OPEN | wxFD_SAVE,
798
 
                                 true );
 
792
                                          path,
 
793
                                          fn.GetFullPath(),
 
794
                                          ext,
 
795
                                          mask,
 
796
                                          this,
 
797
                                          wxFD_SAVE,
 
798
                                          true );
799
799
 
800
800
    if( filename.IsEmpty() )
801
801
        return;