diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp index 828fe26a99..efe7be086c 100644 --- a/pcbnew/dialogs/dialog_copper_zones.cpp +++ b/pcbnew/dialogs/dialog_copper_zones.cpp @@ -7,7 +7,7 @@ * * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2015 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 @@ -57,7 +57,7 @@ public: private: PCB_BASE_FRAME* m_Parent; - wxConfigBase* m_Config; ///< Current config + wxConfigBase* m_Config; ///< Current config ZONE_EDIT_T m_OnExitCode; ///< exit code: ZONE_ABORT if no change, ///< ZONE_OK if new values accepted @@ -75,7 +75,7 @@ private: ///< name position in m_LayerSelectionCtrl static wxString m_netNameShowFilter; ///< the filter to show nets (default * "*"). - ///< static to keep this pattern for an entire pcbnew session + ///< static to keep this pattern for an entire Pcbnew session /** * Function initDialog @@ -91,7 +91,7 @@ private: /** * Function AcceptOptions * @param aPromptForErrors is true to prompt user on incorrect params. - * @param aUseExportableSetupOnly is true to use exportable parametres only (used to export this setup to other zones). + * @param aUseExportableSetupOnly is true to use exportable parameters only (used to export this setup to other zones). * @return bool - false if incorrect options, true if ok. */ bool AcceptOptions( bool aPromptForErrors, bool aUseExportableSetupOnly = false ); @@ -101,7 +101,6 @@ private: void OnPadsInZoneClick( wxCommandEvent& event ); void OnRunFiltersButtonClick( wxCommandEvent& event ); - void buildAvailableListOfNets(); /** @@ -157,6 +156,7 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS* initDialog(); + m_sdbSizerOK->SetDefault(); GetSizer()->SetSizeHints( this ); Center(); } @@ -282,8 +282,8 @@ void DIALOG_COPPER_ZONE::initDialog() // The most easy way to ensure the right size is to use wxLIST_AUTOSIZE // unfortunately this option does not work well both on - // wxWidgets 2.8 ( column witdth too small), and - // wxWidgets 2.9 ( column witdth too large) + // wxWidgets 2.8 ( column width too small), and + // wxWidgets 2.9 ( column width too large) ctrlWidth += LAYER_BITMAP_SIZE_X + 25; // Add bitmap width + margin between bitmap and text m_LayerSelectionCtrl->SetColumnWidth( 0, ctrlWidth ); @@ -401,6 +401,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab // Test if this is a reasonable value for this parameter // A too large value can hang Pcbnew #define CLEARANCE_MAX_VALUE ZONE_CLEARANCE_MAX_VALUE_MIL*IU_PER_MILS + if( m_settings.m_ZoneClearance > CLEARANCE_MAX_VALUE ) { wxString msg; @@ -454,7 +455,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab if( m_settings.m_ThermalReliefCopperBridge <= m_settings.m_ZoneMinThickness ) { DisplayError( this, - _( "Thermal relief spoke must be greater than the minimum width." ) ); + _( "Thermal relief spoke must be greater than the minimum width." ) ); return false; } @@ -484,9 +485,8 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab if( ii == 0 ) // the not connected option was selected: this is not a good practice: warn: { - if( !IsOK( this, _( - "You have chosen the \"not connected\" option. This will create insulated copper islands. Are you sure ?" ) ) - ) + if( !IsOK( this, _( "You have chosen the \"not connected\" option. This will create " + "insulated copper islands. Are you sure ?" ) ) ) return false; } @@ -498,6 +498,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab if( m_ListNetNameSelection->GetSelection() > 0 ) { NETINFO_ITEM* net = m_Parent->GetBoard()->FindNet( net_name ); + if( net ) m_settings.m_NetcodeSelection = net->GetNet(); } @@ -505,6 +506,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab return true; } + void DIALOG_COPPER_ZONE::OnCornerSmoothingModeChoice( wxCommandEvent& event ) { int selection = m_cornerSmoothingChoice->GetSelection(); @@ -537,6 +539,7 @@ void DIALOG_COPPER_ZONE::OnNetSortingOptionSelected( wxCommandEvent& event ) buildAvailableListOfNets(); m_netNameShowFilter = m_ShowNetNameFilter->GetValue(); + if( m_Config ) { m_Config->Write( ZONE_NET_SORT_OPTION_KEY, (long) m_NetDisplayOption->GetSelection() ); @@ -553,6 +556,7 @@ void DIALOG_COPPER_ZONE::ExportSetupToOtherCopperZones( wxCommandEvent& event ) // Export settings ( but layer and netcode ) to others copper zones BOARD* pcb = m_Parent->GetBoard(); + for( int ii = 0; ii < pcb->GetAreaCount(); ii++ ) { ZONE_CONTAINER* zone = pcb->GetArea( ii ); @@ -561,6 +565,7 @@ void DIALOG_COPPER_ZONE::ExportSetupToOtherCopperZones( wxCommandEvent& event ) // to a zone keepout: if( zone->GetIsKeepout() ) continue; + m_settings.ExportSetting( *zone, false ); // false = partial export m_Parent->OnModify(); } @@ -623,6 +628,7 @@ void DIALOG_COPPER_ZONE::OnRunFiltersButtonClick( wxCommandEvent& event ) m_NetDisplayOption->SetSelection( 2 ); else if( m_NetDisplayOption->GetSelection() == 1 ) m_NetDisplayOption->SetSelection( 3 ); + initListNetsParams(); buildAvailableListOfNets(); } diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 0fc493cdb3..a5b851e926 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -298,7 +298,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( editMenu, ID_MENU_PCB_CLEAN, _( "&Cleanup Tracks and Vias" ), - _( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ), + _( "Clean stubs, vias, delete break points, or unconnected tracks to pads and vias" ), KiBitmap( delete_xpm ) ); AddMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS, @@ -307,8 +307,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( swap_layer_xpm ) ); AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES, - _( "&Reset Footprint Field Sizes" ), - _( "Reset text size and width of all footprint fields to current defaults" ), + _( "Set Footp&rint Field Sizes" ), + _( "Set text size and width of footprint fields." ), KiBitmap( reset_text_xpm ) ); //----- View menu -----------------------------------------------------------