Eeschema: fix bug 812924. Very minor other changes to make translations more easy.

common/build_version.cpp

@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2011-07-08)"
+#define KICAD_BUILD_VERSION "(2011-07-19)"
 #endif
 
 

eeschema/block.cpp

@@ -420,6 +420,7 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the rotation center and put it on grid */
             wxPoint rotationPoint = block->Centre();
+            rotationPoint = GetScreen()->GetNearestGridPosition( rotationPoint );
             GetScreen()->SetCrossHairPosition( rotationPoint );
             SaveCopyInUndoList( block->m_ItemsSelection, UR_ROTATED, rotationPoint );
             RotateListOfItems( block->m_ItemsSelection, rotationPoint );
@@ -438,6 +439,7 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the mirror center and put it on grid */
             wxPoint mirrorPoint = block->Centre();
+            mirrorPoint = GetScreen()->GetNearestGridPosition( mirrorPoint );
             GetScreen()->SetCrossHairPosition( mirrorPoint );
             SaveCopyInUndoList( block->m_ItemsSelection, UR_MIRRORED_X, mirrorPoint );
             Mirror_X_ListOfItems( block->m_ItemsSelection, mirrorPoint );
@@ -455,6 +457,7 @@ void SCH_EDIT_FRAME::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             /* Compute the mirror center and put it on grid */
             wxPoint mirrorPoint = block->Centre();
+            mirrorPoint = GetScreen()->GetNearestGridPosition( mirrorPoint );
             GetScreen()->SetCrossHairPosition( mirrorPoint );
             SaveCopyInUndoList( block->m_ItemsSelection, UR_MIRRORED_Y, mirrorPoint );
             MirrorListOfItems( block->m_ItemsSelection, mirrorPoint );

packaging/windows/nsis/install.nsi

@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.07.08"
+!define PRODUCT_VERSION "2011.07.19"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""

pcbnew/class_netinfo_item.cpp

@@ -127,8 +127,8 @@ void NETINFO_ITEM::DisplayInfo( EDA_DRAW_FRAME* frame )
     wxString  txt;
     MODULE*   module;
     D_PAD*    pad;
-    double    lengthnet = 0;
-    double    lengthdie = 0;
+    double    lengthnet = 0;        // This  is the lenght of tracks on pcb
+    double    lengthdie = 0;        // this is the lenght of internal ICs connections
 
     frame->ClearMsgPanel();
 
@@ -169,12 +169,15 @@ void NETINFO_ITEM::DisplayInfo( EDA_DRAW_FRAME* frame )
     txt.Printf( wxT( "%d" ), count );
     frame->AppendMsgPanel( _( "Vias" ), txt, BLUE );
 
+    // Displays the full net lenght (tacks on pcb + internal ICs connections ):
     valeur_param( (int) (lengthnet + lengthdie), txt );
     frame->AppendMsgPanel( _( "Net Length:" ), txt, RED );
 
+    // Displays the net lenght of tracks only:
     valeur_param( (int) lengthnet, txt );
     frame->AppendMsgPanel( _( "on pcb" ), txt, RED );
 
+    // Displays the net lenght of internal ICs connections (wires inside ICs):
     valeur_param( (int) lengthdie, txt );
     frame->AppendMsgPanel( _( "on die" ), txt, RED );
 

pcbnew/class_track.cpp

@@ -1219,7 +1219,7 @@ wxString TRACK::GetSelectMenuText() const
     }
     else
     {
-        text << _( "** BOARD NOT DEFINED ** " );
+        text << _( "** BOARD NOT DEFINED **" );
     }
 
     text << _( " on " ) << GetLayerName() << wxT("  ") << _("Net:") << GetNet()

pcbnew/dialogs/dialog_pcb_text_properties_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_pcb_text_properties_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_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( wxSize( -1,-1 ), wxDefaultSize );
-	
-	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer9;
-	bSizer9 = new wxBoxSizer( wxVERTICAL );
-	
-	m_TextLabel = new wxStaticText( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_TextLabel->Wrap( -1 );
-	bSizer9->Add( m_TextLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_TextContentCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_TextContentCtrl->SetToolTip( _("Enter the text placed on selected layer.") );
-	m_TextContentCtrl->SetMinSize( wxSize( 400,60 ) );
-	
-	bSizer9->Add( m_TextContentCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizerLower;
-	bSizerLower = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizerLeft;
-	bSizerLeft = new wxBoxSizer( wxVERTICAL );
-	
-	m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_SizeXLabel->Wrap( -1 );
-	bSizerLeft->Add( m_SizeXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerLeft->Add( m_SizeXCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_SizeYLabel->Wrap( -1 );
-	bSizerLeft->Add( m_SizeYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_SizeYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerLeft->Add( m_SizeYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_ThicknessLabel->Wrap( -1 );
-	bSizerLeft->Add( m_ThicknessLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerLeft->Add( m_ThicknessCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	bSizerLower->Add( bSizerLeft, 1, 0, 5 );
-	
-	wxBoxSizer* bSizerRight;
-	bSizerRight = new wxBoxSizer( wxVERTICAL );
-	
-	m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PositionXLabel->Wrap( -1 );
-	bSizerRight->Add( m_PositionXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerRight->Add( m_PositionXCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PositionYLabel->Wrap( -1 );
-	bSizerRight->Add( m_PositionYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_PositionYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerRight->Add( m_PositionYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_LayerLabel->Wrap( -1 );
-	bSizerRight->Add( m_LayerLabel, 0, wxLEFT|wxRIGHT, 5 );
-	
-	wxArrayString m_LayerSelectionCtrlChoices;
-	m_LayerSelectionCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_LayerSelectionCtrlChoices, 0 );
-	m_LayerSelectionCtrl->SetSelection( 0 );
-	m_LayerSelectionCtrl->SetToolTip( _("Select the layer on which text should lay.") );
-	
-	bSizerRight->Add( m_LayerSelectionCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizerLower->Add( bSizerRight, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer5;
-	bSizer5 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8->Wrap( -1 );
-	bSizer5->Add( m_staticText8, 0, wxLEFT|wxRIGHT, 5 );
-	
-	wxString m_OrientationCtrlChoices[] = { _("0"), _("90"), _("180"), _("-90") };
-	int m_OrientationCtrlNChoices = sizeof( m_OrientationCtrlChoices ) / sizeof( wxString );
-	m_OrientationCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OrientationCtrlNChoices, m_OrientationCtrlChoices, 0 );
-	m_OrientationCtrl->SetSelection( 0 );
-	bSizer5->Add( m_OrientationCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText9->Wrap( -1 );
-	bSizer5->Add( m_staticText9, 0, wxLEFT|wxRIGHT, 5 );
-	
-	wxString m_StyleCtrlChoices[] = { _("Normal"), _("Italic") };
-	int m_StyleCtrlNChoices = sizeof( m_StyleCtrlChoices ) / sizeof( wxString );
-	m_StyleCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_StyleCtrlNChoices, m_StyleCtrlChoices, 0 );
-	m_StyleCtrl->SetSelection( 0 );
-	bSizer5->Add( m_StyleCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	bSizerLower->Add( bSizer5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer6;
-	bSizer6 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText10 = new wxStaticText( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText10->Wrap( -1 );
-	bSizer6->Add( m_staticText10, 0, wxLEFT|wxRIGHT, 5 );
-	
-	wxString m_DisplayCtrlChoices[] = { _("Normal"), _("Mirrored") };
-	int m_DisplayCtrlNChoices = sizeof( m_DisplayCtrlChoices ) / sizeof( wxString );
-	m_DisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DisplayCtrlNChoices, m_DisplayCtrlChoices, 0 );
-	m_DisplayCtrl->SetSelection( 0 );
-	bSizer6->Add( m_DisplayCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText11->Wrap( -1 );
-	bSizer6->Add( m_staticText11, 0, wxLEFT|wxRIGHT, 5 );
-	
-	wxString m_justifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") };
-	int m_justifyChoiceNChoices = sizeof( m_justifyChoiceChoices ) / sizeof( wxString );
-	m_justifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_justifyChoiceNChoices, m_justifyChoiceChoices, 0 );
-	m_justifyChoice->SetSelection( 0 );
-	bSizer6->Add( m_justifyChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	bSizerLower->Add( bSizer6, 0, wxEXPAND, 5 );
-	
-	bSizer9->Add( bSizerLower, 0, wxEXPAND, 5 );
-	
-	m_StandardSizer = new wxStdDialogButtonSizer();
-	m_StandardSizerOK = new wxButton( this, wxID_OK );
-	m_StandardSizer->AddButton( m_StandardSizerOK );
-	m_StandardSizerCancel = new wxButton( this, wxID_CANCEL );
-	m_StandardSizer->AddButton( m_StandardSizerCancel );
-	m_StandardSizer->Realize();
-	bSizer9->Add( m_StandardSizer, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 );
-	
-	bMainSizer->Add( bSizer9, 1, wxALL|wxEXPAND, 5 );
-	
-	this->SetSizer( bMainSizer );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnClose ) );
-	m_StandardSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnCancelClick ), NULL, this );
-	m_StandardSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this );
-}
-
-DIALOG_PCB_TEXT_PROPERTIES_BASE::~DIALOG_PCB_TEXT_PROPERTIES_BASE()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnClose ) );
-	m_StandardSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnCancelClick ), NULL, this );
-	m_StandardSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 30 2011)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_pcb_text_properties_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_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( wxSize( -1,-1 ), wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer9;
+	bSizer9 = new wxBoxSizer( wxVERTICAL );
+	
+	m_TextLabel = new wxStaticText( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_TextLabel->Wrap( -1 );
+	bSizer9->Add( m_TextLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_TextContentCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+	m_TextContentCtrl->SetToolTip( _("Enter the text placed on selected layer.") );
+	m_TextContentCtrl->SetMinSize( wxSize( 400,60 ) );
+	
+	bSizer9->Add( m_TextContentCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerLower;
+	bSizerLower = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizerLeft;
+	bSizerLeft = new wxBoxSizer( wxVERTICAL );
+	
+	m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_SizeXLabel->Wrap( -1 );
+	bSizerLeft->Add( m_SizeXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerLeft->Add( m_SizeXCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_SizeYLabel->Wrap( -1 );
+	bSizerLeft->Add( m_SizeYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_SizeYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerLeft->Add( m_SizeYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_ThicknessLabel->Wrap( -1 );
+	bSizerLeft->Add( m_ThicknessLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerLeft->Add( m_ThicknessCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	bSizerLower->Add( bSizerLeft, 1, 0, 5 );
+	
+	wxBoxSizer* bSizerRight;
+	bSizerRight = new wxBoxSizer( wxVERTICAL );
+	
+	m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PositionXLabel->Wrap( -1 );
+	bSizerRight->Add( m_PositionXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerRight->Add( m_PositionXCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PositionYLabel->Wrap( -1 );
+	bSizerRight->Add( m_PositionYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_PositionYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerRight->Add( m_PositionYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_LayerLabel->Wrap( -1 );
+	bSizerRight->Add( m_LayerLabel, 0, wxLEFT|wxRIGHT, 5 );
+	
+	wxArrayString m_LayerSelectionCtrlChoices;
+	m_LayerSelectionCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_LayerSelectionCtrlChoices, 0 );
+	m_LayerSelectionCtrl->SetSelection( 0 );
+	m_LayerSelectionCtrl->SetToolTip( _("Select the layer on which text should lay.") );
+	
+	bSizerRight->Add( m_LayerSelectionCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	bSizerLower->Add( bSizerRight, 1, 0, 5 );
+	
+	wxBoxSizer* bSizer5;
+	bSizer5 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText8->Wrap( -1 );
+	bSizer5->Add( m_staticText8, 0, wxLEFT|wxRIGHT, 5 );
+	
+	wxString m_OrientationCtrlChoices[] = { _("0"), _("90"), _("180"), _("-90") };
+	int m_OrientationCtrlNChoices = sizeof( m_OrientationCtrlChoices ) / sizeof( wxString );
+	m_OrientationCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OrientationCtrlNChoices, m_OrientationCtrlChoices, 0 );
+	m_OrientationCtrl->SetSelection( 0 );
+	bSizer5->Add( m_OrientationCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9->Wrap( -1 );
+	bSizer5->Add( m_staticText9, 0, wxLEFT|wxRIGHT, 5 );
+	
+	wxString m_StyleCtrlChoices[] = { _("Normal"), _("Italic") };
+	int m_StyleCtrlNChoices = sizeof( m_StyleCtrlChoices ) / sizeof( wxString );
+	m_StyleCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_StyleCtrlNChoices, m_StyleCtrlChoices, 0 );
+	m_StyleCtrl->SetSelection( 0 );
+	bSizer5->Add( m_StyleCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	bSizerLower->Add( bSizer5, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer6;
+	bSizer6 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText10 = new wxStaticText( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText10->Wrap( -1 );
+	bSizer6->Add( m_staticText10, 0, wxLEFT|wxRIGHT, 5 );
+	
+	wxString m_DisplayCtrlChoices[] = { _("Normal"), _("Mirrored") };
+	int m_DisplayCtrlNChoices = sizeof( m_DisplayCtrlChoices ) / sizeof( wxString );
+	m_DisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DisplayCtrlNChoices, m_DisplayCtrlChoices, 0 );
+	m_DisplayCtrl->SetSelection( 0 );
+	bSizer6->Add( m_DisplayCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	bSizer6->Add( m_staticText11, 0, wxLEFT|wxRIGHT, 5 );
+	
+	wxString m_justifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") };
+	int m_justifyChoiceNChoices = sizeof( m_justifyChoiceChoices ) / sizeof( wxString );
+	m_justifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_justifyChoiceNChoices, m_justifyChoiceChoices, 0 );
+	m_justifyChoice->SetSelection( 0 );
+	bSizer6->Add( m_justifyChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	bSizerLower->Add( bSizer6, 0, wxEXPAND, 5 );
+	
+	bSizer9->Add( bSizerLower, 0, wxEXPAND, 5 );
+	
+	m_StandardSizer = new wxStdDialogButtonSizer();
+	m_StandardSizerOK = new wxButton( this, wxID_OK );
+	m_StandardSizer->AddButton( m_StandardSizerOK );
+	m_StandardSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_StandardSizer->AddButton( m_StandardSizerCancel );
+	m_StandardSizer->Realize();
+	bSizer9->Add( m_StandardSizer, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 );
+	
+	bMainSizer->Add( bSizer9, 1, wxALL|wxEXPAND, 5 );
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnClose ) );
+	m_StandardSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnCancelClick ), NULL, this );
+	m_StandardSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this );
+}
+
+DIALOG_PCB_TEXT_PROPERTIES_BASE::~DIALOG_PCB_TEXT_PROPERTIES_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnClose ) );
+	m_StandardSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnCancelClick ), NULL, this );
+	m_StandardSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PCB_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_pcb_text_properties_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_pcb_text_properties_base__
-#define __dialog_pcb_text_properties_base__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/textctrl.h>
-#include <wx/sizer.h>
-#include <wx/choice.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PCB_TEXT_PROPERTIES_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PCB_TEXT_PROPERTIES_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxStaticText* m_TextLabel;
-		wxTextCtrl* m_TextContentCtrl;
-		wxStaticText* m_SizeXLabel;
-		wxTextCtrl* m_SizeXCtrl;
-		wxStaticText* m_SizeYLabel;
-		wxTextCtrl* m_SizeYCtrl;
-		wxStaticText* m_ThicknessLabel;
-		wxTextCtrl* m_ThicknessCtrl;
-		wxStaticText* m_PositionXLabel;
-		wxTextCtrl* m_PositionXCtrl;
-		wxStaticText* m_PositionYLabel;
-		wxTextCtrl* m_PositionYCtrl;
-		wxStaticText* m_LayerLabel;
-		wxChoice* m_LayerSelectionCtrl;
-		wxStaticText* m_staticText8;
-		wxChoice* m_OrientationCtrl;
-		wxStaticText* m_staticText9;
-		wxChoice* m_StyleCtrl;
-		wxStaticText* m_staticText10;
-		wxChoice* m_DisplayCtrl;
-		wxStaticText* m_staticText11;
-		wxChoice* m_justifyChoice;
-		wxStdDialogButtonSizer* m_StandardSizer;
-		wxButton* m_StandardSizerOK;
-		wxButton* m_StandardSizerCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Item Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 433,465 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); 
-		~DIALOG_PCB_TEXT_PROPERTIES_BASE();
-	
-};
-
-#endif //__dialog_pcb_text_properties_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 30 2011)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PCB_TEXT_PROPERTIES_BASE_H__
+#define __DIALOG_PCB_TEXT_PROPERTIES_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/choice.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PCB_TEXT_PROPERTIES_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PCB_TEXT_PROPERTIES_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxStaticText* m_TextLabel;
+		wxTextCtrl* m_TextContentCtrl;
+		wxStaticText* m_SizeXLabel;
+		wxTextCtrl* m_SizeXCtrl;
+		wxStaticText* m_SizeYLabel;
+		wxTextCtrl* m_SizeYCtrl;
+		wxStaticText* m_ThicknessLabel;
+		wxTextCtrl* m_ThicknessCtrl;
+		wxStaticText* m_PositionXLabel;
+		wxTextCtrl* m_PositionXCtrl;
+		wxStaticText* m_PositionYLabel;
+		wxTextCtrl* m_PositionYCtrl;
+		wxStaticText* m_LayerLabel;
+		wxChoice* m_LayerSelectionCtrl;
+		wxStaticText* m_staticText8;
+		wxChoice* m_OrientationCtrl;
+		wxStaticText* m_staticText9;
+		wxChoice* m_StyleCtrl;
+		wxStaticText* m_staticText10;
+		wxChoice* m_DisplayCtrl;
+		wxStaticText* m_staticText11;
+		wxChoice* m_justifyChoice;
+		wxStdDialogButtonSizer* m_StandardSizer;
+		wxButton* m_StandardSizerOK;
+		wxButton* m_StandardSizerCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 433,465 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); 
+		~DIALOG_PCB_TEXT_PROPERTIES_BASE();
+	
+};
+
+#endif //__DIALOG_PCB_TEXT_PROPERTIES_BASE_H__

version.txt

 release version:
-2011 jul 08
+2011 jul 19
 files (.zip,.tgz):
-kicad-2011-07-08
+kicad-2011-07-19