From 6aba45eb78da8d810360520f06d86338917bf5d4 Mon Sep 17 00:00:00 2001 From: charras Date: Sun, 14 Mar 2010 10:34:40 +0000 Subject: [PATCH] German translation update. Replaced dialog page settings dialogblock version by the same built with wxFormBuilder --- CHANGELOG.txt | 7 +- common/CMakeLists.txt | 1 + common/dialog_page_settings.cpp | 267 +++ common/dialog_page_settings.h | 46 + common/dialog_page_settings_base.cpp | 233 +++ common/dialog_page_settings_base.fbp | 1442 ++++++++++++++ common/dialog_page_settings_base.h | 97 + eeschema/CMakeLists.txt | 2 +- internat/de/kicad.mo | Bin 224382 -> 226438 bytes internat/de/kicad.po | 1760 ++++++++--------- pcbnew/CMakeLists.txt | 2 +- share/setpage.cpp | 614 ------ share/setpage.h | 205 -- share/setpage.pjd | 2612 -------------------------- version.txt | 4 +- 15 files changed, 3001 insertions(+), 4291 deletions(-) create mode 100644 common/dialog_page_settings.cpp create mode 100644 common/dialog_page_settings.h create mode 100644 common/dialog_page_settings_base.cpp create mode 100644 common/dialog_page_settings_base.fbp create mode 100644 common/dialog_page_settings_base.h delete mode 100644 share/setpage.cpp delete mode 100644 share/setpage.h delete mode 100644 share/setpage.pjd diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bf5a1a2c45..8bffb3db25 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,11 @@ KiCad ChangeLog 2010 Please add newer entries at the top, list the date and your name with email address. +2010-mar-13 UPDATE Jean-Pierre Charras +================================================================================ +++ All: + Stable verion for kicad release + 2010-mar-10 UPDATE Jean-Pierre Charras ================================================================================ ++Pcbnew: @@ -18,7 +23,7 @@ email address. //if defined, used the layer manager copper layers order // (from FRONT to BACK) to display inner layers. // if not, use the default order (from BACK to FRONT) - + Currently not active, can be changed if the correponding lines are uncommented in dialog_layers_setup.cpp 2010-Mar-3 UPDATE Dick Hollenbeck diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index a6a1869472..6783731288 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -28,6 +28,7 @@ set(COMMON_SRCS dialog_display_info_HTML_base.cpp dialog_load_error.cpp dcsvg.cpp + dialog_page_settings_base.cpp displlst.cpp dlist.cpp drawframe.cpp diff --git a/common/dialog_page_settings.cpp b/common/dialog_page_settings.cpp new file mode 100644 index 0000000000..f478bfd416 --- /dev/null +++ b/common/dialog_page_settings.cpp @@ -0,0 +1,267 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: dialog_page_settings.cpp +///////////////////////////////////////////////////////////////////////////// + +/* The "Page Settings" dialog box created by this file (and setpage.h) + * contains seven checkboxes which *are* shown when that dialog box is + * invoked in EESchema, but which are *not* shown when that dialog box is + * invoked in Pcbnew instead. + */ + +#include "fctsys.h" +#include "common.h" +#include "base_struct.h" +#include "class_drawpanel.h" +#include "class_base_screen.h" +#include "wxstruct.h" + +#include "wx/valgen.h" + +#ifdef EESCHEMA +#include "program.h" +#include "general.h" +#endif + +#include "dialog_page_settings.h" + +#define NB_ITEMS 11 +Ki_PageDescr * SheetList[NB_ITEMS + 1] = +{ + &g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0, + &g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E, + &g_Sheet_user, NULL +}; + + + +/******************************************************************/ +void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event) +/******************************************************************/ +/* Creation de la fenetre de configuration + */ +{ + DIALOG_PAGES_SETTINGS frame(this); + int diag = frame.ShowModal(); + if ( DrawPanel && diag ) + DrawPanel->Refresh(); +} + + +DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( WinEDA_DrawFrame* parent ): + DIALOG_PAGES_SETTINGS_BASE( parent ) +{ + m_Parent = parent; + m_Screen = m_Parent->GetBaseScreen(); + m_Modified = 0; + m_SelectedSheet = NULL; + m_CurrentSelection = 0; + + initDialog( ); + + GetSizer()->SetSizeHints(this); + Centre(); +} + +DIALOG_PAGES_SETTINGS::~DIALOG_PAGES_SETTINGS() +{ +} + +void DIALOG_PAGES_SETTINGS::initDialog() +{ + wxString msg; + + SetFocus(); + SearchPageSizeSelection(); + + // Init display value for sheet User size + wxString format = m_TextSheetCount->GetLabel(); + msg.Printf(format, m_Screen->m_NumberOfScreen); + m_TextSheetCount->SetLabel(msg); + format = m_TextSheetNumber->GetLabel(); + msg.Printf(format, m_Screen->m_ScreenNumber); + m_TextSheetNumber->SetLabel(msg); + + if( g_UnitMetric ) + { + UserSizeX = (double)g_Sheet_user.m_Size.x * 25.4 / 1000; + UserSizeY = (double)g_Sheet_user.m_Size.y * 25.4 / 1000; + msg.Printf( wxT("%.2f"), UserSizeX ); + m_TextUserSizeX->SetValue(msg); + msg.Printf( wxT("%.2f"), UserSizeY ); + m_TextUserSizeY->SetValue(msg); + } + else + { + UserSizeX = (double)g_Sheet_user.m_Size.x / 1000; + UserSizeY = (double)g_Sheet_user.m_Size.y / 1000; + msg.Printf( wxT("%.3f"), UserSizeX ); + m_TextUserSizeX->SetValue(msg); + msg.Printf( wxT("%.3f"), UserSizeY ); + m_TextUserSizeY->SetValue(msg); + } + // Set validators + m_PageSizeBox->SetValidator( wxGenericValidator(& m_CurrentSelection) ); + m_TextRevision->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Revision) ); + m_TextTitle->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Title) ); + m_TextCompany->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Company) ); + m_TextComment1->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire1) ); + m_TextComment2->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire2) ); + m_TextComment3->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire3) ); + m_TextComment4->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire4) ); + +#ifndef EESCHEMA + m_RevisionExport->Show(false); + m_TitleExport->Show(false); + m_CompanyExport->Show(false); + m_Comment1Export->Show(false); + m_Comment2Export->Show(false); + m_Comment3Export->Show(false); + m_Comment4Export->Show(false); +#endif +} + + +/*! + * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG + */ + +void DIALOG_PAGES_SETTINGS::OnCloseWindow( wxCloseEvent& event ) +{ + EndModal( m_Modified ); +} + + +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK + */ + +void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event ) +{ + SavePageSettings( event ); + m_Modified = 1; + Close( TRUE ); +} + + +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + */ + +void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event ) +{ + Close( TRUE ); +} + + +/*****************************************************************/ +void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) +/*****************************************************************/ +/* Mise a jour effective des textes et dimensions + */ +{ + double dtmp; + wxString msg; + + m_Screen->m_Revision = m_TextRevision->GetValue(); + m_Screen->m_Company = m_TextCompany->GetValue(); + m_Screen->m_Title = m_TextTitle->GetValue(); + m_Screen->m_Commentaire1 = m_TextComment1->GetValue(); + m_Screen->m_Commentaire2 = m_TextComment2->GetValue(); + m_Screen->m_Commentaire3 = m_TextComment3->GetValue(); + m_Screen->m_Commentaire4 = m_TextComment4->GetValue(); + + msg = m_TextUserSizeX->GetValue(); + msg.ToDouble(&dtmp); + UserSizeX = dtmp; + msg = m_TextUserSizeY->GetValue(); + msg.ToDouble(&dtmp); + UserSizeY = dtmp; + + int ii = m_PageSizeBox->GetSelection(); + + if( ii < 0 ) + ii = 0; + + m_SelectedSheet = SheetList[ii]; + m_Screen->m_CurrentSheetDesc = m_SelectedSheet; + + if( g_UnitMetric ) + { + g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 / 25.4 ); + g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 / 25.4 ); + } + else + { + g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 ); + g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 ); + } + + if( g_Sheet_user.m_Size.x < 6000 ) + g_Sheet_user.m_Size.x = 6000; + + if( g_Sheet_user.m_Size.x > 44000 ) + g_Sheet_user.m_Size.x = 44000; + + if( g_Sheet_user.m_Size.y < 4000 ) + g_Sheet_user.m_Size.y = 4000; + + if( g_Sheet_user.m_Size.y > 44000 ) + g_Sheet_user.m_Size.y = 44000; + +#ifdef EESCHEMA + /* Exports settings to other sheets if requested: */ + SCH_SCREEN * screen; + /* Build the screen list */ + EDA_ScreenList ScreenList; + /* Update the datas */ + for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() ) + { + if( screen == m_Screen ) + continue; + + if( m_RevisionExport->IsChecked() ) + screen->m_Revision = m_Screen->m_Revision; + + if( m_TitleExport->IsChecked() ) + screen->m_Title =m_Screen->m_Title; + + if( m_CompanyExport->IsChecked() ) + screen->m_Company = m_Screen->m_Company; + + if( m_Comment1Export->IsChecked() ) + screen->m_Commentaire1 = m_Screen->m_Commentaire1; + + if( m_Comment2Export->IsChecked() ) + screen->m_Commentaire2 = m_Screen->m_Commentaire2; + + if( m_Comment3Export->IsChecked() ) + screen->m_Commentaire3 = m_Screen->m_Commentaire3; + + if( m_Comment4Export->IsChecked() ) + screen->m_Commentaire4 = m_Screen->m_Commentaire4; + } +#endif + + m_Screen->SetModify(); + m_Screen->SetRefreshReq(); +} + + +/*******************************************************/ +void DIALOG_PAGES_SETTINGS::SearchPageSizeSelection() +/*******************************************************/ +/* Search the correct index to activate the radiobox list size selection + * according to the current page size + */ +{ + Ki_PageDescr * sheet; + int ii; + + m_CurrentSelection = NB_ITEMS - 1; + for( ii = 0; ii < NB_ITEMS; ii++ ) + { + sheet = SheetList[ii]; + if( m_Parent->GetBaseScreen()->m_CurrentSheetDesc == sheet ) + m_CurrentSelection = ii; + } +} diff --git a/common/dialog_page_settings.h b/common/dialog_page_settings.h new file mode 100644 index 0000000000..3be9c1fa50 --- /dev/null +++ b/common/dialog_page_settings.h @@ -0,0 +1,46 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: setpage.h +///////////////////////////////////////////////////////////////////////////// + +#ifndef _DIALOG_PAGES_SETTINGS_H_ +#define _DIALOG_PAGES_SETTINGS_H_ + +#include "dialog_page_settings_base.h" + +/*! + * DIALOG_PAGES_SETTINGS class declaration + */ + +class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE +{ +private: + WinEDA_DrawFrame *m_Parent; + BASE_SCREEN * m_Screen; + int m_Modified; + Ki_PageDescr * m_SelectedSheet; + float UserSizeX, UserSizeY; + int m_CurrentSelection; + +public: + DIALOG_PAGES_SETTINGS( WinEDA_DrawFrame* parent ); + ~DIALOG_PAGES_SETTINGS(); + +private: + /// Initialises member variables + void initDialog(); + + /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG + void OnCloseWindow( wxCloseEvent& event ); + + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK + void OnOkClick( wxCommandEvent& event ); + + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + void OnCancelClick( wxCommandEvent& event ); + void SearchPageSizeSelection(); + void SavePageSettings(wxCommandEvent& event); + void ReturnSizeSelected(wxCommandEvent& event); + +}; + +#endif // _DIALOG_PAGES_SETTINGS_H_ diff --git a/common/dialog_page_settings_base.cpp b/common/dialog_page_settings_base.cpp new file mode 100644 index 0000000000..9465fc536b --- /dev/null +++ b/common/dialog_page_settings_base.cpp @@ -0,0 +1,233 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 16 2008) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_page_settings_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bUpperSizerH; + bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); + + wxFlexGridSizer* LeftColumnSizer; + LeftColumnSizer = new wxFlexGridSizer( 6, 1, 0, 0 ); + LeftColumnSizer->AddGrowableRow( 1 ); + LeftColumnSizer->AddGrowableRow( 3 ); + LeftColumnSizer->AddGrowableRow( 4 ); + LeftColumnSizer->AddGrowableRow( 5 ); + LeftColumnSizer->SetFlexibleDirection( wxBOTH ); + LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxString m_PageSizeBoxChoices[] = { _("Size A4"), _("Size A3"), _("Size A2"), _("Size A1"), _("Size A0"), _("Size A"), _("Size B"), _("Size C"), _("Size D"), _("Size E"), _("User size") }; + int m_PageSizeBoxNChoices = sizeof( m_PageSizeBoxChoices ) / sizeof( wxString ); + m_PageSizeBox = new wxRadioBox( this, wxID_ANY, _("wxRadioBox"), wxDefaultPosition, wxDefaultSize, m_PageSizeBoxNChoices, m_PageSizeBoxChoices, 1, wxRA_SPECIFY_COLS ); + m_PageSizeBox->SetSelection( 1 ); + LeftColumnSizer->Add( m_PageSizeBox, 0, wxALL|wxEXPAND, 5 ); + + + LeftColumnSizer->Add( 5, 0, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizerXsize; + bSizerXsize = new wxBoxSizer( wxVERTICAL ); + + UserPageSizeX = new wxStaticText( this, wxID_ANY, _("User Page Size X: "), wxDefaultPosition, wxDefaultSize, 0 ); + UserPageSizeX->Wrap( -1 ); + bSizerXsize->Add( UserPageSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TextUserSizeX = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_X, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizerXsize->Add( m_TextUserSizeX, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + LeftColumnSizer->Add( bSizerXsize, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizerYsize; + bSizerYsize = new wxBoxSizer( wxVERTICAL ); + + UserPageSizeY = new wxStaticText( this, wxID_ANY, _("User Page Size Y: "), wxDefaultPosition, wxDefaultSize, 0 ); + UserPageSizeY->Wrap( -1 ); + bSizerYsize->Add( UserPageSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TextUserSizeY = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_Y, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizerYsize->Add( m_TextUserSizeY, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + LeftColumnSizer->Add( bSizerYsize, 1, wxEXPAND, 5 ); + + + LeftColumnSizer->Add( 5, 5, 1, wxEXPAND, 5 ); + + + LeftColumnSizer->Add( 5, 5, 1, wxEXPAND, 5 ); + + bUpperSizerH->Add( LeftColumnSizer, 0, wxEXPAND, 5 ); + + wxFlexGridSizer* RightColumnSizer; + RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); + RightColumnSizer->AddGrowableCol( 0 ); + RightColumnSizer->AddGrowableRow( 0 ); + RightColumnSizer->AddGrowableRow( 1 ); + RightColumnSizer->AddGrowableRow( 2 ); + RightColumnSizer->AddGrowableRow( 3 ); + RightColumnSizer->AddGrowableRow( 4 ); + RightColumnSizer->AddGrowableRow( 5 ); + RightColumnSizer->AddGrowableRow( 6 ); + RightColumnSizer->AddGrowableRow( 7 ); + RightColumnSizer->SetFlexibleDirection( wxBOTH ); + RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxBoxSizer* SheetInfoSizer; + SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetCount->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); + + + SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); + + m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetNumber->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); + + RightColumnSizer->Add( SheetInfoSizer, 1, 0, 5 ); + + wxStaticBoxSizer* RevisionSizer; + RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision:") ), wxHORIZONTAL ); + + m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextRevision->SetMinSize( wxSize( 100,-1 ) ); + + RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_RevisionExport = new wxCheckBox( this, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + RevisionSizer->Add( m_RevisionExport, 0, wxALL, 5 ); + + RightColumnSizer->Add( RevisionSizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* TitleSizer; + TitleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title:") ), wxHORIZONTAL ); + + m_TextTitle = new wxTextCtrl( this, ID_TEXTCTRL_TITLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextTitle->SetMinSize( wxSize( 400,-1 ) ); + + TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + TitleSizer->Add( m_TitleExport, 0, wxALL, 5 ); + + RightColumnSizer->Add( TitleSizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* CompanySizer; + CompanySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Company:") ), wxHORIZONTAL ); + + m_TextCompany = new wxTextCtrl( this, ID_TEXTCTRL_COMPANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextCompany->SetMinSize( wxSize( 400,-1 ) ); + + CompanySizer->Add( m_TextCompany, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_CompanyExport = new wxCheckBox( this, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + CompanySizer->Add( m_CompanyExport, 0, wxALL, 5 ); + + RightColumnSizer->Add( CompanySizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment1Sizer; + Comment1Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment1:") ), wxHORIZONTAL ); + + m_TextComment1 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextComment1->SetMinSize( wxSize( 400,-1 ) ); + + Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment1Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + Comment1Sizer->Add( m_Comment1Export, 0, wxALL, 5 ); + + RightColumnSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment2Sizer; + Comment2Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment2:") ), wxHORIZONTAL ); + + m_TextComment2 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextComment2->SetMinSize( wxSize( 400,-1 ) ); + + Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment2Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + Comment2Sizer->Add( m_Comment2Export, 0, wxALL, 5 ); + + RightColumnSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment3Sizer; + Comment3Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment3:") ), wxHORIZONTAL ); + + m_TextComment3 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextComment3->SetMinSize( wxSize( 400,-1 ) ); + + Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment3Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + Comment3Sizer->Add( m_Comment3Export, 0, wxALL, 5 ); + + RightColumnSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment4Sizer; + Comment4Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment4:") ), wxHORIZONTAL ); + + m_TextComment4 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextComment4->SetMinSize( wxSize( 400,-1 ) ); + + Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment4Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + Comment4Sizer->Add( m_Comment4Export, 0, wxALL, 5 ); + + RightColumnSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 ); + + bUpperSizerH->Add( RightColumnSizer, 1, wxEXPAND, 5 ); + + bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 ); + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + m_TextUserSizeX->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeXTextUpdated ), NULL, this ); + m_TextUserSizeY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeYTextUpdated ), NULL, this ); + m_TitleExport->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); +} + +DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() +{ + // Disconnect Events + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + m_TextUserSizeX->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeXTextUpdated ), NULL, this ); + m_TextUserSizeY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeYTextUpdated ), NULL, this ); + m_TitleExport->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); +} diff --git a/common/dialog_page_settings_base.fbp b/common/dialog_page_settings_base.fbp new file mode 100644 index 0000000000..a1db9c8ea4 --- /dev/null +++ b/common/dialog_page_settings_base.fbp @@ -0,0 +1,1442 @@ + + + + + + C++ + 1 + UTF-8 + connect + dialog_page_settings_base + 1000 + none + 1 + dialog_page_settings_base + + . + + 1 + 0 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DIALOG_PAGES_SETTINGS_BASE + + 439,497 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Page Settings + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizerH + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + 1 + wxBOTH + + 1,3,4,5 + 0 + + LeftColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none + 6 + 0 + + 5 + wxALL|wxEXPAND + 0 + + + "Size A4" "Size A3" "Size A2" "Size A1" "Size A0" "Size A" "Size B" "Size C" "Size D" "Size E" "User size" + + 1 + + + 0 + wxID_ANY + wxRadioBox + 1 + + + m_PageSizeBox + protected + + 1 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 5 + + + + 5 + wxEXPAND + 1 + + + bSizerXsize + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + User Page Size X: + + + UserPageSizeX + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + ID_TEXTCTRL_USER_PAGE_SIZE_X + + 0 + + m_TextUserSizeX + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTextctrlUserPageSizeXTextUpdated + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerYsize + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + User Page Size Y: + + + UserPageSizeY + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + ID_TEXTCTRL_USER_PAGE_SIZE_Y + + 0 + + m_TextUserSizeY + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTextctrlUserPageSizeYTextUpdated + + + + + + + + + + 5 + wxEXPAND + 1 + + 5 + protected + 5 + + + + 5 + wxEXPAND + 1 + + 5 + protected + 5 + + + + + + 5 + wxEXPAND + 1 + + 1 + wxBOTH + 0 + 0,1,2,3,4,5,6,7 + 0 + + RightColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none + 8 + 0 + + 5 + + 1 + + + SheetInfoSizer + wxHORIZONTAL + none + + 5 + wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Number of sheets: %d + + + m_TextSheetCount + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 5 + protected + 5 + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Sheet number: %d + + + m_TextSheetNumber + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Revision: + + RevisionSizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + ID_TEXTCTRL_REVISION + + 0 + 100,-1 + m_TextRevision + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_REVISION + Export to other sheets + + + m_RevisionExport + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Title: + + TitleSizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_TITLE + + 0 + 400,-1 + m_TextTitle + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Export to other sheets + + + m_TitleExport + protected + + + + + + + + + + OnCheckboxTitleClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Company: + + CompanySizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_COMPANY + + 0 + 400,-1 + m_TextCompany + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_COMPANY + Export to other sheets + + + m_CompanyExport + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment1: + + Comment1Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_COMMENT1 + + 0 + 400,-1 + m_TextComment1 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_COMMENT1 + Export to other sheets + + + m_Comment1Export + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment2: + + Comment2Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_COMMENT2 + + 0 + 400,-1 + m_TextComment2 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_COMMENT2 + Export to other sheets + + + m_Comment2Export + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment3: + + Comment3Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_COMMENT3 + + 0 + 400,-1 + m_TextComment3 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_COMMENT3 + Export to other sheets + + + m_Comment3Export + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment4: + + Comment4Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + 1 + + + 0 + ID_TEXTCTRL_COMMENT4 + + 0 + 400,-1 + m_TextComment4 + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + + + 0 + ID_CHECKBOX_COMMENT4 + Export to other sheets + + + m_Comment4Export + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALIGN_RIGHT|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelClick + + + + OnOkClick + + + + + + + + diff --git a/common/dialog_page_settings_base.h b/common/dialog_page_settings_base.h new file mode 100644 index 0000000000..fb41fe5ae6 --- /dev/null +++ b/common/dialog_page_settings_base.h @@ -0,0 +1,97 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 16 2008) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __dialog_page_settings_base__ +#define __dialog_page_settings_base__ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1000 +#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 1001 +#define ID_TEXTCTRL_REVISION 1002 +#define ID_CHECKBOX_REVISION 1003 +#define ID_TEXTCTRL_TITLE 1004 +#define ID_TEXTCTRL_COMPANY 1005 +#define ID_CHECKBOX_COMPANY 1006 +#define ID_TEXTCTRL_COMMENT1 1007 +#define ID_CHECKBOX_COMMENT1 1008 +#define ID_TEXTCTRL_COMMENT2 1009 +#define ID_CHECKBOX_COMMENT2 1010 +#define ID_TEXTCTRL_COMMENT3 1011 +#define ID_CHECKBOX_COMMENT3 1012 +#define ID_TEXTCTRL_COMMENT4 1013 +#define ID_CHECKBOX_COMMENT4 1014 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_PAGES_SETTINGS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_PAGES_SETTINGS_BASE : public wxDialog +{ + private: + + protected: + wxRadioBox* m_PageSizeBox; + + wxStaticText* UserPageSizeX; + wxTextCtrl* m_TextUserSizeX; + wxStaticText* UserPageSizeY; + wxTextCtrl* m_TextUserSizeY; + + + wxStaticText* m_TextSheetCount; + + wxStaticText* m_TextSheetNumber; + wxTextCtrl* m_TextRevision; + wxCheckBox* m_RevisionExport; + wxTextCtrl* m_TextTitle; + wxCheckBox* m_TitleExport; + wxTextCtrl* m_TextCompany; + wxCheckBox* m_CompanyExport; + wxTextCtrl* m_TextComment1; + wxCheckBox* m_Comment1Export; + wxTextCtrl* m_TextComment2; + wxCheckBox* m_Comment2Export; + wxTextCtrl* m_TextComment3; + wxCheckBox* m_Comment3Export; + wxTextCtrl* m_TextComment4; + wxCheckBox* m_Comment4Export; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); } + virtual void OnTextctrlUserPageSizeXTextUpdated( wxCommandEvent& event ){ event.Skip(); } + virtual void OnTextctrlUserPageSizeYTextUpdated( wxCommandEvent& event ){ event.Skip(); } + virtual void OnCheckboxTitleClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + + + public: + DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Page Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 439,497 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_PAGES_SETTINGS_BASE(); + +}; + +#endif //__dialog_page_settings_base__ diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 873893efba..813631a8c8 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -125,8 +125,8 @@ set(EESCHEMA_SRCS viewlibs.cpp) set(EESCHEMA_EXTRA_SRCS + ../common/dialog_page_settings.cpp ../common/sch_item_struct.cpp - ../share/setpage.cpp ) if(WIN32) diff --git a/internat/de/kicad.mo b/internat/de/kicad.mo index e0fc2d0277a66ef23f5fca32f03752c097612ec5..60aa66e8d1485f21d64f08fa11963a253438f322 100644 GIT binary patch delta 66084 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 delta 64190 zcmXusci_#{|G@FHxpG_n(;B@SW_eT$4e(HtJB@$O*RV;>$un_h}x=f75E;tFV!@Zar3!hItmrPWm zP=bb*=mZ90VVn{kNG!oD)Hh=`d=Ycvo9F-sF%3UQpZf|k;}4h*Phk3Fl)`#!oD!U`RH_58gl@+!Z~5PVgvRfybi9WBYIDR-D5tG5f`^(){Q|(__6F z7NOn{?WZRuT|s{e&U7$3@KAJycSgsfdprqC<7~VQH{y8AcPT_@PINvRsRz*sJcj1b zT6ExN(SEjEBK{RAd`Lqv{0Gg2!vBPo)I&RHj&4a8bWd-@R(L1Y!xyj#p2E6V;onfd z5vx*v3~S>abSp2Q3;yR{;%^~wIhZMWWi&@LcQk*raI|9)z3se6A&5?i6j;{PKyq61YFN98@G}=#XwEvdqR(3|m>4SL~KQSnN zFb17*63gL&SbqVH$WC;|2V(sbGH?UbVBtpyXU_p z1s}XNKF}-H`=bNij80%w{QMsD7~P9bcp3WK+UWD>K(C-H-hoDDKN^uwqCa9D#!sA~ zUEkiQ( zzyun~(r|x#;90bT*P?sTfj>f5`X$=YsrdOn=$>ZH7~ac=4xElgpej1C`mx>=ja-L} z$@m;a~I6Bau=#BR`I`NC>-lt^>q0fUZ zq;Qggdt4rUp>lknYHY6)tsg&cjNTJX(c{@7wzoyUL)ypB`$YRk2Sf))Z;2*vi-i$b zfDUet_4}hU(Fx8$SGFLwKa5UzX{;}cu82MneJc7)bX{}<(r+@cITR9G(GFiiC-QP^ zKM?%@4dKV=p8kM-XZ(h4MfS`gsmh>{sE3BQJ-T(hq65*~7>=p$|M3(Y_}=KW=zY-{ z(V5ZN=oZY4^#$mJ9z-X&9LwW+tc8d18cfR)Ce#3pXge(H`R_zw0^Wf>cpUvUD{)1J zL<8)HetSKPjd4$`r(GF7zXn~=XmsV1&;jP56MZn&A3~FHDfYl8FnJw?KPXhkR#`J7 zR^VOe*XmW-G9(6L8?1wC@qYXqtKop`Va4;&5U;>0xCV{D2UrUKj`gBB!j`o}Z_t}^ zaQ;1q6KHVe)9@i&jIOBcRbeGH(fgoov?aQduIMkH-soPBM8A9{#`+wzpGVONu125V zjK06?D$c(Hzej_9fxd7$KKM75png@(Fo7y)M-9*$uob$1o6z@eMQ^q-(Ff3hmZ8tB zLKm_g&6({<3eIRJ+VLmRZ_o*yLSMWT&6F#=coo`S7(Fee(D&=3--a!*A@;#W_z>2> z1L*Vrq7zHz%N;r_hK8^_8p68hO4^{u>;`l~W6_n*Kqv4dI^eTt1m46JxE~!LN1o7c ze)Rd$SRAWhRnLD13jU@WkFH=2_Q8kI5S>OlK97bjW8N^q+~}85I;MWrqR;ij(l`(+ z;(cf`Zp7Aj1e;^Qd@hLd*PDVXyba6X{pd{Bp*P+Z^fYWo2lyp^egQqEY5Bv%nn$~! z6Yq;Ye+#;>JJDk~2?yc5Sj6*xjDjJ*fNnw70^t}HLT|R#*bMulTd*9xXf~pI{2ETi zGw8r~77Sl9lW{fm`>->XFO(tm>v#;-q`nT5uHYyI_pm_WuxC}#mDfcl)(FjoPFM+V ziuGCOfXmT|twED{JGxc-(G?%XGWaEWZzPIj;O7@VV2W`59q3jX+^bPYQY4n31Mfmt zdIat0TeRaJ(JlHDo!BKbt8*63kZ6fz(VVyyyWljef(OvA>kDYkU0saxZ-{Fb3oGdq z?S+254niLsiVipt{o!#Ry3$9`2&|93h__LH6P-|n;=!iTo@g!%kM*%h3WjbDy7$YY z&!P`*MTUGL;z{(y-(&l~Sc7`$tHbf?5uJ!eZWY?!8g#-hpc8l*?ROut<;lda6nwBy z$&hsA(7mq`ZH#U~XLJGs(TI&gLq9dP&yMva(N(d1W30b|9>?9W{ZOi%^YH=nZ#ItWQG+cmR#qVsygG&6$EyYU;s|sPC!ifqM_0T69bg$6sVC70J&$hPZgc@h(SCkHx8N^y!spTc{==kM zoxOBu$d7*8rK2-!h7L3c?dUf2;usfQgJr0Hf_8ineLk&BFe}=B?r4$NUK%|emCA7b zeW5uG&b%GElK$u(-w_|2hF;N2(dV|IS-%%u$>->K{|SvyqHO3VI~t*q=oZ&NBhwN+ z_T9=R!?C%I23P(dI)TmT1a_jwAC|M!=q39kq=xwy0gXq=%d2IhC)=!~Z_d62NWFlj=a6_e|D{X<^WJAyn=AtuQgs$*u^!Tku zC-@vXfuraaT|y^PxO%X3v}&{-nv^ZDfZzWeDY&Nt(Sh!W4@^gsZ7#Z}Pof=fMw9Gi z^jGsPbmD(tbIeyGETAVkvB{W@PhdBE6WxMbH5u3QpH9J0)%dv@JHx#8Eb`*7Do5H3c8@?SPQ#hI!?!O_%u4syO^v`;TsCRSh#kWNL93h_UM2& zU|pPsuKXpmgSXK4j-nGhjec2WsS_er0KGTLpbM#qPP`-5#Cz&+{!@ENgBQqi=)l{t z6Yh!adFqA^i=YEkK)0$MIzR_BXL{k)I5pN+#?Rl5^$)NgpI<;1aQ!u$e?vd&ny|82 zSd#if=#00a1MWxn_;WOQ{y`^@xnAg~5E_{pXpS^Ov%C#f#v8B;-iN+-2wm{ENeYJW zBpT{}u_czTACBEHG*m0G1|C4S;$Ji=Yc~iTwm>J`16|NabW3KUIkGDH5*p$6&BOyvUBq5cvYnUm;Em%UM#SSuV({W^4uUc-jC7aL)Q z#;M396HO=>qU*6ECb0$XLm$l6Bt)hyI)Tw>Zp_85_%XUgWt)b9>R>wc7HFskN5`TO zdjO5l!&uPs{~U!{G`xd`@I3lp?q=b_xf;EQ%EfvWG^DlB0oq6VqThxi(dQpT&-oJc z;#!N|jGNJjyo#+o|9dF3z--OKmr!RknTDfVFb++sd1%rsK_~Dyn(f=rz5D=O*$?Qz z|3!1R2su^?jnp;h#M@xf}vdu;#@G2VWz32+^whR+1f^J1wbl?`~%6g(J z8;I#R3d`dHbU`no6MGY#$l;cpe;ba`;EaAp2Tp4hejwyV>*djb>Y~rLM?2_)X7g?6 zz!T8tX2klV=)|5u7rF&K6>p>OecdVB^>%2)u8-|w z(1E6-D_wxTw=A}=MYm>KtRFxp@L7_AD?f=2a4CL}txcFfQM989=m6Km_LgWQy2kpz z=qU90iReUTq3=C}M&OC)HZ)?%JrukOKSVE{pV5n`THBD#z0s?65}I^RqaD7CcDNh; zmisieUqn03(k@IeAG)xz=si&fP1;__Z@^??90emV7Y)futbv=*i|0#p&$6@+AxuXn z&=?)4J^EwvdaQ*bV*5&Tg6q-e-#{a>4^8HeQth0-FDUpWbR50gPh%B4i`B4Hhj9G5 zp%Lhdb~rk=PeOBH2Koc!X>=udTg_G3=7PQPOLN*^!(SO;P>*iHsDxHMFdk3 zK?mN1Ch1NzA|IhE{}oGOrcN0WO|dN2!6DcLm!gsS5Z&r;&>Z<2lfICpa|m4c@_K0`aWguO6dm$35T=pQg6Bszh$=z?BABfh%}=iiyUOM@%^ zBz|xL9r%}6zkoh>8QsGi*M<-lLX)cs+HoT^Qk~-G1JQxUq7j>hZt-$-qN}gv{F^kJ zL6L~iJQgm06f-60Q z&hU%)!C7=q)4GMoltx!p7v0;Au|5^us)x|Xyn#;W-RMDdA|FM+L$B`N(FrGWTo-0m z9BrtCZbd^h0-e!|W&pa!cc390i$-7yI`ATNPgkJtuZs0;vHmjp+&;A5kB~?v6UQm| z;;-mHf1w>`>K^vCaI^v%!g^Q}TcaJ0LkCQv$+IaNBiA_M)1@4`Dsl3^S{d! zTv4_jAt~~qAuECIWfgRwR_In;izZLs*nTsbgrm`crlJEajP=#%*1m|Y{2SNKXcR4!nE;J_&q8H7tXvf*F5AEg9y={vg*TGmF@5j`a4|-J} zK(G4WF}aOG?OquY-SJ0kgY|od8*2(W@C-CUi_n!n7VE3y=bLae?XTc?tZ+m43&+RN z37$kJlCe)XUA57E`t*t4|3hdwlv;QMiA|iSp=PH;r~h2ONkE zaRPevZbg&!S2UL{p~;%}#*hnTlN1a^eKcuWMth?d%}8{hF|qxAbRx^pQ?eG_^ViS; zK0yck1%2;gY|nmE$eGg7=2(l*lQ&W@WDC&_-o*a+3EDyJ0b#(_=z!hP6%0k6pMa@s zNAHi-vHk-3J^wCVgU8W@mKYeev;wBie>Dp3b=_!_Xq#x4==ISXqqjsyp%WN~9;-Rg zN6<(-iRRQM^fbMKM)n)b?v3q7qu-$`Jss=k(TgR+ zkT5`g^bayuqYJB#PPiSe!)wtTI*Um^$ar)3cFTrleL5P6j_B3g9bHLpbYdgX&`v>D zGzSgw!?FEIbl^?s^RHt~d>_3J{zZ>_p<6ir4wQaNm{CRa>$e_yW8H|J{|V?srlKpq z4=dvWbONu$_FZVw9YBxcX>9^11?3MNsW+rl1o#j@0UVLDDi zSH1%6U=_M$&!dsqj!x`+b4)7Yf z_xrH|{)C1)=ZLU}718IKp^@l@hP*er^4rk~O+pv65PfbLdVHTmvwth*^ZdU_!45t| z&-p1d7jldY9hHqXh;~6&I0#*F5*_$)G-4ajz26qwccJ|qLKk!#-Kt!pc+c}+nu6I_ z1D$aPbkBRl`VG;+=vIwH2bh3HViu-W7~7vjPto&eKOdtj{v3_;3G~No=G!^{=@g1l zu;V6Z#~q@5(9egV5t@VLaTWUfUi4o0FxF3?@1H@pAk*lupu*^LrO^o0N3*~AXwJW( z=ud-=j!ut0f)2b6jnED>H$FvI^k+12N7#a#XnQeqB9&r$L-h2ti}pe%a?2f@e?v8j z21EZ4rr}ETf_V~$<9q1EQTNUai6J->y~9tU*_`#R5UFZdoqAWSjZ?81Zo%gGTdda@ z6aI2*bdrJ}tVjPSb`rf0DvS+(Cv*$Cw`)Ch~*v^{t#LL zeeVV|g2T{cosM-exsZa{ycfg=n$qZi4bbfGfbQk3=s@?Ok$D&$ z=mj+NZ=qXr2wlKe$a~4eSqiQ^&)s1n-LNY4(dZ4g0^O^pqU)nuqpwDHM)#o$_#k>T zdMx@=^p})LvNbkbil$8n17}5ZA{W|W5p>1rn2ycR8*m`H!eQw16VM4yN8g)+Cif!r zxz%VSwqfe;|KFluM~BfZ_zb5!rEvOc1Az%j?TO<`rHsSatqOW zWHnC3edsA^KQ&yrH=sE%4n3Z;(9fSpQZOl=iw$qY`hn<|Xb68sSM(n`flT*?fv-Zp z|4XA2t%k0!POLXV-)n)s*A~sKuITYh4x(U)Zbw5q0sV5AjYj5)*uDXGQhy!az^O#e zbKZDb=&(Qf{OxG+O^o%2;^$AGE8l{Svlod#GI5lGp*(@Un16bhKsEGYYK?|?2)cp^ zXvC()`h#eP%g_m|MzK4^~Ba3YSyb!dmh z?vFPh8o~zXfSu62?Tt=kI2zhXu|5l(_%bxoPoWdrh*vXyVmpP5_;LK;GxSU22Xufk zGs521K)=7QK_k!uP0GROgodLXPeuotiK&Yx)>orjyE(S+#$*i|KA~U-Ssn-j7Dg|Q zva#L@&DO5yu^E6qKMEb-UUcP)WBb!+1YSh%`km;P&1dK_&p9)EIW?Wh`8Tw;)8LH9 zp)0r-?O+a?WJ}QrY)3=62Yvoftbc|M@Lg;#G%Ng0D21-L2|7-X*xnaCRpVxn#i?wk z!2zE@2il0P^!4aIGzmY&N_ZNLK*8C;iqS@Be_hat4?+9AFSb93Zs8hq0=tqF?C2Bp z!4v4fXVK7RoD)`D5KYRGSOKp^vw1uk`blU+=AjW>g67C7wBP4r{eNgq?MI(aei|S6 z7Jc#8_`n5pVwvZLJuHNNUL)EF9k?ypQEzl>2F3btbRlEWh)ze}UyM#*CGuV}@ofBH z8#?1R(5!wxJdpS(`ZXG|6S4kJG|RlO!rbV9CD4ggiS;H}lX@rgcu$VLgta{Xzfo`n zrRIkRs-U4Cik^ad&<>ZPKh4%*Q~UuNVd({-{U&ToeL4F1C+HUCUl{hh2zo`=i}fa$ z)$`w%f-Almy$4460p5Wo-9&Uk3(>uN3JvvhXh>g1SH3IO52KO%0uB8s^!bbN^NbIM zzi-TmNmtg2f_vQ)9bhOr^D$T!Ct!J8iT*X)?%4hl`uiaJqVVlk1D#MWw4Xuf!fr>8 z-}qRcf=+P8qWI_khhxJEbR`?m?}As*34VY^;Ja8qi%vMp;_xH2F#36Ibl|q=z&+4~ z^h1y3KF_&GX}c8`V*yPyO0 zLqj+i-I^pmfs4@hYb*-`wn6v!1~i%bp%EAxoq`oS{|`{`!OiH;?=5H+AHj4yhIWv6 zEDTTtO}6Uj@$8LGXfnE0k6}%G0X+pjpb=&9L^cJx2=kL4d=IXsOfW8M{E;tkPc?18>F9vyGS3eLZwUrd9pL1+3Z zx{~+NAB{gn|3xR3e`VO~%4lTTqrVjg#d;EbZW;Rib7&;qLAT%lx|N@-6QtbK+VwQa#a*Z$=j|GMYq_?O}AFHR#GWVd@m2Nxa7gePBO2 zvmF;)$?#lhMx~Ks$O2UEwq6#9v1zv={v@ITYJJj2=VZ`x#wO@*D;C zG~<(DhI!B=Nk<>3jP7xLbbv1CO8UglZ$mpA7e7y;@6SUcy9Dj$+2~7Xq<10DB@-Wp zLgFhlB*$a@G&;~Zbb!pO!pd`_TTm8_TxE2CTIh4l&;@mj^&8NM4?&+B9i5z#^EW#- zEQvmizVLkX_2}N{hv-1Z&<;gdYHV-=i<`8@yIDEQzW zbY%zq06#)Qc>?F+pLiQieL76=M>J>tK<|Nz=)_8{4xz7%4%jr-yP^{wjE*-NQ~&<& z-4t%6A&G|kC#-;H(Q{qmnb2Va>_NRVnp{tyTlO?M@H+HVY(u~GcA*#3=V+4tjh?1l zYr;5H*Kqz#lEyT6-n(K09EQ&HDRc$Tp+BwO#Oinnoml0yAqUzHMUwR z+ppXZCR!2Q+LqDl&>J#2kb=oJ9u3``_`nnBoxK^|UER)o>4*JZI1WvTq6<7DC@Ehfeew^oL0w ztcO$33BM3O{|dd56Pv>X^I|c-|BF*_h7HhT(JtB*y3-x4~kj~=T|(VNkMr=SDPjV{OX)Hk46`~f=P zacqr$#rFDJLk?Vv-Xjyxt(c7!aq(8pzoB}K23K?}`X{=g%-g~q=SOGU5}imF^!Xdn z4(~ws{vPzXsp!OKN0-L-XV8g0kLK3vNeXtb3q5}O(Y^Tw4b`9Mxz6)KSZQ@Mlx@(J zcE`531bzRD=UOw^>{75fle^{%fUiuKV`78=f5%qlc5)yeD|Vv_M_-=dKC@T zo9N09q7yrTuIMcK+<)laXMQC_AU8Tt0d$LtN6Vq_SI2bEf8*G2Bf9e8=s;6r`=jUz zo{4UW?f*lwdS7h+Jo;1g&*$id;V4|i6hVm z%|(-IHTwK(=$5>LPV{4RE5AjbI~VI$y%wG;jecJHwRry9)8K;x&}18ru51xH@Kfli z*oh|Hhv=UFi7p`L>mj72(C4b7$=d?m+TQ3XN}>~98C~}}=Rci>Z8X@?hgc4OLcdIM z{4cDyCfY$qbmq6BUpkY~2|t0Z{8cn}-oeUvJl6BR5f)e%op@(-g103p82YKvS!n1N z$NFQ@)o2oJj-PLj?uhP*9z^^51WmGUV*M9%>&~MQ%)KLQMY0A3SI`{GV?Q*Tr=y{q zg>J=TXvZ7S^Zg<^(O1#au@gPlhtY}tioSOq4f&OChOgy(=*`#(`8=8EL&2F2M+dwc zozQG_OID*VY)1!r8_ksu(JeWJK6k}iVQY$FI`tapR$PZQa17f2(`Y1K#MHn4e}IAy z{(zM*%gzjmC$T0rz{6IeJ`g!lZ@UDY&;&qqDFI^~KRQ&;d_Ii|h^cj_5@)5xe37Y=>W>r=-lg zA*ULkkr{}NHy+)(2j1oU-$~(V8eCz%eIaBG(Bm@!oA@~ziDT%1#oh~{uYpymcR-VN zJenhuqjS;Rc?`|5b?5|MjP(JhzFus zo{Y{#vwsQt+*-8X_t8jyAN|D_{E|429;?gfz!~2UNm3XGQE!M|Fw4;utVLI}9ZkO7 zXm)=c{T+QS?Le4FUi9-aXhg0--%qxt;Dgu24+fzRjz(uZEq?wentbc96Mly2SoUCu zKwI=nYbg3BoFuwckD~o;L?`+Ny0u4<8$OEGo+U#8$WK8R-h@o2seLWj-K4!ffl z&5-DLwBy-mq?V!mJdY0iZmfTYzJCcl1v!qyuU{Fh|{F;wB{}wjIh8Lo*MR!KuMLRx( zhVs+cegZv?zoEzKY^?u>PB8N)VWoMZ#nJW(=+@Qwg!AvpTGL=Cd!r$~9lfFEMAxDN z??$uwBQz;b#Lp9-hO4y%+TIxb4(N$)>6lobAKi#9=)EKbCvXHG#2?XfIsRw}(S7LG z=^S*0525FGWpo2Np;yqa-}liiIfX{{x9B-+Nd4dVdHv5qD-9Sy_Omk63% zb7T9W=xTIj+p!+L5j}%_saN?j+#?U5cmGy=5+pT-jwOzT-vxJI3+gXM&te_w^}Y#z794?{sc%7V)PK-qF8giRik9dCdtlPg z4yNE9kHpcq2B%>D@4~z@jLk@?`yoPR@d{^xL0%{$El)KB3mZ1qc+>G#-_`k&Ys zYyKMk^}11LE%Fo5Nv!{jPB3|qg2yQLAK|zZLp!Vz>rK#$r3*Uq z5%Kde=s@?Q6M7I`;bZ7lJdK8W3mU0?XarASNzCzQYGTPmRSKT-#z<}?TA(kqLRT~x zo#|LKv~yy83wmYmK?nK@{n9#zwK30Mp`SL`fcnkoDOrhC@GzF-{z?2p;Tjr>p9z1R z)&uQu7CM1dvAzwxQ1+t(eSx0ub7&-rpAC_#h=#r)8kw$WWcr{B9gOySt9t(Lq2LzG zjSnn|_2pK)2>DbizqYx)<{( z6v2)0fp^f5e~4*#5)IjDbZZKq4;|Gkmr?~vUi&<7@<6M7!|;68L^r7whke%};tq`m;F<0%}AMJ|TDUx4=W7Mjd|qoL1w zDQrnj^i&kS#QFDu3N&Z~G*lg6=6dQJ;4<1DK^e7st)A935=)|u4H-t17+EIS2fThrgb;LqA1dYHXbRuie zWZxX>$;2xZT=`pQ==X&W5?`Xp`2*I#OqYXo(WJTsy$_b6D|!P>vIA(OzKfnf`~MYP z=y^03GX7^f=kH1i?nNGS0wvLls5aVBT{HrXq8;PsePX>I`rPnXzXRREdvPeOTA~x{iEhcQ=yQ|M70p6d{xJI7v*;GQ zj!x{O=;!FxeG@&7N%!Jc3ZCl==pGeLOG||;9nFPGXcE>zKW~FhpbHw>zGwu8pcA?i zy_lw;1Fk}!TZeAt7Ib0Xq@{)b{>Ps*)TQA(R>i6r!@zyf(BF)9JO=IHUUcuD!)x(l z^tm#b(o)G)8x3_+G$O;$h)l*R_y{`Tw=yNeOb*iE0N^~KAI#?qZ9coKJX*DvQy~57tje^ zktL06;Xh1>ehcP~^$KW?R7MAAhHhbNbi&u73k~(5SpNylk-yMLo{Q~?Tw$E6FxiX` z@=;iWJ zH|sA+!z(m6z)`e=ljxoPcdTETCoT0$rV!de9kk;n=)kSe_uIwx8=^O%k-Hh)qC0Ue zF2k8vCNJmT5N*gC+>Gwk7IbB=qe-+6O}hQ)1@s|S!i@RCo>s&1)H|W?-Gv^*B)TOJ zqq(&KN8?@`f%TI4L&HM7QjNSpPQqL-cs`RP>i%GVwbFv-mHx zgNtYgvlR+=cVYCnR6&!dHM-Z=qFXfp&57Y??uVD(JDQjdsumjmULqa`uZ3K?fRvPH;T>{sZX!F(18O zwqokv|Jg&q4iBLZeu1vwJ9GtqpdDUDJIq=%bWj9sua1ViA=*zfG)X%}yP^y0fxh1# zo%qP2oPR?;o(4O*KR&n+ZGRLE{Tg&a+vDf&L=U17`V^h`&uFgviAE}0v2cMEN9#?o z6m~-wc2}|Z{eLeFPGC`da0S}&W^@8O(XY!R=m0;*ddA}6mril?{TAr+ozX455#5?Q z&;?CEC-MNgphuGw4B6V~HuS+AXh-j(q5CS_A-^cbJ(HH-WpQl|NR+bgrgLEB3Znzc)G^o!|^~g0o}$LUcll zQ+3Y&!|{Wq(Z`}IqfbVkj;=vFem1%Z?Qjb^k!`VkU-SUFzz;BWs?a~o{(-5#|Ibk} ze9u?HbUtW}zHke=_v6t$zc;qeMw99>bl|6=tD|e8>!RzU8__M;jP|z$Q~&KRVNau|5P1?X5Tmr{a@%McK4OOI(K^;Yn3QpixbVV7frKSG& zc~@h5>bGGVd>)U^o?5{YXoMVN;&o`OkqD>}eftbxn0I=+kT@H~#fX0^kB8_|fpg(mG6=s;QPgd48_wxC`N?f*vf z+z&@j%~(wR?|)vRU`Y0$D?J+PC(%e;!c3UGZd&3F%#G(nE6z^p7uA< ziRW(^-YbuO2~|bg>!1;8i#2f&n%s-y=Px(p{QJN@8Vvmp=!&y83im=0tVF#u*2ON^ z5U0n_Uq^4Wx3LNSgAUxVafm=?^moC{XfBOL`@bK}jfayI{4?HqbVa+-EG^t5gswg| zrM?2I;AdzEGdB$uLHE2GI#5G&kK156c18F84z%AX=y)s8-xVnT!M$tNDOTj zoQqx<&!Zh5#neTGt|&|MaJ-74SzRBUNU!K1G)G3F1Kx|~%6w!($;1i@X5(w(bI4YUD#DEgGI0o^>XM|^~L6%|D~w{|H>3P z!-B1XWzl4;jds)ky|de3I^Kd#=mGS*;0g5owb2*Ri)RWu@yh60tU`SYI>9f|BszsvF>Bk93-!>@_Ct@~LUe#7n7SX(Q}$wPKZIW4U$o`? zr&IWo29qaWyRd>9YVbzI?*!dgj%9W*AY#|!RU&|#`c+5n)(xH z1a_kDe~CuuVv<5_3RyaanKnc_=oTGbXwV0)Q>Zck1|9>cW%zj6=;2fG9|Dqwv-y<#ckJZ!B zY@dX#U@3Y5twmS%IvTn6(U2d*8kp8I{Q18&)}lTP{VrIJr9J=qDY)0aq7k?h&3b*< z(?V#nRYF5w2VL2<=oZ|8<#7czz+LEqE}=P*p;uT~J~U^FqVJW)s*IoLO2MR)f|{Wd>4KjB0cg(MhRJIvET_;D4`Vef zdqeov>wy)hPeGIA8FYddqgV6^6UmQ8rY3saI>q)u=)$I;D_)Ln$sTme&h?4E|F7s9 z8j7HMUm06qOElE?p%ZxqJx1?iBRr1gLg{|trmKxcu0MJq-G<%^E6|mHiuV5v8oBfR zIR9p6w*DbRrO}YpMOWGi4Rtqk1tYO4K8ohV+tGt)h>v1>JcUlA_Km@2Xn&p1V|qiZ z-GP{qb5{iY@R5td8Yw4O@FX&Zj;NSK(E+5kb%Ya}*rtE%b%M=*{*Yx>xy!g^*Q6 z2WX7ta1OS{=g}MQFLWyl4iEQ0IdrS4qFYrPeXk9AszzYypa0LNP>F_3Xx4s$zVIDh zfoCw48|VPpMufklE`t7Ooq~4w0eV6Gg>KR1ST8g(yjL2XXf5<>`udUa`+p)0X7h4P z$6aWMzej&;UPcElJt_=TE7}vi>Bggby99mj9qf(YpvScS?O_2e(a*b~5gu`SG8B?D zcw8PqL$n4xj{DJ-pGRNFJUVPuQ8Yr8(e@_j1iPcjJSetLLL>1YdNV$Y9>X2+^CL+L z?)`Bz`_H2t6}Tf<7VV%8n$=ym1vMp%a^kM&i-v8uZw`fOfPedK8VwDRct=q5bB*D_9c!yn3i76Rl%I z4|HX>p%a)IU5@VA%V;EypacGlhWcOZiiO66KQG*h6{$aib@2dtiqgi02^2-gsf3L^ z|II1b;be403osp5p?kFx&54hrm(T%9jSF@{-y4e!a3*^5y@~!VxDZVrA5K?$%t3ok zO#S`eAPP-sn2Lt@bu>i#(Bt?udaO>N$MG!M!N2kIYT&yO{d_|M3w8k5P^Z;qURPVmkGa=nM1FWLt*r>9gpS{3?2$KSo3RcQp4s;rWW_ zjoJX6KsWTg+tIC@a}Vd=hNo$0g*(s{WSAKKMAHyWp1aZe;Q@53He*kG6J2S(N#PgG zwOEJxH1xd}u_o?DbLb3?!CaHW0`Hs5`M1N>G#ILv&=tRl?)`o=S&pF*IE(&}$UG%% zK~8jq#n7v^Ho8>}&>yp{(XHx)ZtV@|^Fz@IPDxU*<9X;nE6~tvjSswsuHZ8?+p|p# zmPLP_H$#)}el&-cqAUFfUC3|fX}W|?sPMhvsxOJ=QnDijXVM*A@gOuJZ*O$@fipL07!FJS}q6?gX9M5FpaS9G_1dYU(Xoydvp*tH* zn--EM7y4Wk^z+8C-T|F>A2gXqpvQJD`e(>3=r}LN&v#(zzyJL;1w(NPjliF=o@IKd z=R}jVGO(X#weRCS?w>?U3f}Gg&|@?a zUEyN%#i!7%cnJ;l`{*(J35~#cbSpC5AIytRI31mE6ZHA+=)gmwcVW^8rcrRFOVE{U zL|5=OI9QF!RjN-U_`J24PoRhF{}x9Ey8pr6mSq)!AW77NQGShDK-udP-hK zBk*3Ve>R)sT1CTY8aCsCIq@gf+;ErAL07g5+u|SS`K~`Nbkqv1cSn!gjc85`Lyy}S zT!<5K6ka($L|{CYr@k>sp$df~*cdOPInZc9*s~t!1a3y#A3}~zVgpviV^|q;EDSef zeKhm~F&$^4$+|v%z7^f_&*JCFUn#ivxgHEFEEgS#hH5LC18<=(9z!Q`2JJY)p#SDNXO@VDSO zqIu9gE*LElEgP*8tsQL`Z4qsc`91$#DH!UT(c~F}hHy%(&qj~SL+F4T(NJzfC;kpP z!O!C7-=aBl0!^|)OTxmMq0jZjb~qT5hVa?=zzOV6J>$~w!a#H)lhBFHM9=pkG#6e# zkL|nYDfkJU&>zvvkA|%%g62Ri^lI;nUU1hx8o&Q2W1g-y^D;rBo{^!Z-sO?V@c^@$N^M3*LGVHKKm8_)@SjNaM5 z#QJ3%M7`jOkP8zqo%$klWn0me9*p(VXr!{P43RB>9`kfG$?IW5Om?Txh{C-1z#ep_ zU!onHLX-0xdi*j!9{xyH8@&;GqmfvNMqmwA!~>WK&!KyL35{^}CqiTkBjY3!H7JB?9UX~g`80Gw4`U^K3hih=`utJ!xnIzM6HkT-RYG&BHm3TI_C`a02j=(p|3nIg zZXx=o(oN`v^FeGsk6z6MR)zNN=$=kMZ^nDkt$G~Yis#UY?nl3d&!YY3c`95;HP9q& zi3L3W9Vxh?f#{!hN1-cPgbuVCJysiH`wnz3KR}c8I5xw}=zvY14#%x;bZm41w&3%1 z=mJk*>VN;Ab9D$+DRd%L(Frs}SJVY-;c!gH73iM+4^5``(Fq<$CwvLbowR3yIip3< z=gXrJYxxZ4-@WJ&8*W68&+TaPJb@ zOVEM$p*ivSnq&ysUo;rXTx-JxR382E=z!jM{m?y|8tV_B$@gsZjpz|9Py2Cn&vUK| z?^i`Hwr=PI?m`!SUy_2Mnjb${hMxcR=*oAZp*@Ul$q(p6&ZEceKeVF?&xU_vq857h z*TvCzGmgh2xDh+74-r0t*HBNE+Yt7)KQ^IZ0k+5YqIoxlzy0cmU1(p8*W&N!bImpd zXQF=~If$(>-{!Ee8_)&ZjONk=Ovgu%txG0eqF_kgL09+*n$0KC7b`v&PDK;6J_!5Z zIP{nuKy&4M^dB_T8J-V0PzJ5HM*AO%=F&Zw`v3p=XsW=M2b$%((a@hob0X80@M1A^ zYpSC;(GIV};b^kGhBfhXbc?cY4Hr?qXz^&dXm$1c*QekMEutNw*G2n82StZP?~L9P zofe&q=F}oIH&&t%Sc`tgyo=t9e_`tUU#8%S^K1(*rlaS$D!ONN&}_aAy&p!Sk(rDR z^bq2S=9vAX)R3@IBrQm(j2U z-HPh3h6%MquiV~f5{*JXUx-HNDKr;ei0$uTDl+I5`vY_Ek0h*S-9rQOjSyB&?# z-RJ~oW9s|=5elwk1Nz`==pOGz_xMO`KZahtC(tCV_htxjd+bSl5Vpk^aVlO!7jn;A z;khK5W6RJ9Y{u02f0crJ_&z$3@6nL{g>FgKo#9;PLARhf`gs@3h(pko-HKk__n`f} zj3(b+tb#|-oVbimpwKSPzsXW&S7@k@zR()&pewos1ELerd*BiDRP2cDxps$8S4J2PykmDVJn#(-?$zIDi1NQ3B2ozrX$!1{GqE|of^OB{=t?rY z6SnLsbmGO)3#lraGuL5iLg@3OV|`MRf+2eV?eJ|(#{*aqe?_;T(4Np<5?x^nbiy~G zr(q&G&@41}mPgm4&%c88@ndv>SM3d3mMl%d8P`QSY=h-+5Zcj9^xJL;`s?@=bnm~4 z{)OgF)^|fB)6seZbj97U5%$AsxCD*BZe&Z6i9-~8;Uv0(#J*6^hbC2JG)J1CS$|!u z4@M_4KDN(`u0(TYGp6IaXg?>Tm(X0e>OIHf{8ymhN*ke(=osybhH5xE!F$mOEq zZ1mOm`FrR<-=fd`g-$%n{_tg16sxrZuJqz)z5HR$zoDo@gB`X(L(~m@ z@n-ZpU_6>MN%Z*5Lsz~ZegA88>wZHg`X5%u%pZh*E>Jgm8`h(JIo81sKH&UY$b2LW z&=BpgEjn;-^!N>m^&$96jFPN zCf_b}#$RAM{)`ToO;*RK6-h`!a77R!OE1-MX1)cFt=w6OO_xgTxz@=#NY>4%DWBp59O8Z4LX%~MH z`g;tW*amb?Y{S2C|=h39h@l~(@x+Pbm&vi#Tz8*cM zcViX24{yZh&>YDAb@=xMYG57eGrs2hTX=;A_v$qItylC|SV3zvX*#1Jz6G7oI4p^C z(3Px5Z_NLpUsgxZJwA)}m+PCbbq&z=>(EG#_$C>WWiky7Xm}Kz`C;_8+&{5i?As8b z_UJ_VqFXZ@O}1(1#8#qPvlSia5PE!1q7lmUUFf$wnj3ACu`nX~Ao}2o=!>7Aq5lKD zkS?Mj&h&kVOl~v+mC*JkvEBilK!5byk4JOhK6K@C(EgIkDcHd?Xm-Dh=E5N~iM~aX z@gzFH-{|?z^h20f)@WWdBE@h3)<&=D#c0GnK)2{yw7>JnLiz7M{TMo~h_19Qdf_xh zXWlZ}6}?#cqZ7Fm?Pv^o9H+T_Hpz$X7&7EpkRj?e+m=Gg}zuA zT~Qr$BAw6F$4O{ztw**?p-7Fn07+1)FJ4EW=5Bx18hJqqPNg~zmEQaMkLekp`T=B z3bScwg(Go4j=}nWgqvyu+R;9ArN?nR=J_)?3)89pi(b7~{}m$G5}oh}bOMuNeE~Z0 z$FZvCeN%1_yoy>*6MCh~J_iD|Rv5Y!%TQs2{x+Jsmg4`Z#pJ zxtJ4|pc8!to!~Z1#~tXYId+lr@Avi}G}v*LOX0=hXuS&BLCaY0h7K?kUHP5py)g^D zxK>18Mz`iebRyrQ1OACMFw;Mw|GG&EuDlcW#vW+L>yhJ;cne+OFX(fZaTI3xH{5h% z(T>-m$Ltk!!u!!Z{w&t7yc{N45KYd?=t7e1DVQWZ&`{rq&U|=uVr-v-cDxk*_Id{G zU?ZC4+tF{$gJ{y8M2}8!bI77x%?$nGnL?hJ-Yhusn3^Xz?VJUnU9q&}Co%45@LSY*6q-CUQLW7=$>d`uA zk~YAm*b^5Wqlqlx^X%w^i=hLxK)0j|I^Zp_ejl1s%hB9f7kvrcg56m%hX4N8r}4ob zqJKm$N3&lMIx37F*K%kFjnIpvD|&M-MkoFrx|JWIk@^%X;6?OUm%cJYw!xLjF!PQy zn7xD1y_|v-aS0mQ9q52xpey|ieeQ~^!E`k18=?dBMZcu(K$Cb0dh>0y#FU}+> zn4P(^g$K)^Gj4=V;3o9zawa-~4QO)hKnFOCPW&7ifjrs6d!5h;jYXe(7#;9cG!h?2 zlmAk%!*V&o!1d7w`k^zv4~@WjbRv7um7hXGo$;z*4)k6q5bMRG<LbybdMiFvwIUZ!B@~zau(gPOu53A6hbeaD(Lxdf==+Z`1!TCQS^h(}_ekpyARWNTs&c8EnRxms;65CNqB(|4s@Gi-Z+#Krfg=MMKD{qQ~(% zG%3fTdp8GH;6`-I+84{1`u`JtJGy0`Vn57TJPbS>&54)Lf%l@{CC8E!{IV%gBCMoz zv_`ZEnuHzEE3_AyY&XaDanWh$l{_Ck=UdU|4@AE}PuEH8iD%GcO?J3C%xo;0-4CDx zJc91o8Z;uG#Ls_5bLAo$`fMe`sVRi!N;>*pL)?fX&cXxNV zxI6EgoXK5z_q|zb`tLpR&&)n2Qh|VSjZcA6_%$dKm~$8pvn-$-U2RZq(jK7mq(C3` zS3!B4d*(Fqvw+e-Q7}Ik1ImC4LFd2!*~CH;4udkmT~Kb4@1PY-p3ArieL;C5Y6{9p zO$H@?HCPcm3d-X?PHrQ=HYg_%1j@s9ASgHSJWvMO0@`J9UJb86A&i&D2*?4-6H`S{ z8f*+o;jW;>4F}~Y7lQIAIRZ+7=j#8X{`B64zdR_9miC}DG~AoVzjU|+!&>kFC`TEQ z*W&!a!vb&#`$GAQo8~eoC-V@LMt*>DPo&ImV0O^Tz6dCnun{N^yJ%1v8xBhR98g{Z zR_C`HZ-q8vkcY<}#p8;X6z?j&0OhUIC&fRC@d_CB6pEP?bA!TL7?hJN3(Bixef0;} zHK0A{g`*27&&}Nxhk`P3EGQGN2ZiXk;%)W61D&rOKKj}L%B5)v%EY}DM}op13tB<@ zDi(57r$BiXd=1K7ow%TJ&C7ve4^Zp@%B$pbP#T#J-UK&;@=j-bA!EX&pv0{Kb2q-7=3zSBa`5H%^8k7dS6^nrqR|$0f{=bPVFmwjx+6+{j0!l;6KqtDXS#7Wx`<-AVFhwcl2TQV_T#CoP zG;k6_ZSc1S)GTd04~zum=Gy_v&2EJ>_)aMaIEB3poB)0YBf(K+jfQ`L z)7j@LXED71cY_T*IN9<%{tsjLR)IGj81_`Om}au~tW3x3=YfmCdw#s$gF~uXod2;< z*6J41A>w9%@(!r2zs1xWJO*9@E7veCMe3Ty8x9{(Zbm!UMB+fXcQV;)8BdJ`K`}H0 z<=O@*Mu2k7`hs$o4+aZ?^FX<_XTiMS3s4?zDQhb+C^uO_Q0{g=P;TC?U~aGvm>;w+ zWRa7_8Bi|82T&TxRmXVTmIUSI^8l#l;*+H40s_vVE@*>j*B+)b%6k-P`_s9uQCVK&<0F%`-o>y{!GC);O z?wv-UoM;H>{P}+b3pu*ppd=0k<*28DdBBaJ9Qh5<8;oDyxZ8a}3wwW%Tf|n2qNjQ?dre#J*rz_Dw*!HWNX4RO|-Jf$Ku7l%w9E`(vP7qH~~}$OBNG(7uCml9nbs{^ckNG_g2;4_FhF zOVA(822KPeaT6#+C)Ix&lnLH~#lW;pjYjK$@;uQ7l&9cmP)?{fD36k@pzz-V3{-f|*+wmvp9`#W)OC!7^ZQOXI0>J}8sl2W9eaU{WwaE2HxapzI4NRs`kJ)mID! zwhH{^28Ac3eiYVURGy1ViC}@|!nrf&I zn%UdHE?@{40A2+}#^MIjNnX zJTaXF<ttNJBA^d@e^4fm0p;;N5|krd z1WMtJin~E+@R;sTgOYa*l#_j_e)~sVd;{f(e}i%}dWINJ!8t*(R|lm~T~J>2T7%A; z7W8L75R?XvgHresC?|Ctl$-DcD0zQDxyLM_`u;x-3rWZZ$}?7OP_B6uPzY**a%ozE z@~RjN$_Y&beZg&@9Q_MW-n{1OY+x`b4KD`eVYdmC$zOr;u>1_hk;i|jF2;lv6{~}C z?dyW_JkS)hf>B^`a4IOT87CEAfbs+tFU)utW(8$m29$ygLFWLv4+dr6uCk}TDUyX8 zNncPNpYF1OqsT?{9tm(0*{(;&u>hnP(!n8@_Ey&OPsxlXTZK z93yrAl_nId4%r+ftBS7{-jT!|glLAwKEqapv0j5Aa)Tgy$$Jlen&PoDhdl|AImnuc z_cWQ4@Ki$op}h%2?q@v#Jx5%6t+t1jZ0JukH#rt?G5Kxi>L%-zU_q%u{7L)?@vUUt z2iqO?B1O<7@-MqHQs^DdLA3e6?M%)=6a&##P-Gkpyv6?v5)nSV&}4(S5B7fK&ci-O zW5wSIe|7vKapV;NS%&`~Y(v1yXFb3Er7qF zk>dPX7ynVTC}eZVnTmf9g&zqO*)prxGuvl{_9ArN^C$t()< zOlQhTVUb}ZPG<7kDBn_sz1=17K2F#A0Mnx7A^9me| zuPi(w_Lmr4Qjvlc*!Ll!GDbe5$Fz`+`Q0DCzA~c5GGT-g_69FtkHr;)JuCSam24|T zc9YL- z3!q38`Nhb+#tGzMKaczdsK_wlhNC0Uk*M@C8XV(E{jn_EWi&}0u+7kdF5h{X5PK4h zU!W7^qoEm0(~Y77P(CHoG?d$t8ze3$US1 z+K9kT5T4SLafNtk-Zp&CDAW-QgSqxs9<^WPh2)mlHpVd^^ADHvPcS zhoIX!k*8ZjJ+<4S_$L#`$1s`J5|_D|SOipc?k|spzDK^(r8_zpir_{mW0ZDR*hicGs)(!lEE zq`+G(Qdm*^@|LBSHnB-bE5E5E`IIT-|Bm zrxi4F2!A4CH^QHi_%ZU%ZUUQwY<55zqmx!7Sfn?&8@oU2%Ov_SNgR-GMoo#xTSlHI zn3MfTrm8`lycrZJK<+OZ3?N@*8oCJEeDcS_lZTwC@xwSG2##Uwj`J}IgPq~Lp406W zlGkBRK!Qj;_HT@(X%g$N#Gj(DnfzA}erGSzjJ-%bIL^^zb7%gP0f%zi`2#vr2<8-o zoWhlrv~f^fCHyKrk)qi1lJXJEgs%uOxv}R%dt$#zzQ`?nh1t(!gdiD#xI&;GhaVr` zTVlTB^Mt1zt?iaSrIVkK&c<<>#2i|11Q>w5K8eY}>m+Z|8A_9Uj2V|e?h-!X*(p!( zdE+}kd|C=*fzu@y;VcJV0(>IL;p-Eh8*UelNH$IBOyq_J6oDugg#3Zszf#0)JsE3W z{32c4>;(;z^J{J8906w)EO%+B9yxWv)$CWwM`@%-3)AgLP~<#G19e@LDdV$mg8eKF zi5xZH->)r*{fzIC`n@@gQrPO!)M_-6fx!fQ>Z7t!K^EQBIU6yVK0)J9FeCqkVbx$ zGJ-B{X`ndDKqRtQj{#a04EA}QRSX`kR|seXgUjDS#%#kO}PO}phfT{#Mi-&V+MK^6=?%$Itp!o#K(<%o8dO~lA+v z%Hwnx^Ye75#whLD>Eufnn)*Rv3W|!XmF8Gy*SHG!uW0Uk8l8x5qx$-Ba&NVPv^04N z|7?wYNnCDh_Mtjmb3OKaZVmXd?yvSoU>Db95X%$SADU^4{T5`wTIdtD2drCSZ-|y8 zwl27WcoA=nD@RTZ=Z{hhyYuS`jA3+`3X-p^*O44XvdBtKp&=xzA@HY>(r%54zYKAg z<#dn;G$*;~h|7QuhI2oBF6o2qs5BtY{~~GGw1oUVxCD|6dQ9T;qVOMzmB;Ucc7ZrQ z#WLz7mGO(jhjbq6h1kEtvzC*sPn-qZ1t!vl!{FG?{xCewZw*@F$Vl=~l2%Fs1Z2`l zq`%_2K1!Sq>s1t)H08pxl=j0|1}JSa%9N$;HQH7)q5qE*z&DEcn)o^qI}prBwI0~| z(}7FYu_(?yLT?WKB->=Avueb(#V$Wsz9H|HMf@Q;Oj`%FaAMl41LK=??vIbuRmrz`! zE=l+B-B;2F_=538QLs71G7^&o9gck=x|d1oG00-pBJ*h?t#Zl!4g33O4{{$kKL=Z^ zDsvQnl2Da^fdmF>;Sf4+3h{6DMOk}-kBR5QsZCjlt<0&^rdgNx5xbZDT=1Hky`Azc zAkX#WVfxNAs|jjB!E^-7Vqb`Tc^c`(dNEVwfoMGbZTOdwe4m2dSqJMit`7!bTTe62 zUs-4;1K>%)ItyIwY1~chru!0%3*U{>_M~2|4*_ zW(4*z#QV~~H9hWrRZ46~ay=4aO&O&;aKjdS#{PX#6G!N70N!Pi!cr^}3eu-DnXl79XC2G#sV-MXVFc z=iv6E@HIUaNxFOW#;`bOmap+*eNeZ=2e zn`{%8>wgc!2%HZgya`z;g5xRqMF{0*??bS4)6Q>ev)SC5mYTIGRDqLePi}A4@=Ju( z+VBi5xEX(HZSpEZKC}~%j1yRoBLK%_8W@kQ82cHhKYAUa-vrO30SCUvO1d2TR^neM zc@1zPamCS`TI4lrkw|z%77>5VSUSJj{W19AoTk%^*2%^DP6M}5_`BX8g|XRK@1xik z8i`N*Fp5RMGoO7`_NU>?j{goekr8Mn^eS_^kgN7RqC z$Wx}+0ogtZ9D<}W``PN7;?{5UuvMrR2@~BLX*LoJ8_w zJ%w5{CsxVsFsEK>Sr`tQxjA z6mp3}jv4Mi;*x05L*!;8M}+x#S|njE&cWy&_MK^}6-nhNw4KDepvZk}heM94#)U@~ltLO2l$QHUvmAA5wwW{d{(*;>ha{1BG$*nN96+Hv*eg)Dole%8 z_`diq!nv7sIU3jr?n0j^$8vb>zqN=#$Fmp#7PKbg)B(2;^q3f5h?0SWv9(eH$tgy` zvU&>7X(WsK!if_JWFMo=zSUZZ^c3^S^*@C1g(j8M$tAH99iOFWAbJRbBw#Fhf_VNV zq^T`AHr7$tE|Hf;3rcPeJ?=vwztA>?P%x98%xUuCuzo?)SLF5op%(AO#HR^-tK+$@MyzIoq|{zV@WREmy| zLe`Z+X$W2jCL-7$UoGs_S$9P56K~SSOX+0(`2ARS)4de9P5uQvjcnu`ps8%+d&6A> zbUywsYIn&<^hWovpQ0o)AlXe~YJxNCbThFvCZ?!f*N4P*K-17r0Je47n7=fs@}5R+ z;u{7g#h;S(V&~`J67Yu3d(c@s99zKQkkzE?aul?ZaD;Vd8W0&m;!a~}nofLea(C*4 z85OfDe%844aI~S}H^f(l->QD+{G$mnL|dP%H6yO(3XP8b}XExXd9_RJXOk!)C1xUCK zPKRVI#Is1Ou7$S}Tor#urYQ_YgNfDWL7d1)V)CK=u@8W=A5C-tPk|!AtZ!%o1!)Me zn+B>=c9~fpMB77{o8TsTbU9h~C$XyT50Ko5_)0YSh+@ydacDa9oDd-ii7lj!En`0v z4v{L_w5%)1Z%ak|AM5M((WE$2p)0Zf)aj~{BqG1=63KxU!e3bZVr!sNr^W6|agkp%U4gxs z28yA@v3qa|B1z>ZV#(Y(yUGL;nd&q+9J0?OCXh);NQ+*j_)hjBC-I*m_XzPVS(hXy zKgC2+Vw;4owKf#aI-WM#js_y(-NoMiT@$Kl;8V9|gveLzU9rE@wb*;e7i0j1iWy5& z51RX|F}D?KQ!I*@wpwSUVt0z?kiUvfPbV%3*JE+*Q@HtDwh2sGh|Tu@G`gB1zWAO& z{2Ba;zc}j}oYrqpWEA#j8vCS|#`$XGz*(Q*6*#^r=^ZB7q{Tl&+yX7mJ`0IvCRoPa z6XJb(FSOCAmKt?Tnc=ylzS&@Z3g^(_a>7xL_ygFR+u7`Jn{o+jxx6(ASPY)fPVeb) z-dB78#-b0={^%oAdpCWhxe)Rz3lWkKEP(S2TrF9LGH`n0XMy$=dUC~NV+q}IB+i0Q-T;aW zktX%k$Z2Rvg2+y=2u?4O`9DxhJ;87at|c+9PV)r&Q;K?FE6jQl*p0k(;0PL<0`}8W z$gB;0Wgo=kC#g{h91q$@5ty6;C)nJ>*quV3D6$g`(`$DQ!Yyvo?qZ#rVjsz?rA-%r zyfo_u_-28Xwb7pNik!h-fcQ{qe4%j_{wh}k>k?2KErPQ(wg4gu(wxX38rchWrMUo& z7kf$8!-@G#ULkZb>v-74P{hh!q#{M;aE=aE3`evxa_H8 zddS`vvT7V(C)O>{3y@u+nUe(MM(+_T(wdmkdd&HVb4g|5FH`gxdV$z?@NFS46?>=1 z^?yRbARN2VX{_5obd!K89BDoLHKiLBZ@nbbnD7|nUy1VoMK)_Q1<8MkEeJl5!3^~X zOsoyAAvYe}r@-72&=is=f|nBb7)N)AzCn;1ZNa*5{3(79^VwGt>PJWx@)i>wgnJR; zov??Xp=f8c3(DUl@c(J>PDXpGPfiYUMZ&T5WnT%7am=;>~)Zhah&Bjl|2Rh~|Q91=teuSPGs(vk_Yk+aQYM)aFW( z{0wf9lH`;(mZt6r^`ZKgq&^hwM9@MKMQ*ZRu1V`47TJYusZO$qoVD085j|S9MBU=OtIv;PD?;E&18V=jy76> z{GK#>P@5b=%oiC5zDTXrjo2&1M5FemN+!jwLnOj~2xPiQ@H3LmVQbAq1cUsH<4;#n2LsKvhKoq6F!k> zIAbXOO!D>q<9~&rD~Kj5=~R46Nyvb%K>M*@LsAO$vvo>Q$WEZuXlx5Og=YVO>oqwW zHFg>6*4W}R&^j84!+IQA2ERQni@O-lL!OB#@?-pmgm>T>>>|Z5yx3C`Ujg4UPv*Z(10r5H`$F!L=j?0Iz<0X- zO|ZxwlCNVQt^1GKU;|F>zfy>zZHPNdOiJ=b!aY|Tt_jBn>ITa)uvQcC9fUCu&+ zJVNg)N+YE zJ&pkcmB5h@jSIm!2p14>i%#d_8>Zdg!uE!Z$~0%~7Hd^>a{1wzRGO~F*eh!kcB z2kUQeyTp%073}%>55$}{51J@PS8Yiy3DG48dNOHBY{hiqno9VPjQy+=L%5dMi4dhD zege3deJ`3COCuu9hxS9CBVC$>}%CgUcuL-sz#BF29q~wZRWM2}0Bf0(u30Q+Z!ngqJ z!ZhAs95j@KHw3z5F6$xa80;S?Q~<{v&_-kRC~%kc25iOQ-2ygZpO*Mw{5x4E&<6HV zD<^(?38ssr;5Q5+_XrGN-w^EsNdrw726*bk8`~qU;VBd(n1hF0P z#e<^|zM=4r*IZ{JU(U(n{{T*rbTSdatJr@dxI09Hw73_EU$Ez3-=3H%OjJQHQ2=|F zEY$d^T4)GOq@;=7@QKt#dujZ2IF`uovlbDwh=fa;)QtUA)^9zgWV@bbO0xH!_95D1 z2jzJVM>}}O!y(c`Q;i)p=>4GfR~%n{@(Ob}o%FC$Q9@(^=!v}^Jjc~0b|30}LVq$( zZux$Cj28Hd!Gq#qICqjLas+Z;ie1KDS+7bOZ7dr6MUGvY$qS|=p8v1TDO+_g*-Rln zJNqEC8afF6xiqy%o+QT@@y@TCAWT4^gH9EB+JmjGPHW4LNei#*r`{orp6%`kti8>>EHh72JsKQNo54 z-K%RMTTA{V;)>J!Nwp^-USz)(55SjM8>qwD`6LyO;&%wT&vbqSW`KA-iT|*k#rh5Q zbdbBtKnnd)a(8`6abW}@|&a&T+F4HcD6F5YV zvnzz_=-MT@SZ7qvQFh< zS3C=zqlxMGrcv++10{(+n_&h6}(WzrF2DTs`bgaXY~u_d`2j5t1TgV*;u13eBHSkXWMP8zN z$oWLGB0U%+8@R}I{v#oJLBcqKL?+Yed%CU#=^qMYB4NJaGG(HXX!f4uOeek_vH8$> zsE-zu&|u_-qc5-ov_Mql9{3yQ2jQ)m;;$KP=hv!N%@M+APLKoy#JqU4fvos-Cb zexaeg#Qa0daI`L`@D1W9n(2$bf)c~98FinSBAj~Qv4G3!(K*xQ#uU_hr9*J zF6p4_cr@fglE`Phj-eFw)godag}n*+6Uo_)ZlvG}_D9hzI{i`Vv{#H34d-8cB5$#$hCC^_LyL<&J~@B1@xyNR#;o69A4YsPEiCaF;F~BXm4Np+ zO+rGWtP$NdSN*yok0V1?k9}nv{abqEvp8NZ6;tCzK9L_}A|ugd0~ zX2;8_<`;22`ZzAvF=vaPs;4bH+!`DhWo;Z35*QZUAuKRDI@Tw^oGvy|fH_-iwE%PW z3>^>cjud~-z{oy6&1|8E=KEBQj0x&ui*yVMFegpsTP-pw+7=dOv-(E{b`0%e_3qrw z*2!8uBC=~>bY9c{@pcREwE!WxHL_~J7b%G@vTeZ;e5XxEu9oe^#b`P_9S1+2^)X3IRw4kYx<99sEpPU{x$4?*2CbKz#HFkYrOCiUj!j?I4;xw}b zg+zrphLyB*^YCh7>lJN_t$f!bog-sui?@eI^Vm6M2%S;JQa!6BFeb|JpoPV3aWrpZ z@rdKt9%MOd&RfS8WwS=eA=!dMqeE?xoN{2aEtG@m${{%^aYRJMZs}+#5Zkqg+3LvM z$\n" "Language-Team: Benno Achermann \n" "MIME-Version: 1.0\n" @@ -90,15 +90,15 @@ msgstr "Kopiere 3D Grafik in die Zwischenablage" #: 3d-viewer/3d_toolbar.cpp:40 msgid "Zoom in" -msgstr "hineinzoomen " +msgstr "Hineinzoomen " #: 3d-viewer/3d_toolbar.cpp:43 msgid "Zoom out" -msgstr "herauszoomen " +msgstr "Herauszoomen " #: 3d-viewer/3d_toolbar.cpp:47 msgid "Redraw view" -msgstr "Grafik neuzeichnen" +msgstr "Aktualisieren" #: 3d-viewer/3d_toolbar.cpp:50 msgid "Zoom auto" @@ -142,11 +142,11 @@ msgstr "&Datei" #: 3d-viewer/3d_toolbar.cpp:118 msgid "Create Image (png format)" -msgstr "Erstelle Grafik (png Format)" +msgstr "Bild speichern (PNG Format)" #: 3d-viewer/3d_toolbar.cpp:120 msgid "Create Image (jpeg format)" -msgstr "Erstelle Grafik (jpeg Format)" +msgstr "Bild speichern (JPEG Format)" #: 3d-viewer/3d_toolbar.cpp:122 msgid "&Exit" @@ -314,11 +314,11 @@ msgstr "Mittels Bibliotheksbrowser" #: common/zoom.cpp:185 msgid "Center" -msgstr "zentrieren" +msgstr "Zentrieren" #: common/zoom.cpp:199 msgid "Zoom select" -msgstr "Zoom Wahl" +msgstr "Zoomauswahl" #: common/zoom.cpp:218 msgid "Zoom: " @@ -326,7 +326,7 @@ msgstr "Zoom: " #: common/zoom.cpp:229 msgid "Grid Select" -msgstr "Raster Wahl" +msgstr "Rasterauswahl" #: common/zoom.cpp:245 msgid "User Grid" @@ -428,66 +428,6 @@ msgstr "Verzeichnis" msgid "Select hotkey configuration file location" msgstr "Wähle Hotkey Konfigurationsdatei speichern:" -#: common/common.cpp:60 -msgid "Kicad project files (*.pro)|*.pro" -msgstr "KiCad Projekt Dateien (*.pro)|*.pro" - -#: common/common.cpp:61 -msgid "Kicad PCB files (*.brd)|*.brd" -msgstr "Kicad PCB Dateien (*.brd)|*.brd" - -#: common/common.cpp:62 -msgid "Kicad schematic files (*.sch)|*.sch" -msgstr "Kicad Schaltplan Dateien (*.sch)|*.sch" - -#: common/common.cpp:63 -msgid "Kicad netlist files (*.net)|*.net" -msgstr "KiCad Netzliste Dateien (*.net)|*.net" - -#: common/common.cpp:64 -msgid "Gerber files (*.pho)|*.pho" -msgstr "Gerber Dateien (*.pho)|*.pho" - -#: common/common.cpp:65 -msgid "Portable document format files (*.pdf)|*.pdf" -msgstr "Portable document format Dateien (*.pdf)|*.pdf" - -#: common/common.cpp:66 -msgid "All files (*)|*" -msgstr "Alle Dateien (*)|*" - -#: common/common.cpp:227 -msgid " (\"):" -msgstr " (\"):" - -#: common/common.cpp:231 -msgid " (mm):" -msgstr " (mm):" - -#: common/common.cpp:249 -msgid "inches" -msgstr "Zoll" - -#: common/common.cpp:253 -msgid "millimeters" -msgstr "Millimeter" - -#: common/common.cpp:257 -msgid "centimeters" -msgstr "Zentimeter" - -#: common/common.cpp:260 -msgid "Unknown" -msgstr "Unbekannt" - -#: common/common.cpp:338 -msgid " \"" -msgstr " \"" - -#: common/common.cpp:342 -msgid " mm" -msgstr " mm" - #: common/basicframe.cpp:224 msgid " file <" msgstr " Datei <" @@ -654,33 +594,97 @@ msgstr "Gruppe wenden" msgid "Block Mirror" msgstr "Gruppe spiegeln" -#: common/dsnlexer.cpp:169 -msgid "in file" -msgstr "in Datei" +#: common/dsnlexer.cpp:88 +msgid "clipboard" +msgstr "Zwischenablage" -#: common/dsnlexer.cpp:170 +#: common/dsnlexer.cpp:188 +msgid "in" +msgstr "in" + +#: common/dsnlexer.cpp:189 msgid "on line" msgstr "auf Linie" -#: common/dsnlexer.cpp:171 +#: common/dsnlexer.cpp:190 msgid "at offset" msgstr "bei Offset" -#: common/dsnlexer.cpp:247 +#: common/dsnlexer.cpp:266 msgid "String delimiter must be a single character of ', \", or $" msgstr "Zeichenketten-Trennsymbol muss ein einzelnes Zeichen sein, wie ', \", or $" -#: common/dsnlexer.cpp:362 -#: common/dsnlexer.cpp:375 +#: common/dsnlexer.cpp:381 +#: common/dsnlexer.cpp:394 msgid "Un-terminated delimited string" msgstr "Getrennte Zeichenkette nicht abgeschlossen" +#: common/common.cpp:64 +msgid "Kicad project files (*.pro)|*.pro" +msgstr "KiCad Projekt Dateien (*.pro)|*.pro" + +#: common/common.cpp:65 +msgid "Kicad PCB files (*.brd)|*.brd" +msgstr "Kicad PCB Dateien (*.brd)|*.brd" + +#: common/common.cpp:66 +msgid "Kicad schematic files (*.sch)|*.sch" +msgstr "Kicad Schaltplan Dateien (*.sch)|*.sch" + +#: common/common.cpp:67 +msgid "Kicad netlist files (*.net)|*.net" +msgstr "KiCad Netzliste Dateien (*.net)|*.net" + +#: common/common.cpp:68 +msgid "Gerber files (*.pho)|*.pho" +msgstr "Gerber Dateien (*.pho)|*.pho" + +#: common/common.cpp:69 +msgid "Portable document format files (*.pdf)|*.pdf" +msgstr "Portable document format Dateien (*.pdf)|*.pdf" + +#: common/common.cpp:70 +msgid "All files (*)|*" +msgstr "Alle Dateien (*)|*" + +#: common/common.cpp:231 +msgid " (\"):" +msgstr " (\"):" + +#: common/common.cpp:235 +msgid " (mm):" +msgstr " (mm):" + +#: common/common.cpp:253 +msgid "inches" +msgstr "Zoll" + +#: common/common.cpp:257 +msgid "millimeters" +msgstr "Millimeter" + +#: common/common.cpp:261 +msgid "centimeters" +msgstr "Zentimeter" + +#: common/common.cpp:264 +msgid "Unknown" +msgstr "Unbekannt" + +#: common/common.cpp:342 +msgid " \"" +msgstr " \"" + +#: common/common.cpp:346 +msgid " mm" +msgstr " mm" + #: common/richio.cpp:73 #: common/richio.cpp:95 msgid "Line length exceeded" msgstr "Linienlänge überschritten" -#: common/richio.cpp:213 +#: common/richio.cpp:212 msgid "Error writing to STRINGFORMATTER" msgstr "Fehler beim Schreiben nach STRINGFORMATTER" @@ -1137,15 +1141,15 @@ msgstr "Anzeigeoptionen" #: cvpcb/class_DisplayFootprintsFrame.cpp:162 msgid "Zoom in (F1)" -msgstr "hineinzoomen (F1)" +msgstr "Hineinzoomen (F1)" #: cvpcb/class_DisplayFootprintsFrame.cpp:166 msgid "Zoom out (F2)" -msgstr "herauszoomen (F2)" +msgstr "Herauszoomen (F2)" #: cvpcb/class_DisplayFootprintsFrame.cpp:170 msgid "Redraw view (F3)" -msgstr "Ansicht neuzeichnen (F3)" +msgstr "Aktualisieren (F3)" #: cvpcb/class_DisplayFootprintsFrame.cpp:174 msgid "Zoom auto (Home)" @@ -1542,18 +1546,6 @@ msgstr "Pin %s ausserhalb des Rasters \"%s\" an Position (%.3f, %.3f)< msgid "No off grid or duplicate pins were found." msgstr "Es wurden keine Pins ausserhalb des Rasters und keine Pin-Duplikate gefunden." -#: eeschema/sheet.cpp:77 -msgid "File name is not valid! Aborted" -msgstr "Kein gültiger Dateiname ! Abbruch" - -#: eeschema/sheet.cpp:94 -msgid "" -"Changing the sheet file name can change all the schematic structures and cannot be undone.\n" -"Ok to continue renaming?" -msgstr "" -"Ändern des Dateinamens vom Schaltplan kann die gesamte logische Struktur verändern und nicht mehr rückgängig gemacht werden.\n" -"Möchten Sie mit der Umbennenung fortfahren ?" - #: eeschema/libedit.cpp:25 msgid "Component Library Editor: " msgstr "Bauteilebibliothekseditor: " @@ -1577,109 +1569,109 @@ msgstr "" msgid "Component or alias name \"%s\" not found in library \"%s\"." msgstr "Bauteil oder Alias <%s> nicht in Bibliothek <%s> gefunden." -#: eeschema/libedit.cpp:168 +#: eeschema/libedit.cpp:171 #, c-format msgid "Could not create copy of part <%s> in library <%s>." msgstr "Konnte keine Kopie von Bauteil <%s> in Bibliothek <%s> erstellen." -#: eeschema/libedit.cpp:238 +#: eeschema/libedit.cpp:241 msgid "Include last component changes?" msgstr "Möchten Sie die Bauteiländerungen übernehmen ?" -#: eeschema/libedit.cpp:250 +#: eeschema/libedit.cpp:253 msgid "Modify library file \"" msgstr "Bibliotheksdatei wirklich modifizieren \"" -#: eeschema/libedit.cpp:250 +#: eeschema/libedit.cpp:253 msgid "\"?" msgstr "\"?" -#: eeschema/libedit.cpp:261 +#: eeschema/libedit.cpp:264 msgid "Error while saving library file \"" msgstr "Fehler beim Speichern der Bibliotheksdatei \"" -#: eeschema/libedit.cpp:262 +#: eeschema/libedit.cpp:265 msgid "\"." msgstr "\"." -#: eeschema/libedit.cpp:263 +#: eeschema/libedit.cpp:266 msgid "*** ERROR: ***" msgstr "*** FEHLER: ***" -#: eeschema/libedit.cpp:268 +#: eeschema/libedit.cpp:271 msgid "Library file \"" msgstr "Bibliotheksdatei \"" -#: eeschema/libedit.cpp:270 +#: eeschema/libedit.cpp:273 msgid "Document file \"" msgstr "Dokumentdatei \"" -#: eeschema/libedit.cpp:293 +#: eeschema/libedit.cpp:296 msgid "Part" msgstr "Bauteil" -#: eeschema/libedit.cpp:296 +#: eeschema/libedit.cpp:299 msgid "None" msgstr "Keinen" -#: eeschema/libedit.cpp:300 +#: eeschema/libedit.cpp:303 msgid "Alias" msgstr "Alias" -#: eeschema/libedit.cpp:305 +#: eeschema/libedit.cpp:308 msgid "Unit" msgstr "Einheit" -#: eeschema/libedit.cpp:308 +#: eeschema/libedit.cpp:311 msgid "Convert" msgstr "Umgewandelt" -#: eeschema/libedit.cpp:310 +#: eeschema/libedit.cpp:313 msgid "Normal" msgstr "Normal" -#: eeschema/libedit.cpp:312 +#: eeschema/libedit.cpp:315 msgid "Body" msgstr "Gehäuse" -#: eeschema/libedit.cpp:315 +#: eeschema/libedit.cpp:318 msgid "Power Symbol" msgstr "Spannungsquelle Symbol" -#: eeschema/libedit.cpp:317 +#: eeschema/libedit.cpp:320 msgid "Component" msgstr "Bestückungsseite" -#: eeschema/libedit.cpp:319 +#: eeschema/libedit.cpp:322 msgid "Type" msgstr "Typ" -#: eeschema/libedit.cpp:327 +#: eeschema/libedit.cpp:330 msgid "Description" msgstr "Bezeichnung" -#: eeschema/libedit.cpp:334 +#: eeschema/libedit.cpp:337 msgid "Key words" msgstr "Schlüsselwörter" -#: eeschema/libedit.cpp:341 +#: eeschema/libedit.cpp:344 msgid "Datasheet" msgstr "Datenblatt" -#: eeschema/libedit.cpp:377 +#: eeschema/libedit.cpp:380 msgid "Please select a component library." msgstr "Wähle bitte eine Bauteilebibliothek." -#: eeschema/libedit.cpp:386 +#: eeschema/libedit.cpp:389 #, c-format msgid "Component library <%s> is empty." msgstr "Bauteilebibliothek <%s> ist leer." -#: eeschema/libedit.cpp:388 +#: eeschema/libedit.cpp:391 msgid "Delete Entry Error" msgstr "Entferne fehlerhaften Eintrag" -#: eeschema/libedit.cpp:393 +#: eeschema/libedit.cpp:396 #, c-format msgid "" "Select 1 of %d components to delete\n" @@ -1688,27 +1680,27 @@ msgstr "" "Wähle 1 von %d Bauteilen zum Entfernen\n" "aus Bibliothek <%s>." -#: eeschema/libedit.cpp:397 +#: eeschema/libedit.cpp:400 msgid "Delete Component" msgstr "Bauteil entfernen" -#: eeschema/libedit.cpp:406 +#: eeschema/libedit.cpp:409 #, c-format msgid "Entry <%s> not found in library <%s>." msgstr "Eintrag <%s> konnte nicht in Bauteilebibliothek <%s> gefunden werden." -#: eeschema/libedit.cpp:413 +#: eeschema/libedit.cpp:416 #, c-format msgid "Delete component \"%s\" from library \"%s\"?" msgstr "Möchten Sie das Bauteil <%s> aus Bibliothek <%s> entfernen ?" -#: eeschema/libedit.cpp:433 +#: eeschema/libedit.cpp:436 msgid "The component being deleted has been modified. All changes will be lost. Discard changes?" msgstr "" "Das zu löschende Bauteil wurde modifiziert. Alle Änderungen werden somit verloren gehen.\n" "Möchten Sie die Änderungen verwerfen ?" -#: eeschema/libedit.cpp:488 +#: eeschema/libedit.cpp:491 msgid "" "All changes to the current component will be lost!\n" "\n" @@ -1718,56 +1710,33 @@ msgstr "" "\n" "Soll das Bauteil wirklich entfernt werden ?" -#: eeschema/libedit.cpp:504 +#: eeschema/libedit.cpp:507 msgid "This new component has no name and cannot be created. Aborted" msgstr "Dieses Bauteil besitzt keinen Namen und kann somit nicht erstellt werden. Abbruch" -#: eeschema/libedit.cpp:516 +#: eeschema/libedit.cpp:519 #, c-format msgid "Component \"%s\" already exists in library \"%s\"." msgstr "Bauteil <%s> existiert bereits in Bibliothek <%s>." -#: eeschema/libedit.cpp:584 +#: eeschema/libedit.cpp:589 msgid "No component to save." msgstr "Kein Bauteil zum Speichern." -#: eeschema/libedit.cpp:593 +#: eeschema/libedit.cpp:598 msgid "No library specified." msgstr "Keine Bibliothek angegeben." -#: eeschema/libedit.cpp:603 +#: eeschema/libedit.cpp:608 #, c-format msgid "Component \"%s\" exists. Change it?" msgstr "Soll das existierende Bauteil \"%s\" geändert werden ?" -#: eeschema/libedit.cpp:621 +#: eeschema/libedit.cpp:626 #, c-format msgid "Component %s saved in library %s" msgstr "Bauteil %s in Bibliothek %s gespeichert" -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:151 -msgid "Name" -msgstr "Name" - -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:154 -msgid "Value" -msgstr "Wert" - -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:226 -#, c-format -msgid "" -"A new name is entered for this component\n" -"An alias %s already exists!\n" -"Cannot update this component" -msgstr "" -"Ein neuer Name wurde für das Bauteil vergeben\n" -"Ein Alias namens %s existiert bereits!\n" -"Kann das Bauteil nicht aktualieseren" - -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:445 -msgid "Chip Name" -msgstr "Bauteilname" - #: eeschema/tool_lib.cpp:38 msgid "Deselect current tool" msgstr "Aktuelles Werkzeug abwählen" @@ -1876,10 +1845,53 @@ msgstr "Darstellung als \"De Morgan\" Bauteil" msgid "Edit document file" msgstr "Editiere Dokumentation \"" -#: eeschema/tool_lib.cpp:205 +#: eeschema/tool_lib.cpp:203 msgid "Edit pins part per part ( Use carefully!)" msgstr "Editiere Pins, Bauteil für Bauteil (bitte vorsichtig anwenden !)" +#: eeschema/tool_lib.cpp:205 +msgid "Usual option = OFF when parts are not locked" +msgstr "Üblicherweise AUS, wenn Teile nicht gesperrt sind" + +#: eeschema/tool_lib.cpp:207 +msgid "Usual option = ON when parts are locked" +msgstr "Üblicherweise AN, wenn Teile gesperrt sind" + +#: eeschema/sheet.cpp:77 +msgid "File name is not valid! Aborted" +msgstr "Kein gültiger Dateiname ! Abbruch" + +#: eeschema/sheet.cpp:94 +msgid "" +"Changing the sheet file name can change all the schematic structures and cannot be undone.\n" +"Ok to continue renaming?" +msgstr "" +"Ändern des Dateinamens vom Schaltplan kann die gesamte logische Struktur verändern und nicht mehr rückgängig gemacht werden.\n" +"Möchten Sie mit der Umbennenung fortfahren ?" + +#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:151 +msgid "Name" +msgstr "Name" + +#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:154 +msgid "Value" +msgstr "Wert" + +#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:226 +#, c-format +msgid "" +"A new name is entered for this component\n" +"An alias %s already exists!\n" +"Cannot update this component" +msgstr "" +"Ein neuer Name wurde für das Bauteil vergeben\n" +"Ein Alias namens %s existiert bereits!\n" +"Kann das Bauteil nicht aktualieseren" + +#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:445 +msgid "Chip Name" +msgstr "Bauteilname" + #: eeschema/netlist.cpp:89 msgid "List" msgstr "Als Liste" @@ -2401,7 +2413,7 @@ msgstr "D&rucken" #: eeschema/menubar.cpp:99 msgid "Plot PostScript" -msgstr "Postscript Plot" +msgstr "Postscript Format" #: eeschema/menubar.cpp:100 msgid "Plot schematic sheet in PostScript format" @@ -2474,12 +2486,12 @@ msgstr "Annotation der Footprints aus Datei einlesen und durchführen" #: eeschema/menubar.cpp:219 #: eeschema/menubar.cpp:220 msgid "Zoom In" -msgstr "hineinzoomen" +msgstr "Hineinzoomen" #: eeschema/menubar.cpp:226 #: eeschema/menubar.cpp:227 msgid "Zoom Out" -msgstr "herauszoomen" +msgstr "Herauszoomen" #: eeschema/menubar.cpp:233 msgid "Fit on Screen" @@ -2491,11 +2503,11 @@ msgstr "Schaltplan an Bildschirmgöße anpassen" #: eeschema/menubar.cpp:245 msgid "Redraw" -msgstr "Grafik neuzeichnen" +msgstr "Aktualisieren" #: eeschema/menubar.cpp:249 msgid "Redraw the schematic view" -msgstr "Schaltplandarstellung neuzeichnen" +msgstr "Schaltplandarstellung neu zeichnen" #: eeschema/menubar.cpp:263 msgid "&Component" @@ -2672,7 +2684,7 @@ msgstr "&Einfügen" #: eeschema/getpart.cpp:96 #, c-format msgid "component selection (%d items loaded):" -msgstr "Bauteilwahl (%d Elemente geladen):" +msgstr "Bauteilauswahl (%d Elemente geladen):" #: eeschema/getpart.cpp:187 msgid "Failed to find part " @@ -4252,119 +4264,6 @@ msgstr "Keine Übereinstimmung zwischen hierarchischen Labeln und Pins" msgid "A no connect symbol is connected to more than 1 pin" msgstr "Ein 'Keine-Verbindung' Symbol ist mit mehr als einem Pin verbunden" -#: eeschema/edit_component_in_lib.cpp:192 -#: eeschema/edit_component_in_lib.cpp:265 -#, c-format -msgid "Alias <%s> cannot be removed while it is being edited!" -msgstr "Alias <%s> kann nicht während der Bearbeitung entfernt werden !" - -#: eeschema/edit_component_in_lib.cpp:202 -msgid "Remove all aliases from list?" -msgstr "Alle Alias aus der Liste entfernen ?" - -#: eeschema/edit_component_in_lib.cpp:229 -msgid "New alias:" -msgstr "Neuen Alias:" - -#: eeschema/edit_component_in_lib.cpp:230 -msgid "Component Alias" -msgstr "Bauteilalias" - -#: eeschema/edit_component_in_lib.cpp:240 -#, c-format -msgid "Alias or component name <%s> already exists in library <%s>." -msgstr "Alias oder Bauteilname <%s> existiert bereits in Bibliothek <%s>." - -#: eeschema/edit_component_in_lib.cpp:297 -msgid "Delete extra parts from component?" -msgstr "Zusätzliche Komponenten des Bauteils ebenfalls entfernen ?" - -#: eeschema/edit_component_in_lib.cpp:318 -msgid "Add new pins for alternate body style ( DeMorgan ) to component?" -msgstr "Dem Bauteil neue Pins für alternative Darstellungsform (De Morgan) hinzufügen ?" - -#: eeschema/edit_component_in_lib.cpp:325 -msgid "Delete alternate body style (DeMorgan) draw items from component?" -msgstr "Elemente des Bauteils aus alternativer Darstellungsform (De Morgan) löschen ?" - -#: eeschema/edit_component_in_lib.cpp:385 -msgid "Ok to Delete FootprintFilter LIST" -msgstr "FootprintFilter-Liste entfernen ?" - -#: eeschema/edit_component_in_lib.cpp:408 -msgid "Add Footprint Filter" -msgstr "Footprint Filter hinzufügen" - -#: eeschema/edit_component_in_lib.cpp:421 -#, c-format -msgid "Foot print filter <%s> is already defined." -msgstr "Footprintfilter <%s> ist bereits definiert." - -#: eeschema/dialog_SVG_print_base.cpp:23 -msgid "Print SVG options:" -msgstr "SVG-Einstellungen für Ausdruck:" - -#: eeschema/dialog_SVG_print_base.cpp:25 -msgid "Default Pen Size" -msgstr "Voreinstellung für Stiftgrösse" - -#: eeschema/dialog_SVG_print_base.cpp:30 -msgid "Selection of the default pen thickness used to draw items, when their thickness is set to 0." -msgstr "Auswahl der voreingestellten Stiftbreite zum zeichnen von Elementen, wenn ihre Breite auf 0 gesetzt ist." - -#: eeschema/dialog_SVG_print_base.cpp:34 -msgid "Color" -msgstr "Farbe" - -#: eeschema/dialog_SVG_print_base.cpp:34 -msgid "Black and White" -msgstr "Schwarz Weiss" - -#: eeschema/dialog_SVG_print_base.cpp:36 -msgid "Print mode" -msgstr "Druckmodus" - -#: eeschema/dialog_SVG_print_base.cpp:38 -msgid "" -"Choose if you wand to draw the sheet like it appears on screen,\n" -"or in black and white mode, better to print it when using black and white printers" -msgstr "" -"Auswählen, wenn das Schaltblatt gezeichnet werden soll, wie auf dem Bildschirm zu sehen,\n" -"oder im Schwarz-Weiß-Modus, was für Schwarz-Weiß-Drucker vorteilhaft ist." - -#: eeschema/dialog_SVG_print_base.cpp:42 -msgid "Print Frame Ref" -msgstr "Drucke Seitenreferenz" - -#: eeschema/dialog_SVG_print_base.cpp:44 -#: eeschema/dialog_print_using_printer_base.cpp:25 -msgid "Print (or not) the Frame references." -msgstr "Drucke die Seitenreferenzen oder drucke diese nicht." - -#: eeschema/dialog_SVG_print_base.cpp:53 -msgid "Print Current" -msgstr "Drucke aktuelle Seite" - -#: eeschema/dialog_SVG_print_base.cpp:56 -msgid "Print All" -msgstr "Drucke Alles" - -#: eeschema/dialog_SVG_print_base.cpp:60 -msgid "Quit" -msgstr "Abbrechen" - -#: eeschema/dialog_SVG_print_base.cpp:67 -msgid "Filename:" -msgstr "Dateiname:" - -#: eeschema/dialog_SVG_print_base.cpp:72 -msgid "" -"Enter a filename if you do not want to use default file names\n" -"Can be used only when printing the current sheet" -msgstr "" -"Vergebe einen Dateinamen, wenn nicht der voreingestellte Dateiname verwendet werden soll.\n" -"Kann nur angewandt werden, wenn der aktuelle Schaltplan gedruckt wird." - #: eeschema/libeditframe.cpp:301 msgid "" "Component was modified!\n" @@ -4406,6 +4305,71 @@ msgstr "Importieren" msgid "Export" msgstr "Exportieren" +#: eeschema/dialog_SVG_print_base.cpp:23 +msgid "Print SVG options:" +msgstr "SVG-Einstellungen für Ausdruck:" + +#: eeschema/dialog_SVG_print_base.cpp:25 +msgid "Default Pen Size" +msgstr "Voreinstellung für Stiftgrösse" + +#: eeschema/dialog_SVG_print_base.cpp:30 +msgid "Selection of the default pen thickness used to draw items, when their thickness is set to 0." +msgstr "Auswahl der voreingestellten Stiftbreite zum zeichnen von Elementen, wenn ihre Breite auf 0 gesetzt ist." + +#: eeschema/dialog_SVG_print_base.cpp:34 +msgid "Color" +msgstr "Farbe" + +#: eeschema/dialog_SVG_print_base.cpp:34 +msgid "Black and White" +msgstr "Schwarz Weiss" + +#: eeschema/dialog_SVG_print_base.cpp:36 +msgid "Print mode" +msgstr "Druckmodus" + +#: eeschema/dialog_SVG_print_base.cpp:38 +msgid "" +"Choose if you wand to draw the sheet like it appears on screen,\n" +"or in black and white mode, better to print it when using black and white printers" +msgstr "" +"Auswählen, ob das Schaltplanblatt, wie auf dem Bildschirm zu sehen, gezeichnet werden soll,\n" +"oder im Schwarz-Weiß-Modus, was bei Schwarz-Weiß-Druckern vorteilhaft ist." + +#: eeschema/dialog_SVG_print_base.cpp:42 +msgid "Print Frame Ref" +msgstr "Drucke Seitenreferenz" + +#: eeschema/dialog_SVG_print_base.cpp:44 +#: eeschema/dialog_print_using_printer_base.cpp:25 +msgid "Print (or not) the Frame references." +msgstr "Drucke die Seitenreferenzen oder drucke diese nicht." + +#: eeschema/dialog_SVG_print_base.cpp:53 +msgid "Print Current" +msgstr "Drucke aktuelle Seite" + +#: eeschema/dialog_SVG_print_base.cpp:56 +msgid "Print All" +msgstr "Drucke Alles" + +#: eeschema/dialog_SVG_print_base.cpp:60 +msgid "Quit" +msgstr "Abbrechen" + +#: eeschema/dialog_SVG_print_base.cpp:67 +msgid "Filename:" +msgstr "Dateiname:" + +#: eeschema/dialog_SVG_print_base.cpp:72 +msgid "" +"Enter a filename if you do not want to use default file names\n" +"Can be used only when printing the current sheet" +msgstr "" +"Vergebe einen Dateinamen, wenn nicht der voreingestellte Dateiname verwendet werden soll.\n" +"Kann nur angewandt werden, wenn der aktuelle Schaltplan gedruckt wird." + #: eeschema/dialog_edit_component_in_schematic.cpp:170 msgid "No Component Name!" msgstr "Kein Bauteil Name !" @@ -4784,22 +4748,53 @@ msgstr "Gruppe heranzoomen (Shift + Ziehen der Maus)" msgid "Select Items" msgstr "Selektiere Elemente" -#: eeschema/class_libentry.cpp:67 -msgid "none" -msgstr "keine" - -#: eeschema/class_libentry.cpp:342 -msgid "value" -msgstr "Wert" - -#: eeschema/class_libentry.cpp:342 -msgid "reference" -msgstr "Referenz" - -#: eeschema/class_libentry.cpp:344 +#: eeschema/edit_component_in_lib.cpp:202 +#: eeschema/edit_component_in_lib.cpp:275 #, c-format -msgid "An attempt was made to remove the %s field from component %s in library %s." -msgstr "Es wurde versucht das %s Feld von Bauteil %s in Bibliothek %s zu entfernen." +msgid "Alias <%s> cannot be removed while it is being edited!" +msgstr "Alias <%s> kann nicht während der Bearbeitung entfernt werden !" + +#: eeschema/edit_component_in_lib.cpp:212 +msgid "Remove all aliases from list?" +msgstr "Alle Alias aus der Liste entfernen ?" + +#: eeschema/edit_component_in_lib.cpp:239 +msgid "New alias:" +msgstr "Neuen Alias:" + +#: eeschema/edit_component_in_lib.cpp:240 +msgid "Component Alias" +msgstr "Bauteilalias" + +#: eeschema/edit_component_in_lib.cpp:250 +#, c-format +msgid "Alias or component name <%s> already exists in library <%s>." +msgstr "Alias oder Bauteilname <%s> existiert bereits in Bibliothek <%s>." + +#: eeschema/edit_component_in_lib.cpp:307 +msgid "Delete extra parts from component?" +msgstr "Zusätzliche Komponenten des Bauteils ebenfalls entfernen ?" + +#: eeschema/edit_component_in_lib.cpp:328 +msgid "Add new pins for alternate body style ( DeMorgan ) to component?" +msgstr "Dem Bauteil neue Pins für alternative Darstellungsform (De Morgan) hinzufügen ?" + +#: eeschema/edit_component_in_lib.cpp:335 +msgid "Delete alternate body style (DeMorgan) draw items from component?" +msgstr "Elemente des Bauteils aus alternativer Darstellungsform (De Morgan) löschen ?" + +#: eeschema/edit_component_in_lib.cpp:395 +msgid "Ok to Delete FootprintFilter LIST" +msgstr "FootprintFilter-Liste entfernen ?" + +#: eeschema/edit_component_in_lib.cpp:418 +msgid "Add Footprint Filter" +msgstr "Footprint Filter hinzufügen" + +#: eeschema/edit_component_in_lib.cpp:431 +#, c-format +msgid "Foot print filter <%s> is already defined." +msgstr "Footprintfilter <%s> ist bereits definiert." #: eeschema/class_library.cpp:25 #, c-format @@ -4942,6 +4937,23 @@ msgstr "Allen &alternativen Darstellungsformen (De Morgan) zuweisen" msgid "&Visible" msgstr "&Sichtbar" +#: eeschema/class_libentry.cpp:67 +msgid "none" +msgstr "keine" + +#: eeschema/class_libentry.cpp:342 +msgid "value" +msgstr "Wert" + +#: eeschema/class_libentry.cpp:342 +msgid "reference" +msgstr "Referenz" + +#: eeschema/class_libentry.cpp:344 +#, c-format +msgid "An attempt was made to remove the %s field from component %s in library %s." +msgstr "Es wurde versucht das %s Feld von Bauteil %s in Bibliothek %s zu entfernen." + #: eeschema/dialog_eeschema_config_fbp.cpp:20 msgid "Component library files" msgstr "Bauteilebibliotheksdateien" @@ -5081,7 +5093,7 @@ msgstr "Seitenformat E" #: eeschema/plothpgl.cpp:215 msgid "Plot page size:" -msgstr "Blattformat für Plot:" +msgstr "Seitenformat für Plot:" #: eeschema/plothpgl.cpp:225 msgid "Pen control:" @@ -5338,7 +5350,7 @@ msgstr "Konnte die Symboldatei <%s> nicht öffnen." #: eeschema/plotps.cpp:164 msgid "Auto" -msgstr "Auto Zoom" +msgstr "Autom. Anpassung" #: eeschema/plotps.cpp:256 msgid "Default Line Width" @@ -5808,7 +5820,7 @@ msgstr "&Entpacke Archiv" #: kicad/menubar.cpp:125 msgid "Unarchive project files from zip file" -msgstr "Projektdateien aus Zip-Archiv auspacken" +msgstr "Projektdateien aus Zip-Archiv entpacken" #: kicad/menubar.cpp:134 msgid "Quit KiCad" @@ -5816,7 +5828,7 @@ msgstr "Beende KiCad" #: kicad/menubar.cpp:148 msgid "Text E&ditor" -msgstr "Texte&ditor" +msgstr "&Texteditor aufrufen" #: kicad/menubar.cpp:149 msgid "Open prefered text editor" @@ -5828,11 +5840,11 @@ msgstr "Datei &editieren" #: kicad/menubar.cpp:156 msgid "View, read or edit file with a text editor" -msgstr "Lese oder editiere Dateien mit Texteditor" +msgstr "Datei mit Texteditor betrachten oder editieren" #: kicad/menubar.cpp:169 msgid "&Text Editor" -msgstr "&Texteditor" +msgstr "&Texteditor auswählen" #: kicad/menubar.cpp:170 msgid "Select your prefered text editor" @@ -5873,7 +5885,7 @@ msgstr "Über den KiCad-Projektmanager" #: kicad/menubar.cpp:248 msgid "&Browse" -msgstr "&Browsen" +msgstr "&Bearbeiten" #: kicad/menubar.cpp:277 msgid "Load existing project" @@ -6035,6 +6047,77 @@ msgstr "Leiterbahnlänge" msgid "Segs Count" msgstr "Segm.anzahl" +#: pcbnew/netlist.cpp:118 +#, c-format +msgid "Netlist file %s not found" +msgstr "Netzliste <%s> nicht gefunden" + +#: pcbnew/netlist.cpp:173 +#, c-format +msgid "Reading Netlist \"%s\"" +msgstr "Lese Netzliste <%s>" + +#: pcbnew/netlist.cpp:349 +msgid "Ok to delete footprints not in netlist?" +msgstr "Sollen die Footprints entfernt werden, welche sich nicht in der Netzliste befinden ?" + +#: pcbnew/netlist.cpp:500 +#, c-format +msgid "Component \"%s\": Mismatch! module is [%s] and netlist said [%s]\n" +msgstr "Bauteil <%s>: Keine Übereinstimmung! Bauteil ist <%s>, jedoch laut Netzliste <%s>\n" + +#: pcbnew/netlist.cpp:545 +#, c-format +msgid "Component [%s] not found" +msgstr "Bauteil <%s> nicht gefunden" + +#: pcbnew/netlist.cpp:611 +#, c-format +msgid "Module [%s]: Pad [%s] not found" +msgstr "Bauteil <%s>: Pad <%s> nicht gefunden" + +#: pcbnew/netlist.cpp:634 +msgid "No Modules" +msgstr "Keine Bauteile vorhanden" + +#: pcbnew/netlist.cpp:637 +msgid "Components" +msgstr "Bauteile" + +#: pcbnew/netlist.cpp:687 +msgid "No modules" +msgstr "Keine Bauteile" + +#: pcbnew/netlist.cpp:701 +msgid "No modules in NetList" +msgstr "Keine Bauteile in der Netzliste vorhanden" + +#: pcbnew/netlist.cpp:705 +msgid "Check Modules" +msgstr "Footprinttest" + +#: pcbnew/netlist.cpp:708 +msgid "Duplicates" +msgstr "Duplikate" + +#: pcbnew/netlist.cpp:728 +msgid "Lack:" +msgstr "Mängel:" + +#: pcbnew/netlist.cpp:750 +msgid "Not in Netlist:" +msgstr "Nicht in Netzliste vorhanden:" + +#: pcbnew/netlist.cpp:890 +#, c-format +msgid "File <%s> not found, use Netlist for lib module selection" +msgstr "Datei <%s> nicht gefunden. Verwende Netzliste zum Wählen von Bauteilen aus der Bibliothek." + +#: pcbnew/netlist.cpp:1017 +#, c-format +msgid "Component [%s]: footprint <%s> not found" +msgstr "Bauteil <%s>: Footprint <%s> nicht gefunden" + #: pcbnew/controle.cpp:175 #: pcbnew/modedit.cpp:81 msgid "Selection Clarification" @@ -6216,8 +6299,8 @@ msgid "" "Show/hide the toolbar for microwaves tools\n" " This is a experimental feature (under development)" msgstr "" -"Anzeigen/Ausblenden der Werkzeugleiste für Mikrowellen-Applikationen\n" -" Dies sind experimentielle Funktionen, die sich in Entwicklung befinden." +"Anzeigen/Ausblenden der Werkzeugleiste für Mikrowellen-Applikationen.\n" +"Dies sind experimentielle Funktionen, die sich noch in Entwicklung befinden." #: pcbnew/tool_pcb.cpp:418 msgid "Highlight net" @@ -6783,77 +6866,6 @@ msgstr "Suche nächsten Marker" msgid "Error: Unexpected end of file !" msgstr "Fehler: Unerwartetes Dateiende !" -#: pcbnew/netlist.cpp:118 -#, c-format -msgid "Netlist file %s not found" -msgstr "Netzliste <%s> nicht gefunden" - -#: pcbnew/netlist.cpp:173 -#, c-format -msgid "Reading Netlist \"%s\"" -msgstr "Lese Netzliste <%s>" - -#: pcbnew/netlist.cpp:349 -msgid "Ok to delete footprints not in netlist?" -msgstr "Sollen die Footprints entfernt werden, welche sich nicht in der Netzliste befinden ?" - -#: pcbnew/netlist.cpp:500 -#, c-format -msgid "Component \"%s\": Mismatch! module is [%s] and netlist said [%s]\n" -msgstr "Bauteil <%s>: Keine Übereinstimmung! Bauteil ist <%s>, jedoch laut Netzliste <%s>\n" - -#: pcbnew/netlist.cpp:544 -#, c-format -msgid "Component [%s] not found" -msgstr "Bauteil <%s> nicht gefunden" - -#: pcbnew/netlist.cpp:610 -#, c-format -msgid "Module [%s]: Pad [%s] not found" -msgstr "Bauteil <%s>: Pad <%s> nicht gefunden" - -#: pcbnew/netlist.cpp:633 -msgid "No Modules" -msgstr "Keine Bauteile vorhanden" - -#: pcbnew/netlist.cpp:636 -msgid "Components" -msgstr "Bauteile" - -#: pcbnew/netlist.cpp:686 -msgid "No modules" -msgstr "Keine Bauteile" - -#: pcbnew/netlist.cpp:700 -msgid "No modules in NetList" -msgstr "Keine Bauteile in der Netzliste vorhanden" - -#: pcbnew/netlist.cpp:704 -msgid "Check Modules" -msgstr "Footprinttest" - -#: pcbnew/netlist.cpp:707 -msgid "Duplicates" -msgstr "Duplikate" - -#: pcbnew/netlist.cpp:727 -msgid "Lack:" -msgstr "Mängel:" - -#: pcbnew/netlist.cpp:749 -msgid "Not in Netlist:" -msgstr "Nicht in Netzliste vorhanden:" - -#: pcbnew/netlist.cpp:889 -#, c-format -msgid "File <%s> not found, use Netlist for lib module selection" -msgstr "Datei <%s> nicht gefunden. Verwende Netzliste zum Wählen von Bauteilen aus der Bibliothek." - -#: pcbnew/netlist.cpp:1016 -#, c-format -msgid "Component [%s]: footprint <%s> not found" -msgstr "Bauteil <%s>: Footprint <%s> nicht gefunden" - #: pcbnew/initpcb.cpp:47 msgid "Ok to delete selected items ?" msgstr "Möchten Sie die ausgewählten Elemente entfernen ?" @@ -8012,25 +8024,101 @@ msgstr "Wert:" msgid "The text thickness is too large for the text size. It will be clamped" msgstr "Die Textstärke ist für diese Textgröße zu groß. Text wird eingeklemmt." -#: pcbnew/dialog_layers_setup.cpp:269 -msgid "Enabled" -msgstr "Aktiviert" +#: pcbnew/dialog_drc_base.cpp:40 +msgid "By Netclass" +msgstr "Nach Netzklasse" -#: pcbnew/dialog_layers_setup.cpp:615 -msgid "Layer name may not be empty" -msgstr "Lagenname sollte gesetzt sein" +#: pcbnew/dialog_drc_base.cpp:45 +msgid "Min track width" +msgstr "Mindestleiterbahnbreite" -#: pcbnew/dialog_layers_setup.cpp:622 -msgid "Layer name has an illegal character, one of: '" -msgstr "Lagenname besitzt ein unzulässiges Zeichen und zwar: " +#: pcbnew/dialog_drc_base.cpp:47 +msgid "Enter the minimum acceptable value for a track width" +msgstr "Gebe zulässigen Mindestwert für Leiterbahnbreite an" -#: pcbnew/dialog_layers_setup.cpp:629 -msgid "'signal' is a reserved layer name" -msgstr "'signal' ist ein reservierter Lagenname" +#: pcbnew/dialog_drc_base.cpp:54 +msgid "Min via size" +msgstr "Mindest-DuKo-Größe" -#: pcbnew/dialog_layers_setup.cpp:638 -msgid "Layer name is a duplicate of another" -msgstr "Lagenname existiert bereits" +#: pcbnew/dialog_drc_base.cpp:56 +msgid "Enter the minimum acceptable diameter for a standard via" +msgstr "Gebe den zulässigen Mindestdurchmesser für eine Standard-Durchkontaktierung an" + +#: pcbnew/dialog_drc_base.cpp:63 +msgid "Min uVia size" +msgstr "Mindest-MicroDuKo-Größe" + +#: pcbnew/dialog_drc_base.cpp:65 +msgid "Enter the minimum acceptable diameter for a micro via" +msgstr "Gebe den zulässigen Mindestdurchmesser für eine Micro-Durchkontaktierung an" + +#: pcbnew/dialog_drc_base.cpp:75 +msgid "Create Report File" +msgstr "Erstelle Protokoll" + +#: pcbnew/dialog_drc_base.cpp:79 +msgid "Enable writing report to this file" +msgstr "Ermögliche das Schreiben des Protokolls in diese Datei" + +#: pcbnew/dialog_drc_base.cpp:84 +msgid "Enter the report filename" +msgstr "Gebe den Dateinamen für das zu erstellende Protokoll an" + +#: pcbnew/dialog_drc_base.cpp:89 +msgid "..." +msgstr "..." + +#: pcbnew/dialog_drc_base.cpp:115 +msgid "Start DRC" +msgstr "Starte DRC" + +#: pcbnew/dialog_drc_base.cpp:117 +msgid "Start the Design Rule Checker" +msgstr "Starte Design Rule Checker (DRC)" + +#: pcbnew/dialog_drc_base.cpp:121 +msgid "List Unconnected" +msgstr "Liste nicht verbunden" + +#: pcbnew/dialog_drc_base.cpp:122 +msgid "List unconnected pads or tracks" +msgstr "Liste nicht verbundene Pads oder Leiterbahnen" + +#: pcbnew/dialog_drc_base.cpp:126 +msgid "Delete All Markers" +msgstr "Entferne alle Marker" + +#: pcbnew/dialog_drc_base.cpp:127 +msgid "Delete every marker" +msgstr "Entferne jeden Marker" + +#: pcbnew/dialog_drc_base.cpp:131 +msgid "Delete Current Marker" +msgstr "Entferne aktuellen Marker" + +#: pcbnew/dialog_drc_base.cpp:132 +msgid "Delete the marker selected in the listBox below" +msgstr "Entferne den gewählten Marker in der unteren Auswahlbox" + +#: pcbnew/dialog_drc_base.cpp:140 +msgid "Error Messages:" +msgstr "Fehlermeldungen:" + +#: pcbnew/dialog_drc_base.cpp:150 +msgid "MARKERs, double click any to go there in PCB, right click for popup menu" +msgstr "MARKER, doppelklicken um zum PCB zu springen, rechtsklicken für Pop-up-Menü" + +#: pcbnew/dialog_drc_base.cpp:158 +msgid "Problems / Markers" +msgstr "Probleme / Marker" + +#: pcbnew/dialog_drc_base.cpp:164 +msgid "A list of unconnected pads, right click for popup menu" +msgstr "Eine List mit nicht verbundenen Pads, Rechtsklick für Pop-up-Menü" + +#: pcbnew/dialog_drc_base.cpp:171 +msgid "Unconnected" +msgstr "Nicht verbunden" #: pcbnew/dialog_netlist_fbp.cpp:25 msgid "Timestamp" @@ -8404,96 +8492,6 @@ msgstr "3D Einstellungen" msgid "ErrType" msgstr "Fehlertyp" -#: pcbnew/dialog_drc_base.cpp:40 -msgid "By Netclass" -msgstr "Nach Netzklasse" - -#: pcbnew/dialog_drc_base.cpp:45 -msgid "Min track width" -msgstr "Mindestleiterbahnbreite" - -#: pcbnew/dialog_drc_base.cpp:50 -#: pcbnew/dialog_drc_base.cpp:59 -#: pcbnew/dialog_drc_base.cpp:68 -msgid "In the clearance units, enter the clearance distance" -msgstr "Gebe die Distanz für die einzuhaltenden Abstandsflächen in der vorgegebenen Einheit an" - -#: pcbnew/dialog_drc_base.cpp:54 -msgid "Min via size" -msgstr "Mindest-DuKo-Größe" - -#: pcbnew/dialog_drc_base.cpp:63 -msgid "Min uVia size" -msgstr "Mindest-MicroDuKo-Größe" - -#: pcbnew/dialog_drc_base.cpp:75 -msgid "Create Report File" -msgstr "Erstelle Protokoll" - -#: pcbnew/dialog_drc_base.cpp:79 -msgid "Enable writing report to this file" -msgstr "Ermögliche das Schreiben des Protokolls in diese Datei" - -#: pcbnew/dialog_drc_base.cpp:84 -msgid "Enter the report filename" -msgstr "Gebe den Dateinamen für das zu erstellende Protokoll an" - -#: pcbnew/dialog_drc_base.cpp:89 -msgid "..." -msgstr "..." - -#: pcbnew/dialog_drc_base.cpp:115 -msgid "Start DRC" -msgstr "Starte DRC" - -#: pcbnew/dialog_drc_base.cpp:117 -msgid "Start the Design Rule Checker" -msgstr "Starte Design Rule Checker (DRC)" - -#: pcbnew/dialog_drc_base.cpp:121 -msgid "List Unconnected" -msgstr "Liste nicht verbunden" - -#: pcbnew/dialog_drc_base.cpp:122 -msgid "List unconnected pads or tracks" -msgstr "Liste nicht verbundene Pads oder Leiterbahnen" - -#: pcbnew/dialog_drc_base.cpp:126 -msgid "Delete All Markers" -msgstr "Entferne alle Marker" - -#: pcbnew/dialog_drc_base.cpp:127 -msgid "Delete every marker" -msgstr "Entferne jeden Marker" - -#: pcbnew/dialog_drc_base.cpp:131 -msgid "Delete Current Marker" -msgstr "Entferne aktuellen Marker" - -#: pcbnew/dialog_drc_base.cpp:132 -msgid "Delete the marker selected in the listBox below" -msgstr "Entferne den gewählten Marker in der unteren Auswahlbox" - -#: pcbnew/dialog_drc_base.cpp:140 -msgid "Error Messages:" -msgstr "Fehlermeldungen:" - -#: pcbnew/dialog_drc_base.cpp:150 -msgid "MARKERs, double click any to go there in PCB, right click for popup menu" -msgstr "MARKER, doppelklicken um zum PCB zu springen, rechtsklicken für Pop-up-Menü" - -#: pcbnew/dialog_drc_base.cpp:158 -msgid "Problems / Markers" -msgstr "Probleme / Marker" - -#: pcbnew/dialog_drc_base.cpp:164 -msgid "A list of unconnected pads, right click for popup menu" -msgstr "Eine List mit nicht verbundenen Pads, Rechtsklick für Pop-up-Menü" - -#: pcbnew/dialog_drc_base.cpp:171 -msgid "Unconnected" -msgstr "Nicht verbunden" - #: pcbnew/class_drc_item.cpp:39 msgid "Unconnected pads" msgstr "Nicht verbundene Pads" @@ -8630,6 +8628,26 @@ msgstr "Lötseite" msgid "Warning: The Top Layer and Bottom Layer are same." msgstr "Achtung: Bestückungsseite und Lötseite sind die selben." +#: pcbnew/dialog_layers_setup.cpp:300 +msgid "Enabled" +msgstr "Aktiviert" + +#: pcbnew/dialog_layers_setup.cpp:658 +msgid "Layer name may not be empty" +msgstr "Lagenname sollte gesetzt sein" + +#: pcbnew/dialog_layers_setup.cpp:665 +msgid "Layer name has an illegal character, one of: '" +msgstr "Lagenname besitzt ein unzulässiges Zeichen und zwar: " + +#: pcbnew/dialog_layers_setup.cpp:672 +msgid "'signal' is a reserved layer name" +msgstr "'signal' ist ein reservierter Lagenname" + +#: pcbnew/dialog_layers_setup.cpp:681 +msgid "Layer name is a duplicate of another" +msgstr "Lagenname existiert bereits" + #: pcbnew/dialog_copper_zones.cpp:276 msgid "Error : Zone clearance is set to an unreasonnable value" msgstr "Fehler: Unangemessener Wert für Flächenabstandsmaß" @@ -8662,17 +8680,343 @@ msgstr "Fehler: Sie müssen einen Netznamen wählen" msgid "You have chosen the \"not connected\" option. This will create insulated copper islands. Are you sure ?" msgstr "Die \"nicht verbunden\" Option wurde ausgewählt. Dies erzeugt isolierte Kupferinseln. Sind Sie sich sicher ?" -#: pcbnew/dialog_pad_properties.cpp:541 -msgid "Incorrect value for pad drill: pad drill bigger than pad size" -msgstr "Inkorrekter Wert für Pad Bohrdurchmesser. Bohrdurchmesser ist größer als Pad." +#: pcbnew/dialog_layers_setup_base.cpp:23 +msgid "Preset Layer Groupings" +msgstr "Voreinstellung für Lagengruppierungen" -#: pcbnew/dialog_pad_properties.cpp:547 -msgid "Incorrect value for pad offset" -msgstr "Inkorrekter Wert für Padoffset" +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Custom" +msgstr "Benutzerdefiniert" -#: pcbnew/dialog_pad_properties.cpp:641 -msgid "Unknown netname, no change" -msgstr "Unbekannter Netzname. Keine Änderung durchgeführt" +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Two layers, parts on Front only" +msgstr "Zwei Lagen, Bauteile nur auf Vorderseite" + +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Two layers, parts on Back only" +msgstr "Zwei Lagen, Bauteile nur auf Rückseite" + +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Two layers, parts on Front and Back" +msgstr "Zwei Lagen, Bauteile auf Vorder- und Rückseite" + +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Four layers, parts on Front only" +msgstr "Vier Lagen, Bauteile nur auf Vorderseite" + +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "Four layers, parts on Front and Back" +msgstr "Vier Lagen, Bauteile nur auf Rückseite" + +#: pcbnew/dialog_layers_setup_base.cpp:25 +msgid "All layers on" +msgstr "Alle Lagen ein" + +#: pcbnew/dialog_layers_setup_base.cpp:34 +msgid "Copper Layers" +msgstr "Kupferlagen" + +#: pcbnew/dialog_layers_setup_base.cpp:47 +msgid "Layers" +msgstr "Lagen " + +#: pcbnew/dialog_layers_setup_base.cpp:68 +msgid "Adhes_Front_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:80 +msgid "If you want an adhesive template for the front side of the board" +msgstr "Wenn eine Klebervorlage für die Platinenvorderseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:89 +#: pcbnew/dialog_layers_setup_base.cpp:114 +#: pcbnew/dialog_layers_setup_base.cpp:679 +#: pcbnew/dialog_layers_setup_base.cpp:704 +msgid "Off-board, manufacturing" +msgstr "Off-board, Fertigung" + +#: pcbnew/dialog_layers_setup_base.cpp:93 +msgid "SoldP_Front_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:105 +msgid "If you want a solder paster layer for front side of the board" +msgstr "Wenn ein Lage für Lötpaste auf der Platinenvorderseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:118 +msgid "SilkS_Front_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:130 +msgid "If you want a silk screen layer for the front side of the board" +msgstr "Wenn eine Lage für Siebdruck auf der Platinenvorderseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:139 +#: pcbnew/dialog_layers_setup_base.cpp:164 +#: pcbnew/dialog_layers_setup_base.cpp:629 +#: pcbnew/dialog_layers_setup_base.cpp:654 +msgid "On-board, non-copper" +msgstr "On-board, kupferfrei" + +#: pcbnew/dialog_layers_setup_base.cpp:143 +msgid "Mask_Front_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:155 +msgid "If you want a solder mask layer for the front of the board" +msgstr "Wenn eine Lage für Lötstoppmaske auf der Platinenvorderseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:168 +msgid "Front_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:170 +msgid "Layer name of front (top) copper layer" +msgstr "Name der vorderseitigen (oberen) Kupferlage" + +#: pcbnew/dialog_layers_setup_base.cpp:182 +msgid "If you want a front copper layer" +msgstr "Wenn eine vorderseitige Kupferlage benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:191 +#: pcbnew/dialog_layers_setup_base.cpp:218 +#: pcbnew/dialog_layers_setup_base.cpp:245 +#: pcbnew/dialog_layers_setup_base.cpp:272 +#: pcbnew/dialog_layers_setup_base.cpp:299 +#: pcbnew/dialog_layers_setup_base.cpp:326 +#: pcbnew/dialog_layers_setup_base.cpp:353 +#: pcbnew/dialog_layers_setup_base.cpp:380 +#: pcbnew/dialog_layers_setup_base.cpp:407 +#: pcbnew/dialog_layers_setup_base.cpp:434 +#: pcbnew/dialog_layers_setup_base.cpp:461 +#: pcbnew/dialog_layers_setup_base.cpp:488 +#: pcbnew/dialog_layers_setup_base.cpp:515 +#: pcbnew/dialog_layers_setup_base.cpp:542 +#: pcbnew/dialog_layers_setup_base.cpp:569 +#: pcbnew/dialog_layers_setup_base.cpp:600 +msgid "signal" +msgstr "Signal" + +#: pcbnew/dialog_layers_setup_base.cpp:191 +#: pcbnew/dialog_layers_setup_base.cpp:218 +#: pcbnew/dialog_layers_setup_base.cpp:245 +#: pcbnew/dialog_layers_setup_base.cpp:272 +#: pcbnew/dialog_layers_setup_base.cpp:299 +#: pcbnew/dialog_layers_setup_base.cpp:326 +#: pcbnew/dialog_layers_setup_base.cpp:353 +#: pcbnew/dialog_layers_setup_base.cpp:380 +#: pcbnew/dialog_layers_setup_base.cpp:407 +#: pcbnew/dialog_layers_setup_base.cpp:434 +#: pcbnew/dialog_layers_setup_base.cpp:461 +#: pcbnew/dialog_layers_setup_base.cpp:488 +#: pcbnew/dialog_layers_setup_base.cpp:515 +#: pcbnew/dialog_layers_setup_base.cpp:542 +#: pcbnew/dialog_layers_setup_base.cpp:569 +#: pcbnew/dialog_layers_setup_base.cpp:600 +msgid "power" +msgstr "Spannung/Strom" + +#: pcbnew/dialog_layers_setup_base.cpp:191 +#: pcbnew/dialog_layers_setup_base.cpp:218 +#: pcbnew/dialog_layers_setup_base.cpp:245 +#: pcbnew/dialog_layers_setup_base.cpp:272 +#: pcbnew/dialog_layers_setup_base.cpp:299 +#: pcbnew/dialog_layers_setup_base.cpp:326 +#: pcbnew/dialog_layers_setup_base.cpp:353 +#: pcbnew/dialog_layers_setup_base.cpp:380 +#: pcbnew/dialog_layers_setup_base.cpp:407 +#: pcbnew/dialog_layers_setup_base.cpp:434 +#: pcbnew/dialog_layers_setup_base.cpp:461 +#: pcbnew/dialog_layers_setup_base.cpp:488 +#: pcbnew/dialog_layers_setup_base.cpp:515 +#: pcbnew/dialog_layers_setup_base.cpp:542 +#: pcbnew/dialog_layers_setup_base.cpp:569 +#: pcbnew/dialog_layers_setup_base.cpp:600 +msgid "mixed" +msgstr "Mix" + +#: pcbnew/dialog_layers_setup_base.cpp:191 +#: pcbnew/dialog_layers_setup_base.cpp:218 +#: pcbnew/dialog_layers_setup_base.cpp:245 +#: pcbnew/dialog_layers_setup_base.cpp:272 +#: pcbnew/dialog_layers_setup_base.cpp:299 +#: pcbnew/dialog_layers_setup_base.cpp:326 +#: pcbnew/dialog_layers_setup_base.cpp:353 +#: pcbnew/dialog_layers_setup_base.cpp:380 +#: pcbnew/dialog_layers_setup_base.cpp:407 +#: pcbnew/dialog_layers_setup_base.cpp:434 +#: pcbnew/dialog_layers_setup_base.cpp:461 +#: pcbnew/dialog_layers_setup_base.cpp:488 +#: pcbnew/dialog_layers_setup_base.cpp:515 +#: pcbnew/dialog_layers_setup_base.cpp:542 +#: pcbnew/dialog_layers_setup_base.cpp:569 +#: pcbnew/dialog_layers_setup_base.cpp:600 +msgid "jumper" +msgstr "Jumper" + +#: pcbnew/dialog_layers_setup_base.cpp:195 +#: pcbnew/dialog_layers_setup_base.cpp:222 +#: pcbnew/dialog_layers_setup_base.cpp:249 +#: pcbnew/dialog_layers_setup_base.cpp:276 +#: pcbnew/dialog_layers_setup_base.cpp:303 +#: pcbnew/dialog_layers_setup_base.cpp:330 +#: pcbnew/dialog_layers_setup_base.cpp:357 +#: pcbnew/dialog_layers_setup_base.cpp:384 +#: pcbnew/dialog_layers_setup_base.cpp:411 +#: pcbnew/dialog_layers_setup_base.cpp:438 +#: pcbnew/dialog_layers_setup_base.cpp:465 +#: pcbnew/dialog_layers_setup_base.cpp:492 +#: pcbnew/dialog_layers_setup_base.cpp:519 +#: pcbnew/dialog_layers_setup_base.cpp:546 +#: pcbnew/dialog_layers_setup_base.cpp:573 +#: pcbnew/dialog_layers_setup_base.cpp:604 +msgid "Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus." +msgstr "" +"Kupferlagentyp für Freerouter.\n" +"Spannungs-/Stromlagen werden aus Freerouter's Lagenmenüs entfernt." + +#: pcbnew/dialog_layers_setup_base.cpp:199 +msgid "Inner2" +msgstr "Innen 2" + +#: pcbnew/dialog_layers_setup_base.cpp:226 +msgid "Inner3" +msgstr "Innen 3" + +#: pcbnew/dialog_layers_setup_base.cpp:253 +msgid "Inner4" +msgstr "Innen 4" + +#: pcbnew/dialog_layers_setup_base.cpp:280 +msgid "Inner5" +msgstr "Innen 5" + +#: pcbnew/dialog_layers_setup_base.cpp:307 +msgid "Inner6" +msgstr "Innen 6" + +#: pcbnew/dialog_layers_setup_base.cpp:334 +msgid "Inner7" +msgstr "Innen 7" + +#: pcbnew/dialog_layers_setup_base.cpp:361 +msgid "Inner8" +msgstr "Innen 8" + +#: pcbnew/dialog_layers_setup_base.cpp:388 +msgid "Inner9" +msgstr "Innen 9" + +#: pcbnew/dialog_layers_setup_base.cpp:415 +msgid "Inner10" +msgstr "Innen 10" + +#: pcbnew/dialog_layers_setup_base.cpp:442 +msgid "Inner11" +msgstr "Innen 11" + +#: pcbnew/dialog_layers_setup_base.cpp:469 +msgid "Inner12" +msgstr "Innen 12" + +#: pcbnew/dialog_layers_setup_base.cpp:496 +msgid "Inner13" +msgstr "Innen 13" + +#: pcbnew/dialog_layers_setup_base.cpp:523 +msgid "Inner14" +msgstr "Innen 14" + +#: pcbnew/dialog_layers_setup_base.cpp:550 +msgid "Inner15" +msgstr "Innen 5" + +#: pcbnew/dialog_layers_setup_base.cpp:577 +msgid "Back" +msgstr "Rückseite" + +#: pcbnew/dialog_layers_setup_base.cpp:579 +msgid "Layer name of back (bottom) copper layer" +msgstr "Name der rückseitigen (unteren) Kupferlage" + +#: pcbnew/dialog_layers_setup_base.cpp:591 +msgid "If you want a back copper layer" +msgstr "Wenn eine rückseitige Kupferlage benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:608 +msgid "Mask_Back_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:620 +msgid "If you want a solder mask layer for the back side of the board" +msgstr "Wenn eine Lage für Lötstoppmaske auf der Platinenrückseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:633 +msgid "SilkS_Back_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:645 +msgid "If you want a silk screen layer for the back side of the board" +msgstr "Wenn eine Lage für Siebdruck auf der Platinenrückseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:658 +msgid "SoldP_Back_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:670 +msgid "If you want a solder paste layer for the back side of the board" +msgstr "Wenn eine Lage für Lötpaste auf der Platinenrückseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:683 +msgid "Adhes_Back_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:695 +msgid "If you want an adhesive layer for the back side of the board" +msgstr "Wenn eine Lage für Kleber auf der Platinenrückseite benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:708 +msgid "PCB_Edges_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:720 +msgid "If you want a board perimeter layer" +msgstr "Wenn eine Lage für den Platinenumfang benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:729 +msgid "Board contour" +msgstr "Platinenumriss" + +#: pcbnew/dialog_layers_setup_base.cpp:733 +msgid "Eco1_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:752 +#: pcbnew/dialog_layers_setup_base.cpp:775 +#: pcbnew/dialog_layers_setup_base.cpp:800 +#: pcbnew/dialog_layers_setup_base.cpp:825 +msgid "Auxiliary" +msgstr "Behelfstyp" + +#: pcbnew/dialog_layers_setup_base.cpp:756 +msgid "Eco2_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:779 +msgid "Comments_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:791 +msgid "If you want a separate layer for comments or notes" +msgstr "Wenn eine separate Lage für Kommentare oder Bemerkungen benötigt wird" + +#: pcbnew/dialog_layers_setup_base.cpp:804 +msgid "Drawings_later" +msgstr "" + +#: pcbnew/dialog_layers_setup_base.cpp:816 +msgid "If you want a layer for documentation drawings" +msgstr "Wenn eine Lage für dokumentative Zeichnungen benötigt wird" #: pcbnew/dialog_general_options.cpp:222 msgid "Hide &Layers Manager" @@ -9316,6 +9660,22 @@ msgstr "Typenbeschreibung: " msgid "KeyW: " msgstr "Schlüsselwort: " +#: pcbnew/dialog_pad_properties.cpp:569 +msgid "Incorrect value for pad drill: pad drill bigger than pad size" +msgstr "Inkorrekter Wert für Pad Bohrdurchmesser. Bohrdurchmesser ist größer als Pad." + +#: pcbnew/dialog_pad_properties.cpp:578 +msgid "Error: pad is not on a copper layer and has a hole" +msgstr "Fehler: Pad befindet sich nicht auf einer Kupferlage und besitzt ein Bohrung" + +#: pcbnew/dialog_pad_properties.cpp:586 +msgid "Incorrect value for pad offset" +msgstr "Inkorrekter Wert für Padoffset" + +#: pcbnew/dialog_pad_properties.cpp:649 +msgid "Unknown netname, no change" +msgstr "Unbekannter Netzname. Keine Änderung durchgeführt" + #: pcbnew/layer_widget.cpp:358 msgid "Left click to select, middle click for color change, right click for menu" msgstr "Linksklick zum Selektieren, Mittelklick für Farbwechsel, Rechtsklick für Menü" @@ -9370,67 +9730,7 @@ msgstr "Dies ist die voreingestellte Netzklasse." #: pcbnew/class_board.cpp:215 msgid "Front" -msgstr "Bestückungsseite - BS" - -#: pcbnew/class_board.cpp:216 -msgid "Inner2" -msgstr "Innen 2" - -#: pcbnew/class_board.cpp:217 -msgid "Inner3" -msgstr "Innen 3" - -#: pcbnew/class_board.cpp:218 -msgid "Inner4" -msgstr "Innen 4" - -#: pcbnew/class_board.cpp:219 -msgid "Inner5" -msgstr "Innen 5" - -#: pcbnew/class_board.cpp:220 -msgid "Inner6" -msgstr "Innen 6" - -#: pcbnew/class_board.cpp:221 -msgid "Inner7" -msgstr "Innen 7" - -#: pcbnew/class_board.cpp:222 -msgid "Inner8" -msgstr "Innen 8" - -#: pcbnew/class_board.cpp:223 -msgid "Inner9" -msgstr "Innen 9" - -#: pcbnew/class_board.cpp:224 -msgid "Inner10" -msgstr "Innen 10" - -#: pcbnew/class_board.cpp:225 -msgid "Inner11" -msgstr "Innen 11" - -#: pcbnew/class_board.cpp:226 -msgid "Inner12" -msgstr "Innen 12" - -#: pcbnew/class_board.cpp:227 -msgid "Inner13" -msgstr "Innen 13" - -#: pcbnew/class_board.cpp:228 -msgid "Inner14" -msgstr "Innen 14" - -#: pcbnew/class_board.cpp:229 -msgid "Inner15" -msgstr "Innen 5" - -#: pcbnew/class_board.cpp:230 -msgid "Back" -msgstr "Rückseite" +msgstr "Vorderseite" #: pcbnew/class_board.cpp:231 msgid "Adhes_Back" @@ -10016,7 +10316,7 @@ msgstr "Position" #: pcbnew/swap_layers.cpp:70 msgid "Swap Layers:" -msgstr "Wechsle Lagen:" +msgstr "Tausche Lagen:" #: pcbnew/swap_layers.cpp:217 #: pcbnew/swap_layers.cpp:222 @@ -10034,7 +10334,7 @@ msgstr "Bauteileditor: Bauteil wurde modifiziert ! Fortfahren ?" #: pcbnew/moduleframe.cpp:383 msgid "Show pads in sketch mode" -msgstr "Pads als Umrisse darstellen" +msgstr "Pads als Umriss darstellen" #: pcbnew/moduleframe.cpp:384 msgid "Show pads in filled mode" @@ -11056,7 +11356,7 @@ msgstr "Darstellung der Platine an den Bildschirm anpassen" #: pcbnew/menubar_pcbframe.cpp:338 msgid "Redraw the screen of the board" -msgstr "Platine neuzeichnen" +msgstr "Platine neu zeichnen" #: pcbnew/menubar_pcbframe.cpp:347 msgid "&List Nets" @@ -11641,284 +11941,6 @@ msgstr "Bezeichnung" msgid "Supplier and ref" msgstr "Anbieter und Ref" -#: pcbnew/dialog_layers_setup_base.cpp:23 -msgid "Preset Layer Groupings" -msgstr "Voreinstellung für Lagengruppierungen" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Custom" -msgstr "Benutzerdefiniert" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Two layers, parts on Front only" -msgstr "Zwei Lagen, Bauteile nur auf Vorderseite" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Two layers, parts on Back only" -msgstr "Zwei Lagen, Bauteile nur auf Rückseite" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Two layers, parts on Front and Back" -msgstr "Zwei Lagen, Bauteile auf Vorder- und Rückseite" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Four layers, parts on Front only" -msgstr "Vier Lagen, Bauteile nur auf Vorderseite" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "Four layers, parts on Front and Back" -msgstr "Vier Lagen, Bauteile nur auf Rückseite" - -#: pcbnew/dialog_layers_setup_base.cpp:25 -msgid "All layers on" -msgstr "Alle Lagen ein" - -#: pcbnew/dialog_layers_setup_base.cpp:34 -msgid "Copper Layers" -msgstr "Kupferlagen" - -#: pcbnew/dialog_layers_setup_base.cpp:47 -msgid "Layers" -msgstr "Lagen " - -#: pcbnew/dialog_layers_setup_base.cpp:68 -msgid "Adhes_Front_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:80 -msgid "If you want an adhesive template for the front side of the board" -msgstr "Wenn eine Klebervorlage für die Platinenvorderseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:89 -#: pcbnew/dialog_layers_setup_base.cpp:114 -#: pcbnew/dialog_layers_setup_base.cpp:679 -#: pcbnew/dialog_layers_setup_base.cpp:704 -msgid "Off-board, manufacturing" -msgstr "Off-board, Fertigung" - -#: pcbnew/dialog_layers_setup_base.cpp:93 -msgid "SoldP_Front_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:105 -msgid "If you want a solder paster layer for front side of the board" -msgstr "Wenn ein Lage für Lötpaste auf der Platinenvorderseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:118 -msgid "SilkS_Front_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:130 -msgid "If you want a silk screen layer for the front side of the board" -msgstr "Wenn eine Lage für Siebdruck auf der Platinenvorderseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:139 -#: pcbnew/dialog_layers_setup_base.cpp:164 -#: pcbnew/dialog_layers_setup_base.cpp:629 -#: pcbnew/dialog_layers_setup_base.cpp:654 -msgid "On-board, non-copper" -msgstr "On-board, kupferfrei" - -#: pcbnew/dialog_layers_setup_base.cpp:143 -msgid "Mask_Front_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:155 -msgid "If you want a solder mask layer for the front of the board" -msgstr "Wenn eine Lage für Lötstoppmaske auf der Platinenvorderseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:168 -msgid "Front_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:170 -msgid "Layer name of front (top) copper layer" -msgstr "Name der vorderseitigen (oberen) Kupferlage" - -#: pcbnew/dialog_layers_setup_base.cpp:182 -msgid "If you want a front copper layer" -msgstr "Wenn eine vorderseitige Kupferlage benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:191 -#: pcbnew/dialog_layers_setup_base.cpp:218 -#: pcbnew/dialog_layers_setup_base.cpp:245 -#: pcbnew/dialog_layers_setup_base.cpp:272 -#: pcbnew/dialog_layers_setup_base.cpp:299 -#: pcbnew/dialog_layers_setup_base.cpp:326 -#: pcbnew/dialog_layers_setup_base.cpp:353 -#: pcbnew/dialog_layers_setup_base.cpp:380 -#: pcbnew/dialog_layers_setup_base.cpp:407 -#: pcbnew/dialog_layers_setup_base.cpp:434 -#: pcbnew/dialog_layers_setup_base.cpp:461 -#: pcbnew/dialog_layers_setup_base.cpp:488 -#: pcbnew/dialog_layers_setup_base.cpp:515 -#: pcbnew/dialog_layers_setup_base.cpp:542 -#: pcbnew/dialog_layers_setup_base.cpp:569 -#: pcbnew/dialog_layers_setup_base.cpp:600 -msgid "signal" -msgstr "Signal" - -#: pcbnew/dialog_layers_setup_base.cpp:191 -#: pcbnew/dialog_layers_setup_base.cpp:218 -#: pcbnew/dialog_layers_setup_base.cpp:245 -#: pcbnew/dialog_layers_setup_base.cpp:272 -#: pcbnew/dialog_layers_setup_base.cpp:299 -#: pcbnew/dialog_layers_setup_base.cpp:326 -#: pcbnew/dialog_layers_setup_base.cpp:353 -#: pcbnew/dialog_layers_setup_base.cpp:380 -#: pcbnew/dialog_layers_setup_base.cpp:407 -#: pcbnew/dialog_layers_setup_base.cpp:434 -#: pcbnew/dialog_layers_setup_base.cpp:461 -#: pcbnew/dialog_layers_setup_base.cpp:488 -#: pcbnew/dialog_layers_setup_base.cpp:515 -#: pcbnew/dialog_layers_setup_base.cpp:542 -#: pcbnew/dialog_layers_setup_base.cpp:569 -#: pcbnew/dialog_layers_setup_base.cpp:600 -msgid "power" -msgstr "Spannung/Strom" - -#: pcbnew/dialog_layers_setup_base.cpp:191 -#: pcbnew/dialog_layers_setup_base.cpp:218 -#: pcbnew/dialog_layers_setup_base.cpp:245 -#: pcbnew/dialog_layers_setup_base.cpp:272 -#: pcbnew/dialog_layers_setup_base.cpp:299 -#: pcbnew/dialog_layers_setup_base.cpp:326 -#: pcbnew/dialog_layers_setup_base.cpp:353 -#: pcbnew/dialog_layers_setup_base.cpp:380 -#: pcbnew/dialog_layers_setup_base.cpp:407 -#: pcbnew/dialog_layers_setup_base.cpp:434 -#: pcbnew/dialog_layers_setup_base.cpp:461 -#: pcbnew/dialog_layers_setup_base.cpp:488 -#: pcbnew/dialog_layers_setup_base.cpp:515 -#: pcbnew/dialog_layers_setup_base.cpp:542 -#: pcbnew/dialog_layers_setup_base.cpp:569 -#: pcbnew/dialog_layers_setup_base.cpp:600 -msgid "mixed" -msgstr "Mix" - -#: pcbnew/dialog_layers_setup_base.cpp:191 -#: pcbnew/dialog_layers_setup_base.cpp:218 -#: pcbnew/dialog_layers_setup_base.cpp:245 -#: pcbnew/dialog_layers_setup_base.cpp:272 -#: pcbnew/dialog_layers_setup_base.cpp:299 -#: pcbnew/dialog_layers_setup_base.cpp:326 -#: pcbnew/dialog_layers_setup_base.cpp:353 -#: pcbnew/dialog_layers_setup_base.cpp:380 -#: pcbnew/dialog_layers_setup_base.cpp:407 -#: pcbnew/dialog_layers_setup_base.cpp:434 -#: pcbnew/dialog_layers_setup_base.cpp:461 -#: pcbnew/dialog_layers_setup_base.cpp:488 -#: pcbnew/dialog_layers_setup_base.cpp:515 -#: pcbnew/dialog_layers_setup_base.cpp:542 -#: pcbnew/dialog_layers_setup_base.cpp:569 -#: pcbnew/dialog_layers_setup_base.cpp:600 -msgid "jumper" -msgstr "Jumper" - -#: pcbnew/dialog_layers_setup_base.cpp:195 -#: pcbnew/dialog_layers_setup_base.cpp:222 -#: pcbnew/dialog_layers_setup_base.cpp:249 -#: pcbnew/dialog_layers_setup_base.cpp:276 -#: pcbnew/dialog_layers_setup_base.cpp:303 -#: pcbnew/dialog_layers_setup_base.cpp:330 -#: pcbnew/dialog_layers_setup_base.cpp:357 -#: pcbnew/dialog_layers_setup_base.cpp:384 -#: pcbnew/dialog_layers_setup_base.cpp:411 -#: pcbnew/dialog_layers_setup_base.cpp:438 -#: pcbnew/dialog_layers_setup_base.cpp:465 -#: pcbnew/dialog_layers_setup_base.cpp:492 -#: pcbnew/dialog_layers_setup_base.cpp:519 -#: pcbnew/dialog_layers_setup_base.cpp:546 -#: pcbnew/dialog_layers_setup_base.cpp:573 -#: pcbnew/dialog_layers_setup_base.cpp:604 -msgid "Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus." -msgstr "" -"Kupferlagentyp für Freerouter.\n" -"Spannungs-/Stromlagen werden aus Freerouter's Lagenmenüs entfernt." - -#: pcbnew/dialog_layers_setup_base.cpp:579 -msgid "Layer name of back (bottom) copper layer" -msgstr "Name der rückseitigen (unteren) Kupferlage" - -#: pcbnew/dialog_layers_setup_base.cpp:591 -msgid "If you want a back copper layer" -msgstr "Wenn eine rückseitige Kupferlage benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:608 -msgid "Mask_Back_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:620 -msgid "If you want a solder mask layer for the back side of the board" -msgstr "Wenn eine Lage für Lötstoppmaske auf der Platinenrückseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:633 -msgid "SilkS_Back_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:645 -msgid "If you want a silk screen layer for the back side of the board" -msgstr "Wenn eine Lage für Siebdruck auf der Platinenrückseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:658 -msgid "SoldP_Back_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:670 -msgid "If you want a solder paste layer for the back side of the board" -msgstr "Wenn eine Lage für Lötpaste auf der Platinenrückseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:683 -msgid "Adhes_Back_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:695 -msgid "If you want an adhesive layer for the back side of the board" -msgstr "Wenn eine Lage für Kleber auf der Platinenrückseite benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:708 -msgid "PCB_Edges_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:720 -msgid "If you want a board perimeter layer" -msgstr "Wenn eine Lage für den Platinenumfang benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:729 -msgid "Board contour" -msgstr "Platinenumriss" - -#: pcbnew/dialog_layers_setup_base.cpp:733 -msgid "Eco2_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:752 -#: pcbnew/dialog_layers_setup_base.cpp:775 -#: pcbnew/dialog_layers_setup_base.cpp:800 -#: pcbnew/dialog_layers_setup_base.cpp:825 -msgid "Auxiliary" -msgstr "Behelfstyp" - -#: pcbnew/dialog_layers_setup_base.cpp:756 -msgid "Eco1_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:779 -msgid "Comments_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:791 -msgid "If you want a separate layer for comments or notes" -msgstr "Wenn eine separate Lage für Kommentare oder Bemerkungen benötigt wird" - -#: pcbnew/dialog_layers_setup_base.cpp:804 -msgid "Drawings_later" -msgstr "" - -#: pcbnew/dialog_layers_setup_base.cpp:816 -msgid "If you want a layer for documentation drawings" -msgstr "Wenn eine Lage für dokumentative Zeichnungen benötigt wird" - #: pcbnew/librairi.cpp:32 msgid "Kicad foot print export files (*.emp)|*.emp" msgstr "KiCad Footprint Export Dateien (*.emp)|*.emp" @@ -12075,6 +12097,54 @@ msgstr "Platzierungsdatei der Lötseite:" msgid "Module count" msgstr "Bauteileanzahl" +#: pcbnew/dialog_freeroute_exchange_base.cpp:25 +msgid "Export/Import to/from FreeRoute:" +msgstr "Export/Import von/nach FreeRoute:" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:40 +msgid "Export a Specctra Design (*.dsn) File" +msgstr "Exportiere eine Specctra Design Datei (*.dsn)" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:41 +msgid "Export a Specctra DSN file (to FreeRouter)" +msgstr "Exportiere eine Specctra DSN Datei (nach FreeRouter)" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:45 +msgid "Launch FreeRouter via Java Web Start" +msgstr "Starte FreeRouter via Java Web Start" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:46 +msgid "Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)" +msgstr "Verwende die Java Web Start Funktion um FreeRouter via Internet zu starten (oder den Browser falls nicht auffindbar)" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:50 +msgid "Back Import the Specctra Session (*.ses) File" +msgstr "Die Specctra Session Datei (*.ses) rückimportieren" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:51 +msgid "Merge a session file created by FreeRouter with the current board." +msgstr "Eine Session Datei, erzeugt durch FreeRouter, mit der aktuellen Platine zusammenführen" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:67 +msgid "FreeRoute Info:" +msgstr "Freeroute Hinweise:" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:82 +msgid "Visit the FreeRouting.net Website with your Browser" +msgstr "Aufrufen der FreeRouting.net Webseite" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:85 +msgid "FreeRouting.net URL" +msgstr "FreeRouting.net URL" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:90 +msgid "The URL of the FreeRouting.net website" +msgstr "Die URL der FreeRouting.net Webseite" + +#: pcbnew/dialog_freeroute_exchange_base.cpp:94 +msgid "Help" +msgstr "Hilfe" + #: gerbview/reglage.cpp:92 msgid "Save Cfg..." msgstr "Speichere Konfiguration..." @@ -12813,10 +12883,6 @@ msgstr "Tausche Bauteil(e) Footprint(s):" msgid "Design Rules Editor" msgstr "Design Regeln Editor" -#: pcbnew/dialog_layers_setup_base.h:262 -msgid "Layer Setup" -msgstr "Lagen Einstellungen" - #: pcbnew/dialog_drc_base.h:96 msgid "DRC Control" msgstr "ERC Steuerung" @@ -12857,6 +12923,10 @@ msgstr "Pad Eigenschaften" msgid "Footprints Orientation" msgstr "Footprint Ausrichtung" +#: pcbnew/dialog_layers_setup_base.h:262 +msgid "Layer Setup" +msgstr "Lagen Einstellungen" + #: gerbview/gerbview_dialog_display_options_frame_base.h:54 msgid "Gerbview Draw Options" msgstr "Gerbview Darstellungsoptionen" @@ -12865,6 +12935,12 @@ msgstr "Gerbview Darstellungsoptionen" msgid "Page Settings" msgstr "Seite einrichten..." +#~ msgid "in file" +#~ msgstr "in Datei" +#~ msgid "In the clearance units, enter the clearance distance" +#~ msgstr "" +#~ "Gebe die Distanz für die einzuhaltenden Abstandsflächen in der " +#~ "vorgegebenen Einheit an" #~ msgid "Grid: " #~ msgstr "Raster:" #~ msgid "Current" @@ -13447,32 +13523,8 @@ msgstr "Seite einrichten..." #~ msgstr "Pad Bohrung" #~ msgid "This layer name %s is already existing
" #~ msgstr "Der Lagenname %s existiert bereits
" -#~ msgid "Export a Specctra Design (*.dsn) File" -#~ msgstr "Exportiere eine Specctra Design Datei (*.dsn)" -#~ msgid "Export a Specctra DSN file (to FreeRouter)" -#~ msgstr "Exportiere eine Specctra DSN Datei (nach FreeRouter)" -#~ msgid "Launch FreeRouter via Java Web Start" -#~ msgstr "Starte FreeRouter via Java Web Start" -#~ msgid "" -#~ "Use Java Web Start function to run FreeRouter via Internet (or your " -#~ "Browser if not found)" -#~ msgstr "" -#~ "Verwende die Java Web Start Funktion um FreeRouter via Internet zu " -#~ "starten (oder den Browser falls nicht auffindbar)" -#~ msgid "Back Import the Specctra Session (*.ses) File" -#~ msgstr "Die Specctra Session Datei (*.ses) zurück importieren" -#~ msgid "Merge a session file created by FreeRouter with the current board." -#~ msgstr "" -#~ "Eine Session Datei, erzeugt durch FreeRouter, mit der aktuellen Platine " -#~ "zusammenführen" -#~ msgid "Visit FreeRouting.net website" -#~ msgstr "Besuche die FreeRouting.net Webseite" #~ msgid "Launch your browser and go to the FreeRouting.net website" #~ msgstr "Starte den Browser und gehe zur FreeRouting.net Webseite" -#~ msgid "FreeRouting.net URL" -#~ msgstr "FreeRouting.net URL" -#~ msgid "The URL of the FreeRouting.net website" -#~ msgstr "Die URL der FreeRouting.net Webseite" #~ msgid "Via Min Drill" #~ msgstr "DuKo Mindestbohrdurchmesser" #~ msgid "MicroVia Min Diameter" @@ -13633,8 +13685,6 @@ msgstr "Seite einrichten..." #~ "nicht anders vorgegeben." #~ msgid "Micro Via Size" #~ msgstr "Micro DuKo-Durchmesser" -#~ msgid "Enter the current track width" -#~ msgstr "Zu verwendende Breite für Leiterbahnen" #~ msgid "This is the clearance between tracks, vias and pads for DRC." #~ msgstr "" #~ "Dies ist der Abstand zwischen Leiterbahnen, Durchkontaktierungen und Pads " diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 0cf6890d12..130bc99fb0 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -174,7 +174,7 @@ set(PCBNEW_SRCS ) set(PCBNEW_EXTRA_SRCS - ../share/setpage.cpp + ../common/dialog_page_settings.cpp ) if(WIN32) diff --git a/share/setpage.cpp b/share/setpage.cpp deleted file mode 100644 index 596097fdcd..0000000000 --- a/share/setpage.cpp +++ /dev/null @@ -1,614 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: setpage.cpp -// Purpose: -// Author: jean-pierre Charras -// Modified by: -// Created: 13/11/2007 09:11:27 -// RCS-ID: -// Copyright: License GNU -// Licence: -///////////////////////////////////////////////////////////////////////////// - -/* The "Page Settings" dialog box created by this file (and setpage.h) - * contains seven checkboxes which *are* provided when that dialog box is - * invoked in EESchema, but which are *not* provided when that dialog box is - * invoked in Pcbnew instead. As such, various lines within this file - * (and setpage.h) are included on an appropriately conditional basis. - * (That aspect should be noted if the contents of this file (and setpage.h) - * are ever consequently modified as a consequence of setpage.pjd being - * opened in DialogBlocks (as that file now incorporates those checkboxes).) - */ - -// Generated by DialogBlocks (unregistered), 13/11/2007 09:11:27 - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "setpage.h" -#endif - -////@begin includes -////@end includes -#include "fctsys.h" -#include "gr_basic.h" -#include "common.h" -#include "base_struct.h" -#include "class_drawpanel.h" -#include "class_base_screen.h" -#include "wxstruct.h" - -#ifdef EESCHEMA -#include "program.h" -#include "general.h" -#endif - -#define NB_ITEMS 11 -Ki_PageDescr * SheetList[NB_ITEMS + 1] = -{ - &g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0, - &g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E, - &g_Sheet_user, NULL -}; - -#include "setpage.h" - -////@begin XPM images -////@end XPM images - -/******************************************************************/ -void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event) -/******************************************************************/ -/* Creation de la fenetre de configuration - */ -{ - WinEDA_SetPageFrame frame(this); - frame.ShowModal(); - if ( DrawPanel ) - DrawPanel->Refresh(); -} - -/*! - * WinEDA_SetPageFrame type definition - */ - -IMPLEMENT_DYNAMIC_CLASS( WinEDA_SetPageFrame, wxDialog ) - - -/*! - * WinEDA_SetPageFrame event table definition - */ - -BEGIN_EVENT_TABLE( WinEDA_SetPageFrame, wxDialog ) - -////@begin WinEDA_SetPageFrame event table entries - EVT_CLOSE( WinEDA_SetPageFrame::OnCloseWindow ) - - EVT_BUTTON( wxID_OK, WinEDA_SetPageFrame::OnOkClick ) - - EVT_BUTTON( wxID_CANCEL, WinEDA_SetPageFrame::OnCancelClick ) - -////@end WinEDA_SetPageFrame event table entries - -END_EVENT_TABLE() - - -/*! - * WinEDA_SetPageFrame constructors - */ - -WinEDA_SetPageFrame::WinEDA_SetPageFrame( ) -{ - Init(); -} - -WinEDA_SetPageFrame::WinEDA_SetPageFrame( WinEDA_DrawFrame* parent, wxWindowID id, - const wxString& caption, const wxPoint& pos, - const wxSize& size, long style ) -{ - Init(); - - wxString msg; - - m_ParentDrawFrame = parent; - m_Screen = m_ParentDrawFrame->GetBaseScreen(); - m_Modified = FALSE; - m_SelectedSheet = NULL; - m_CurrentSelection = 0; - SearchPageSizeSelection(); - - Create( parent, id, caption, pos, size, style); - // Init display value for sheet User size - wxString format = m_TextSheetCount->GetLabel(); - msg.Printf(format, m_Screen->m_NumberOfScreen); - m_TextSheetCount->SetLabel(msg); - format = m_TextSheetNumber->GetLabel(); - msg.Printf(format, m_Screen->m_ScreenNumber); - m_TextSheetNumber->SetLabel(msg); - - if( g_UnitMetric ) - { - UserSizeX = (double)g_Sheet_user.m_Size.x * 25.4 / 1000; - UserSizeY = (double)g_Sheet_user.m_Size.y * 25.4 / 1000; - msg.Printf( wxT("%.2f"), UserSizeX ); - m_TextUserSizeX->SetValue(msg); - msg.Printf( wxT("%.2f"), UserSizeY ); - m_TextUserSizeY->SetValue(msg); - } - else - { - UserSizeX = (double)g_Sheet_user.m_Size.x / 1000; - UserSizeY = (double)g_Sheet_user.m_Size.y / 1000; - msg.Printf( wxT("%.3f"), UserSizeX ); - m_TextUserSizeX->SetValue(msg); - msg.Printf( wxT("%.3f"), UserSizeY ); - m_TextUserSizeY->SetValue(msg); - } -} - - -/*! - * WinEDA_SetPageFrame creator - */ - -bool WinEDA_SetPageFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) -{ -////@begin WinEDA_SetPageFrame creation - wxDialog::Create( parent, id, caption, pos, size, style ); - - CreateControls(); - if (GetSizer()) - { - GetSizer()->SetSizeHints(this); - } - Centre(); -////@end WinEDA_SetPageFrame creation - return true; -} - - -/*! - * WinEDA_SetPageFrame destructor - */ - -WinEDA_SetPageFrame::~WinEDA_SetPageFrame() -{ -////@begin WinEDA_SetPageFrame destruction -////@end WinEDA_SetPageFrame destruction -} - - -/*! - * Member initialisation - */ - -void WinEDA_SetPageFrame::Init() -{ - -// NOTE: The following code has been modified by initialising the seven -// checkboxes *only* within the EESchema version of this dialog box. - -////@begin WinEDA_SetPageFrame member initialisation - OuterSizer = NULL; - MainSizer = NULL; - LeftColumnSizer = NULL; - m_PageSizeBox = NULL; - UserSizeXSizer = NULL; - UserPageSizeX = NULL; - m_TextUserSizeX = NULL; - UserSizeYSizer = NULL; - UserPageSizeY = NULL; - m_TextUserSizeY = NULL; - RightColumnSizer = NULL; - SheetInfoSizer = NULL; - m_TextSheetCount = NULL; - m_TextSheetNumber = NULL; - RevisionSizer = NULL; - m_TextRevision = NULL; - m_RevisionExport = NULL; - TitleSizer = NULL; - m_TextTitle = NULL; - m_TitleExport = NULL; - CompanySizer = NULL; - m_TextCompany = NULL; - m_CompanyExport = NULL; - Comment1Sizer = NULL; - m_TextComment1 = NULL; - m_Comment1Export = NULL; - Comment2Sizer = NULL; - m_TextComment2 = NULL; - m_Comment2Export = NULL; - Comment3Sizer = NULL; - m_TextComment3 = NULL; - m_Comment3Export = NULL; - Comment4Sizer = NULL; - m_TextComment4 = NULL; - m_Comment4Export = NULL; - Line = NULL; - StdDialogButtonSizer = NULL; - Button_OK = NULL; - Button_Cancel = NULL; -////@end WinEDA_SetPageFrame member initialisation -} - - -/*! - * Control creation for WinEDA_SetPageFrame - */ - -void WinEDA_SetPageFrame::CreateControls() -{ -// NOTE: The following code has been modified by providing the seven -// checkboxes *only* within the EESchema version of this dialog box. - -////@begin WinEDA_SetPageFrame content construction - // Generated by DialogBlocks, 24/04/2009 15:17:10 (unregistered) - - WinEDA_SetPageFrame* itemDialog1 = this; - - OuterSizer = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(OuterSizer); - - MainSizer = new wxBoxSizer(wxHORIZONTAL); - OuterSizer->Add(MainSizer, 1, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5); - - LeftColumnSizer = new wxFlexGridSizer(6, 1, 0, 0); - LeftColumnSizer->AddGrowableRow(1); - LeftColumnSizer->AddGrowableRow(2); - LeftColumnSizer->AddGrowableRow(3); - LeftColumnSizer->AddGrowableRow(4); - LeftColumnSizer->AddGrowableRow(5); - MainSizer->Add(LeftColumnSizer, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5); - - wxArrayString m_PageSizeBoxStrings; - m_PageSizeBoxStrings.Add(_("Size A4")); - m_PageSizeBoxStrings.Add(_("Size A3")); - m_PageSizeBoxStrings.Add(_("Size A2")); - m_PageSizeBoxStrings.Add(_("Size A1")); - m_PageSizeBoxStrings.Add(_("Size A0")); - m_PageSizeBoxStrings.Add(_("Size A")); - m_PageSizeBoxStrings.Add(_("Size B")); - m_PageSizeBoxStrings.Add(_("Size C")); - m_PageSizeBoxStrings.Add(_("Size D")); - m_PageSizeBoxStrings.Add(_("Size E")); - m_PageSizeBoxStrings.Add(_("User size")); - m_PageSizeBox = new wxRadioBox( itemDialog1, ID_RADIOBOX_PAGE_SIZE, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PageSizeBoxStrings, 1, wxRA_SPECIFY_COLS ); - m_PageSizeBox->SetSelection(0); - LeftColumnSizer->Add(m_PageSizeBox, 1, wxGROW|wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - - UserSizeXSizer = new wxBoxSizer(wxVERTICAL); - LeftColumnSizer->Add(UserSizeXSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 5); - - UserPageSizeX = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size X: "), wxDefaultPosition, wxDefaultSize, 0 ); - UserSizeXSizer->Add(UserPageSizeX, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); - - m_TextUserSizeX = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_USER_PAGE_SIZE_X, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - UserSizeXSizer->Add(m_TextUserSizeX, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5); - - UserSizeYSizer = new wxBoxSizer(wxVERTICAL); - LeftColumnSizer->Add(UserSizeYSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 5); - - UserPageSizeY = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size Y: "), wxDefaultPosition, wxDefaultSize, 0 ); - UserSizeYSizer->Add(UserPageSizeY, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); - - m_TextUserSizeY = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_USER_PAGE_SIZE_Y, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - UserSizeYSizer->Add(m_TextUserSizeY, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5); - - LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - RightColumnSizer = new wxFlexGridSizer(8, 1, 0, 0); - RightColumnSizer->AddGrowableRow(0); - RightColumnSizer->AddGrowableRow(1); - RightColumnSizer->AddGrowableRow(2); - RightColumnSizer->AddGrowableRow(3); - RightColumnSizer->AddGrowableRow(4); - RightColumnSizer->AddGrowableRow(5); - RightColumnSizer->AddGrowableRow(6); - RightColumnSizer->AddGrowableRow(7); - RightColumnSizer->AddGrowableCol(0); - MainSizer->Add(RightColumnSizer, 1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5); - - SheetInfoSizer = new wxBoxSizer(wxHORIZONTAL); - RightColumnSizer->Add(SheetInfoSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - - m_TextSheetCount = new wxStaticText( itemDialog1, wxID_STATIC, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - SheetInfoSizer->Add(m_TextSheetCount, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM|wxADJUST_MINSIZE, 5); - - SheetInfoSizer->Add(5, 5, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_TextSheetNumber = new wxStaticText( itemDialog1, wxID_STATIC, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - SheetInfoSizer->Add(m_TextSheetNumber, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM|wxADJUST_MINSIZE, 5); - - wxStaticBox* itemStaticBoxSizer20Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Revision:")); - RevisionSizer = new wxStaticBoxSizer(itemStaticBoxSizer20Static, wxHORIZONTAL); - RightColumnSizer->Add(RevisionSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); - - m_TextRevision = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_REVISION, _T(""), wxDefaultPosition, wxSize(100, -1), wxTE_RICH ); - RevisionSizer->Add(m_TextRevision, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_RevisionExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_RevisionExport->SetValue(false); - RevisionSizer->Add(m_RevisionExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer23Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Title:")); - TitleSizer = new wxStaticBoxSizer(itemStaticBoxSizer23Static, wxHORIZONTAL); - RightColumnSizer->Add(TitleSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextTitle = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_TITLE, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - TitleSizer->Add(m_TextTitle, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_TitleExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_TITLE, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TitleExport->SetValue(false); - TitleSizer->Add(m_TitleExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer26Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Company:")); - CompanySizer = new wxStaticBoxSizer(itemStaticBoxSizer26Static, wxHORIZONTAL); - RightColumnSizer->Add(CompanySizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextCompany = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMPANY, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - CompanySizer->Add(m_TextCompany, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_CompanyExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CompanyExport->SetValue(false); - CompanySizer->Add(m_CompanyExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer29Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment1:")); - Comment1Sizer = new wxStaticBoxSizer(itemStaticBoxSizer29Static, wxHORIZONTAL); - RightColumnSizer->Add(Comment1Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextComment1 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT1, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - Comment1Sizer->Add(m_TextComment1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_Comment1Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Comment1Export->SetValue(false); - Comment1Sizer->Add(m_Comment1Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer32Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment2:")); - Comment2Sizer = new wxStaticBoxSizer(itemStaticBoxSizer32Static, wxHORIZONTAL); - RightColumnSizer->Add(Comment2Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextComment2 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT2, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - Comment2Sizer->Add(m_TextComment2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_Comment2Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Comment2Export->SetValue(false); - Comment2Sizer->Add(m_Comment2Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer35Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment3:")); - Comment3Sizer = new wxStaticBoxSizer(itemStaticBoxSizer35Static, wxHORIZONTAL); - RightColumnSizer->Add(Comment3Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextComment3 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT3, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - Comment3Sizer->Add(m_TextComment3, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_Comment3Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Comment3Export->SetValue(false); - Comment3Sizer->Add(m_Comment3Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - wxStaticBox* itemStaticBoxSizer38Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment4:")); - Comment4Sizer = new wxStaticBoxSizer(itemStaticBoxSizer38Static, wxHORIZONTAL); - RightColumnSizer->Add(Comment4Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5); - - m_TextComment4 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT4, _T(""), wxDefaultPosition, wxSize(400, -1), 0 ); - Comment4Sizer->Add(m_TextComment4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - m_Comment4Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Comment4Export->SetValue(false); - Comment4Sizer->Add(m_Comment4Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); - - Line = new wxStaticLine( itemDialog1, ID_STATICLINE, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - OuterSizer->Add(Line, 0, wxGROW|wxLEFT|wxRIGHT, 5); - - StdDialogButtonSizer = new wxStdDialogButtonSizer; - - OuterSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10); - Button_OK = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - StdDialogButtonSizer->AddButton(Button_OK); - - Button_Cancel = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - StdDialogButtonSizer->AddButton(Button_Cancel); - - StdDialogButtonSizer->Realize(); - - // Set validators - m_PageSizeBox->SetValidator( wxGenericValidator(& m_CurrentSelection) ); - m_TextRevision->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Revision) ); - m_TextTitle->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Title) ); - m_TextCompany->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Company) ); - m_TextComment1->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire1) ); - m_TextComment2->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire2) ); - m_TextComment3->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire3) ); - m_TextComment4->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire4) ); -////@end WinEDA_SetPageFrame content construction -#ifndef EESCHEMA - m_RevisionExport->Show(false); - m_TitleExport->Show(false); - m_CompanyExport->Show(false); - m_Comment1Export->Show(false); - m_Comment2Export->Show(false); - m_Comment3Export->Show(false); - m_Comment4Export->Show(false); -#endif -} - - -/*! - * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG - */ - -void WinEDA_SetPageFrame::OnCloseWindow( wxCloseEvent& event ) -{ - EndModal( m_Modified ); -} - - -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK - */ - -void WinEDA_SetPageFrame::OnOkClick( wxCommandEvent& event ) -{ - SavePageSettings( event ); - Close( TRUE ); -} - - -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL - */ - -void WinEDA_SetPageFrame::OnCancelClick( wxCommandEvent& event ) -{ - Close( TRUE ); -} - - -/*! - * Should we show tooltips? - */ - -bool WinEDA_SetPageFrame::ShowToolTips() -{ - return true; -} - -/*! - * Get bitmap resources - */ - -wxBitmap WinEDA_SetPageFrame::GetBitmapResource( const wxString& name ) -{ - // Bitmap retrieval -////@begin WinEDA_SetPageFrame bitmap retrieval - wxUnusedVar(name); - return wxNullBitmap; -////@end WinEDA_SetPageFrame bitmap retrieval -} - -/*! - * Get icon resources - */ - -wxIcon WinEDA_SetPageFrame::GetIconResource( const wxString& name ) -{ - // Icon retrieval -////@begin WinEDA_SetPageFrame icon retrieval - wxUnusedVar(name); - return wxNullIcon; -////@end WinEDA_SetPageFrame icon retrieval -} - - -/*****************************************************************/ -void WinEDA_SetPageFrame::SavePageSettings(wxCommandEvent& event) -/*****************************************************************/ -/* Mise a jour effective des textes et dimensions - */ -{ - double dtmp; - wxString msg; - - m_Screen->m_Revision = m_TextRevision->GetValue(); - m_Screen->m_Company = m_TextCompany->GetValue(); - m_Screen->m_Title = m_TextTitle->GetValue(); - m_Screen->m_Commentaire1 = m_TextComment1->GetValue(); - m_Screen->m_Commentaire2 = m_TextComment2->GetValue(); - m_Screen->m_Commentaire3 = m_TextComment3->GetValue(); - m_Screen->m_Commentaire4 = m_TextComment4->GetValue(); - - msg = m_TextUserSizeX->GetValue(); - msg.ToDouble(&dtmp); - UserSizeX = dtmp; - msg = m_TextUserSizeY->GetValue(); - msg.ToDouble(&dtmp); - UserSizeY = dtmp; - - int ii = m_PageSizeBox->GetSelection(); - - if( ii < 0 ) - ii = 0; - - m_SelectedSheet = SheetList[ii]; - m_Screen->m_CurrentSheetDesc = m_SelectedSheet; - - if( g_UnitMetric ) - { - g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 / 25.4 ); - g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 / 25.4 ); - } - else - { - g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 ); - g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 ); - } - - if( g_Sheet_user.m_Size.x < 6000 ) - g_Sheet_user.m_Size.x = 6000; - - if( g_Sheet_user.m_Size.x > 44000 ) - g_Sheet_user.m_Size.x = 44000; - - if( g_Sheet_user.m_Size.y < 4000 ) - g_Sheet_user.m_Size.y = 4000; - - if( g_Sheet_user.m_Size.y > 44000 ) - g_Sheet_user.m_Size.y = 44000; - -#ifdef EESCHEMA - /* Exports settings to other sheets if requested: */ - SCH_SCREEN * screen; - /* Build the screen list */ - EDA_ScreenList ScreenList; - /* Update the datas */ - for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() ) - { - if( screen == m_Screen ) - continue; - - if( m_RevisionExport->IsChecked() ) - screen->m_Revision = m_Screen->m_Revision; - - if( m_TitleExport->IsChecked() ) - screen->m_Title =m_Screen->m_Title; - - if( m_CompanyExport->IsChecked() ) - screen->m_Company = m_Screen->m_Company; - - if( m_Comment1Export->IsChecked() ) - screen->m_Commentaire1 = m_Screen->m_Commentaire1; - - if( m_Comment2Export->IsChecked() ) - screen->m_Commentaire2 = m_Screen->m_Commentaire2; - - if( m_Comment3Export->IsChecked() ) - screen->m_Commentaire3 = m_Screen->m_Commentaire3; - - if( m_Comment4Export->IsChecked() ) - screen->m_Commentaire4 = m_Screen->m_Commentaire4; - } -#endif - - m_Screen->SetModify(); - m_Screen->SetRefreshReq(); -} - - -/*******************************************************/ -void WinEDA_SetPageFrame::SearchPageSizeSelection() -/*******************************************************/ -/* Search the correct index to activate the radiobox list size selection - * according to the current page size - */ -{ - Ki_PageDescr * sheet; - int ii; - - m_CurrentSelection = NB_ITEMS - 1; - for( ii = 0; ii < NB_ITEMS; ii++ ) - { - sheet = SheetList[ii]; - if( m_ParentDrawFrame->GetBaseScreen()->m_CurrentSheetDesc == sheet ) - m_CurrentSelection = ii; - } -} diff --git a/share/setpage.h b/share/setpage.h deleted file mode 100644 index 61aefe2a5a..0000000000 --- a/share/setpage.h +++ /dev/null @@ -1,205 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: setpage.h -// Purpose: -// Author: jean-pierre Charras -// Modified by: -// Created: 13/11/2007 09:11:27 -// RCS-ID: -// Copyright: License GNU -// Licence: -///////////////////////////////////////////////////////////////////////////// - -/* The "Page Settings" dialog box created by this file (and setpage.cpp) - * contains seven checkboxes which *are* provided when that dialog box is - * invoked in EESchema, but which are *not* provided when that dialog box is - * invoked in Pcbnew instead. As such, various lines within this file - * (and setpage.cpp) are included on an appropriately conditional basis. - * (That aspect should be noted if the contents of this file (and setpage.cpp) - * are ever consequently modified as a consequence of setpage.pjd being - * opened in DialogBlocks (as that file now incorporates those checkboxes).) - */ - -// Generated by DialogBlocks (unregistered), 13/11/2007 09:11:27 - -#ifndef _SETPAGE_H_ -#define _SETPAGE_H_ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "setpage.h" -#endif - -/*! - * Includes - */ - -////@begin includes -#include "wx/valgen.h" -#include "wx/valtext.h" -#include "wx/statline.h" -////@end includes - -/*! - * Forward declarations - */ - -////@begin forward declarations -class wxBoxSizer; -class wxFlexGridSizer; -class wxStaticLine; -class wxStdDialogButtonSizer; -////@end forward declarations - -/*! - * Control identifiers - */ - -// NOTE: The following code has been modified by listing the seven checkbox- -// related definitions *only* within the EESchema version of this dialog box. - -////@begin control identifiers -#define ID_DIALOG 10000 -#define ID_RADIOBOX_PAGE_SIZE 10001 -#define ID_TEXTCTRL_USER_PAGE_SIZE_X 10002 -#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 10003 -#define ID_TEXTCTRL_REVISION 10004 -#define ID_CHECKBOX_REVISION 10011 -#define ID_TEXTCTRL_TITLE 10005 -#define ID_CHECKBOX_TITLE 10012 -#define ID_TEXTCTRL_COMPANY 10006 -#define ID_CHECKBOX_COMPANY 10013 -#define ID_TEXTCTRL_COMMENT1 10007 -#define ID_CHECKBOX_COMMENT1 10014 -#define ID_TEXTCTRL_COMMENT2 10008 -#define ID_CHECKBOX_COMMENT2 10015 -#define ID_TEXTCTRL_COMMENT3 10009 -#define ID_CHECKBOX_COMMENT3 10016 -#define ID_TEXTCTRL_COMMENT4 10010 -#define ID_CHECKBOX_COMMENT4 10017 -#define ID_STATICLINE 10018 -#define SYMBOL_WINEDA_SETPAGEFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER -#define SYMBOL_WINEDA_SETPAGEFRAME_TITLE _("Page Settings") -#define SYMBOL_WINEDA_SETPAGEFRAME_IDNAME ID_DIALOG -#define SYMBOL_WINEDA_SETPAGEFRAME_SIZE wxSize(400, 300) -#define SYMBOL_WINEDA_SETPAGEFRAME_POSITION wxDefaultPosition -////@end control identifiers - - -/*! - * WinEDA_SetPageFrame class declaration - */ - -class WinEDA_SetPageFrame: public wxDialog -{ - DECLARE_DYNAMIC_CLASS( WinEDA_SetPageFrame ) - DECLARE_EVENT_TABLE() - -public: - /// Constructors - WinEDA_SetPageFrame( ); - WinEDA_SetPageFrame( WinEDA_DrawFrame* parent, - wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME, - const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE, - const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION, - const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE, - long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE ); - - /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME, - const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE, - const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION, - const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE, - long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE ); - - /// Destructor - ~WinEDA_SetPageFrame(); - - /// Initialises member variables - void Init(); - - /// Creates the controls and sizers - void CreateControls(); - -////@begin WinEDA_SetPageFrame event handler declarations - - /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG - void OnCloseWindow( wxCloseEvent& event ); - - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK - void OnOkClick( wxCommandEvent& event ); - - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL - void OnCancelClick( wxCommandEvent& event ); - -////@end WinEDA_SetPageFrame event handler declarations - -////@begin WinEDA_SetPageFrame member function declarations - - /// Retrieves bitmap resources - wxBitmap GetBitmapResource( const wxString& name ); - - /// Retrieves icon resources - wxIcon GetIconResource( const wxString& name ); -////@end WinEDA_SetPageFrame member function declarations - - /// Should we show tooltips? - static bool ShowToolTips(); - - void SearchPageSizeSelection(); - void SavePageSettings(wxCommandEvent& event); - void ReturnSizeSelected(wxCommandEvent& event); - -// NOTE: The following code has been modified by listing the seven -// checkboxes *only* within the EESchema version of this dialog box. - -////@begin WinEDA_SetPageFrame member variables - wxBoxSizer* OuterSizer; - wxBoxSizer* MainSizer; - wxFlexGridSizer* LeftColumnSizer; - wxRadioBox* m_PageSizeBox; - wxBoxSizer* UserSizeXSizer; - wxStaticText* UserPageSizeX; - wxTextCtrl* m_TextUserSizeX; - wxBoxSizer* UserSizeYSizer; - wxStaticText* UserPageSizeY; - wxTextCtrl* m_TextUserSizeY; - wxFlexGridSizer* RightColumnSizer; - wxBoxSizer* SheetInfoSizer; - wxStaticText* m_TextSheetCount; - wxStaticText* m_TextSheetNumber; - wxStaticBoxSizer* RevisionSizer; - wxTextCtrl* m_TextRevision; - wxCheckBox* m_RevisionExport; - wxStaticBoxSizer* TitleSizer; - wxTextCtrl* m_TextTitle; - wxCheckBox* m_TitleExport; - wxStaticBoxSizer* CompanySizer; - wxTextCtrl* m_TextCompany; - wxCheckBox* m_CompanyExport; - wxStaticBoxSizer* Comment1Sizer; - wxTextCtrl* m_TextComment1; - wxCheckBox* m_Comment1Export; - wxStaticBoxSizer* Comment2Sizer; - wxTextCtrl* m_TextComment2; - wxCheckBox* m_Comment2Export; - wxStaticBoxSizer* Comment3Sizer; - wxTextCtrl* m_TextComment3; - wxCheckBox* m_Comment3Export; - wxStaticBoxSizer* Comment4Sizer; - wxTextCtrl* m_TextComment4; - wxCheckBox* m_Comment4Export; - wxStaticLine* Line; - wxStdDialogButtonSizer* StdDialogButtonSizer; - wxButton* Button_OK; - wxButton* Button_Cancel; -////@end WinEDA_SetPageFrame member variables - - WinEDA_DrawFrame *m_ParentDrawFrame; - BASE_SCREEN * m_Screen; - int m_Modified; - Ki_PageDescr * m_SelectedSheet; - float UserSizeX, UserSizeY; - int m_CurrentSelection; -}; - -#endif - // _SETPAGE_H_ diff --git a/share/setpage.pjd b/share/setpage.pjd deleted file mode 100644 index cb07313b32..0000000000 --- a/share/setpage.pjd +++ /dev/null @@ -1,2612 +0,0 @@ - - -
- 0 - "" - "" - "" - "" - "" - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 0 - "jean-pierre Charras" - "License GNU" - "" - 0 - 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 - 0 - 1 - 1 - 0 - 1 - 0 - 0 -
- - - "" - "data-document" - "" - "" - 0 - 1 - 0 - 0 - - "Configurations" - "config-data-document" - "" - "" - 0 - 1 - 0 - 0 - "" - 1 - -8519680 - "" - "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%" - "%AUTO%" - "%AUTO%" - 0 - 1 - "" - - - - - - - "Projects" - "root-document" - "" - "project" - 1 - 1 - 0 - 1 - - "Windows" - "html-document" - "" - "dialogsfolder" - 1 - 1 - 0 - 1 - - "Page Settings" - "dialog-document" - "" - "dialog" - 0 - 1 - 0 - 0 - "6/10/2006" - "wbDialogProxy" - 10000 - 0 - "" - 0 - "" - 0 - 0 - "wxEVT_CLOSE_WINDOW|OnCloseWindow|||" - "ID_DIALOG" - 10000 - "WinEDA_SetPageFrame" - "wxDialog" - "wxDialog" - "setpage.cpp" - "setpage.h" - "" - "Page Settings" - 1 - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "Tiled" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "MAYBE_RESIZE_BORDER" - 0 - 1 - -1 - -1 - 400 - 300 - 0 - "" - - "wxBoxSizer V" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "12/11/2007" - "wbBoxSizerProxy" - "Vertical" - "OuterSizer" - 0 - 0 - 0 - "<Any platform>" - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "12/11/2007" - "wbBoxSizerProxy" - "Horizontal" - "MainSizer" - "Expand" - "Centre" - 1 - 5 - 0 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - "wxFlexGridSizer" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbFlexGridSizerProxy" - "" - "1,2,3,4,5" - 1 - 6 - 0 - 0 - "LeftColumnSizer" - "<Any platform>" - "Centre" - "Expand" - 0 - 5 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - - "wxRadioBox: ID_RADIOBOX_PAGE_SIZE" - "dialog-control-document" - "" - "radiobox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbRadioBoxProxy" - "ID_RADIOBOX_PAGE_SIZE" - 10001 - "" - "wxRadioBox" - "wxRadioBox" - 1 - 0 - "" - "" - "m_PageSizeBox" - "Page Size:" - 1 - "Size A4|Size A3|Size A2|Size A1|Size A0|Size A|Size B|Size C|Size D|Size E|User size" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_CurrentSelection" - "wxGenericValidator(& %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 1 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Expand" - "Top" - 1 - 5 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - "" - "" - - - "wxBoxSizer V" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbBoxSizerProxy" - "Vertical" - "UserSizeXSizer" - "Centre" - "Centre" - 0 - 5 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "UserPageSizeX" - "User Page Size X: " - -1 - "" - "" - "" - "" - "" - 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 - 0 - 0 - 0 - 1 - 0 - "" - "" - - - "wxTextCtrl: ID_TEXTCTRL_USER_PAGE_SIZE_X" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_USER_PAGE_SIZE_X" - 10002 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextUserSizeX" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Left" - "Centre" - 0 - 5 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - "" - "" - - - - "wxBoxSizer V" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbBoxSizerProxy" - "Vertical" - "UserSizeYSizer" - "Centre" - "Centre" - 0 - 5 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "UserPageSizeY" - "User Page Size Y: " - -1 - "" - "" - "" - "" - "" - 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 - 0 - 0 - 0 - 1 - 0 - "" - "" - - - "wxTextCtrl: ID_TEXTCTRL_USER_PAGE_SIZE_Y" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_USER_PAGE_SIZE_Y" - 10003 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextUserSizeY" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Left" - "Centre" - 0 - 5 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - "" - "" - - - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbSpacerProxy" - 5 - 10 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbSpacerProxy" - 5 - 10 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbSpacerProxy" - 5 - 10 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - - "wxFlexGridSizer" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbFlexGridSizerProxy" - "0" - "0,1,2,3,4,5,6,7" - 1 - 8 - 0 - 0 - "RightColumnSizer" - "<Any platform>" - "Centre" - "Expand" - 1 - 5 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbBoxSizerProxy" - "Horizontal" - "SheetInfoSizer" - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "m_TextSheetCount" - "Number of sheets: %d" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Expand" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 1 - 0 - "" - "" - - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbSpacerProxy" - 5 - 5 - "Centre" - "Expand" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "m_TextSheetNumber" - "Sheet number: %d" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Expand" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 1 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_ANY" - -1 - "Revision:" - "" - "RevisionSizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_REVISION" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_REVISION" - 10004 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextRevision" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Revision" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 100 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_REVISION" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_REVISION" - 10011 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_RevisionExport" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_ANY" - -1 - "Title:" - "" - "TitleSizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_TITLE" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_TITLE" - 10005 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextTitle" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Title" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_TITLE" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_TITLE" - 10012 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_TitleExport" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_ANY" - -1 - "Company:" - "" - "CompanySizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_COMPANY" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_COMPANY" - 10006 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextCompany" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Company" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_COMPANY" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_COMPANY" - 10013 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_CompanyExport" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_STATIC" - 5105 - "Comment1:" - "" - "Comment1Sizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_COMMENT1" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_COMMENT1" - 10007 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextComment1" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Commentaire1" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_COMMENT1" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_COMMENT1" - 10014 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_Comment1Export" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_STATIC" - 5105 - "Comment2:" - "" - "Comment2Sizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_COMMENT2" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_COMMENT2" - 10008 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextComment2" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Commentaire2" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_COMMENT2" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_COMMENT2" - 10015 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_Comment2Export" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_STATIC" - 5105 - "Comment3:" - "" - "Comment3Sizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_COMMENT3" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_COMMENT3" - 10009 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextComment3" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Commentaire3" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_COMMENT3" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_COMMENT3" - 10016 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_Comment3Export" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - "wxStaticBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStaticBoxSizerProxy" - "wxID_STATIC" - 5105 - "Comment4:" - "" - "Comment4Sizer" - "" - "" - 0 - 1 - "wxStaticBox" - "Horizontal" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 1 - 1 - 0 - 1 - 0 - "<Any platform>" - - "wxTextCtrl: ID_TEXTCTRL_COMMENT4" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbTextCtrlProxy" - "ID_TEXTCTRL_COMMENT4" - 10010 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_TextComment4" - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "m_Screen->m_Commentaire4" - "wxTextValidator(wxFILTER_NONE, & %VARIABLE%)" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 400 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - "wxCheckBox: ID_CHECKBOX_COMMENT4" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbCheckBoxProxy" - "ID_CHECKBOX_COMMENT4" - 10017 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_Comment4Export" - "Export to other sheets" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - "" - "" - - - - - - "wxStaticLine: ID_STATICLINE" - "dialog-control-document" - "" - "staticline" - 0 - 1 - 0 - 0 - "12/11/2007" - "wbStaticLineProxy" - "ID_STATICLINE" - 10018 - "" - "wxStaticLine" - "wxStaticLine" - 1 - 0 - "" - "" - "Line" - "" - "" - "" - 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 - 0 - 0 - 0 - 0 - 0 - - - "wxStdDialogButtonSizer" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "13/11/2007" - "wbStdDialogButtonSizerProxy" - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - "StdDialogButtonSizer" - "Expand" - "Centre" - 0 - 10 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - "wxButton: wxID_OK" - "dialog-control-document" - "" - "dialogcontrol" - 0 - 1 - 0 - 1 - "13/11/2007" - "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick|NONE||" - "wxID_OK" - 5100 - "" - "wxButton" - "wxButton" - 1 - 0 - "" - "" - "Button_OK" - "&OK" - 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 - "" - "" - - - "wxButton: wxID_CANCEL" - "dialog-control-document" - "" - "dialogcontrol" - 0 - 1 - 0 - 1 - "13/11/2007" - "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||" - "wxID_CANCEL" - 5101 - "" - "wxButton" - "wxButton" - 1 - 0 - "" - "" - "Button_Cancel" - "&Cancel" - 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 - - "setpage.rc" - "source-editor-document" - "setpage.rc" - "source-editor" - 0 - 0 - 1 - 0 - "6/10/2006" - "" - - - - "Images" - "html-document" - "" - "bitmapsfolder" - 1 - 1 - 0 - 1 - - - - - diff --git a/version.txt b/version.txt index 27580b16bb..9543a70ceb 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -2010 mar 13 +2010 mar 14 files (.zip,.tgz): -kicad-2010-03-13-final +kicad-2010-03-14-final