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

Widen strings in cvpcb

This commit is contained in:
Seth Hillbrand 2022-02-08 16:03:23 -08:00
parent b554c4cb66
commit eecb54bff2
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cvpcb/cvpcb_mainframe.cpp
View File

@ -74,7 +74,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_tcFilterString = nullptr; m_tcFilterString = nullptr;
m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() ); m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() );
m_initialized = false; m_initialized = false;
m_aboutTitle = "CvPcb"; m_aboutTitle = wxT( "CvPcb" );
// Give an icon // Give an icon
wxIcon icon; wxIcon icon;
@ -97,16 +97,16 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_auimgr.SetManagedWindow( this ); m_auimgr.SetManagedWindow( this );
m_auimgr.AddPane( m_mainToolBar, EDA_PANE().HToolbar().Name( "MainToolbar" ).Top().Layer(6) ); m_auimgr.AddPane( m_mainToolBar, EDA_PANE().HToolbar().Name( wxT( "MainToolbar" ) ).Top().Layer(6) );
m_auimgr.AddPane( m_librariesListBox, EDA_PANE().Palette().Name( "Libraries" ).Left().Layer(1) m_auimgr.AddPane( m_librariesListBox, EDA_PANE().Palette().Name( wxT( "Libraries" ) ).Left().Layer(1)
.Caption( _( "Footprint Libraries" ) ) .Caption( _( "Footprint Libraries" ) )
.BestSize((int) ( m_frameSize.x * 0.20 ), m_frameSize.y ) ); .BestSize((int) ( m_frameSize.x * 0.20 ), m_frameSize.y ) );
m_auimgr.AddPane( m_symbolsListBox, EDA_PANE().Palette().Name( "Symbols" ).Center().Layer(0) m_auimgr.AddPane( m_symbolsListBox, EDA_PANE().Palette().Name( wxT( "Symbols" ) ).Center().Layer(0)
.Caption( _( "Symbol : Footprint Assignments" ) ) ); .Caption( _( "Symbol : Footprint Assignments" ) ) );
m_auimgr.AddPane( m_footprintListBox, EDA_PANE().Palette().Name( "Footprints" ).Right().Layer(1) m_auimgr.AddPane( m_footprintListBox, EDA_PANE().Palette().Name( wxT( "Footprints" ) ).Right().Layer(1)
.Caption( _( "Filtered Footprints" ) ) .Caption( _( "Filtered Footprints" ) )
.BestSize((int) ( m_frameSize.x * 0.30 ), m_frameSize.y ) ); .BestSize((int) ( m_frameSize.x * 0.30 ), m_frameSize.y ) );
@ -159,7 +159,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
sdbSizerOK->SetDefault(); sdbSizerOK->SetDefault();
KIPLATFORM::UI::FixupCancelButtonCmdKeyCollision( this ); KIPLATFORM::UI::FixupCancelButtonCmdKeyCollision( this );
m_auimgr.AddPane( bottomPanel, EDA_PANE().HToolbar().Name( "Buttons" ).Bottom().Layer(6) ); m_auimgr.AddPane( bottomPanel, EDA_PANE().HToolbar().Name( wxT( "Buttons" ) ).Bottom().Layer(6) );
m_auimgr.Update(); m_auimgr.Update();
m_initialized = true; m_initialized = true;
@ -168,7 +168,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
{ {
if( cfg->m_LibrariesWidth > 0 ) if( cfg->m_LibrariesWidth > 0 )
{ {
wxAuiPaneInfo& librariesPane = m_auimgr.GetPane( "Libraries" ); wxAuiPaneInfo& librariesPane = m_auimgr.GetPane( wxT( "Libraries" ) );
// wxAUI hack: force width by setting MinSize() and then Fixed() // wxAUI hack: force width by setting MinSize() and then Fixed()
// thanks to ZenJu http://trac.wxwidgets.org/ticket/13180 // thanks to ZenJu http://trac.wxwidgets.org/ticket/13180
@ -186,7 +186,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
if( cfg->m_FootprintsWidth > 0 ) if( cfg->m_FootprintsWidth > 0 )
{ {
wxAuiPaneInfo& footprintsPane = m_auimgr.GetPane( "Footprints" ); wxAuiPaneInfo& footprintsPane = m_auimgr.GetPane( wxT( "Footprints" ) );
// wxAUI hack: force width by setting MinSize() and then Fixed() // wxAUI hack: force width by setting MinSize() and then Fixed()
// thanks to ZenJu http://trac.wxwidgets.org/ticket/13180 // thanks to ZenJu http://trac.wxwidgets.org/ticket/13180
@ -1058,7 +1058,7 @@ std::vector<unsigned int> CVPCB_MAINFRAME::GetComponentIndices(
break; break;
default: default:
wxASSERT_MSG( false, "Invalid symbol selection criteria" ); wxASSERT_MSG( false, wxT( "Invalid symbol selection criteria" ) );
} }
return idx; return idx;
@ -1132,7 +1132,7 @@ void CVPCB_MAINFRAME::SetStatusText( const wxString& aText, int aNumber )
case 0: m_statusLine1->SetLabel( aText ); break; case 0: m_statusLine1->SetLabel( aText ); break;
case 1: m_statusLine2->SetLabel( aText ); break; case 1: m_statusLine2->SetLabel( aText ); break;
case 2: m_statusLine3->SetLabel( aText ); break; case 2: m_statusLine3->SetLabel( aText ); break;
default: wxFAIL_MSG( "Invalid status row number" ); break; default: wxFAIL_MSG( wxT( "Invalid status row number" ) ); break;
} }
} }

8
cvpcb/display_footprints_frame.cpp
View File

@ -131,13 +131,13 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, wxWindow* aPa
m_auimgr.SetManagedWindow( this ); m_auimgr.SetManagedWindow( this );
CreateInfoBar(); CreateInfoBar();
m_auimgr.AddPane( m_mainToolBar, EDA_PANE().HToolbar().Name( "MainToolbar" ) m_auimgr.AddPane( m_mainToolBar, EDA_PANE().HToolbar().Name( wxT( "MainToolbar" ) )
.Top().Layer( 6 ) ); .Top().Layer( 6 ) );
m_auimgr.AddPane( m_optionsToolBar, EDA_PANE().VToolbar().Name( "OptToolbar" ) m_auimgr.AddPane( m_optionsToolBar, EDA_PANE().VToolbar().Name( wxT( "OptToolbar" ) )
.Left().Layer( 3 ) ); .Left().Layer( 3 ) );
m_auimgr.AddPane( GetCanvas(), EDA_PANE().Canvas().Name( "DrawFrame" ) m_auimgr.AddPane( GetCanvas(), EDA_PANE().Canvas().Name( wxT( "DrawFrame" ) )
.Center() ); .Center() );
m_auimgr.AddPane( m_messagePanel, EDA_PANE().Messages().Name( "MsgPanel" ) m_auimgr.AddPane( m_messagePanel, EDA_PANE().Messages().Name( wxT( "MsgPanel" ) )
.Bottom().Layer( 6 ) ); .Bottom().Layer( 6 ) );
FinishAUIInitialization(); FinishAUIInitialization();

4
cvpcb/footprints_listbox.cpp
View File

@ -158,7 +158,7 @@ void FOOTPRINTS_LISTBOX::SetFootprints( FOOTPRINT_LIST& aList, const wxString& a
for( auto& i: filter ) for( auto& i: filter )
{ {
msg.Printf( "%3d %s:%s", msg.Printf( wxT( "%3d %s:%s" ),
int( newList.GetCount() + 1 ), int( newList.GetCount() + 1 ),
i.GetLibNickname(), i.GetLibNickname(),
i.GetFootprintName() ); i.GetFootprintName() );
@ -227,7 +227,7 @@ void FOOTPRINTS_LISTBOX::OnLeftDClick( wxListEvent& event )
void FOOTPRINTS_LISTBOX::OnChar( wxKeyEvent& event ) void FOOTPRINTS_LISTBOX::OnChar( wxKeyEvent& event )
{ {
wxLogTrace( kicadTraceKeyEvent, "FOOTPRINTS_LISTBOX::OnChar %s", dump( event ) ); wxLogTrace( kicadTraceKeyEvent, wxT( "FOOTPRINTS_LISTBOX::OnChar %s" ), dump( event ) );
int key = event.GetKeyCode(); int key = event.GetKeyCode();

2
cvpcb/library_listbox.cpp
View File

@ -142,7 +142,7 @@ END_EVENT_TABLE()
void LIBRARY_LISTBOX::OnChar( wxKeyEvent& event ) void LIBRARY_LISTBOX::OnChar( wxKeyEvent& event )
{ {
wxLogTrace( kicadTraceKeyEvent, "LIBRARY_LISTBOX::OnChar %s", dump( event ) ); wxLogTrace( kicadTraceKeyEvent, wxT( "LIBRARY_LISTBOX::OnChar %s" ), dump( event ) );
int key = event.GetKeyCode(); int key = event.GetKeyCode();

2
cvpcb/listbox_base.cpp
View File

@ -74,7 +74,7 @@ void ITEMS_LISTBOX_BASE::UpdateLineWidth( unsigned aLine )
int newWidth = 10; // Value of AUTOSIZE_COL_MARGIN from wxWidgets source. int newWidth = 10; // Value of AUTOSIZE_COL_MARGIN from wxWidgets source.
dc.SetFont( GetFont() ); dc.SetFont( GetFont() );
dc.GetTextExtent( GetItemText( aLine, 0 ) + " ", &w, nullptr ); dc.GetTextExtent( GetItemText( aLine, 0 ) + wxT( " " ), &w, nullptr );
newWidth += w; newWidth += w;
if( newWidth > columnWidth ) if( newWidth > columnWidth )

2
cvpcb/symbols_listbox.cpp
View File

@ -110,7 +110,7 @@ void SYMBOLS_LISTBOX::SetSelection( int index, bool State )
void SYMBOLS_LISTBOX::OnChar( wxKeyEvent& event ) void SYMBOLS_LISTBOX::OnChar( wxKeyEvent& event )
{ {
wxLogTrace( kicadTraceKeyEvent, "SYMBOLS_LISTBOX::OnChar %s", dump( event ) ); wxLogTrace( kicadTraceKeyEvent, wxT( "SYMBOLS_LISTBOX::OnChar %s" ), dump( event ) );
int key = event.GetKeyCode(); int key = event.GetKeyCode();

2
cvpcb/toolbars_cvpcb.cpp
View File

@ -76,7 +76,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
wxStaticText* text = new wxStaticText( m_mainToolBar, wxID_ANY, msg_bold ); wxStaticText* text = new wxStaticText( m_mainToolBar, wxID_ANY, msg_bold );
text->SetFont( m_mainToolBar->GetFont().Bold() ); text->SetFont( m_mainToolBar->GetFont().Bold() );
#ifdef __WXGTK3__ #ifdef __WXGTK3__
text->SetLabelMarkup( "<b>" + msg_bold + "</b>" ); text->SetLabelMarkup( wxT( "<b>" ) + msg_bold + wxT( "</b>" ) );
#endif #endif
m_mainToolBar->AddControl( text ); m_mainToolBar->AddControl( text );

2
cvpcb/tools/cvpcb_control.cpp
View File

@ -261,7 +261,7 @@ int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
break; break;
default: default:
wxASSERT_MSG( false, "Invalid direction" ); wxASSERT_MSG( false, wxT( "Invalid direction" ) );
} }
// Find the next index in the component list // Find the next index in the component list