Skip to content

K
kicad-source-mirror
Commit 13a847d3 authored by CHARRAS's avatar CHARRAS
Browse files
Options

Add catalan language to language list

parent 185738fa
Show whitespace changes
Inline Side-by-side
Showing with 8223 additions and 452 deletions
common/bitmaps/Lang_Catalan.xpm 0 → 100644
View file @ 13a847d3
/* XPM */
static char *lang_catalan_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 14 1",
"* c #E40E04",
"@ c #F4C20C",
" c #FCFE04",
"X c #F40604",
"& c #FCA60C",
"o c #FC0204",
". c #FCE60C",
"= c #FCE614",
"- c #FCE61C",
"O c #F42E04",
"+ c #FCFA04",
"% c #F48E0C",
"$ c #F46204",
"# c #F4620C",
/* pixels */
" ",
"................",
"XoXoXXoXoXoXoXoX",
"OOOOOOOOOOOOOOOO",
"++++++++++++++++",
"@@@@@@@@@@@@@@@@",
"oooooooooooooooo",
"#$#$#$#$#$#$#$#$",
"+ + + + +++ + + ",
"%%%%%%%%%%%%%%%%",
"XXXXXXXXXXXXXXXX",
"&&&&&&&&&&&&&&&&",
" ",
"$$$$$$$$$$$$$$$$",
"****************",
"=-=-=-=-=-=-=-=-"
};
common/edaappl.cpp
View file @ 13a847d3
/***************/ /***************/
/* edaappl.cpp */ /* edaappl.cpp */
/***************/ /***************/
/* /*
ROLE: methodes relative a la classe winEDA_App, communes * ROLE: methodes relative a la classe winEDA_App, communes
aux environements window et linux * aux environements window et linux
*/ */
#define EDA_BASE #define EDA_BASE
#define COMMON_GLOBL #define COMMON_GLOBL
...@@ -45,16 +46,17 @@ ...@@ -45,16 +46,17 @@
#include "Lang_Po.xpm" #include "Lang_Po.xpm"
#include "Lang_Ko.xpm" #include "Lang_Ko.xpm"
#include "Lang_Ru.xpm" #include "Lang_Ru.xpm"
#include "Lang_Catalan.xpm"
#endif #endif
#define FONT_DEFAULT_SIZE 10 /* Default font size. #define FONT_DEFAULT_SIZE 10 /* Default font size.
The real font size will be computed at run time */ * The real font size will be computed at run time */
/*****************************/ /*****************************/
/* Constructeur de WinEDA_App */ /* Constructeur de WinEDA_App */
/*****************************/ /*****************************/
WinEDA_App::WinEDA_App() WinEDA_App::WinEDA_App()
{ {
...@@ -80,9 +82,10 @@ WinEDA_App::WinEDA_App() ...@@ -80,9 +82,10 @@ WinEDA_App::WinEDA_App()
m_PdfBrowserIsDefault = TRUE; m_PdfBrowserIsDefault = TRUE;
} }
/*****************************/
/* Destructeur de WinEDA_App */ /*****************************/
/*****************************/ /* Destructeur de WinEDA_App */
/*****************************/
WinEDA_App::~WinEDA_App() WinEDA_App::~WinEDA_App()
{ {
...@@ -97,65 +100,71 @@ WinEDA_App::~WinEDA_App() ...@@ -97,65 +100,71 @@ WinEDA_App::~WinEDA_App()
delete g_ItalicFont; delete g_ItalicFont;
delete g_FixedFont; delete g_FixedFont;
delete g_MsgFont; delete g_MsgFont;
if ( m_Checker ) delete m_Checker; if( m_Checker )
delete m_Checker;
delete m_Locale; delete m_Locale;
} }
/**************************************************/ /**************************************************/
void WinEDA_App::InitEDA_Appl(const wxString & name) void WinEDA_App::InitEDA_Appl( const wxString& name )
/***************************************************/ /***************************************************/
{ {
wxString ident; wxString ident;
wxString EnvLang; wxString EnvLang;
ident = name + wxT("-") + wxGetUserId(); ident = name + wxT( "-" ) + wxGetUserId();
m_Checker = new wxSingleInstanceChecker(ident); m_Checker = new wxSingleInstanceChecker( ident );
/* Init environnement /* Init environnement
(KICAD definit le chemin de kicad ex: set KICAD=d:\kicad) */ * (KICAD definit le chemin de kicad ex: set KICAD=d:\kicad) */
m_Env_Defined = wxGetEnv( wxT("KICAD"), &m_KicadEnv); m_Env_Defined = wxGetEnv( wxT( "KICAD" ), &m_KicadEnv );
if ( m_Env_Defined ) // m_KicadEnv doit finir par "/" ou "\" if( m_Env_Defined ) // m_KicadEnv doit finir par "/" ou "\"
{ {
m_KicadEnv.Replace(WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP); m_KicadEnv.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
if ( m_KicadEnv.Last() != '/' ) m_KicadEnv += UNIX_STRING_DIR_SEP; if( m_KicadEnv.Last() != '/' )
m_KicadEnv += UNIX_STRING_DIR_SEP;
} }
/* Prepare On Line Help */ /* Prepare On Line Help */
m_HelpFileName = name + wxT(".html"); m_HelpFileName = name + wxT( ".html" );
// Init parametres pour configuration // Init parametres pour configuration
SetVendorName(wxT("kicad")); SetVendorName( wxT( "kicad" ) );
SetAppName(name); SetAppName( name );
m_EDA_Config = new wxConfig(name); m_EDA_Config = new wxConfig( name );
m_EDA_CommonConfig = new wxConfig(wxT("kicad_common")); m_EDA_CommonConfig = new wxConfig( wxT( "kicad_common" ) );
/* Creation des fontes utiles */ /* Creation des fontes utiles */
g_StdFontPointSize = FONT_DEFAULT_SIZE; g_StdFontPointSize = FONT_DEFAULT_SIZE;
g_MsgFontPointSize = FONT_DEFAULT_SIZE; g_MsgFontPointSize = FONT_DEFAULT_SIZE;
g_DialogFontPointSize = FONT_DEFAULT_SIZE; g_DialogFontPointSize = FONT_DEFAULT_SIZE;
g_FixedFontPointSize = FONT_DEFAULT_SIZE; g_FixedFontPointSize = FONT_DEFAULT_SIZE;
g_StdFont = new wxFont(g_StdFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL); g_StdFont = new wxFont( g_StdFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL );
g_MsgFont = new wxFont(g_StdFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL); g_MsgFont = new wxFont( g_StdFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL );
g_DialogFont = new wxFont(g_DialogFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL); g_DialogFont = new wxFont( g_DialogFontPointSize, wxFONTFAMILY_ROMAN, wxNORMAL, wxNORMAL );
g_ItalicFont = new wxFont(g_DialogFontPointSize, wxFONTFAMILY_ROMAN, wxFONTSTYLE_ITALIC, wxNORMAL); g_ItalicFont = new wxFont( g_DialogFontPointSize,
g_FixedFont = new wxFont(g_FixedFontPointSize, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL); wxFONTFAMILY_ROMAN,
wxFONTSTYLE_ITALIC,
wxNORMAL );
g_FixedFont = new wxFont( g_FixedFontPointSize, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL );
/* installation des gestionnaires de visu d'images (pour help) */ /* installation des gestionnaires de visu d'images (pour help) */
wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler( new wxPNGHandler );
wxImage::AddHandler(new wxGIFHandler); wxImage::AddHandler( new wxGIFHandler );
wxImage::AddHandler(new wxJPEGHandler); wxImage::AddHandler( new wxJPEGHandler );
wxFileSystem::AddHandler(new wxZipFSHandler); wxFileSystem::AddHandler( new wxZipFSHandler );
// Analyse command line & init binary path // Analyse command line & init binary path
SetBinDir(); SetBinDir();
ReadPdfBrowserInfos(); ReadPdfBrowserInfos();
// Internationalisation: chargement du Dictionnaire de kicad // Internationalisation: chargement du Dictionnaire de kicad
m_EDA_CommonConfig->Read(wxT("Language"), &m_LanguageId, wxLANGUAGE_DEFAULT); m_EDA_CommonConfig->Read( wxT( "Language" ), &m_LanguageId, wxLANGUAGE_DEFAULT );
bool succes = SetLanguage(TRUE); bool succes = SetLanguage( TRUE );
if ( ! succes ) if( !succes )
{ {
} }
...@@ -168,20 +177,21 @@ bool succes = SetLanguage(TRUE); ...@@ -168,20 +177,21 @@ bool succes = SetLanguage(TRUE);
/*****************************************/ /*****************************************/
void WinEDA_App::InitOnLineHelp() void WinEDA_App::InitOnLineHelp()
/*****************************************/ /*****************************************/
/* Init On Line Help /* Init On Line Help
*/ */
{ {
wxString fullfilename = FindKicadHelpPath(); wxString fullfilename = FindKicadHelpPath();
fullfilename += wxT("kicad.hhp"); fullfilename += wxT( "kicad.hhp" );
if ( wxFileExists(fullfilename) ) if( wxFileExists( fullfilename ) )
{ {
m_HtmlCtrl = new wxHtmlHelpController(wxHF_TOOLBAR | m_HtmlCtrl = new wxHtmlHelpController( wxHF_TOOLBAR |
wxHF_CONTENTS | wxHF_PRINT | wxHF_OPEN_FILES wxHF_CONTENTS | wxHF_PRINT | wxHF_OPEN_FILES
/*| wxHF_SEARCH */); /*| wxHF_SEARCH */ );
m_HtmlCtrl->UseConfig(m_EDA_CommonConfig); m_HtmlCtrl->UseConfig( m_EDA_CommonConfig );
m_HtmlCtrl->SetTitleFormat( wxT("Kicad Help") ); m_HtmlCtrl->SetTitleFormat( wxT( "Kicad Help" ) );
m_HtmlCtrl->AddBook(fullfilename); m_HtmlCtrl->AddBook( fullfilename );
} }
} }
...@@ -189,47 +199,51 @@ wxString fullfilename = FindKicadHelpPath(); ...@@ -189,47 +199,51 @@ wxString fullfilename = FindKicadHelpPath();
/*******************************/ /*******************************/
bool WinEDA_App::SetBinDir() bool WinEDA_App::SetBinDir()
/*******************************/ /*******************************/
/* /*
Analyse la ligne de commande pour retrouver le chemin de l'executable * Analyse la ligne de commande pour retrouver le chemin de l'executable
Sauve en WinEDA_App::m_BinDir le repertoire de l'executable * Sauve en WinEDA_App::m_BinDir le repertoire de l'executable
*/ */
{ {
/* Calcul du chemin ou se trouve l'executable */ /* Calcul du chemin ou se trouve l'executable */
#ifdef __UNIX__ #ifdef __UNIX__
/* Sous LINUX ptarg[0] ne donne pas le chemin complet de l'executable, /* Sous LINUX ptarg[0] ne donne pas le chemin complet de l'executable,
il faut le retrouver par la commande "which <filename> si aucun * il faut le retrouver par la commande "which <filename> si aucun
chemin n'est donne */ * chemin n'est donne */
FILE * ftmp; FILE* ftmp;
#define TMP_FILE "/tmp/kicad.tmp" #define TMP_FILE "/tmp/kicad.tmp"
char Line[1024]; char Line[1024];
char FileName[1024]; char FileName[1024];
wxString str_arg0; wxString str_arg0;
int ii; int ii;
FileName[0] = 0; FileName[0] = 0;
str_arg0 = argv[0]; str_arg0 = argv[0];
if( strchr( (const char *)argv[0],'/') == NULL ) /* pas de chemin */ if( strchr( (const char*) argv[0], '/' ) == NULL ) /* pas de chemin */
{ {
sprintf( FileName, "which %s > %s", CONV_TO_UTF8(str_arg0), TMP_FILE); sprintf( FileName, "which %s > %s", CONV_TO_UTF8( str_arg0 ), TMP_FILE );
ii = system(FileName); ii = system( FileName );
if( (ftmp = fopen(TMP_FILE, "rt")) != NULL ) if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL )
{ {
fgets(Line,1000,ftmp); fgets( Line, 1000, ftmp );
fclose(ftmp); fclose( ftmp );
remove(TMP_FILE); remove( TMP_FILE );
} }
m_BinDir = CONV_FROM_UTF8(Line); m_BinDir = CONV_FROM_UTF8( Line );
} }
else m_BinDir = argv[0]; else
m_BinDir = argv[0];
#else #else
m_BinDir = argv[0]; m_BinDir = argv[0];
#endif #endif
m_BinDir.Replace(WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP); m_BinDir.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
while ( m_BinDir.Last() != '/' ) m_BinDir.RemoveLast(); while( m_BinDir.Last() != '/' )
m_BinDir.RemoveLast();
return TRUE; return TRUE;
} }
...@@ -238,70 +252,77 @@ int ii; ...@@ -238,70 +252,77 @@ int ii;
/*********************************/ /*********************************/
void WinEDA_App::GetSettings() void WinEDA_App::GetSettings()
/*********************************/ /*********************************/
/* Lit les infos utiles sauvees lors de la derniere utilisation du logiciel /* Lit les infos utiles sauvees lors de la derniere utilisation du logiciel
*/ */
{ {
wxString Line, Ident; wxString Line, Ident;
unsigned ii; unsigned ii;
m_HelpSize.x = 500; m_HelpSize.y = 400; m_HelpSize.x = 500; m_HelpSize.y = 400;
if ( m_EDA_CommonConfig ) if( m_EDA_CommonConfig )
{ {
m_LanguageId = m_EDA_CommonConfig->Read(wxT("Language"), wxLANGUAGE_DEFAULT); m_LanguageId = m_EDA_CommonConfig->Read( wxT( "Language" ), wxLANGUAGE_DEFAULT );
g_EditorName = m_EDA_CommonConfig->Read(wxT("Editor")); g_EditorName = m_EDA_CommonConfig->Read( wxT( "Editor" ) );
g_ConfigFileLocationChoice = m_EDA_CommonConfig->Read(HOTKEY_CFG_PATH_OPT, 0L); g_ConfigFileLocationChoice = m_EDA_CommonConfig->Read( HOTKEY_CFG_PATH_OPT, 0L );
} }
if ( ! m_EDA_Config ) return; if( !m_EDA_Config )
return;
for ( ii = 0; ii < 10; ii++ ) for( ii = 0; ii < 10; ii++ )
{ {
Ident = wxT("LastProject"); if ( ii ) Ident << ii; Ident = wxT( "LastProject" ); if( ii )
if( m_EDA_Config->Read(Ident, &Line) ) Ident << ii;
m_LastProject.Add(Line); if( m_EDA_Config->Read( Ident, &Line ) )
m_LastProject.Add( Line );
} }
g_StdFontPointSize = m_EDA_Config->Read(wxT("SdtFontSize"), FONT_DEFAULT_SIZE); g_StdFontPointSize = m_EDA_Config->Read( wxT( "SdtFontSize" ), FONT_DEFAULT_SIZE );
g_MsgFontPointSize = m_EDA_Config->Read(wxT("MsgFontSize"), FONT_DEFAULT_SIZE); g_MsgFontPointSize = m_EDA_Config->Read( wxT( "MsgFontSize" ), FONT_DEFAULT_SIZE );
g_DialogFontPointSize = m_EDA_Config->Read(wxT("DialogFontSize"), FONT_DEFAULT_SIZE); g_DialogFontPointSize = m_EDA_Config->Read( wxT( "DialogFontSize" ), FONT_DEFAULT_SIZE );
g_FixedFontPointSize = m_EDA_Config->Read(wxT("FixedFontSize"), FONT_DEFAULT_SIZE); g_FixedFontPointSize = m_EDA_Config->Read( wxT( "FixedFontSize" ), FONT_DEFAULT_SIZE );
Line = m_EDA_Config->Read(wxT("SdtFontType"), wxEmptyString); Line = m_EDA_Config->Read( wxT( "SdtFontType" ), wxEmptyString );
if ( ! Line.IsEmpty() ) g_StdFont->SetFaceName(Line); if( !Line.IsEmpty() )
ii = m_EDA_Config->Read(wxT("SdtFontStyle"), wxFONTFAMILY_ROMAN); g_StdFont->SetFaceName( Line );
g_StdFont->SetStyle(ii); ii = m_EDA_Config->Read( wxT( "SdtFontStyle" ), wxFONTFAMILY_ROMAN );
ii = m_EDA_Config->Read(wxT("SdtFontWeight"), wxNORMAL); g_StdFont->SetStyle( ii );
g_StdFont->SetWeight(ii); ii = m_EDA_Config->Read( wxT( "SdtFontWeight" ), wxNORMAL );
g_StdFont->SetPointSize(g_StdFontPointSize); g_StdFont->SetWeight( ii );
g_StdFont->SetPointSize( g_StdFontPointSize );
Line = m_EDA_Config->Read(wxT("MsgFontType"), wxEmptyString);
if ( ! Line.IsEmpty() ) g_MsgFont->SetFaceName(Line); Line = m_EDA_Config->Read( wxT( "MsgFontType" ), wxEmptyString );
ii = m_EDA_Config->Read(wxT("MsgFontStyle"), wxFONTFAMILY_ROMAN); if( !Line.IsEmpty() )
g_MsgFont->SetStyle(ii); g_MsgFont->SetFaceName( Line );
ii = m_EDA_Config->Read(wxT("MsgFontWeight"), wxNORMAL); ii = m_EDA_Config->Read( wxT( "MsgFontStyle" ), wxFONTFAMILY_ROMAN );
g_MsgFont->SetWeight(ii); g_MsgFont->SetStyle( ii );
g_MsgFont->SetPointSize(g_MsgFontPointSize); ii = m_EDA_Config->Read( wxT( "MsgFontWeight" ), wxNORMAL );
g_MsgFont->SetWeight( ii );
Line = m_EDA_Config->Read(wxT("DialogFontType"), wxEmptyString); g_MsgFont->SetPointSize( g_MsgFontPointSize );
if ( ! Line.IsEmpty() ) g_DialogFont->SetFaceName(Line);
ii = m_EDA_Config->Read(wxT("DialogFontStyle"), wxFONTFAMILY_ROMAN); Line = m_EDA_Config->Read( wxT( "DialogFontType" ), wxEmptyString );
g_DialogFont->SetStyle(ii); if( !Line.IsEmpty() )
ii = m_EDA_Config->Read(wxT("DialogFontWeight"), wxNORMAL); g_DialogFont->SetFaceName( Line );
g_DialogFont->SetWeight(ii); ii = m_EDA_Config->Read( wxT( "DialogFontStyle" ), wxFONTFAMILY_ROMAN );
g_DialogFont->SetPointSize(g_DialogFontPointSize); g_DialogFont->SetStyle( ii );
ii = m_EDA_Config->Read( wxT( "DialogFontWeight" ), wxNORMAL );
g_FixedFont->SetPointSize(g_FixedFontPointSize); g_DialogFont->SetWeight( ii );
g_DialogFont->SetPointSize( g_DialogFontPointSize );
m_EDA_Config->Read(wxT("ShowPageLimits"), & g_ShowPageLimits);
g_FixedFont->SetPointSize( g_FixedFontPointSize );
if( m_EDA_Config->Read(wxT("WorkingDir"), &Line) )
m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits );
if( m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) )
{ {
if ( wxDirExists(Line) ) wxSetWorkingDirectory(Line); if( wxDirExists( Line ) )
wxSetWorkingDirectory( Line );
} }
m_EDA_Config->Read( wxT("BgColor"), &g_DrawBgColor); m_EDA_Config->Read( wxT( "BgColor" ), &g_DrawBgColor );
} }
...@@ -309,71 +330,76 @@ unsigned ii; ...@@ -309,71 +330,76 @@ unsigned ii;
void WinEDA_App::SaveSettings() void WinEDA_App::SaveSettings()
/**********************************/ /**********************************/
{ {
unsigned int ii; unsigned int ii;
if( m_EDA_Config == NULL ) return; if( m_EDA_Config == NULL )
return;
m_EDA_Config->Write(wxT("SdtFontSize"), g_StdFontPointSize); m_EDA_Config->Write( wxT( "SdtFontSize" ), g_StdFontPointSize );
m_EDA_Config->Write(wxT("SdtFontType"), g_StdFont->GetFaceName()); m_EDA_Config->Write( wxT( "SdtFontType" ), g_StdFont->GetFaceName() );
m_EDA_Config->Write(wxT("SdtFontStyle"), g_StdFont->GetStyle()); m_EDA_Config->Write( wxT( "SdtFontStyle" ), g_StdFont->GetStyle() );
m_EDA_Config->Write(wxT("SdtFontWeight"), g_StdFont->GetWeight()); m_EDA_Config->Write( wxT( "SdtFontWeight" ), g_StdFont->GetWeight() );
m_EDA_Config->Write(wxT("MsgFontSize"), g_MsgFontPointSize); m_EDA_Config->Write( wxT( "MsgFontSize" ), g_MsgFontPointSize );
m_EDA_Config->Write(wxT("MsgFontType"), g_MsgFont->GetFaceName()); m_EDA_Config->Write( wxT( "MsgFontType" ), g_MsgFont->GetFaceName() );
m_EDA_Config->Write(wxT("MsgFontStyle"), g_MsgFont->GetStyle()); m_EDA_Config->Write( wxT( "MsgFontStyle" ), g_MsgFont->GetStyle() );
m_EDA_Config->Write(wxT("MsgFontWeight"), g_MsgFont->GetWeight()); m_EDA_Config->Write( wxT( "MsgFontWeight" ), g_MsgFont->GetWeight() );
m_EDA_Config->Write(wxT("DialogFontSize"), g_DialogFontPointSize); m_EDA_Config->Write( wxT( "DialogFontSize" ), g_DialogFontPointSize );
m_EDA_Config->Write(wxT("DialogFontType"), g_DialogFont->GetFaceName()); m_EDA_Config->Write( wxT( "DialogFontType" ), g_DialogFont->GetFaceName() );
m_EDA_Config->Write(wxT("DialogFontStyle"), g_DialogFont->GetStyle()); m_EDA_Config->Write( wxT( "DialogFontStyle" ), g_DialogFont->GetStyle() );
m_EDA_Config->Write(wxT("DialogFontWeight"), g_DialogFont->GetWeight()); m_EDA_Config->Write( wxT( "DialogFontWeight" ), g_DialogFont->GetWeight() );
m_EDA_Config->Write(wxT("FixedFontSize"), g_FixedFontPointSize); m_EDA_Config->Write( wxT( "FixedFontSize" ), g_FixedFontPointSize );
m_EDA_Config->Write(wxT("ShowPageLimits"), g_ShowPageLimits); m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits );
m_EDA_Config->Write(wxT("WorkingDir"), wxGetCwd()); m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() );
for( ii = 0; ii < 10; ii++ ) for( ii = 0; ii < 10; ii++ )
{ {
wxString msg = wxT("LastProject"); wxString msg = wxT( "LastProject" );
if ( ii ) msg << ii; if( ii )
msg << ii;
if ( ii < m_LastProject.GetCount() ) if( ii < m_LastProject.GetCount() )
m_EDA_Config->Write(msg, m_LastProject[ii]); m_EDA_Config->Write( msg, m_LastProject[ii] );
else else
m_EDA_Config->Write(msg, wxEmptyString); m_EDA_Config->Write( msg, wxEmptyString );
} }
} }
/*********************************************/ /*********************************************/
bool WinEDA_App::SetLanguage(bool first_time) bool WinEDA_App::SetLanguage( bool first_time )
/*********************************************/ /*********************************************/
/* Set the dictionary file name for internationalization /* Set the dictionary file name for internationalization
the files are in kicad/internat/xx or kicad/internat/xx_XX * the files are in kicad/internat/xx or kicad/internat/xx_XX
and are named kicad.mo * and are named kicad.mo
*/ */
{ {
wxString DictionaryName( wxT("kicad")); // dictionary file name without extend (full name is kicad.mo) wxString DictionaryName( wxT( "kicad" ) ); // dictionary file name without extend (full name is kicad.mo)
wxString BaseDictionaryPath( wxT("internat")); // Real path is kicad/internat/xx_XX or kicad/internat/xx wxString BaseDictionaryPath( wxT( "internat" ) ); // Real path is kicad/internat/xx_XX or kicad/internat/xx
wxString dic_path; wxString dic_path;
if ( m_Locale != NULL ) delete m_Locale; if( m_Locale != NULL )
delete m_Locale;
m_Locale = new wxLocale(); m_Locale = new wxLocale();
m_Locale->Init(m_LanguageId); m_Locale->Init( m_LanguageId );
dic_path = ReturnKicadDatasPath() + BaseDictionaryPath; dic_path = ReturnKicadDatasPath() + BaseDictionaryPath;
m_Locale->AddCatalogLookupPathPrefix(dic_path); m_Locale->AddCatalogLookupPathPrefix( dic_path );
if ( ! first_time ) if( !first_time )
{ {
if ( m_EDA_CommonConfig ) if( m_EDA_CommonConfig )
m_EDA_CommonConfig->Write( wxT("Language"), m_LanguageId); m_EDA_CommonConfig->Write( wxT( "Language" ), m_LanguageId );
} }
if ( ! m_Locale->IsLoaded(DictionaryName) ) if( !m_Locale->IsLoaded( DictionaryName ) )
m_Locale->AddCatalog(DictionaryName); m_Locale->AddCatalog( DictionaryName );
SetLanguageList(NULL); SetLanguageList( NULL );
return m_Locale->IsOk(); return m_Locale->IsOk();
...@@ -381,13 +407,14 @@ wxString dic_path; ...@@ -381,13 +407,14 @@ wxString dic_path;
/**************************************************/ /**************************************************/
void WinEDA_App::SetLanguageIdentifier(int menu_id) void WinEDA_App::SetLanguageIdentifier( int menu_id )
/**************************************************/ /**************************************************/
/* return in m_LanguageId the language id (wxWidgets language identifier) /* return in m_LanguageId the language id (wxWidgets language identifier)
from menu id (internal menu identifier) * from menu id (internal menu identifier)
*/ */
{ {
switch (menu_id) switch( menu_id )
{ {
case ID_LANGUAGE_ITALIAN: case ID_LANGUAGE_ITALIAN:
m_LanguageId = wxLANGUAGE_ITALIAN; m_LanguageId = wxLANGUAGE_ITALIAN;
...@@ -422,163 +449,182 @@ void WinEDA_App::SetLanguageIdentifier(int menu_id) ...@@ -422,163 +449,182 @@ void WinEDA_App::SetLanguageIdentifier(int menu_id)
break; break;
case ID_LANGUAGE_HUNGARIAN: case ID_LANGUAGE_HUNGARIAN:
m_LanguageId = wxLANGUAGE_HUNGARIAN ; m_LanguageId = wxLANGUAGE_HUNGARIAN;
break; break;
case ID_LANGUAGE_POLISH: case ID_LANGUAGE_POLISH:
m_LanguageId = wxLANGUAGE_POLISH ; m_LanguageId = wxLANGUAGE_POLISH;
break; break;
case ID_LANGUAGE_KOREAN: case ID_LANGUAGE_KOREAN:
m_LanguageId = wxLANGUAGE_KOREAN; m_LanguageId = wxLANGUAGE_KOREAN;
break; break;
case ID_LANGUAGE_CATALAN:
m_LanguageId = wxLANGUAGE_CATALAN;
break;
default: default:
m_LanguageId = wxLANGUAGE_DEFAULT; m_LanguageId = wxLANGUAGE_DEFAULT;
break; break;
} }
} }
/*********************************************************/ /*********************************************************/
wxMenu * WinEDA_App::SetLanguageList(wxMenu * MasterMenu) wxMenu* WinEDA_App::SetLanguageList( wxMenu* MasterMenu )
/*********************************************************/ /*********************************************************/
/* Create menu list for language choice. /* Create menu list for language choice.
*/ */
{ {
wxMenuItem * item; wxMenuItem* item;
if ( m_Language_Menu == NULL ) if( m_Language_Menu == NULL )
{ {
m_Language_Menu = new wxMenu; m_Language_Menu = new wxMenu;
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_DEFAULT, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_DEFAULT,
_("Default"), wxEmptyString, wxITEM_CHECK ); _( "Default" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_def_xpm); SETBITMAPS( lang_def_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_ENGLISH, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_ENGLISH,
wxT("English"), wxEmptyString, wxITEM_CHECK); wxT( "English" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_en_xpm); SETBITMAPS( lang_en_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_FRENCH, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_FRENCH,
_("French"), wxEmptyString, wxITEM_CHECK); _( "French" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_fr_xpm); SETBITMAPS( lang_fr_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_SPANISH, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_SPANISH,
_("Spanish"), wxEmptyString, wxITEM_CHECK); _( "Spanish" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_es_xpm); SETBITMAPS( lang_es_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_PORTUGUESE, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_PORTUGUESE,
_("Portuguese"), wxEmptyString, wxITEM_CHECK); _( "Portuguese" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_pt_xpm); SETBITMAPS( lang_pt_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_ITALIAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_ITALIAN,
_("Italian"), wxEmptyString, wxITEM_CHECK); _( "Italian" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_it_xpm); SETBITMAPS( lang_it_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_GERMAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_GERMAN,
_("German"), wxEmptyString, wxITEM_CHECK); _( "German" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_de_xpm); SETBITMAPS( lang_de_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_SLOVENIAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_SLOVENIAN,
_("Slovenian"), wxEmptyString, wxITEM_CHECK); _( "Slovenian" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_sl_xpm); SETBITMAPS( lang_sl_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_HUNGARIAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_HUNGARIAN,
_("Hungarian"), wxEmptyString, wxITEM_CHECK); _( "Hungarian" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_hu_xpm); SETBITMAPS( lang_hu_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_POLISH, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_POLISH,
_("Polish"), wxEmptyString, wxITEM_CHECK); _( "Polish" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_po_xpm); SETBITMAPS( lang_po_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_RUSSIAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_RUSSIAN,
_("Russian"), wxEmptyString, wxITEM_CHECK); _( "Russian" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_ru_xpm); SETBITMAPS( lang_ru_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem(m_Language_Menu, ID_LANGUAGE_KOREAN, item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_KOREAN,
_("Korean"), wxEmptyString, wxITEM_CHECK); _( "Korean" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS(lang_ko_xpm); SETBITMAPS( lang_ko_xpm );
m_Language_Menu->Append(item); m_Language_Menu->Append( item );
item = new wxMenuItem( m_Language_Menu, ID_LANGUAGE_CATALAN,
_( "Catalan" ), wxEmptyString, wxITEM_CHECK );
SETBITMAPS( lang_catalan_xpm );
m_Language_Menu->Append( item );
} }
m_Language_Menu->Check(ID_LANGUAGE_KOREAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_CATALAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_RUSSIAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_KOREAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_POLISH, FALSE); m_Language_Menu->Check( ID_LANGUAGE_RUSSIAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_HUNGARIAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_POLISH, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_SLOVENIAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_HUNGARIAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_ITALIAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_SLOVENIAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_PORTUGUESE, FALSE); m_Language_Menu->Check( ID_LANGUAGE_ITALIAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_GERMAN, FALSE); m_Language_Menu->Check( ID_LANGUAGE_PORTUGUESE, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_SPANISH, FALSE); m_Language_Menu->Check( ID_LANGUAGE_GERMAN, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_FRENCH, FALSE); m_Language_Menu->Check( ID_LANGUAGE_SPANISH, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_ENGLISH, FALSE); m_Language_Menu->Check( ID_LANGUAGE_FRENCH, FALSE );
m_Language_Menu->Check(ID_LANGUAGE_DEFAULT, FALSE); m_Language_Menu->Check( ID_LANGUAGE_ENGLISH, FALSE );
m_Language_Menu->Check( ID_LANGUAGE_DEFAULT, FALSE );
switch ( m_LanguageId )
switch( m_LanguageId )
{ {
case wxLANGUAGE_CATALAN:
m_Language_Menu->Check( ID_LANGUAGE_CATALAN, TRUE );
break;
case wxLANGUAGE_KOREAN: case wxLANGUAGE_KOREAN:
m_Language_Menu->Check(ID_LANGUAGE_KOREAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_KOREAN, TRUE );
break; break;
case wxLANGUAGE_RUSSIAN: case wxLANGUAGE_RUSSIAN:
m_Language_Menu->Check(ID_LANGUAGE_RUSSIAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_RUSSIAN, TRUE );
break; break;
case wxLANGUAGE_GERMAN: case wxLANGUAGE_GERMAN:
m_Language_Menu->Check(ID_LANGUAGE_GERMAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_GERMAN, TRUE );
break; break;
case wxLANGUAGE_FRENCH: case wxLANGUAGE_FRENCH:
m_Language_Menu->Check(ID_LANGUAGE_FRENCH, TRUE); m_Language_Menu->Check( ID_LANGUAGE_FRENCH, TRUE );
break; break;
case wxLANGUAGE_ENGLISH: case wxLANGUAGE_ENGLISH:
m_Language_Menu->Check(ID_LANGUAGE_ENGLISH, TRUE); m_Language_Menu->Check( ID_LANGUAGE_ENGLISH, TRUE );
break; break;
case wxLANGUAGE_SPANISH: case wxLANGUAGE_SPANISH:
m_Language_Menu->Check(ID_LANGUAGE_SPANISH, TRUE); m_Language_Menu->Check( ID_LANGUAGE_SPANISH, TRUE );
break; break;
case wxLANGUAGE_PORTUGUESE: case wxLANGUAGE_PORTUGUESE:
m_Language_Menu->Check(ID_LANGUAGE_PORTUGUESE, TRUE); m_Language_Menu->Check( ID_LANGUAGE_PORTUGUESE, TRUE );
break; break;
case wxLANGUAGE_ITALIAN: case wxLANGUAGE_ITALIAN:
m_Language_Menu->Check(ID_LANGUAGE_ITALIAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_ITALIAN, TRUE );
break; break;
case wxLANGUAGE_SLOVENIAN: case wxLANGUAGE_SLOVENIAN:
m_Language_Menu->Check(ID_LANGUAGE_SLOVENIAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_SLOVENIAN, TRUE );
break; break;
case wxLANGUAGE_HUNGARIAN: case wxLANGUAGE_HUNGARIAN:
m_Language_Menu->Check(ID_LANGUAGE_HUNGARIAN, TRUE); m_Language_Menu->Check( ID_LANGUAGE_HUNGARIAN, TRUE );
break; break;
case wxLANGUAGE_POLISH: case wxLANGUAGE_POLISH:
m_Language_Menu->Check(ID_LANGUAGE_POLISH, TRUE); m_Language_Menu->Check( ID_LANGUAGE_POLISH, TRUE );
break; break;
default: default:
m_Language_Menu->Check(ID_LANGUAGE_DEFAULT, TRUE); m_Language_Menu->Check( ID_LANGUAGE_DEFAULT, TRUE );
break; break;
} }
if ( MasterMenu ) if( MasterMenu )
{ {
ADD_MENUITEM_WITH_HELP_AND_SUBMENU(MasterMenu, m_Language_Menu, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( MasterMenu, m_Language_Menu,
ID_LANGUAGE_CHOICE, _("Language"), ID_LANGUAGE_CHOICE, _( "Language" ),
wxT("For test only, use Default setup for normal use"), wxT( "For test only, use Default setup for normal use" ),
language_xpm); language_xpm );
} }
return m_Language_Menu; return m_Language_Menu;
} }
...@@ -592,4 +638,3 @@ int WinEDA_App::OnRun() ...@@ -592,4 +638,3 @@ int WinEDA_App::OnRun()
#endif #endif
return wxApp::OnRun(); return wxApp::OnRun();
} }
include/id.h
View file @ 13a847d3
...@@ -147,7 +147,7 @@ enum main_id { ...@@ -147,7 +147,7 @@ enum main_id {
ID_LANGUAGE_HUNGARIAN, ID_LANGUAGE_HUNGARIAN,
ID_LANGUAGE_POLISH, ID_LANGUAGE_POLISH,
ID_LANGUAGE_KOREAN, ID_LANGUAGE_KOREAN,
ID_LANGUAGE_UNUSED2, ID_LANGUAGE_CATALAN,
ID_LANGUAGE_UNUSED3, ID_LANGUAGE_UNUSED3,
ID_LANGUAGE_UNUSED4, ID_LANGUAGE_UNUSED4,
ID_LANGUAGE_CHOICE_END, ID_LANGUAGE_CHOICE_END,
......
internat/ca/kicad.po 0 → 100644
View file @ 13a847d3
This source diff could not be displayed because it is too large. You can view the blob instead.
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