++pcbnew

    Renamed dialog_layers_setup* files.
    Got rid of the header file since there was only one file including it.

CHANGELOG.txt

@@ -4,6 +4,13 @@ KiCad ChangeLog 2009
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-Dec-20 UPDATE Dick Hollenbeck <dick@softplc.com>
+================================================================================
+++pcbnew
+    Renamed dialog_layers_setup* files.
+    Got rid of the header file since there was only one file including it.
+
+
 2009-Dec-11 UPDATE Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 ++pcbnew

pcbnew/CMakeLists.txt

@@ -53,12 +53,8 @@ set(PCBNEW_SRCS
     dialog_graphic_item_properties_base.cpp
 #   dialog_initpcb.cpp
 
-#   Bear with us temporarily while we play with a couple of strategies, Dick.
-#   Eventually these filenames will get changed.
-#    dialog_layers_setup.cpp
-    dialog_layers_setup2.cpp
-    dialog_layers_setup_base2.cpp
-
+    dialog_layers_setup.cpp
+    dialog_layers_setup_base.cpp
     dialog_netlist.cpp
     dialog_netlist_fbp.cpp
     dialog_pcb_text_properties.cpp

pcbnew/dialog_layers_setup.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
-// http://www.wxformbuilder.org/
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DialogLayerSetup__
-#define __DialogLayerSetup__
-
-#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/choice.h>
-#include <wx/sizer.h>
-#include <wx/statline.h>
-#include <wx/panel.h>
-#include <wx/textctrl.h>
-#include <wx/checkbox.h>
-#include <wx/scrolwin.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DialogLayerSetup
-///////////////////////////////////////////////////////////////////////////////
-class DialogLayerSetup : public wxDialog
-{
-    private:
-
-    protected:
-        wxPanel*                        m_MainPanel;
-
-            wxStaticText*               m_PresetsCaption;
-            wxChoice*                   m_PresetsChoice;
-
-            wxStaticText*               m_LayerNumberCaption;
-            wxChoice*                   m_LayerNumberChoice;
-
-            wxStaticLine*               m_Separator1;
-
-            wxStaticText*               m_LayersCaptionText;
-
-            wxPanel*                    m_LayersPanel;
-
-                wxStaticText*           m_LayerNameCaptionText;
-                wxStaticText*           m_LayerEnabledCaptionText;
-                wxStaticText*           m_LayerTypeCaptionText;
-
-                wxScrolledWindow*       m_LayerListScroller;
-
-                    wxPanel*            m_LayerNamePanel[NB_LAYERS];
-                        wxStaticText*   m_LayerNameStaticText[NB_LAYERS-NB_COPPER_LAYERS];
-                        wxTextCtrl*     m_LayerNameTextCtrl[NB_COPPER_LAYERS];
-
-                    wxPanel*            m_LayerEnabledPanel[NB_LAYERS];
-                        wxCheckBox*     m_LayerEnabledCheckBox[NB_LAYERS];
-
-                    wxPanel*            m_LayerTypePanel[NB_LAYERS];
-                        wxStaticText*   m_LayerTypeStaticText[NB_LAYERS-NB_COPPER_LAYERS];
-                        wxChoice*       m_LayerTypeChoice[NB_COPPER_LAYERS];
-
-            wxStaticLine*               m_Separator2;
-
-            wxStdDialogButtonSizer*     m_StdButtonsSizer;
-                wxButton*               m_StdButtonsSizerOK;
-                wxButton*               m_StdButtonsSizerCancel;
-
-        int                             m_LayersMask;
-
-        static wxPoint                  m_DialogLastPosition;
-
-        WinEDA_PcbFrame*                m_Parent;
-        BOARD*                          m_Pcb;
-
-        
-        wxString GetLayerName( int Layer );
-        int GetLayerType( int Layer );
-        void SetLayerName( int Layer, wxString Name );
-        void SetLayerType( int Layer, LAYER_T Type );
-        int GetLayersMask();
-
-
-        // Virtual event handlers, overide them in your derived class
-        virtual void OnPresetChoice( wxCommandEvent& event );
-        virtual void OnCopperLayersChoice( wxCommandEvent& event );
-
-        virtual void OnLayerNameKillFocus( wxFocusEvent& event );
-        virtual void OnLayerNameSetFocus( wxFocusEvent& event );
-
-        virtual void OnLayerEnabledCheckBox( wxCommandEvent& event );
-
-        virtual void OnLayerEnabledSetFocus( wxFocusEvent& event );
-        virtual void OnLayerEnabledKillFocus( wxFocusEvent& event );
-
-        virtual void OnLayerTypeChoice( wxCommandEvent& event ){ event.Skip(); }
-
-        virtual void OnLayerTypeSetFocus( wxFocusEvent& event );
-        virtual void OnLayerTypeKillFocus( wxFocusEvent& event );
-
-        virtual void OnCancelClick( wxCommandEvent& event );
-        virtual void OnOKClick( wxCommandEvent& event );
-
-        void UpdateCheckBoxes();
-        void UpdateCopperLayersChoice();
-        void UpdatePresetsChoice();
-
-    public:
-        DialogLayerSetup(   WinEDA_PcbFrame* parent,
-                            const wxPoint&  pos     = wxDefaultPosition,
-                            wxWindowID      id      = wxID_ANY,
-                            const wxString& title   = wxT("Layer Setup"),
-                            const wxSize&   size    = wxSize( -1,-1 ),
-                            long            style   = wxDEFAULT_DIALOG_STYLE );
-
-        ~DialogLayerSetup();
-};
-
-#endif //__DialogLayerSetup__

pcbnew/dialog_layers_setup2.h

-#ifndef __dialog_layers_setup2_h_
-#define __dialog_layers_setup2_h_
-
-/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2009 Isaac Marino Bavaresco, isaacbavaresco@yahoo.com.br
- * Copyright (C) 2009 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2009 Kicad Developers, see change_log.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
- */
-
-
-#include "dialog_layers_setup_base2.h"
-
-
-class DIALOG_LAYERS_SETUP : public DIALOG_LAYERS_SETUP_BASE2
-{
-private:
-    static wxPoint      s_LastPos;
-    static wxSize       s_LastSize;
-
-    WinEDA_PcbFrame*    m_Parent;
-
-    int                 m_CopperLayerCount;
-    int                 m_EnabledLayers;
-
-    BOARD*              m_Pcb;
-
-    void init();
-
-    void setLayerCheckBox( int layer, bool isChecked );
-    void setCopperLayerCheckBoxes( int copperCount );
-
-    void showCopperChoice( int copperCount );
-    void showBoardLayerNames();
-    void showSelectedLayerCheckBoxes( int enableLayerMask );
-    void showLayerTypes();
-    void showPresets( int enabledLayerMask );
-
-    /** return the selected layer mask within the UI checkboxes */
-    int getUILayerMask();
-    wxString getLayerName( int layer );
-    int getLayerTypeIndex( int layer );
-
-
-    void OnCancelButtonClick( wxCommandEvent& event );
-    void OnOkButtonClick( wxCommandEvent& event );
-    void OnCheckBox( wxCommandEvent& event );
-    void DenyChangeCheckBox( wxCommandEvent& event );
-    void OnPresetsChoice( wxCommandEvent& event );
-    void OnCopperLayersChoice( wxCommandEvent& event );
-
-    bool testLayerNames();
-
-
-public:
-    DIALOG_LAYERS_SETUP( WinEDA_PcbFrame* parent );
-    ~DIALOG_LAYERS_SETUP( ) { };
-
-    bool Show( bool show );     // overload stock function
-
-};
-
-#endif //__dialog_layers_setup2_h_

pcbnew/dialog_layers_setup_base2.h → pcbnew/dialog_layers_setup_base.h

@@ -5,8 +5,8 @@
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __dialog_layers_setup_base2__
-#define __dialog_layers_setup_base2__
+#ifndef __dialog_layers_setup_base__
+#define __dialog_layers_setup_base__
 
 #include <wx/intl.h>
 
@@ -117,9 +117,9 @@
 #define ID_DRAWINGSCHOICE 1086
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_LAYERS_SETUP_BASE2
+/// Class DIALOG_LAYERS_SETUP_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class DIALOG_LAYERS_SETUP_BASE2 : public wxDialog 
+class DIALOG_LAYERS_SETUP_BASE : public wxDialog 
 {
 	private:
 	
@@ -261,9 +261,9 @@ class DIALOG_LAYERS_SETUP_BASE2 : public wxDialog
 		
 	
 	public:
-		DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-		~DIALOG_LAYERS_SETUP_BASE2();
+		DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_LAYERS_SETUP_BASE();
 	
 };
 
-#endif //__dialog_layers_setup_base2__
+#endif //__dialog_layers_setup_base__