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

Fix capitalization issues in title bar and config files (broken by bzr rev 3543)

parent 2e0941a1

common/edaappl.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -335,7 +335,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId ) 




    /* Init parameters for configuration */

    /* Init parameters for configuration */

    SetVendorName( wxT( "KiCad" ) );

    SetVendorName( wxT( "KiCad" ) );

    SetAppName( aName );

    SetAppName( aName.Lower() );

    SetTitle( aName );

    SetTitle( aName );

    m_settings = new wxConfig();

    m_settings = new wxConfig();

    wxASSERT( m_settings != NULL );

    wxASSERT( m_settings != NULL );

cvpcb/cvpcb.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ bool EDA_APP::OnInit() 
    wxString         message;

    wxString         message;

    CVPCB_MAINFRAME* frame = NULL;

    CVPCB_MAINFRAME* frame = NULL;





    InitEDA_Appl( wxT( "CvPCB" ), APP_CVPCB_T );

    InitEDA_Appl( wxT( "CvPcb" ), APP_CVPCB_T );





    if( m_Checker && m_Checker->IsAnotherRunning() )

    if( m_Checker && m_Checker->IsAnotherRunning() )

    {

    {

eeschema/eeschema.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ bool EDA_APP::OnInit() 
    wxFileName      filename;

    wxFileName      filename;

    SCH_EDIT_FRAME* frame = NULL;

    SCH_EDIT_FRAME* frame = NULL;





    InitEDA_Appl( wxT( "EESchema" ), APP_EESCHEMA_T );

    InitEDA_Appl( wxT( "Eeschema" ), APP_EESCHEMA_T );





    if( m_Checker && m_Checker->IsAnotherRunning() )

    if( m_Checker && m_Checker->IsAnotherRunning() )

    {

    {

eeschema/schframe.cpp

+8 −10
Original line number Original line Diff line number Diff line
@@ -977,9 +977,8 @@ void SCH_EDIT_FRAME::UpdateTitle() 




    if( GetScreen()->GetFileName() == m_DefaultSchematicFileName )

    if( GetScreen()->GetFileName() == m_DefaultSchematicFileName )

    {

    {

        wxString msg = wxGetApp().GetAppName() + wxT( " " ) + GetBuildVersion();

        title.Printf( wxT( "Eeschema %s [%s]" ), GetChars( GetBuildVersion() ),

        title.Printf( wxT( "%s [%s]" ), GetChars( msg), GetChars( GetScreen()->GetFileName() ) );

                            GetChars( GetScreen()->GetFileName() ) );

        SetTitle( title );

    }

    }

    else

    else

    {

    {
@@ -989,12 +988,10 @@ void SCH_EDIT_FRAME::UpdateTitle() 
        // passed to LoadOneEEFile() which omits the path on non-root schematics.

        // passed to LoadOneEEFile() which omits the path on non-root schematics.

        // Making the path absolute solves this problem.

        // Making the path absolute solves this problem.

        fn.MakeAbsolute();

        fn.MakeAbsolute();

        title = wxChar( '[' );

        title.Printf( wxT( "[ %s %s] (%s)" ),

        title << fn.GetName() << wxChar( ' ' );

                      GetChars( fn.GetName() ),

        title << m_CurrentSheet->PathHumanReadable() << wxChar( ']' );

                      GetChars( m_CurrentSheet->PathHumanReadable() ),



                      GetChars( fn.GetPath() ) );

        title << wxChar( ' ' );

        title << wxChar( '(' ) << fn.GetPath() << wxChar( ')' );





        if( fn.FileExists() )

        if( fn.FileExists() )

        {

        {
@@ -1004,6 +1001,7 @@ void SCH_EDIT_FRAME::UpdateTitle() 
        else

        else

            title << _( " [no file]" );

            title << _( " [no file]" );





        SetTitle( title );

    }

    }



    SetTitle( title );

}
 
}

gerbview/gerbview_frame.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo() 
    // Display the gerber filename

    // Display the gerber filename

    if( gerber == NULL )

    if( gerber == NULL )

    {

    {

        text = wxGetApp().GetAppName() + wxT( " " ) + GetBuildVersion();

        text.Printf( wxT( "GerbView %s" ), GetChars( GetBuildVersion() ) );

        SetTitle( text );

        SetTitle( text );

        SetStatusText( wxEmptyString, 0 );

        SetStatusText( wxEmptyString, 0 );

        text.Printf( _( "Layer %d not in use" ), getActiveLayer() + 1 );

        text.Printf( _( "Layer %d not in use" ), getActiveLayer() + 1 );