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

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:
jerryjacobs 2008-10-01 17:34:55 +00:00
parent 0545f6811f
commit 7c655d1d36
11 changed files with 435 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/CMakeLists.txt
View File

@ -29,6 +29,7 @@ set(COMMON_SRCS
toolbars.cpp toolbars.cpp
trigo.cpp trigo.cpp
worksheet.cpp worksheet.cpp
wxwineda.cpp) wxwineda.cpp
icons.cpp)
add_library(common ${COMMON_SRCS}) add_library(common ${COMMON_SRCS})

2
common/get_component_dialog.cpp
View File

@ -131,7 +131,7 @@ wxStaticText * Text;
{ {
Button = new wxButton(this, ID_EXTRA_TOOL, _("By Lib Browser")); 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); RightBoxSizer->Add(Button, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
} }
#endif #endif

17
eeschema/eelibs_read_libraryfiles.cpp
View File

@ -140,13 +140,13 @@ void LoadLibraries( WinEDA_DrawFrame* frame )
FullLibName = MakeFileName( g_RealLibDirBuffer, LibName, g_LibExtBuffer ); FullLibName = MakeFileName( g_RealLibDirBuffer, LibName, g_LibExtBuffer );
msg = wxT( "Loading " ) + FullLibName; msg = _( "Loading library " ) + FullLibName;
frame->PrintMsg( msg ); frame->PrintMsg( msg );
if( LoadLibraryName( frame, FullLibName, LibName ) ) if( LoadLibraryName( frame, FullLibName, LibName ) )
msg += wxT( " OK" ); msg += _( " OK" );
else else
msg += wxT( " ->Error" ); msg += _( " ->Error" );
frame->PrintMsg( msg ); frame->PrintMsg( msg );
} }
@ -281,11 +281,14 @@ int LibraryEntryCompare( EDA_LibComponentStruct* LE1, EDA_LibComponentStruct* LE
} }
/***************************************************************************** /**************************************************/
* Routine to load a library from given open file. * /* Routine to load a library from given open file */
*****************************************************************************/ /**************************************************/
PriorQue* LoadLibraryAux( WinEDA_DrawFrame* frame, LibraryStruct* Library, FILE* libfile, PriorQue* LoadLibraryAux( WinEDA_DrawFrame* frame,
LibraryStruct* Library,
FILE* libfile,
int* NumOfParts ) int* NumOfParts )
/**************************************************/
{ {
int LineNum = 0; int LineNum = 0;
char Line[1024]; char Line[1024];

2
eeschema/files-io.cpp
View File

@ -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 if( !wxFileExists( g_RootSheet->m_AssociatedScreen->m_FileName ) && !LibCacheExist ) // Nouveau projet prpbablement
{ {
Zoom_Automatique( FALSE ); Zoom_Automatique( FALSE );
msg.Printf( _( "File %s not found (new project ?)" ), msg.Printf( _( "File <%s> not found." ),
g_RootSheet->m_AssociatedScreen->m_FileName.GetData() ); g_RootSheet->m_AssociatedScreen->m_FileName.GetData() );
DisplayInfo( this, msg, 20 ); DisplayInfo( this, msg, 20 );
return -1; return -1;

2
eeschema/libedit.cpp
View File

@ -328,7 +328,7 @@ wxString msg;
ListBox = new WinEDAListBox(this, msg, ListBox = new WinEDAListBox(this, msg,
ListNames, wxEmptyString, NULL /*DisplayCmpDoc*/, ListNames, wxEmptyString, NULL /*DisplayCmpDoc*/,
wxColour(255,255,200)); wxColour(255,255,255)); // Component listbox background color
int ii = ListBox->ShowModal(); ListBox->Destroy(); int ii = ListBox->ShowModal(); ListBox->Destroy();

8
eeschema/selpart.cpp
View File

@ -41,9 +41,9 @@ const wxChar ** ListNames;
} }
ListNames = GetLibNames(); ListNames = GetLibNames();
ListBox = new WinEDAListBox(frame, ListBox = new WinEDAListBox(frame, _("Select Lib"),
_("Select Lib"), ListNames, OldLibName, NULL, ListNames, OldLibName, NULL,
wxColour(150,255,255)); wxColour(255,255,255)); // Library browser background color
ListBox->MoveMouseToOrigin(); ListBox->MoveMouseToOrigin();
ii = ListBox->ShowModal(); ListBox->Destroy(); ii = ListBox->ShowModal(); ListBox->Destroy();
@ -105,7 +105,7 @@ const wxChar ** ListNames;
ListBox = new WinEDAListBox(frame, msg, ListBox = new WinEDAListBox(frame, msg,
ListNames, OldName, DisplayCmpDoc, ListNames, OldName, DisplayCmpDoc,
wxColour(255,255,200)); wxColour(255,255,255)); // Component background listbox color
ListBox->MoveMouseToOrigin(); ListBox->MoveMouseToOrigin();
ii = ListBox->ShowModal(); ListBox->Destroy(); ii = ListBox->ShowModal(); ListBox->Destroy();

2
eeschema/symbtext.cpp
View File

@ -140,7 +140,7 @@ void WinEDA_bodytext_PropertiesFrame::CreateControls()
wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); 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); 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 ); m_NewText = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(250, -1), 0 );

8
eeschema/viewlib_frame.cpp
View File

@ -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_LibList = new wxListBox( this, ID_LIBVIEW_LIB_LIST, wxPoint( 0, 0 ),
m_LibListSize, 0, NULL, wxLB_HSCROLL ); m_LibListSize, 0, NULL, wxLB_HSCROLL );
m_LibList->SetFont( *g_DialogFont ); m_LibList->SetFont( *g_DialogFont );
m_LibList->SetBackgroundColour( wxColour( 150, 255, 255 ) ); m_LibList->SetBackgroundColour( wxColour( 255, 255, 255 ) ); // Library background listbox color (white)
m_LibList->SetForegroundColour( wxColour( 0, 0, 0 ) ); m_LibList->SetForegroundColour( wxColour( 0, 0, 0 ) ); // Library foreground listbox color (black)
} }
else else
g_CurrentViewLibraryName = Library->m_Name; 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_CmpList = new wxListBox( this, ID_LIBVIEW_CMP_LIST, wxPoint( m_LibListSize.x, 0 ),
m_CmpListSize, 0, NULL, wxLB_HSCROLL ); m_CmpListSize, 0, NULL, wxLB_HSCROLL );
m_CmpList->SetFont( *g_DialogFont ); m_CmpList->SetFont( *g_DialogFont );
m_CmpList->SetBackgroundColour( wxColour( 255, 255, 200 ) ); m_CmpList->SetBackgroundColour( wxColour( 255, 255, 255 ) ); // Component background listbox color (white)
m_CmpList->SetForegroundColour( wxColour( 0, 0, 0 ) ); m_CmpList->SetForegroundColour( wxColour( 0, 0, 0 ) ); // Component foreground listbox color (black)
GetSettings(); GetSettings();
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );

8
gerbview/gerbview.cpp
View File

@ -38,7 +38,6 @@ bool WinEDA_App::OnInit()
return false; return false;
} }
g_DrawBgColor = BLACK; g_DrawBgColor = BLACK;
Read_Hotkey_Config( m_PcbFrame, false ); /* Must be called before creating the main frame 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" ), m_GerberFrame = new WinEDA_GerberFrame( NULL, this, wxT( "GerbView" ),
wxPoint( 0, 0 ), wxSize( 600, 400 ) ); wxPoint( 0, 0 ), wxSize( 600, 400 ) );
/* Gerbview mainframe title */
wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion(); wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
m_GerberFrame->SetTitle( Title ); m_GerberFrame->SetTitle( Title );
m_GerberFrame->m_Pcb = new BOARD( NULL, m_GerberFrame ); m_GerberFrame->m_Pcb = new BOARD( NULL, m_GerberFrame );
SetTopWindow( m_GerberFrame ); SetTopWindow( m_GerberFrame ); // Set GerbView mainframe on top
m_GerberFrame->Show( TRUE );
m_GerberFrame->Zoom_Automatique( TRUE ); m_GerberFrame->Show( TRUE ); // Show GerbView mainframe
m_GerberFrame->Zoom_Automatique( TRUE ); // Zoomfit drawing in frame
if( argc > 1 ) if( argc > 1 )
{ {

BIN
internat/nl/kicad.mo
View File

Binary file not shown.

679
internat/nl/kicad.po
View File

File diff suppressed because it is too large Load Diff