Pcbnew: menu Edit/Reset modules fields size: Add dialog to select what modules are modified.

include/wxBasePcbFrame.h

@@ -320,10 +320,14 @@ public:
      * Function ResetModuleTextSizes
      * resets text size and width of all module text fields of given field
      * type to current settings in Preferences->Dimensions->Texts and Drawings.
-     * @param aType is the field type (TEXT_is_REFERENCE, TEXT_is_VALUE, or TEXT_is_DIVERS).
-     * @param aDC is the drawing context.
-     */
-    void ResetModuleTextSizes( int aType, wxDC* aDC );
+     * @param aFilter is a filter: footprint names must match this filter.
+     *        an empty filter, or "*" do not filter anything.
+     * @param aRef = true to modify the reference of footprints.
+     * @param aValue = true to modify the value of footprints.
+     * @param aOthers = true to modify the other fields of footprints.
+     */
+    void ResetModuleTextSizes( const wxString & aFilter, bool aRef,
+                               bool aValue, bool aOthers );
 
     void InstallPadOptionsFrame( D_PAD*         pad );
     void InstallTextModOptionsFrame( TEXTE_MODULE* TextMod, wxDC* DC );

include/wxPcbStruct.h

@@ -481,6 +481,13 @@ public:
     void Tracks_and_Vias_Size_Event( wxCommandEvent& event );
     void OnSelectTool( wxCommandEvent& aEvent );
 
+    /**
+     * Function OnResetModuleTextSizes
+     * resets text size and width of all module text fields of given field
+     * type to current settings in Preferences
+     */
+    void OnResetModuleTextSizes( wxCommandEvent& event );
+
     void ProcessMuWaveFunctions( wxCommandEvent& event );
     void MuWaveCommand( wxDC* DC, const wxPoint& MousePos );
 

pcbnew/CMakeLists.txt

@@ -50,6 +50,8 @@ set(PCBNEW_DIALOGS
     dialogs/dialog_general_options_BoardEditor_base.cpp
     dialogs/dialog_global_edit_tracks_and_vias.cpp
     dialogs/dialog_global_edit_tracks_and_vias_base.cpp
+    dialogs/dialog_global_modules_fields_edition.cpp
+    dialogs/dialog_global_modules_fields_edition_base.cpp
     dialogs/dialog_global_pads_edition_base.cpp
     dialogs/dialog_graphic_items_options.cpp
     dialogs/dialog_graphic_items_options_base.cpp

pcbnew/dialogs/dialog_global_modules_fields_edition.cpp

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file dialog_global_modules_fields_edition.cpp
+ * @brief global module fields edition.
+ */
+
+#include <fctsys.h>
+#include <common.h>
+#include <class_drawpanel.h>
+#include <wxBasePcbFrame.h>
+#include <base_units.h>
+#include <kicad_string.h>
+
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+
+#include <class_board.h>
+#include <class_module.h>
+#include <class_text_mod.h>
+#include <dialog_global_modules_fields_edition_base.h>
+
+
+// The dialog to set options for global fields edition:
+// optionas are:
+// edited fields (ref, value, others
+// the footprint filter, for selective edition
+class DIALOG_GLOBAL_MODULES_FIELDS_EDITION : public DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE
+{
+    PCB_EDIT_FRAME* m_parent;
+    BOARD_DESIGN_SETTINGS* m_brdSettings;
+    // Static variable to remember options, withing a session:
+    static bool m_refSelection;
+    static bool m_valueSelection;
+    static bool m_othersSelection;
+    static wxString m_filterString;
+
+
+public:
+    DIALOG_GLOBAL_MODULES_FIELDS_EDITION( PCB_EDIT_FRAME* parent )
+        : DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( parent )
+    {
+        m_parent = parent;
+        initDialog();
+        GetSizer()->SetSizeHints( this );
+    }
+
+private:
+    void initDialog();
+
+    // event handlers
+    void OnOKClick( wxCommandEvent& event );
+    void OnCancelClick( wxCommandEvent& event )
+    {
+        EndModal( wxID_CANCEL );
+    }
+};
+
+bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_refSelection = false;
+bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_valueSelection = false;
+bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_othersSelection = false;
+wxString DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_filterString;
+
+void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::initDialog()
+{
+    SetFocus();
+
+    m_brdSettings = &m_parent->GetDesignSettings();
+
+    m_ReferenceOpt->SetValue(m_refSelection),
+    m_ValueOpt->SetValue(m_valueSelection),
+    m_OtherFields->SetValue(m_othersSelection);
+    m_ModuleFilter->SetValue(m_filterString);
+    m_SizeXunit->SetLabel( GetAbbreviatedUnitsLabel() );
+    m_SizeYunit->SetLabel( GetAbbreviatedUnitsLabel() );
+    m_Ticknessunit->SetLabel( GetAbbreviatedUnitsLabel() );
+    m_SizeX_Value->SetValue(
+        ReturnStringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextSize.x ) );
+    m_SizeY_Value->SetValue(
+        ReturnStringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextSize.y ) );
+    m_TicknessValue->SetValue(
+        ReturnStringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextWidth) );
+}
+
+
+void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::OnOKClick( wxCommandEvent& event )
+{
+    m_refSelection = m_ReferenceOpt->GetValue();
+    m_valueSelection = m_ValueOpt->GetValue();
+    m_othersSelection = m_OtherFields->GetValue();
+    m_filterString = m_ModuleFilter->GetValue();
+
+    m_brdSettings->m_ModuleTextSize.x = ReturnValueFromTextCtrl( *m_SizeX_Value );
+    m_brdSettings->m_ModuleTextSize.y = ReturnValueFromTextCtrl( *m_SizeY_Value );
+    m_brdSettings->m_ModuleTextWidth = ReturnValueFromTextCtrl( *m_TicknessValue );
+
+    // clip m_ModuleTextWidth to the 1/4 of min size, to keep it always readable
+    int minsize = min( m_brdSettings->m_ModuleTextSize.x,
+                       m_brdSettings->m_ModuleTextSize.y ) / 4;
+    if( m_brdSettings->m_ModuleTextWidth > minsize )
+        m_brdSettings->m_ModuleTextWidth = minsize;
+
+    m_parent->ResetModuleTextSizes( m_filterString, m_refSelection,
+                                    m_valueSelection, m_othersSelection );
+    EndModal( wxID_OK );
+}
+
+
+void PCB_EDIT_FRAME::OnResetModuleTextSizes( wxCommandEvent& event )
+{
+    DIALOG_GLOBAL_MODULES_FIELDS_EDITION dlg(this);
+    dlg.ShowModal();
+
+    m_canvas->Refresh();
+}
+
+void PCB_BASE_FRAME::ResetModuleTextSizes( const wxString & aFilter, bool aRef,
+                                           bool aValue, bool aOthers )
+{
+    MODULE* module;
+    BOARD_ITEM* boardItem;
+    TEXTE_MODULE* item;
+    ITEM_PICKER itemWrapper( NULL, UR_CHANGED );
+    PICKED_ITEMS_LIST undoItemList;
+    unsigned int ii;
+
+    // Prepare undo list
+    for( module = GetBoard()->m_Modules; module; module = module->Next() )
+    {
+        itemWrapper.SetItem( module );
+
+        if( ! aFilter.IsEmpty() )
+        {
+            if( ! WildCompareString( aFilter, module->GetLibRef(), false ) )
+                continue;
+        }
+
+
+        if( aRef )
+        {
+            item = module->m_Reference;
+
+            if( item->GetSize() != GetDesignSettings().m_ModuleTextSize ||
+                item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
+            {
+                undoItemList.PushItem( itemWrapper );
+            }
+        }
+
+        if( aValue )
+        {
+            item = module->m_Value;
+
+            if( item->GetSize() != GetDesignSettings().m_ModuleTextSize ||
+                item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
+            {
+                undoItemList.PushItem( itemWrapper );
+            }
+        }
+
+        if( aOthers )
+        {
+            // Go through all other module text fields
+            for( boardItem = module->m_Drawings; boardItem; boardItem = boardItem->Next() )
+            {
+                if( boardItem->Type() == PCB_MODULE_TEXT_T )
+                {
+                    item = (TEXTE_MODULE*) boardItem;
+
+                    if( item->GetSize() != GetDesignSettings().m_ModuleTextSize
+                        || item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
+                    {
+                        undoItemList.PushItem( itemWrapper );
+                    }
+                }
+            }
+        }
+    }
+
+    // Exit if there's nothing to do
+    if( !undoItemList.GetCount() )
+        return;
+
+    SaveCopyInUndoList( undoItemList, UR_CHANGED );
+
+    // Apply changes to modules in the undo list
+    for( ii = 0; ii < undoItemList.GetCount(); ii++ )
+    {
+        module = (MODULE*) undoItemList.GetPickedItem( ii );
+
+        if( aRef )
+        {
+            module->m_Reference->SetThickness( GetDesignSettings().m_ModuleTextWidth );
+            module->m_Reference->SetSize( GetDesignSettings().m_ModuleTextSize );
+        }
+
+        if( aValue )
+        {
+            module->m_Value->SetThickness( GetDesignSettings().m_ModuleTextWidth );
+            module->m_Value->SetSize( GetDesignSettings().m_ModuleTextSize );
+        }
+
+        if( aOthers )
+        {
+            for( boardItem = module->m_Drawings; boardItem; boardItem = boardItem->Next() )
+            {
+                if( boardItem->Type() == PCB_MODULE_TEXT_T )
+                {
+                    item = (TEXTE_MODULE*) boardItem;
+                    item->SetThickness( GetDesignSettings().m_ModuleTextWidth );
+                    item->SetSize( GetDesignSettings().m_ModuleTextSize );
+                }
+            }
+        }
+    }
+
+    OnModify();
+}

pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_global_modules_fields_edition_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizerUpper;
+	bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bLeftSizer;
+	bLeftSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer1;
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields:") ), wxVERTICAL );
+	
+	m_ReferenceOpt = new wxCheckBox( this, wxID_ANY, _("Modify reference"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer1->Add( m_ReferenceOpt, 0, wxALL, 5 );
+	
+	m_ValueOpt = new wxCheckBox( this, wxID_ANY, _("Modify value"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer1->Add( m_ValueOpt, 0, wxALL, 5 );
+	
+	m_OtherFields = new wxCheckBox( this, wxID_ANY, _("Modify other fields"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer1->Add( m_OtherFields, 0, wxALL, 5 );
+	
+	
+	bLeftSizer->Add( sbSizer1, 1, wxEXPAND|wxRIGHT, 5 );
+	
+	m_staticTextFilter = new wxStaticText( this, wxID_ANY, _("Modules Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFilter->Wrap( -1 );
+	m_staticTextFilter->SetToolTip( _("A string to filter modules to edit.\nIf not void, footprint names should match this filter.\nA filter can be something like SM* (case insensitive)") );
+	
+	bLeftSizer->Add( m_staticTextFilter, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_ModuleFilter = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_ModuleFilter->SetMinSize( wxSize( 150,-1 ) );
+	
+	bLeftSizer->Add( m_ModuleFilter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizerUpper->Add( bLeftSizer, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bRightSizer;
+	bRightSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizerSettings;
+	sbSizerSettings = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current Design Settings:") ), wxVERTICAL );
+	
+	wxFlexGridSizer* fgSizerCurrSettings;
+	fgSizerCurrSettings = new wxFlexGridSizer( 3, 3, 0, 0 );
+	fgSizerCurrSettings->SetFlexibleDirection( wxBOTH );
+	fgSizerCurrSettings->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText3 = new wxStaticText( this, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	
+	m_SizeX_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizerCurrSettings->Add( m_SizeX_Value, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_SizeXunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_SizeXunit->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_SizeXunit, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText6 = new wxStaticText( this, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText6->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 );
+	
+	m_SizeY_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_SizeYunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_SizeYunit->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_SizeYunit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_staticText9, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	
+	m_TicknessValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizerCurrSettings->Add( m_TicknessValue, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_Ticknessunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_Ticknessunit->Wrap( -1 );
+	fgSizerCurrSettings->Add( m_Ticknessunit, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	sbSizerSettings->Add( fgSizerCurrSettings, 1, wxEXPAND, 5 );
+	
+	
+	bRightSizer->Add( sbSizerSettings, 1, wxEXPAND|wxLEFT, 5 );
+	
+	
+	bSizerUpper->Add( bRightSizer, 0, wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 );
+	
+	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
+	
+	m_sdbSizerButtons = new wxStdDialogButtonSizer();
+	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
+	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
+	m_sdbSizerButtons->Realize();
+	
+	bMainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	
+	// Connect Events
+	m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::OnOKClick ), NULL, this );
+}
+
+DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::~DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE()
+{
+	// Disconnect Events
+	m_sdbSizerButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::OnOKClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_global_modules_fields_edition_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__
+#define __DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/checkbox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/statline.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxCheckBox* m_ReferenceOpt;
+		wxCheckBox* m_ValueOpt;
+		wxCheckBox* m_OtherFields;
+		wxStaticText* m_staticTextFilter;
+		wxTextCtrl* m_ModuleFilter;
+		wxStaticText* m_staticText3;
+		wxTextCtrl* m_SizeX_Value;
+		wxStaticText* m_SizeXunit;
+		wxStaticText* m_staticText6;
+		wxTextCtrl* m_SizeY_Value;
+		wxStaticText* m_SizeYunit;
+		wxStaticText* m_staticText9;
+		wxTextCtrl* m_TicknessValue;
+		wxStaticText* m_Ticknessunit;
+		wxStaticLine* m_staticline1;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Module Fields Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 482,199 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE();
+	
+};
+
+#endif //__DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE_H__

pcbnew/edit.cpp

@@ -1078,14 +1078,6 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         Swap_Layers( event );
         break;
 
-    case ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES:
-        ResetModuleTextSizes( TEXT_is_REFERENCE, &dc );
-        break;
-
-    case ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES:
-        ResetModuleTextSizes( TEXT_is_VALUE, &dc );
-        break;
-
     case ID_PCB_USER_GRID_SETUP:
         InstallGridFrame( pos );
         break;

pcbnew/edtxtmod.cpp

 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
 #include <macros.h>
 
 #include <pcbnew.h>
-#include <protos.h>
+#include <wxPcbStruct.h>
 
 #include <class_board.h>
 #include <class_module.h>
@@ -356,107 +356,3 @@ void PCB_BASE_FRAME::ResetTextSize( BOARD_ITEM* aItem, wxDC* aDC )
 
     OnModify();
 }
-
-void PCB_BASE_FRAME::ResetModuleTextSizes( int aType, wxDC* aDC )
-{
-    MODULE* module;
-    BOARD_ITEM* boardItem;
-    TEXTE_MODULE* item;
-    ITEM_PICKER itemWrapper( NULL, UR_CHANGED );
-    PICKED_ITEMS_LIST undoItemList;
-    unsigned int ii;
-
-    module = GetBoard()->m_Modules;
-
-    // Prepare undo list
-    while( module )
-    {
-        itemWrapper.SetItem( module );
-
-        switch( aType )
-        {
-        case TEXT_is_REFERENCE:
-            item = module->m_Reference;
-
-            if( item->GetSize() != GetDesignSettings().m_ModuleTextSize || item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
-                undoItemList.PushItem( itemWrapper );
-
-            break;
-
-        case TEXT_is_VALUE:
-            item = module->m_Value;
-
-            if( item->GetSize() != GetDesignSettings().m_ModuleTextSize ||
-                item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
-                undoItemList.PushItem( itemWrapper );
-
-            break;
-
-        case TEXT_is_DIVERS:
-            // Go through all other module text fields
-            for( boardItem = module->m_Drawings; boardItem; boardItem = boardItem->Next() )
-            {
-                if( boardItem->Type() == PCB_MODULE_TEXT_T )
-                {
-                    item = (TEXTE_MODULE*) boardItem;
-
-                    if( item->GetSize() != GetDesignSettings().m_ModuleTextSize
-                        || item->GetThickness() != GetDesignSettings().m_ModuleTextWidth )
-                    {
-                        undoItemList.PushItem( itemWrapper );
-                        break;
-                    }
-                }
-            }
-
-            break;
-
-        default:
-            break;
-        }
-        module = module->Next();
-    }
-
-    // Exit if there's nothing to do
-    if( !undoItemList.GetCount() )
-        return;
-
-    SaveCopyInUndoList( undoItemList, UR_CHANGED );
-
-    // Apply changes to modules in the undo list
-    for( ii = 0; ii < undoItemList.GetCount(); ii++ )
-    {
-        module = (MODULE*) undoItemList.GetPickedItem( ii );
-
-        switch( aType )
-        {
-        case TEXT_is_REFERENCE:
-            module->m_Reference->SetThickness( GetDesignSettings().m_ModuleTextWidth );
-            module->m_Reference->SetSize( GetDesignSettings().m_ModuleTextSize );
-            break;
-
-        case TEXT_is_VALUE:
-            module->m_Value->SetThickness( GetDesignSettings().m_ModuleTextWidth );
-            module->m_Value->SetSize( GetDesignSettings().m_ModuleTextSize );
-            break;
-
-        case TEXT_is_DIVERS:
-            for( boardItem = module->m_Drawings; boardItem; boardItem = boardItem->Next() )
-            {
-                if( boardItem->Type() == PCB_MODULE_TEXT_T )
-                {
-                    item = (TEXTE_MODULE*) boardItem;
-                    item->SetThickness( GetDesignSettings().m_ModuleTextWidth );
-                    item->SetSize( GetDesignSettings().m_ModuleTextSize );
-                }
-            }
-
-            break;
-        }
-    }
-
-    if( aDC )
-        m_canvas->Refresh();
-
-    OnModify();
-}

pcbnew/menubar_pcbframe.cpp

@@ -295,15 +295,9 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
                  KiBitmap( swap_layer_xpm ) );
 
     // Reset module reference sizes
-    AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES,
-                 _( "Reset Module &Reference Sizes" ),
-                 _( "Reset text size and width of all module references to current defaults" ),
-                 KiBitmap( reset_text_xpm ) );
-
-    // Reset module value sizes
-    AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES,
-                 _( "Reset Module &Value Sizes" ),
-                 _( "Reset text size and width of all module values to current defaults" ),
+    AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES,
+                 _( "&Reset Module Field Sizes" ),
+                 _( "Reset text size and width of all module fields to current defaults" ),
                  KiBitmap( reset_text_xpm ) );
 
     /** Create View menu **/

pcbnew/pcbframe.cpp

@@ -135,10 +135,8 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
     EVT_MENU( ID_PCB_GLOBAL_DELETE, PCB_EDIT_FRAME::Process_Special_Functions )
     EVT_MENU( ID_MENU_PCB_CLEAN, PCB_EDIT_FRAME::Process_Special_Functions )
     EVT_MENU( ID_MENU_PCB_SWAP_LAYERS, PCB_EDIT_FRAME::Process_Special_Functions )
-    EVT_MENU( ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES,
-              PCB_EDIT_FRAME::Process_Special_Functions )
-    EVT_MENU( ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES,
-              PCB_EDIT_FRAME::Process_Special_Functions )
+    EVT_MENU( ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES,
+              PCB_EDIT_FRAME::OnResetModuleTextSizes )
 
     // Menu Help
     EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )

pcbnew/pcbnew_id.h

@@ -219,8 +219,7 @@ enum pcbnew_ids
     ID_MENU_LIST_NETS,
     ID_MENU_PCB_CLEAN,
     ID_MENU_PCB_SWAP_LAYERS,
-    ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES,
-    ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES,
+    ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES,
 
     ID_GEN_EXPORT_FILE_VRML,
     ID_GEN_EXPORT_SPECCTRA,