From a3c60f3692fe6af7abd43bd6704615ad426f25db Mon Sep 17 00:00:00 2001 From: CHARRAS Date: Wed, 24 Oct 2007 19:19:47 +0000 Subject: [PATCH] cvpcb: 2 missing .prj files added --- change_log.txt | 6 + cvpcb/dialog_cvpcb_config.cpp | 9 +- cvpcb/dialog_cvpcb_config.pjd | 1575 ++++++++++++++++++++++++++++++ cvpcb/dialog_display_options.cpp | 171 ++-- cvpcb/dialog_display_options.h | 33 +- cvpcb/dialog_display_options.pjd | 955 ++++++++++++++++++ internat/fr/kicad.mo | Bin 133902 -> 134017 bytes internat/fr/kicad.po | 402 ++++---- 8 files changed, 2883 insertions(+), 268 deletions(-) create mode 100644 cvpcb/dialog_cvpcb_config.pjd create mode 100644 cvpcb/dialog_display_options.pjd diff --git a/change_log.txt b/change_log.txt index 19ea8afa3c..b580a5d8b4 100644 --- a/change_log.txt +++ b/change_log.txt @@ -4,6 +4,12 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2007-Oct-24 UPDATE Jean-Pierre Charras +================================================================================ ++ cvpcb: + 2 missing .prj files added (and updated) + dialog_display_option.cpp is rebuild from its dialog_display_option.prj source + 2007-Oct-23 UPDATE Geoff Harland ================================================================================ diff --git a/cvpcb/dialog_cvpcb_config.cpp b/cvpcb/dialog_cvpcb_config.cpp index 9041963f99..9d533ac9d4 100644 --- a/cvpcb/dialog_cvpcb_config.cpp +++ b/cvpcb/dialog_cvpcb_config.cpp @@ -261,10 +261,11 @@ wxBitmap KiConfigCvpcbFrame::GetBitmapResource( const wxString& name ) wxIcon KiConfigCvpcbFrame::GetIconResource( const wxString& name ) { // Icon retrieval -////@begin KiConfigCvpcbFrame icon retrieval - wxUnusedVar(name); - return wxNullIcon; -////@end KiConfigCvpcbFrame icon retrieval + #ifdef __WINDOWS__ + return( wxICON(a_icon_cvpcb)); + #else + return( wxICON(icon_cvpcb)); + #endif } /*! * wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG diff --git a/cvpcb/dialog_cvpcb_config.pjd b/cvpcb/dialog_cvpcb_config.pjd new file mode 100644 index 0000000000..b7d19e42ad --- /dev/null +++ b/cvpcb/dialog_cvpcb_config.pjd @@ -0,0 +1,1575 @@ + + +
+ 0 + "" + "" + "" + "" + "" + 0 + 0 + 0 + 1 + 1 + 0 + "jean-pierre Charras" + "License GNU" + "" + 0 + 0 + "<All platforms>" + "<Any>" + "///////////////////////////////////////////////////////////////////////////// +// Name: %HEADER-FILENAME% +// Purpose: +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "///////////////////////////////////////////////////////////////////////////// +// Name: %SOURCE-FILENAME% +// Purpose: +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "///////////////////////////////////////////////////////////////////////////// +// Name: %SYMBOLS-FILENAME% +// Purpose: Symbols file +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma interface "%HEADER-FILENAME%" +#endif + +" + "#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "%HEADER-FILENAME%" +#endif + +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif + +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + +" + "app_resources.h" + "app_resources.cpp" + "AppResources" + "app.h" + "app.cpp" + "Application" + 0 + "" + "<None>" + "<System>" + "utf-8" + "<System>" + "" + 0 + 0 + 4 + " " + "" + 0 + 0 + 1 + 1 + 1 + 0 + 1 +
+ + + "" + "data-document" + "" + "" + 0 + 1 + 0 + 0 + + "Configurations" + "config-data-document" + "" + "" + 0 + 1 + 0 + 0 + "" + 1 + "" + "Debug" + "ANSI" + "Static" + "Modular" + "GUI" + "wxMSW" + "Dynamic" + "Yes" + "No" + "No" + "%WXVERSION%" + "%EXECUTABLE%" + "" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + + + + + + + "Projects" + "root-document" + "" + "project" + 1 + 1 + 0 + 1 + + "Windows" + "html-document" + "" + "dialogsfolder" + 1 + 1 + 0 + 1 + + "Config_dialog_frame" + "dialog-document" + "" + "dialog" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbDialogProxy" + 10000 + 0 + "" + 0 + "" + 0 + "ID_DIALOG" + 10000 + "KiConfigCvpcbFrame" + "wxDialog" + "wxDialog" + "dialog_cvpcb_config.cpp" + "dialog_cvpcb_config.h" + "" + "Dialog" + 1 + "" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + "" + 0 + 1 + -1 + -1 + 400 + 300 + 0 + "" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Expand" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxButton: SAVE_CFG" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnSaveCfgClick" + "SAVE_CFG" + 10001 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Save Cfg" + 0 + "" + "" + "" + "C60000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + "" + "" + + + "wxButton: ID_READ_OLDCFG" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnReadOldcfgClick" + "ID_READ_OLDCFG" + 10002 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Read Cfg" + 0 + "" + "" + "" + "0000FF" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + "" + "" + + + "wxButton: wxID_OK" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick" + "wxID_OK" + 5100 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "&OK" + 0 + "" + "" + "" + "008000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + "" + "" + + + "wxRadioBox: FORMAT_NETLIST" + "dialog-control-document" + "" + "radiobox" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbRadioBoxProxy" + "wxEVT_COMMAND_RADIOBOX_SELECTED|OnFormatNetlistSelected" + "FORMAT_NETLIST" + 10003 + "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" + "m_NetFormatBox" + "NetList Formats:" + 1 + "&PcbNew|&ViewLogic|View &Net + Pkg" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + 0 + 1 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxStaticBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/11/2006" + "wbStaticBoxSizerProxy" + "wxID_ANY" + "-1" + "Files ext:" + "" + "m_FileExtList" + "" + "" + 0 + 1 + "wxStaticBox" + "Vertical" + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "m_RightBoxSizer" + "Centre" + "Expand" + 0 + 5 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Horizontal" + "" + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Expand" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Horizontal" + "" + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxButton: DEL_LIB" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnDelLibClick" + "DEL_LIB" + 10004 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Del" + 0 + "" + "" + "" + "BF0000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Expand" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: ADD_LIB" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnAddLibClick" + "ADD_LIB" + 10005 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Add" + 0 + "" + "" + "" + "008000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: INSERT_LIB" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnInsertLibClick" + "INSERT_LIB" + 10006 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Ins" + 0 + "" + "" + "" + "0000FF" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" + "" + "Libraries" + -1 + "" + "" + "" + "CC0000" + "" + 0 + 1 + "<Any platform>" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Left" + "Centre" + 0 + 5 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + "" + "" + + + "wxListBox: ID_LISTBOX" + "dialog-control-document" + "" + "listbox" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbListBoxProxy" + "ID_LISTBOX" + 10010 + "wxListBox" + "wxListBox" + 1 + 0 + "" + "" + "m_ListLibr" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + 200 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + "" + "" + + + + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Expand" + 0 + 5 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Horizontal" + "" + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxButton: DEL_EQU" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnDelEquClick" + "DEL_EQU" + 10007 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Del" + 0 + "" + "" + "" + "C40000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: ADD_EQU" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnAddEquClick" + "ADD_EQU" + 10008 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Add" + 0 + "" + "" + "" + "008000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: INSERT_EQU" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnInsertEquClick" + "INSERT_EQU" + 10009 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Ins" + 0 + "" + "" + "" + "0000FF" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Vertical" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" + "" + "Equiv" + -1 + "" + "" + "" + "CC0000" + "" + 0 + 1 + "<Any platform>" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Left" + "Centre" + 0 + 5 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + "" + "" + + + "wxListBox: ID_LISTBOX1" + "dialog-control-document" + "" + "listbox" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbListBoxProxy" + "ID_LISTBOX1" + 10011 + "wxListBox" + "wxListBox" + 1 + 0 + "" + "" + "m_ListEquiv" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + 200 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + "" + "" + + + + + + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "17/9/2006" + "wbBoxSizerProxy" + "Horizontal" + "m_FileExtBoxSizerH" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "28/4/2006" + "wbBoxSizerProxy" + "Vertical" + "m_NetExtBoxSizer" + "Centre" + "Expand" + 0 + 5 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "28/4/2006" + "wbBoxSizerProxy" + "Vertical" + "m_PkgExtBoxSizer" + "Centre" + "Expand" + 0 + 5 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + + + + + + + "Sources" + "html-document" + "" + "sourcesfolder" + 1 + 1 + 0 + 1 + + "dialog_cvpcb_config.rc" + "source-editor-document" + "dialog_cvpcb_config.rc" + "source-editor" + 0 + 0 + 1 + 0 + "17/11/2006" + "" + + + + "Images" + "html-document" + "" + "bitmapsfolder" + 1 + 1 + 0 + 1 + + + + + diff --git a/cvpcb/dialog_display_options.cpp b/cvpcb/dialog_display_options.cpp index 9767dde9f1..28c0e2d772 100644 --- a/cvpcb/dialog_display_options.cpp +++ b/cvpcb/dialog_display_options.cpp @@ -66,6 +66,14 @@ IMPLEMENT_DYNAMIC_CLASS( KiDisplayOptionsFrame, wxDialog ) BEGIN_EVENT_TABLE( KiDisplayOptionsFrame, wxDialog ) ////@begin KiDisplayOptionsFrame event table entries + EVT_RADIOBOX( EDGE_SELECT, KiDisplayOptionsFrame::OnEdgeSelectSelected ) + + EVT_RADIOBOX( TEXT_SELECT, KiDisplayOptionsFrame::OnTextSelectSelected ) + + EVT_CHECKBOX( PADFILL_OPT, KiDisplayOptionsFrame::OnPadfillOptClick ) + + EVT_CHECKBOX( PADNUM_OPT, KiDisplayOptionsFrame::OnPadnumOptClick ) + EVT_BUTTON( ID_SAVE_CONFIG, KiDisplayOptionsFrame::OnSaveConfigClick ) EVT_BUTTON( wxID_OK, KiDisplayOptionsFrame::OnOkClick ) @@ -102,17 +110,19 @@ bool KiDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxStr ////@begin KiDisplayOptionsFrame member initialisation m_EdgesDisplayOption = NULL; m_TextDisplayOption = NULL; - m_IsShowPadNum = NULL; m_IsShowPadFill = NULL; + m_IsShowPadNum = NULL; ////@end KiDisplayOptionsFrame member initialisation ////@begin KiDisplayOptionsFrame creation - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); + SetExtraStyle(wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); - GetSizer()->Fit(this); - GetSizer()->SetSizeHints(this); + if (GetSizer()) + { + GetSizer()->SetSizeHints(this); + } Centre(); ////@end KiDisplayOptionsFrame creation return true; @@ -127,7 +137,7 @@ void KiDisplayOptionsFrame::CreateControls() SetFont(*g_DialogFont); ////@begin KiDisplayOptionsFrame content construction - // Generated by DialogBlocks, 17/02/2006 18:31:55 (unregistered) + // Generated by DialogBlocks, 24/10/2007 22:11:46 (unregistered) KiDisplayOptionsFrame* itemDialog1 = this; @@ -135,76 +145,65 @@ void KiDisplayOptionsFrame::CreateControls() itemDialog1->SetSizer(itemBoxSizer2); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); -// itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_TOP|wxALL, 5); + itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL); -// itemBoxSizer2->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - itemBoxSizer2->Add(itemBoxSizer4, 0, wxGROW|wxALIGN_TOP|wxALL, 5); + wxArrayString m_EdgesDisplayOptionStrings; + m_EdgesDisplayOptionStrings.Add(_("&Line")); + m_EdgesDisplayOptionStrings.Add(_("&Filled")); + m_EdgesDisplayOptionStrings.Add(_("&Sketch")); + m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS ); + m_EdgesDisplayOption->SetSelection(0); + itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxGROW|wxALL, 5); - wxString m_EdgesDisplayOptionStrings[] = { - _("&Filaire"), - _("&Filled"), - _("&Sketch") - }; - m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, 3, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS ); -// itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxGROW|wxALL, 5); - itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxALIGN_LEFT|wxALL, 5); + wxArrayString m_TextDisplayOptionStrings; + m_TextDisplayOptionStrings.Add(_("&Line")); + m_TextDisplayOptionStrings.Add(_("&Filled")); + m_TextDisplayOptionStrings.Add(_("&Sketch")); + m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS ); + m_TextDisplayOption->SetSelection(0); + itemBoxSizer3->Add(m_TextDisplayOption, 0, wxGROW|wxALL, 5); - wxString m_TextDisplayOptionStrings[] = { - _("&Filaire"), - _("&Filled"), - _("&Sketch") - }; - m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, 3, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS ); -// itemBoxSizer3->Add(m_TextDisplayOption, 0, wxGROW|wxALL, 5); - itemBoxSizer3->Add(m_TextDisplayOption, 0, wxALIGN_LEFT|wxALL, 5); + wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer3->Add(itemBoxSizer6, 0, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); -// itemBoxSizer3->Add(itemBoxSizer5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer3->Add(itemBoxSizer5, 0, wxGROW|wxALL, 0); - - // Provide a spacer to improve appearance of dialog box - itemBoxSizer5->AddSpacer(5); - - m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); - m_IsShowPadNum->SetValue(false); -// itemBoxSizer5->Add(m_IsShowPadNum, 0, wxGROW|wxALL, 5); - itemBoxSizer5->Add(m_IsShowPadNum, 0, wxALIGN_TOP|wxALL, 5); - - m_IsShowPadFill = new wxCheckBox( itemDialog1, PADFILL_OPT, _("&Pad Fill"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + m_IsShowPadFill = new wxCheckBox( itemDialog1, PADFILL_OPT, _("&Pad Filled"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_IsShowPadFill->SetValue(false); -// itemBoxSizer5->Add(m_IsShowPadFill, 0, wxGROW|wxALL, 5); - itemBoxSizer5->Add(m_IsShowPadFill, 0, wxALIGN_TOP|wxALL, 5); + itemBoxSizer6->Add(m_IsShowPadFill, 0, wxGROW|wxALL, 5); - // Provide a stretch spacer to improve appearance of dialog box - itemBoxSizer5->AddStretchSpacer(); + m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + m_IsShowPadNum->SetValue(false); + if (ShowToolTips()) + m_IsShowPadNum->SetToolTip(_("Display pad number")); + itemBoxSizer6->Add(m_IsShowPadNum, 0, wxGROW|wxALL, 5); - wxButton* itemButton6 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg..."), wxDefaultPosition, wxDefaultSize, 0 ); -// itemBoxSizer5->Add(itemButton6, 0, wxGROW|wxALL, 5); - itemBoxSizer5->Add(itemButton6, 0, wxALIGN_BOTTOM|wxALL, 5); + itemBoxSizer6->Add(5, 5, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5); -// itemBoxSizer4->AddStretchSpacer(); + wxButton* itemButton10 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer6->Add(itemButton10, 0, wxGROW|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton7->SetForegroundColour(*wxRED); -// itemBoxSizer4->Add(itemButton7, 0, wxGROW|wxALL, 5); - itemBoxSizer4->Add(itemButton7, 0, wxALIGN_RIGHT|wxALL, 5); + wxStaticLine* itemStaticLine11 = new wxStaticLine( itemDialog1, ID_STATICLINE1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + itemBoxSizer2->Add(itemStaticLine11, 0, wxGROW|wxALL, 5); - wxButton* itemButton8 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton8->SetForegroundColour(*wxBLUE); -// itemBoxSizer4->Add(itemButton8, 0, wxGROW|wxALL, 5); - itemBoxSizer4->Add(itemButton8, 0, wxALIGN_RIGHT|wxALL, 5); + wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer2->Add(itemBoxSizer12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton9 = new wxButton( itemDialog1, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 ); -// itemBoxSizer4->Add(itemButton9, 0, wxGROW|wxALL, 5); - itemBoxSizer4->Add(itemButton9, 0, wxALIGN_RIGHT|wxALL, 5); + wxButton* itemButton13 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton13->SetDefault(); + itemButton13->SetForegroundColour(wxColour(255, 0, 0)); + itemBoxSizer12->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton14->SetForegroundColour(wxColour(0, 0, 255)); + itemBoxSizer12->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + wxButton* itemButton15 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer12->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_EdgesDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModEdge) ); m_TextDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModText) ); - m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) ); m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) ); + m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) ); ////@end KiDisplayOptionsFrame content construction } @@ -247,7 +246,7 @@ wxIcon KiDisplayOptionsFrame::GetIconResource( const wxString& name ) * Update settings related to edges, text strings, and pads */ -void KiDisplayOptionsFrame::UpdateObjectSettings() +void KiDisplayOptionsFrame::UpdateObjectSettings(void) { // Update settings ////@begin KiDisplayOptionsFrame update settings @@ -305,3 +304,55 @@ void KiDisplayOptionsFrame::OnApplyClick( wxCommandEvent& event ) } + +/*! + * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT + */ + +void KiDisplayOptionsFrame::OnEdgeSelectSelected( wxCommandEvent& event ) +{ +////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame. + // Before editing this code, remove the block markers. + event.Skip(); +////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame. +} + + +/*! + * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT + */ + +void KiDisplayOptionsFrame::OnTextSelectSelected( wxCommandEvent& event ) +{ +////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame. + // Before editing this code, remove the block markers. + event.Skip(); +////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame. +} + + +/*! + * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT + */ + +void KiDisplayOptionsFrame::OnPadfillOptClick( wxCommandEvent& event ) +{ +////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame. + // Before editing this code, remove the block markers. + event.Skip(); +////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame. +} + + +/*! + * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT + */ + +void KiDisplayOptionsFrame::OnPadnumOptClick( wxCommandEvent& event ) +{ +////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame. + // Before editing this code, remove the block markers. + event.Skip(); +////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame. +} + diff --git a/cvpcb/dialog_display_options.h b/cvpcb/dialog_display_options.h index e28fd22fc1..636b345f21 100644 --- a/cvpcb/dialog_display_options.h +++ b/cvpcb/dialog_display_options.h @@ -24,6 +24,7 @@ ////@begin includes #include "wx/valgen.h" +#include "wx/statline.h" ////@end includes /*! @@ -39,16 +40,17 @@ ////@begin control identifiers #define ID_DIALOG 10000 -#define SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER +#define EDGE_SELECT 10003 +#define TEXT_SELECT 10004 +#define PADFILL_OPT 10001 +#define PADNUM_OPT 10002 +#define ID_SAVE_CONFIG 10005 +#define ID_STATICLINE1 10007 +#define SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX #define SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE _("Options") #define SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME ID_DIALOG #define SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE wxSize(400, 300) #define SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION wxDefaultPosition -#define PADNUM_OPT 10002 -#define ID_SAVE_CONFIG 10005 -#define PADFILL_OPT 10001 -#define EDGE_SELECT 10003 -#define TEXT_SELECT 10004 ////@end control identifiers /*! @@ -81,6 +83,18 @@ public: ////@begin KiDisplayOptionsFrame event handler declarations + /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT + void OnEdgeSelectSelected( wxCommandEvent& event ); + + /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT + void OnTextSelectSelected( wxCommandEvent& event ); + + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT + void OnPadfillOptClick( wxCommandEvent& event ); + + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT + void OnPadnumOptClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SAVE_CONFIG void OnSaveConfigClick( wxCommandEvent& event ); @@ -102,19 +116,18 @@ public: /// Retrieves icon resources wxIcon GetIconResource( const wxString& name ); - - /// Updates settings related to edges, text strings, and pads - void UpdateObjectSettings(); ////@end KiDisplayOptionsFrame member function declarations /// Should we show tooltips? static bool ShowToolTips(); + + void UpdateObjectSettings(void); ////@begin KiDisplayOptionsFrame member variables wxRadioBox* m_EdgesDisplayOption; wxRadioBox* m_TextDisplayOption; - wxCheckBox* m_IsShowPadNum; wxCheckBox* m_IsShowPadFill; + wxCheckBox* m_IsShowPadNum; ////@end KiDisplayOptionsFrame member variables WinEDA_BasePcbFrame * m_Parent; diff --git a/cvpcb/dialog_display_options.pjd b/cvpcb/dialog_display_options.pjd new file mode 100644 index 0000000000..25105b2fe6 --- /dev/null +++ b/cvpcb/dialog_display_options.pjd @@ -0,0 +1,955 @@ + + +
+ 0 + "" + "" + "" + "" + "" + 0 + 0 + 0 + 1 + 1 + 0 + "jean-pierre Charras" + "License GNU" + "" + 0 + 0 + "<All platforms>" + "<Any>" + "///////////////////////////////////////////////////////////////////////////// +// Name: %HEADER-FILENAME% +// Purpose: +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "///////////////////////////////////////////////////////////////////////////// +// Name: %SOURCE-FILENAME% +// Purpose: +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "///////////////////////////////////////////////////////////////////////////// +// Name: %SYMBOLS-FILENAME% +// Purpose: Symbols file +// Author: %AUTHOR% +// Modified by: +// Created: %DATE% +// RCS-ID: +// Copyright: %COPYRIGHT% +// Licence: +///////////////////////////////////////////////////////////////////////////// + +" + "#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma interface "%HEADER-FILENAME%" +#endif + +" + "#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "%HEADER-FILENAME%" +#endif + +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif + +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + +" + "app_resources.h" + "app_resources.cpp" + "AppResources" + "app.h" + "app.cpp" + "Application" + 0 + "" + "<None>" + "<System>" + "utf-8" + "<System>" + "" + 0 + 0 + 4 + " " + "" + 0 + 0 + 1 + 1 + 1 + 0 + 1 +
+ + + "" + "data-document" + "" + "" + 0 + 1 + 0 + 0 + + "Configurations" + "config-data-document" + "" + "" + 0 + 1 + 0 + 0 + "" + 1 + "" + "Debug" + "ANSI" + "Static" + "Modular" + "GUI" + "wxMSW" + "Dynamic" + "Yes" + "No" + "No" + "%WXVERSION%" + "%EXECUTABLE%" + "" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + + + + + + + "Projects" + "root-document" + "" + "project" + 1 + 1 + 0 + 1 + + "Windows" + "html-document" + "" + "dialogsfolder" + 1 + 1 + 0 + 1 + + "Options" + "dialog-document" + "" + "dialog" + 0 + 1 + 0 + 0 + "17/6/2006" + "wbDialogProxy" + 10000 + 0 + "" + 0 + "" + 0 + "ID_DIALOG" + 10000 + "KiDisplayOptionsFrame" + "wxDialog" + "wxDialog" + "dialog_display_options.cpp" + "dialog_display_options.h" + "" + "Options" + 1 + "" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + "" + 0 + 1 + -1 + -1 + 400 + 300 + 0 + "" + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbBoxSizerProxy" + "Vertical" + "" + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxRadioBox: EDGE_SELECT" + "dialog-control-document" + "" + "radiobox" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbRadioBoxProxy" + "wxEVT_COMMAND_RADIOBOX_SELECTED|OnEdgeSelectSelected" + "EDGE_SELECT" + 10003 + "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" + "m_EdgesDisplayOption" + "Edges:" + 1 + "&Line|&Filled|&Sketch" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "DisplayOpt.DisplayModEdge" + "wxGenericValidator(& %VARIABLE%)" + 0 + 1 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Left" + "Expand" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxRadioBox: TEXT_SELECT" + "dialog-control-document" + "" + "radiobox" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbRadioBoxProxy" + "wxEVT_COMMAND_RADIOBOX_SELECTED|OnTextSelectSelected" + "TEXT_SELECT" + 10004 + "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" + "m_TextDisplayOption" + "Texts:" + 1 + "&Line|&Filled|&Sketch" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "DisplayOpt.DisplayModText" + "wxGenericValidator(& %VARIABLE%)" + 0 + 1 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Expand" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbBoxSizerProxy" + "Vertical" + "" + "Centre" + "Expand" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxCheckBox: PADFILL_OPT" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbCheckBoxProxy" + "wxEVT_COMMAND_CHECKBOX_CLICKED|OnPadfillOptClick" + "PADFILL_OPT" + 10001 + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_IsShowPadFill" + "&Pad Filled" + 0 + "" + "" + "DisplayOpt.DisplayPadFill" + "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxCheckBox: PADNUM_OPT" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbCheckBoxProxy" + "wxEVT_COMMAND_CHECKBOX_CLICKED|OnPadnumOptClick" + "PADNUM_OPT" + 10002 + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_IsShowPadNum" + "Display Pad &Num" + 0 + "" + "Display pad number" + "DisplayOpt.DisplayPadNum" + "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "Spacer" + "dialog-control-document" + "" + "spacer" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbSpacerProxy" + 5 + 5 + "Expand" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + "wxButton: ID_SAVE_CONFIG" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnSaveConfigClick|||" + "ID_SAVE_CONFIG" + 10005 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "Save Cfg" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + + "wxStaticLine: ID_STATICLINE1" + "dialog-control-document" + "" + "staticline" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbStaticLineProxy" + "ID_STATICLINE1" + 10007 + "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbBoxSizerProxy" + "Horizontal" + "" + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + "wxButton: wxID_OK" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick|NONE||" + "wxID_OK" + 5100 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "&OK" + 1 + "" + "" + "" + "FF0000" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: wxID_CANCEL" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||" + "wxID_CANCEL" + 5101 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "&Cancel" + 0 + "" + "" + "" + "0000FF" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxButton: wxID_APPLY" + "dialog-control-document" + "" + "dialogcontrol" + 0 + 1 + 0 + 0 + "24/10/2007" + "wbButtonProxy" + "wxEVT_COMMAND_BUTTON_CLICKED|OnApplyClick|NONE||" + "wxID_APPLY" + 5102 + "wxButton" + "wxButton" + 1 + 0 + "" + "" + "" + "&Apply" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + + + + "Sources" + "html-document" + "" + "sourcesfolder" + 1 + 1 + 0 + 1 + + "dialog_display_options.rc" + "source-editor-document" + "dialog_display_options.rc" + "source-editor" + 0 + 0 + 1 + 0 + "17/6/2006" + "" + + + + "Images" + "html-document" + "" + "bitmapsfolder" + 1 + 1 + 0 + 1 + + + + + diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 1dceb66c0ecef5ecaa158ed37c7c74923d02d366..241ef8662eb33b0c8e38d93094c1fb89d6914022 100644 GIT binary patch delta 48208 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 delta 48116 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 MV!LeYwf)Ke1B!qDDgXcg diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 329986291d..aacaf1692c 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-10-21 19:16+0100\n" +"PO-Revision-Date: 2007-10-24 22:13+0100\n" "Last-Translator: \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgid "Connect" msgstr "Connect" #: pcbnew/class_board.cpp:329 -#: eeschema/eelayer.cpp:177 +#: eeschema/eelayer.h:115 msgid "NoConn" msgstr "Non Conn" @@ -325,7 +325,7 @@ msgstr "Module [%s] non trouv #: pcbnew/librairi.cpp:518 #: pcbnew/librairi.cpp:712 #: pcbnew/plothpgl.cpp:67 -#: pcbnew/files.cpp:314 +#: pcbnew/files.cpp:321 #: pcbnew/gen_modules_placefile.cpp:87 #: pcbnew/gen_modules_placefile.cpp:98 #: pcbnew/gen_modules_placefile.cpp:251 @@ -491,7 +491,7 @@ msgstr "Tst Pistes\n" #: pcbnew/drc.cpp:361 #: pcbnew/drc.cpp:439 -#: eeschema/eelayer.cpp:141 +#: eeschema/eelayer.h:103 msgid "Netname" msgstr "NetName" @@ -845,11 +845,11 @@ msgstr "Inclure couche Edge" #: pcbnew/sel_layer.cpp:162 #: pcbnew/sel_layer.cpp:320 #: eeschema/sheetlab.cpp:97 +#: eeschema/eelayer.cpp:252 #: eeschema/libedit_onrightclick.cpp:68 #: eeschema/libedit_onrightclick.cpp:83 #: eeschema/onrightclick.cpp:121 #: eeschema/onrightclick.cpp:133 -#: cvpcb/dialog_display_options.cpp:194 #: gerbview/set_color.cpp:253 #: gerbview/options.cpp:167 #: gerbview/options.cpp:296 @@ -875,7 +875,7 @@ msgstr "Annuler" #: pcbnew/sel_layer.cpp:158 #: pcbnew/sel_layer.cpp:316 #: eeschema/sheetlab.cpp:93 -#: cvpcb/dialog_display_options.cpp:189 +#: eeschema/eelayer.cpp:248 #: gerbview/set_color.cpp:249 #: gerbview/options.cpp:163 #: gerbview/options.cpp:292 @@ -1131,6 +1131,7 @@ msgstr "Offset Y" #: eeschema/dialog_cmp_graphic_properties.cpp:178 #: eeschema/pinedit-dialog.cpp:308 #: eeschema/dialog_build_BOM.cpp:339 +#: cvpcb/dialog_display_options.cpp:190 #: cvpcb/dialog_cvpcb_config.cpp:135 #: share/setpage.cpp:232 msgid "&OK" @@ -1154,6 +1155,7 @@ msgstr "&OK" #: eeschema/dialog_cmp_graphic_properties.cpp:182 #: eeschema/pinedit-dialog.cpp:304 #: eeschema/dialog_build_BOM.cpp:343 +#: cvpcb/dialog_display_options.cpp:195 #: share/setpage.cpp:237 msgid "&Cancel" msgstr "&Annuler" @@ -1285,6 +1287,7 @@ msgstr "De " #: pcbnew/dialog_setup_libs.cpp:153 #: eeschema/eestatus.cpp:116 #: eeschema/dialog_eeschema_config.cpp:161 +#: cvpcb/dialog_display_options.cpp:181 #: cvpcb/dialog_cvpcb_config.cpp:127 msgid "Save Cfg" msgstr "Sauver config" @@ -1414,10 +1417,10 @@ msgstr "Couche:" #: pcbnew/dialog_netlist.cpp:133 #: pcbnew/class_board_item.cpp:76 -#: eeschema/eelayer.cpp:99 #: eeschema/dialog_create_component.cpp:164 #: eeschema/onrightclick.cpp:317 #: eeschema/edit_component_in_schematic.cpp:745 +#: eeschema/eelayer.h:152 msgid "Reference" msgstr "Référence" @@ -1859,7 +1862,9 @@ msgid "Zoom " msgstr "Zoom " #: pcbnew/tool_pcb.cpp:585 +#: eeschema/eelayer.cpp:223 #: pcbnew/set_color.h:335 +#: eeschema/eelayer.h:209 #: gerbview/set_color.h:246 msgid "Grid" msgstr "Grille" @@ -1991,10 +1996,10 @@ msgstr "Texte Pcb" #: pcbnew/class_board_item.cpp:80 #: pcbnew/class_text_mod.cpp:323 #: pcbnew/class_edge_mod.cpp:286 -#: eeschema/eelayer.cpp:105 #: eeschema/component_class.cpp:55 #: eeschema/onrightclick.cpp:316 #: eeschema/edit_component_in_schematic.cpp:784 +#: eeschema/eelayer.h:158 msgid "Value" msgstr "Valeur" @@ -2795,42 +2800,6 @@ msgstr "connecte une extr msgid "Clean pcb" msgstr "Nettoyage PCB" -#: pcbnew/files.cpp:57 -msgid "Recovery file " -msgstr "Fichier de secours " - -#: pcbnew/files.cpp:63 -msgid "Ok to load Recovery file " -msgstr "Ok pour charger le fichier de secours" - -#: pcbnew/files.cpp:143 -msgid "Board Modified: Continue ?" -msgstr "Circuit imprimé modifié, Continuer ?" - -#: pcbnew/files.cpp:161 -msgid "Load board files:" -msgstr "Charger Fichiers C.I.:" - -#: pcbnew/files.cpp:263 -msgid "Save board files:" -msgstr "Sauver Fichiers C.I.:" - -#: pcbnew/files.cpp:299 -msgid "Warning: unable to create bakfile " -msgstr "Attention: Impossible de créer fichier backup " - -#: pcbnew/files.cpp:335 -msgid "Backup file: " -msgstr "Fichier backup: " - -#: pcbnew/files.cpp:340 -msgid "Write Board file: " -msgstr "Ecriture fichier CI: " - -#: pcbnew/files.cpp:342 -msgid "Failed to create " -msgstr "Impossible de créer fichier " - #: pcbnew/pcbplot.cpp:115 #: pcbnew/pcbplot.cpp:205 #: gerbview/tool_gerber.cpp:91 @@ -3286,6 +3255,42 @@ msgstr "Fenetre 3D d msgid "3D Viewer" msgstr "Visu 3D" +#: pcbnew/files.cpp:57 +msgid "Recovery file " +msgstr "Fichier de secours " + +#: pcbnew/files.cpp:63 +msgid "Ok to load Recovery file " +msgstr "Ok pour charger le fichier de secours" + +#: pcbnew/files.cpp:143 +msgid "Board Modified: Continue ?" +msgstr "Circuit imprimé modifié, Continuer ?" + +#: pcbnew/files.cpp:161 +msgid "Load board files:" +msgstr "Charger Fichiers C.I.:" + +#: pcbnew/files.cpp:269 +msgid "Save board files:" +msgstr "Sauver Fichiers C.I.:" + +#: pcbnew/files.cpp:306 +msgid "Warning: unable to create bakfile " +msgstr "Attention: Impossible de créer fichier backup " + +#: pcbnew/files.cpp:340 +msgid "Backup file: " +msgstr "Fichier backup: " + +#: pcbnew/files.cpp:344 +msgid "Wrote board file: " +msgstr "Ecriture fichier CI: " + +#: pcbnew/files.cpp:346 +msgid "Failed to create " +msgstr "Impossible de créer fichier " + #: pcbnew/modedit_onclick.cpp:205 #: pcbnew/onrightclick.cpp:151 #: eeschema/libedit_onrightclick.cpp:73 @@ -3467,7 +3472,7 @@ msgid "Show None" msgstr "Rien Afficher" #: pcbnew/set_color.cpp:285 -#: cvpcb/dialog_display_options.cpp:199 +#: eeschema/eelayer.cpp:256 #: gerbview/set_color.cpp:257 msgid "Apply" msgstr "Appliquer" @@ -4798,7 +4803,7 @@ msgstr "KeyW: " #: eeschema/dialog_edit_component_in_lib.cpp:166 #: eeschema/dialog_create_component.cpp:176 #: eeschema/dialog_edit_component_in_schematic.cpp:204 -#: cvpcb/dialog_display_options.h:43 +#: cvpcb/dialog_display_options.h:50 msgid "Options" msgstr "Options" @@ -5230,6 +5235,18 @@ msgstr "Forme Pin de hi msgid "No New Global Label found" msgstr "Pas de nouveau Global Label trouvé" +#: eeschema/eelayer.cpp:233 +msgid "White Background" +msgstr "Fond Blanc" + +#: eeschema/eelayer.cpp:234 +msgid "Black Background" +msgstr "Fond Noir" + +#: eeschema/eelayer.cpp:235 +msgid "Background Color" +msgstr "Couleur du Fond" + #: eeschema/dialog_options.cpp:140 #: eeschema/dialog_options.cpp:288 msgid "Delta Step X" @@ -6181,114 +6198,6 @@ msgstr "Erreur: Root Part <%s> non trouv msgid "Current Part: <%s>" msgstr "Cmp Courant: <%s>" -#: eeschema/eelayer.cpp:45 -msgid "General" -msgstr " Général " - -#: eeschema/eelayer.cpp:51 -msgid "Sheets" -msgstr "Feuilles" - -#: eeschema/eelayer.cpp:57 -msgid "Wire" -msgstr "Fil" - -#: eeschema/eelayer.cpp:63 -msgid "Bus" -msgstr "Bus" - -#: eeschema/eelayer.cpp:69 -msgid "Junction" -msgstr "Jonction" - -#: eeschema/eelayer.cpp:75 -msgid "Label" -msgstr "Label" - -#: eeschema/eelayer.cpp:81 -msgid "GlobLabel" -msgstr "Lab Global" - -#: eeschema/eelayer.cpp:87 -#: eeschema/affiche.cpp:80 -msgid "PinNum" -msgstr "Num Pin" - -#: eeschema/eelayer.cpp:93 -msgid "PinNam" -msgstr "Nom Pin" - -#: eeschema/eelayer.cpp:111 -#: eeschema/dialog_edit_component_in_schematic.cpp:228 -#: eeschema/edit_component_in_lib.cpp:484 -msgid "Fields" -msgstr "Champs" - -#: eeschema/eelayer.cpp:117 -msgid "Body" -msgstr "Body" - -#: eeschema/eelayer.cpp:123 -msgid "Body Bg" -msgstr "Body Bg" - -#: eeschema/eelayer.cpp:129 -msgid "Device" -msgstr "Composant" - -#: eeschema/eelayer.cpp:135 -msgid "Notes" -msgstr "Notes" - -#: eeschema/eelayer.cpp:147 -msgid "Pin" -msgstr "Pin" - -#: eeschema/eelayer.cpp:153 -#: eeschema/component_class.cpp:57 -msgid "Sheet" -msgstr "Feuille" - -#: eeschema/eelayer.cpp:159 -msgid "SheetName" -msgstr "Nom feuille" - -#: eeschema/eelayer.cpp:165 -msgid "Sheetfile" -msgstr "Fichier feuille" - -#: eeschema/eelayer.cpp:171 -msgid "SheetLabel" -msgstr "SheetLabel" - -#: eeschema/eelayer.cpp:184 -msgid "Erc Mark" -msgstr "Marqueur ERC" - -#: eeschema/eelayer.cpp:190 -msgid "Erc Warning" -msgstr "ERC Warning" - -#: eeschema/eelayer.cpp:196 -msgid "Erc Error" -msgstr "ERC Erreur" - -#: eeschema/eelayer.cpp:282 -msgid "EESchema Preferences" -msgstr "EESchema Préférences" - -#: eeschema/eelayer.cpp:367 -msgid "White Background" -msgstr "Fond Blanc" - -#: eeschema/eelayer.cpp:367 -msgid "Black Background" -msgstr "Fond Noir" - -#: eeschema/eelayer.cpp:370 -msgid "Background Colour" -msgstr "Couleur du fond" - #: eeschema/affiche.cpp:22 #: eeschema/dialog_create_component.cpp:157 msgid "Name" @@ -6323,6 +6232,11 @@ msgstr "Lib" msgid "PinName" msgstr "Nom Pin" +#: eeschema/affiche.cpp:80 +#: eeschema/eelayer.h:140 +msgid "PinNum" +msgstr "Num Pin" + #: eeschema/affiche.cpp:84 msgid "PinType" msgstr "Type Pin" @@ -6609,6 +6523,7 @@ msgid "&Spice" msgstr "&Spice" #: eeschema/dialog_eeschema_config.cpp:172 +#: eeschema/eelayer.h:271 msgid "Other" msgstr "Autre" @@ -6759,6 +6674,12 @@ msgstr "Nom en librairie" msgid "Show Text" msgstr "Texte visible" +#: eeschema/dialog_edit_component_in_schematic.cpp:228 +#: eeschema/edit_component_in_lib.cpp:484 +#: eeschema/eelayer.h:164 +msgid "Fields" +msgstr "Champs" + #: eeschema/dialog_edit_component_in_schematic.cpp:239 msgid "Defaults" msgstr "Defauts" @@ -7241,6 +7162,11 @@ msgstr "Effacement Bloc (shift+ctrl + drag mouse)" msgid "Library browser" msgstr "Visualisateur des librairies" +#: eeschema/component_class.cpp:57 +#: eeschema/eelayer.h:171 +msgid "Sheet" +msgstr "Feuille" + #: eeschema/component_class.cpp:58 #: eeschema/component_class.cpp:59 #: eeschema/component_class.cpp:60 @@ -7771,6 +7697,7 @@ msgid "Create &List" msgstr "Créer &Liste" #: eeschema/dialog_build_BOM.cpp:347 +#: cvpcb/dialog_display_options.cpp:199 msgid "&Apply" msgstr "&Appliquer" @@ -8110,41 +8037,40 @@ msgstr " Formats NetListe: EESchema" msgid "Netlist error: %s" msgstr "Erreur Netliste: %s" -#: cvpcb/dialog_display_options.cpp:146 -#: cvpcb/dialog_display_options.cpp:155 -msgid "&Filaire" -msgstr "&Filaire" +#: cvpcb/dialog_display_options.cpp:151 +#: cvpcb/dialog_display_options.cpp:159 +msgid "&Line" +msgstr "&Ligne" -#: cvpcb/dialog_display_options.cpp:147 -#: cvpcb/dialog_display_options.cpp:156 +#: cvpcb/dialog_display_options.cpp:152 +#: cvpcb/dialog_display_options.cpp:160 msgid "&Filled" msgstr "&Plein" -#: cvpcb/dialog_display_options.cpp:148 -#: cvpcb/dialog_display_options.cpp:157 +#: cvpcb/dialog_display_options.cpp:153 +#: cvpcb/dialog_display_options.cpp:161 msgid "&Sketch" msgstr "&Contour" -#: cvpcb/dialog_display_options.cpp:150 +#: cvpcb/dialog_display_options.cpp:154 msgid "Edges:" msgstr "Contours:" -#: cvpcb/dialog_display_options.cpp:159 +#: cvpcb/dialog_display_options.cpp:162 msgid "Texts:" msgstr "Textes:" -#: cvpcb/dialog_display_options.cpp:170 -msgid "Pad &Num" -msgstr "Pad &Num" - -#: cvpcb/dialog_display_options.cpp:175 -msgid "&Pad Fill" +#: cvpcb/dialog_display_options.cpp:169 +msgid "&Pad Filled" msgstr "&Pad plein" -#: cvpcb/dialog_display_options.cpp:183 -#: gerbview/reglage.cpp:110 -msgid "Save Cfg..." -msgstr "Sauver config..." +#: cvpcb/dialog_display_options.cpp:173 +msgid "Display Pad &Num" +msgstr "Afficher Numero de Pad" + +#: cvpcb/dialog_display_options.cpp:176 +msgid "Display pad number" +msgstr "Afficher numéro des pastilles" #: cvpcb/tool_cvpcb.cpp:35 msgid "Open Netlist" @@ -8760,6 +8686,10 @@ msgstr "Spots:" msgid "Show D codes" msgstr "Monter DCodes" +#: gerbview/reglage.cpp:110 +msgid "Save Cfg..." +msgstr "Sauver config..." + #: gerbview/reglage.cpp:128 msgid "Drill File Ext:" msgstr "Ext. Fichier de percage" @@ -9024,51 +8954,55 @@ msgstr "Y" msgid "No default editor found, you must choose it" msgstr "Pas d'éditeur par défaut trouvé, vous devez en choisir un" -#: common/edaappl.cpp:457 +#: common/edaappl.cpp:487 msgid "Default" msgstr "Defaut" -#: common/edaappl.cpp:467 +#: common/edaappl.cpp:497 msgid "French" msgstr "French" -#: common/edaappl.cpp:472 +#: common/edaappl.cpp:502 msgid "Spanish" msgstr "Espagnol" -#: common/edaappl.cpp:477 +#: common/edaappl.cpp:507 msgid "Portuguese" msgstr "Portugais" -#: common/edaappl.cpp:483 +#: common/edaappl.cpp:513 msgid "Italian" msgstr "Italien" -#: common/edaappl.cpp:488 +#: common/edaappl.cpp:518 msgid "German" msgstr "Allemand" -#: common/edaappl.cpp:493 +#: common/edaappl.cpp:523 msgid "Slovenian" msgstr "Slovène" -#: common/edaappl.cpp:498 +#: common/edaappl.cpp:528 msgid "Hungarian" msgstr "Hongrois" -#: common/edaappl.cpp:503 +#: common/edaappl.cpp:533 msgid "Polish" msgstr "Polonais" -#: common/edaappl.cpp:508 +#: common/edaappl.cpp:538 msgid "Russian" msgstr "Russe" -#: common/edaappl.cpp:513 +#: common/edaappl.cpp:543 msgid "Korean" msgstr "Coréen" -#: common/edaappl.cpp:579 +#: common/edaappl.cpp:548 +msgid "Catalan" +msgstr "Catalan" + +#: common/edaappl.cpp:625 msgid "Language" msgstr "Langage" @@ -9810,10 +9744,6 @@ msgstr "Propri msgid "Netlist: " msgstr "Netliste: " -#: pcbnew/cleaningoptions_dialog.h:48 -msgid "Cleaning options" -msgstr "Options de nettoyage" - #: pcbnew/dialog_general_options.h:44 #: eeschema/dialog_options.h:55 msgid "General Options" @@ -9823,14 +9753,14 @@ msgstr "Options g msgid "TextMod properties" msgstr "Propriétés du Texte sur Module" +#: pcbnew/cleaningoptions_dialog.h:48 +msgid "Cleaning options" +msgstr "Options de nettoyage" + #: pcbnew/zones.h:54 msgid "Fill Zones Options" msgstr "Options de remplissage de Zone" -#: pcbnew/dialog_drc.h:56 -msgid "DRC Control" -msgstr "Controle ERC" - #: pcbnew/dialog_initpcb.h:38 msgid "Global Delete" msgstr "Effacements Généraux" @@ -9883,6 +9813,10 @@ msgstr "Afficher Modules Cmp" msgid "Show Modules Cu" msgstr "Afficher Modules Cu" +#: pcbnew/dialog_drc.h:56 +msgid "DRC Control" +msgstr "Controle ERC" + #: pcbnew/dialog_track_options.h:42 msgid "Tracks and Vias Sizes" msgstr "Dims pistes et vias" @@ -9903,6 +9837,86 @@ msgstr "Propri msgid "EESchema Erc" msgstr "EESchema Erc" +#: eeschema/eelayer.h:34 +msgid "EESchema Preferences" +msgstr "EESchema Préférences" + +#: eeschema/eelayer.h:73 +msgid "Wire" +msgstr "Fil" + +#: eeschema/eelayer.h:79 +msgid "Bus" +msgstr "Bus" + +#: eeschema/eelayer.h:85 +msgid "Junction" +msgstr "Jonction" + +#: eeschema/eelayer.h:91 +msgid "Label" +msgstr "Label" + +#: eeschema/eelayer.h:97 +msgid "GlobLabel" +msgstr "Lab Global" + +#: eeschema/eelayer.h:109 +msgid "Notes" +msgstr "Notes" + +#: eeschema/eelayer.h:122 +msgid "Body" +msgstr "Body" + +#: eeschema/eelayer.h:128 +msgid "Body Bg" +msgstr "Body Bg" + +#: eeschema/eelayer.h:134 +msgid "Pin" +msgstr "Pin" + +#: eeschema/eelayer.h:146 +msgid "PinNam" +msgstr "Nom Pin" + +#: eeschema/eelayer.h:177 +msgid "Sheetfile" +msgstr "Fichier feuille" + +#: eeschema/eelayer.h:183 +msgid "SheetName" +msgstr "Nom feuille" + +#: eeschema/eelayer.h:189 +msgid "SheetLabel" +msgstr "SheetLabel" + +#: eeschema/eelayer.h:196 +msgid "Erc Warning" +msgstr "ERC Warning" + +#: eeschema/eelayer.h:202 +msgid "Erc Error" +msgstr "ERC Erreur" + +#: eeschema/eelayer.h:247 +msgid "General" +msgstr " Général " + +#: eeschema/eelayer.h:253 +msgid "Device" +msgstr "Composant" + +#: eeschema/eelayer.h:259 +msgid "Sheets" +msgstr "Feuilles" + +#: eeschema/eelayer.h:265 +msgid "Erc Mark" +msgstr "Marqueur ERC" + #: eeschema/annotate_dialog.h:53 msgid "EESchema Annotation" msgstr "Numérotation des composants"