Component and library selection color to white (same as eagle), some strings fine tuned and made translatable, dutch translation update, gerbview zoomfit on start
This commit is contained in:
parent
0545f6811f
commit
7c655d1d36
|
@ -29,6 +29,7 @@ set(COMMON_SRCS
|
|||
toolbars.cpp
|
||||
trigo.cpp
|
||||
worksheet.cpp
|
||||
wxwineda.cpp)
|
||||
wxwineda.cpp
|
||||
icons.cpp)
|
||||
|
||||
add_library(common ${COMMON_SRCS})
|
||||
|
|
|
@ -131,7 +131,7 @@ wxStaticText * Text;
|
|||
{
|
||||
|
||||
Button = new wxButton(this, ID_EXTRA_TOOL, _("By Lib Browser"));
|
||||
Button->SetForegroundColour(wxColor(80, 0, 80));
|
||||
Button->SetForegroundColour(wxColor(0, 0, 0)); // Listbox Color
|
||||
RightBoxSizer->Add(Button, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -140,13 +140,13 @@ void LoadLibraries( WinEDA_DrawFrame* frame )
|
|||
|
||||
FullLibName = MakeFileName( g_RealLibDirBuffer, LibName, g_LibExtBuffer );
|
||||
|
||||
msg = wxT( "Loading " ) + FullLibName;
|
||||
msg = _( "Loading library " ) + FullLibName;
|
||||
frame->PrintMsg( msg );
|
||||
|
||||
if( LoadLibraryName( frame, FullLibName, LibName ) )
|
||||
msg += wxT( " OK" );
|
||||
msg += _( " OK" );
|
||||
else
|
||||
msg += wxT( " ->Error" );
|
||||
msg += _( " ->Error" );
|
||||
|
||||
frame->PrintMsg( msg );
|
||||
}
|
||||
|
@ -281,11 +281,14 @@ int LibraryEntryCompare( EDA_LibComponentStruct* LE1, EDA_LibComponentStruct* LE
|
|||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Routine to load a library from given open file. *
|
||||
*****************************************************************************/
|
||||
PriorQue* LoadLibraryAux( WinEDA_DrawFrame* frame, LibraryStruct* Library, FILE* libfile,
|
||||
/**************************************************/
|
||||
/* Routine to load a library from given open file */
|
||||
/**************************************************/
|
||||
PriorQue* LoadLibraryAux( WinEDA_DrawFrame* frame,
|
||||
LibraryStruct* Library,
|
||||
FILE* libfile,
|
||||
int* NumOfParts )
|
||||
/**************************************************/
|
||||
{
|
||||
int LineNum = 0;
|
||||
char Line[1024];
|
||||
|
|
|
@ -178,7 +178,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe
|
|||
if( !wxFileExists( g_RootSheet->m_AssociatedScreen->m_FileName ) && !LibCacheExist ) // Nouveau projet prpbablement
|
||||
{
|
||||
Zoom_Automatique( FALSE );
|
||||
msg.Printf( _( "File %s not found (new project ?)" ),
|
||||
msg.Printf( _( "File <%s> not found." ),
|
||||
g_RootSheet->m_AssociatedScreen->m_FileName.GetData() );
|
||||
DisplayInfo( this, msg, 20 );
|
||||
return -1;
|
||||
|
|
|
@ -328,7 +328,7 @@ wxString msg;
|
|||
|
||||
ListBox = new WinEDAListBox(this, msg,
|
||||
ListNames, wxEmptyString, NULL /*DisplayCmpDoc*/,
|
||||
wxColour(255,255,200));
|
||||
wxColour(255,255,255)); // Component listbox background color
|
||||
|
||||
|
||||
int ii = ListBox->ShowModal(); ListBox->Destroy();
|
||||
|
|
|
@ -41,9 +41,9 @@ const wxChar ** ListNames;
|
|||
}
|
||||
|
||||
ListNames = GetLibNames();
|
||||
ListBox = new WinEDAListBox(frame,
|
||||
_("Select Lib"), ListNames, OldLibName, NULL,
|
||||
wxColour(150,255,255));
|
||||
ListBox = new WinEDAListBox(frame, _("Select Lib"),
|
||||
ListNames, OldLibName, NULL,
|
||||
wxColour(255,255,255)); // Library browser background color
|
||||
ListBox->MoveMouseToOrigin();
|
||||
|
||||
ii = ListBox->ShowModal(); ListBox->Destroy();
|
||||
|
@ -105,7 +105,7 @@ const wxChar ** ListNames;
|
|||
|
||||
ListBox = new WinEDAListBox(frame, msg,
|
||||
ListNames, OldName, DisplayCmpDoc,
|
||||
wxColour(255,255,200));
|
||||
wxColour(255,255,255)); // Component background listbox color
|
||||
ListBox->MoveMouseToOrigin();
|
||||
|
||||
ii = ListBox->ShowModal(); ListBox->Destroy();
|
||||
|
|
|
@ -140,7 +140,7 @@ void WinEDA_bodytext_PropertiesFrame::CreateControls()
|
|||
wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
|
||||
itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
|
||||
wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("Component name:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
|
||||
|
||||
m_NewText = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(250, -1), 0 );
|
||||
|
|
|
@ -77,8 +77,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, WinEDA_App* parent,
|
|||
m_LibList = new wxListBox( this, ID_LIBVIEW_LIB_LIST, wxPoint( 0, 0 ),
|
||||
m_LibListSize, 0, NULL, wxLB_HSCROLL );
|
||||
m_LibList->SetFont( *g_DialogFont );
|
||||
m_LibList->SetBackgroundColour( wxColour( 150, 255, 255 ) );
|
||||
m_LibList->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
m_LibList->SetBackgroundColour( wxColour( 255, 255, 255 ) ); // Library background listbox color (white)
|
||||
m_LibList->SetForegroundColour( wxColour( 0, 0, 0 ) ); // Library foreground listbox color (black)
|
||||
}
|
||||
else
|
||||
g_CurrentViewLibraryName = Library->m_Name;
|
||||
|
@ -88,8 +88,8 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, WinEDA_App* parent,
|
|||
m_CmpList = new wxListBox( this, ID_LIBVIEW_CMP_LIST, wxPoint( m_LibListSize.x, 0 ),
|
||||
m_CmpListSize, 0, NULL, wxLB_HSCROLL );
|
||||
m_CmpList->SetFont( *g_DialogFont );
|
||||
m_CmpList->SetBackgroundColour( wxColour( 255, 255, 200 ) );
|
||||
m_CmpList->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
m_CmpList->SetBackgroundColour( wxColour( 255, 255, 255 ) ); // Component background listbox color (white)
|
||||
m_CmpList->SetForegroundColour( wxColour( 0, 0, 0 ) ); // Component foreground listbox color (black)
|
||||
|
||||
GetSettings();
|
||||
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
|
||||
|
|
|
@ -38,7 +38,6 @@ bool WinEDA_App::OnInit()
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
g_DrawBgColor = BLACK;
|
||||
|
||||
Read_Hotkey_Config( m_PcbFrame, false ); /* Must be called before creating the main frame
|
||||
|
@ -48,14 +47,15 @@ bool WinEDA_App::OnInit()
|
|||
m_GerberFrame = new WinEDA_GerberFrame( NULL, this, wxT( "GerbView" ),
|
||||
wxPoint( 0, 0 ), wxSize( 600, 400 ) );
|
||||
|
||||
/* Gerbview mainframe title */
|
||||
wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
|
||||
m_GerberFrame->SetTitle( Title );
|
||||
m_GerberFrame->m_Pcb = new BOARD( NULL, m_GerberFrame );
|
||||
|
||||
SetTopWindow( m_GerberFrame );
|
||||
m_GerberFrame->Show( TRUE );
|
||||
SetTopWindow( m_GerberFrame ); // Set GerbView mainframe on top
|
||||
|
||||
m_GerberFrame->Zoom_Automatique( TRUE );
|
||||
m_GerberFrame->Show( TRUE ); // Show GerbView mainframe
|
||||
m_GerberFrame->Zoom_Automatique( TRUE ); // Zoomfit drawing in frame
|
||||
|
||||
if( argc > 1 )
|
||||
{
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue