haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
jean-pierre charras 2012-05-10 08:25:27 +02:00
parent 2e0941a1de
commit f6551172d2
7 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/edaappl.cpp
View File

@ -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 );

2
cvpcb/cvpcb.cpp
View File

@ -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() )
{ {

2
eeschema/eeschema.cpp
View File

@ -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() )
{ {

18
eeschema/schframe.cpp
View File

@ -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 );
} }

2
gerbview/gerbview_frame.cpp
View File

@ -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 );

8
pcbnew/pcbframe.cpp
View File

@ -752,16 +752,16 @@ void PCB_EDIT_FRAME::UpdateTitle()
if( fileName.IsOk() && fileName.FileExists() ) if( fileName.IsOk() && fileName.FileExists() )
{ {
title = wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion() + title.Printf( wxT( "Pcbnew %s %s" ), GetChars( GetBuildVersion() ),
wxT( " " ) + fileName.GetFullPath(); GetChars( fileName.GetFullPath() ) );
if( !fileName.IsFileWritable() ) if( !fileName.IsFileWritable() )
title += _( " [Read Only]" ); title += _( " [Read Only]" );
} }
else else
{ {
title = wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion() + title.Printf( wxT( "Pcbnew %s " ), GetChars( GetBuildVersion() ) );
wxT( " " ) + _( " [no file]" ); title << _( " [no file]" );
} }
SetTitle( title ); SetTitle( title );

2
pcbnew/pcbnew.cpp
View File

@ -102,7 +102,7 @@ bool EDA_APP::OnInit()
wxFileName fn; wxFileName fn;
PCB_EDIT_FRAME* frame = NULL; PCB_EDIT_FRAME* frame = NULL;
InitEDA_Appl( wxT( "PCBNew" ), APP_PCBNEW_T ); InitEDA_Appl( wxT( "Pcbnew" ), APP_PCBNEW_T );
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {