Commit 18bfe66d authored by jerryjacobs's avatar jerryjacobs

Dutch language update, kicad splash making to work

parent 608535f7
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -55,19 +55,19 @@ void WinEDA_CommandFrame::CreateCommandToolbar( void ) ...@@ -55,19 +55,19 @@ void WinEDA_CommandFrame::CreateCommandToolbar( void )
m_ButtonLastPosition.y = 20; m_ButtonLastPosition.y = 20;
btn = new wxBitmapButton( this, ID_TO_EESCHEMA, BITMAP( icon_eeschema_xpm ) ); btn = new wxBitmapButton( this, ID_TO_EESCHEMA, BITMAP( icon_eeschema_xpm ) );
btn->SetToolTip( _( "eeschema (Schematic editor)" ) ); btn->SetToolTip( _( "EESchema (Schematic editor)" ) );
AddFastLaunch( btn ); AddFastLaunch( btn );
btn = new wxBitmapButton( this, ID_TO_CVPCB, BITMAP( icon_cvpcb_xpm ) ); btn = new wxBitmapButton( this, ID_TO_CVPCB, BITMAP( icon_cvpcb_xpm ) );
btn->SetToolTip( _( "cvpcb (Components to modules)" ) ); btn->SetToolTip( _( "CVpcb (Components to modules)" ) );
AddFastLaunch( btn ); AddFastLaunch( btn );
btn = new wxBitmapButton( this, ID_TO_PCB, BITMAP( a_icon_pcbnew_xpm ) ); btn = new wxBitmapButton( this, ID_TO_PCB, BITMAP( a_icon_pcbnew_xpm ) );
btn->SetToolTip( _( "pcbnew (PCB editor)" ) ); btn->SetToolTip( _( "PCBnew (PCB editor)" ) );
AddFastLaunch( btn ); AddFastLaunch( btn );
btn = new wxBitmapButton( this, ID_TO_GERBVIEW, BITMAP( icon_gerbview_xpm ) ); btn = new wxBitmapButton( this, ID_TO_GERBVIEW, BITMAP( icon_gerbview_xpm ) );
btn->SetToolTip( _( "gerbview (Gerber viewer)" ) ); btn->SetToolTip( _( "GerbView (Gerber viewer)" ) );
AddFastLaunch( btn ); AddFastLaunch( btn );
......
...@@ -16,10 +16,15 @@ ...@@ -16,10 +16,15 @@
//#define SPLASH_OK //#define SPLASH_OK
#ifdef SPLASH_OK #ifdef SPLASH_OK
#include <wx/splash.h>
/* Define Splash Image */
#define SPLASH_IMAGE logo_kicad.png
#include "wx/splash.h"
#include "wx/mediactrl.h"
#endif #endif
#include <wx/button.h>
#include <wx/button.h>
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "bitmaps.h" #include "bitmaps.h"
...@@ -196,6 +201,9 @@ static void py_common_init() ...@@ -196,6 +201,9 @@ static void py_common_init()
bool WinEDA_App::OnInit() bool WinEDA_App::OnInit()
{ {
wxImage::AddHandler(new wxPNGHandler);
g_EDA_Appl = this; g_EDA_Appl = this;
InitEDA_Appl( wxT("KiCad")); InitEDA_Appl( wxT("KiCad"));
...@@ -223,22 +231,24 @@ bool WinEDA_App::OnInit() ...@@ -223,22 +231,24 @@ bool WinEDA_App::OnInit()
m_MainFrame->m_LeftWin->ReCreateTreePrj(); m_MainFrame->m_LeftWin->ReCreateTreePrj();
SetTopWindow(m_MainFrame); SetTopWindow(m_MainFrame);
m_MainFrame->Show(TRUE);
/* Preparation Affichage du logo */ /* Splash Screen Logo */
#ifdef SPLASH_OK #ifdef SPLASH_OK
wxString logoname( wxString(m_BinDir) + wxT("logokicad.png") ); wxString logoname( wxString(m_BinDir) + _T("logokicad.png") );
wxBitmap image; wxBitmap splash_screen;
if ( image.LoadFile( logoname, wxBITMAP_TYPE_PNG ) ) if ( splash_screen.LoadFile( logoname, wxBITMAP_TYPE_PNG ) )
{ {
wxSplashScreen * logoscreen = new wxSplashScreen( image, wxSplashScreen *splash = new wxSplashScreen(splash_screen,
wxSPLASH_CENTRE_ON_PARENT | wxSPLASH_TIMEOUT, wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
500, m_MainFrame, -1, 3000, m_MainFrame, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxSTAY_ON_TOP);
wxSIMPLE_BORDER | wxSTAY_ON_TOP);
} }
#endif #endif
m_MainFrame->Show(TRUE);
m_MainFrame->Raise();
if( wxFileExists(m_MainFrame->m_PrjFileName) ) if( wxFileExists(m_MainFrame->m_PrjFileName) )
{ {
m_MainFrame->Load_Prj_Config(); m_MainFrame->Load_Prj_Config();
......
...@@ -812,7 +812,7 @@ void WinEDA_PcbFrame::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu ) ...@@ -812,7 +812,7 @@ void WinEDA_PcbFrame::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu )
sub_menu_Pad->AppendSeparator(); sub_menu_Pad->AppendSeparator();
ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_DELETE_PAD, ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_DELETE_PAD,
_( "delete" ), delete_pad_xpm ); _( "Delete" ), delete_pad_xpm );
} }
if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOROUTE ) if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOROUTE )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment