Commit ea6102e1 authored by charras's avatar charras
Browse files

renaming files created by wxFormBuilder to dialog_xxx_base according to an idea of Dick, in a mail.

parent 90b9850e

pcbnew/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ set(PCBNEW_SRCS 
    cross-probing.cpp

    deltrack.cpp

    dialog_copper_zones.cpp

    dialog_copper_zones_frame.cpp

    dialog_copper_zones_base.cpp

#   dialog_display_options.cpp

#   dialog_drc.cpp

    dialog_edit_mod_text.cpp
@@ -55,7 +55,7 @@ set(PCBNEW_SRCS 
#   dialog_initpcb.cpp

#   dialog_netlist.cpp

    zones_non_copper_type_functions.cpp

    dialog_non_copper_zones_properties.cpp

    dialog_non_copper_zones_properties_base.cpp

#   dialog_pad_edit.cpp

    dialog_setup_libs.cpp

    dialog_orient_footprints.cpp

pcbnew/dialog_copper_zones.cpp

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


/************************************************************************************************/

dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* zone_setting ) :

    dialog_copper_zone_frame( parent )

    dialog_copper_zone_base( parent )

/************************************************************************************************/

{

    m_Parent = parent;
@@ -311,8 +311,10 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab 


    case 4:

        m_Zone_Setting->m_GridFillValue = 0;

#if 0   // I hope this feature works fine ( JP Charras)

        DisplayInfo( this, wxT(

                "You are using No grid for filling zones\nThis is currently in development and for tests only.\n Do not use for production" ) );

#endif

        break;

    }

pcbnew/dialog_copper_zones.h

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
#ifndef DIALOG_COPPER_ZONES

#define DIALOG_COPPER_ZONES



#include "dialog_copper_zones_frame.h"

#include "dialog_copper_zones_base.h"



/* here is the derivated class from dialog_copper_zone_frame created by wxFormBuilder

*/

class dialog_copper_zone: public dialog_copper_zone_frame

class dialog_copper_zone: public dialog_copper_zone_base

{

public:

    WinEDA_PcbFrame* m_Parent;

pcbnew/dialog_copper_zones_frame.cpp→pcbnew/dialog_copper_zones_base.cpp

+10 −10
Original line number Diff line number Diff line
@@ -5,20 +5,20 @@ 
// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////



#include "dialog_copper_zones_frame.h"

#include "dialog_copper_zones_base.h"



///////////////////////////////////////////////////////////////////////////



BEGIN_EVENT_TABLE( dialog_copper_zone_frame, wxDialog )

	EVT_INIT_DIALOG( dialog_copper_zone_frame::_wxFB_OnInitDialog )

	EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_frame::_wxFB_OnPadsInZoneClick )

	EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_frame::_wxFB_ExportSetupToOtherCopperZones )

	EVT_BUTTON( wxID_OK, dialog_copper_zone_frame::_wxFB_OnButtonOkClick )

	EVT_BUTTON( wxID_CANCEL, dialog_copper_zone_frame::_wxFB_OnButtonCancelClick )

	EVT_RADIOBOX( ID_NET_SORTING_OPTION, dialog_copper_zone_frame::_wxFB_OnNetSortingOptionSelected )

BEGIN_EVENT_TABLE( dialog_copper_zone_base, wxDialog )

	EVT_INIT_DIALOG( dialog_copper_zone_base::_wxFB_OnInitDialog )

	EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_base::_wxFB_OnPadsInZoneClick )

	EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_base::_wxFB_ExportSetupToOtherCopperZones )

	EVT_BUTTON( wxID_OK, dialog_copper_zone_base::_wxFB_OnButtonOkClick )

	EVT_BUTTON( wxID_CANCEL, dialog_copper_zone_base::_wxFB_OnButtonCancelClick )

	EVT_RADIOBOX( ID_NET_SORTING_OPTION, dialog_copper_zone_base::_wxFB_OnNetSortingOptionSelected )

END_EVENT_TABLE()



dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

dialog_copper_zone_base::dialog_copper_zone_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 );
@@ -204,6 +204,6 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID 
	this->Layout();

}



dialog_copper_zone_frame::~dialog_copper_zone_frame()

dialog_copper_zone_base::~dialog_copper_zone_base()

{

}

pcbnew/dialog_copper_zones_frame.fbp→pcbnew/dialog_copper_zones_base.fbp

+3 −3
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
        <property name="disconnect_events">1</property>

        <property name="encoding">UTF-8</property>

        <property name="event_generation">table</property>

        <property name="file">dialog_copper_zones_frame</property>

        <property name="file">dialog_copper_zones_base</property>

        <property name="first_id">1000</property>

        <property name="help_provider">none</property>

        <property name="internationalize">1</property>

        <property name="name">dialog_copper_zones_frame</property>

        <property name="name">dialog_copper_zones_base</property>

        <property name="namespace"></property>

        <property name="path">.</property>

        <property name="precompiled_header"></property>
@@ -30,7 +30,7 @@ 
            <property name="id">wxID_ANY</property>

            <property name="maximum_size"></property>

            <property name="minimum_size"></property>

            <property name="name">dialog_copper_zone_frame</property>

            <property name="name">dialog_copper_zone_base</property>

            <property name="pos"></property>

            <property name="size">545,493</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>