Commit ad9ec412 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

UI consistency and assertion fixes. 

* Use "Close" in the file menu of every main frame window instead of the
  mismatch of the terms "Close", "Exit", and "Quit".
* Change the terminology in the Pcbnew graphic text edit dialog to match the
  module text edit dialog.
* Improve the layout of the Pcbnew graphic text dialog.
* Fix some wxPrintf parameter type assertions for 64 bit time_t.
* Fix all (at least I think I got all of them) duplicate menu accelerator
  characters.
parent 20dfe9ca

cvpcb/menubar.cpp

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() 


    // Quit

    AddMenuItem( filesMenu, wxID_EXIT,

                 _( "&Quit" ), _( "Quit CvPcb" ),

                 _( "&Close" ), _( "Close CvPcb" ),

                 KiBitmap( exit_xpm ) );



    // Menu Preferences:
@@ -134,7 +134,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() 


    // Keep open on save

    item = new wxMenuItem( preferencesMenu, ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE,

                           _( "Keep Open On Save" ),

                           _( "&Keep Open On Save" ),

                           _( "Prevent CvPcb from exiting after saving netlist file" ),

                           wxITEM_CHECK );

    preferencesMenu->Append( item );

eeschema/menubar.cpp

+7 −7
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() 
    }



    AddMenuItem( fileMenu,

                 ID_APPEND_PROJECT, _( "&Append Schematic Sheet" ),

                 ID_APPEND_PROJECT, _( "App&end Schematic Sheet" ),

                 _( "Append schematic sheet to current project" ),

                 KiBitmap( open_document_xpm ) );
@@ -125,7 +125,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() 
    {

        AddMenuItem( fileMenu,

                     ID_SAVE_ONE_SHEET_UNDER_NEW_NAME,

                     _( "Save Current Sheet &As" ),

                     _( "Save C&urrent Sheet As" ),

                     _( "Save current schematic sheet as..." ),

                     KiBitmap( save_as_xpm ) );

    }
@@ -156,7 +156,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() 
    // Plot to Clipboard (Windows only)



    AddMenuItem( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD,

                 _( "Plot to &Clipboard" ),

                 _( "Plot to C&lipboard" ),

                 _( "Export drawings to clipboard" ),

                 KiBitmap( copy_button_xpm ) );
@@ -183,8 +183,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() 
    // Quit

    AddMenuItem( fileMenu,

                 wxID_EXIT,

                 _( "&Quit" ),

                 _( "Quit Eeschema" ),

                 _( "&Close" ),

                 _( "Close Eeschema" ),

                 KiBitmap( exit_xpm ) );



    // Menu Edit:
@@ -361,14 +361,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() 
                 HELP_PLACE_GRAPHICLINES,

                 KiBitmap( add_dashed_line_xpm ) );



    text = AddHotkeyName( _( "Graphic &Text" ), g_Schematic_Hokeys_Descr,

    text = AddHotkeyName( _( "&Graphic Text" ), g_Schematic_Hokeys_Descr,

                          HK_ADD_GRAPHIC_TEXT, IS_ACCELERATOR );    // add an accelerator, not a shortcut

    AddMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT, text,

                 HELP_PLACE_GRAPHICTEXTS,

                 KiBitmap( add_text_xpm ) );



    // Graphic image

    AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _( "Image" ),

    AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _( "&Image" ),

                 HELP_PLACE_GRAPHICIMAGES,

                 KiBitmap( image_xpm ) );

eeschema/sch_sheet_path.cpp

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ wxString SCH_SHEET_PATH::Path() const 
    // it's timestamp changes anyway.

    for( unsigned i = 1; i < m_numSheets; i++ )

    {

        t.Printf( _( "%8.8lX/" ), m_sheets[i]->GetTimeStamp() );

        t.Printf( _( "%8.8lX/" ), (long unsigned) m_sheets[i]->GetTimeStamp() );

        s = s + t;

    }

eeschema/sheet.cpp

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, wxDC* aDC ) 
    aSheet->SetSheetNameSize( ValueFromString( g_UserUnit, dlg.GetSheetNameTextSize() ) );



    if( aSheet->GetName().IsEmpty() )

        aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ), aSheet->GetTimeStamp() ) );

        aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ),

                                           (long unsigned) aSheet->GetTimeStamp() ) );



    m_canvas->MoveCursorToCrossHair();

    m_canvas->SetIgnoreMouseEvents( false );

gerbview/menubar.cpp

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() 
    // Clear all

    AddMenuItem( fileMenu,

                 ID_GERBVIEW_ERASE_ALL,

                 _( "&Clear All" ),

                 _( "Clear &All" ),

                 _( "Clear all layers. All data will be deleted" ),

                 KiBitmap( gerbview_clear_layers_xpm ) );
@@ -142,8 +142,8 @@ void GERBVIEW_FRAME::ReCreateMenuBar() 
    // Exit

    AddMenuItem( fileMenu,

                 wxID_EXIT,

                 _( "E&xit" ),

                 _( "Quit GerbView" ),

                 _( "&Close" ),

                 _( "Close GerbView" ),

                 KiBitmap( exit_xpm ) );



    // Menu for configuration and preferences