Commit 9c2b4c8c authored by charras's avatar charras

pcbnew: Convert dialog_display_option from DialogBlocks to wxFormBuilder,...

pcbnew: Convert dialog_display_option from DialogBlocks to wxFormBuilder, rename files and remove typos
parent 06ca1750
...@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion ...@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
# include "config.h" # include "config.h"
(wxT(KICAD_SVN_VERSION)) (wxT(KICAD_SVN_VERSION))
# else # else
(wxT("(20081214-unstable)")) /* main program version */ (wxT("(20081221-unstable)")) /* main program version */
# endif # endif
#endif #endif
; ;
...@@ -20,7 +20,7 @@ COMMON_GLOBL wxString g_BuildAboutVersion ...@@ -20,7 +20,7 @@ COMMON_GLOBL wxString g_BuildAboutVersion
# include "config.h" # include "config.h"
(wxT(KICAD_ABOUT_VERSION)) (wxT(KICAD_ABOUT_VERSION))
# else # else
(wxT("(20081214-unstable)")) /* svn date & rev (normally overridden) */ (wxT("(20081221-unstable)")) /* svn date & rev (normally overridden) */
# endif # endif
#endif #endif
; ;
......
No preview for this file type
This diff is collapsed.
...@@ -46,14 +46,14 @@ set(PCBNEW_SRCS ...@@ -46,14 +46,14 @@ set(PCBNEW_SRCS
deltrack.cpp deltrack.cpp
dialog_copper_zones.cpp dialog_copper_zones.cpp
dialog_copper_zones_base.cpp dialog_copper_zones_base.cpp
# dialog_display_options.cpp dialog_display_options_base.cpp
# dialog_drc.cpp # dialog_drc.cpp
dialog_edit_mod_text.cpp dialog_edit_mod_text.cpp
# dialog_edit_module.cpp # dialog_edit_module.cpp
dialog_freeroute_exchange.cpp dialog_freeroute_exchange.cpp
# dialog_gendrill.cpp # dialog_gendrill.cpp
dialog_general_options.cpp dialog_general_options.cpp
dialog_generaloptions_BoardEditor_base.cpp dialog_general_options_BoardEditor_base.cpp
# dialog_graphic_items_options.cpp # dialog_graphic_items_options.cpp
# dialog_initpcb.cpp # dialog_initpcb.cpp
# dialog_netlist.cpp # dialog_netlist.cpp
......
This diff is collapsed.
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_display_options.h
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 25/02/2006 18:43:49
// RCS-ID:
// Copyright: License GNU
// Licence:
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 25/02/2006 18:43:49
#ifndef _DIALOG_DISPLAY_OPTIONS_H_
#define _DIALOG_DISPLAY_OPTIONS_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "dialog_display_options.h"
#endif
/*!
* Includes
*/
////@begin includes
#include "wx/valgen.h"
////@end includes
/*!
* Forward declarations
*/
////@begin forward declarations
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_RADIOBOX_OPT_TRACK 10001
#define ID_RADIOBOX_SHOWCLR 10002
#define ID_RADIOBOX_SHOW_VIAS 10003
#define ID_RADIOBOX_MODTXT 10004
#define ID_RADIOBOX_MOD_EDGES 10005
#define ID_RADIOBOX_SHOWPADS 10007
#define ID_CHECKBOX_PAD_CLR 10008
#define ID_CHECKBOX_PADNUM 10009
#define ID_CHECKBOX_PADNC 10010
#define ID_RADIOBOX_SHOW_OTHERS 10011
#define ID_RADIOBOX_PAGE_LIMITS 10006
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_TITLE _("Display Options")
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_POSITION wxDefaultPosition
////@end control identifiers
/*!
* Compatibility
*/
#ifndef wxCLOSE_BOX
#define wxCLOSE_BOX 0x1000
#endif
/*!
* WinEDA_DisplayOptionsDialog class declaration
*/
class WinEDA_DisplayOptionsDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS( WinEDA_DisplayOptionsDialog )
DECLARE_EVENT_TABLE()
public:
/// Constructors
WinEDA_DisplayOptionsDialog( );
WinEDA_DisplayOptionsDialog( WinEDA_BasePcbFrame* parent, wxWindowID id = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_SIZE, long style = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_SIZE, long style = SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_STYLE );
/// Creates the controls and sizers
void CreateControls();
////@begin WinEDA_DisplayOptionsDialog event handler declarations
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
void OnOkClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
void OnCancelClick( wxCommandEvent& event );
////@end WinEDA_DisplayOptionsDialog event handler declarations
////@begin WinEDA_DisplayOptionsDialog member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end WinEDA_DisplayOptionsDialog member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
void AcceptPcbOptions(wxCommandEvent& event);
////@begin WinEDA_DisplayOptionsDialog member variables
wxRadioBox* m_OptDisplayTracks;
wxRadioBox* m_OptDisplayTracksClearance;
wxRadioBox* m_OptDisplayViaHole;
wxRadioBox* m_OptDisplayModTexts;
wxRadioBox* m_OptDisplayModEdges;
wxRadioBox* m_OptDisplayPads;
wxCheckBox* m_OptDisplayPadClearence;
wxCheckBox* m_OptDisplayPadNumber;
wxCheckBox* m_OptDisplayPadNoConn;
wxRadioBox* m_OptDisplayDrawings;
wxRadioBox* m_Show_Page_Limits;
////@end WinEDA_DisplayOptionsDialog member variables
WinEDA_BasePcbFrame * m_Parent;
};
#endif
// _DIALOG_DISPLAY_OPTIONS_H_
This diff is collapsed.
This diff is collapsed.
#ifndef __dialog_general_options_h
#define __dialog_general_options_h
/***********************************************************************/
class Dialog_GeneralOptions : public DialogGeneralOptionsBoardEditor_base
/***********************************************************************/
{
private:
WinEDA_PcbFrame* m_Parent;
wxDC* m_DC;
public:
Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC );
~Dialog_GeneralOptions() {};
void OnInitDialog( wxInitDialogEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
};
class Dialog_Display_Options : public DialogDisplayOptions_base
{
private:
WinEDA_BasePcbFrame* m_Parent;
public:
Dialog_Display_Options( WinEDA_BasePcbFrame* parent );
~Dialog_Display_Options( ) { };
void OnInitDialog( wxInitDialogEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
};
#endif // __dialog_general_options_h
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_generaloptions_BoardEditor_base.h" #include "dialog_general_options_BoardEditor_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
...@@ -30,8 +30,8 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi ...@@ -30,8 +30,8 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi
wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") }; wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") };
int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString ); int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString );
m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS );
m_UnitsSelection->SetSelection( 0 ); m_UnitsSelection->SetSelection( 1 );
m_UnitsSelection->SetToolTip( _("Selection of units used for display diemsions and positions") ); m_UnitsSelection->SetToolTip( _("Selection of units used to display dimensions and positions of items") );
bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 );
...@@ -106,13 +106,13 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi ...@@ -106,13 +106,13 @@ DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWi
m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Track only 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Track only 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 );
m_Track_45_Only_Ctrl->SetToolTip( _("If enabled, force tracks directions to H, V or 40 degrees, when creating a track.") ); m_Track_45_Only_Ctrl->SetToolTip( _("If enabled, force tracks directions to H, V or 45 degrees, when creating a track.") );
bMiddleRightBoxSizer->Add( m_Track_45_Only_Ctrl, 0, wxALL, 5 ); bMiddleRightBoxSizer->Add( m_Track_45_Only_Ctrl, 0, wxALL, 5 );
m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Segments 45 Only"), wxDefaultPosition, wxDefaultSize, 0 ); m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Segments 45 Only"), wxDefaultPosition, wxDefaultSize, 0 );
m_Segments_45_Only_Ctrl->SetToolTip( _("If enabled, force segments directions to H, V or 40 degrees, when creatine a segment on technical layers.") ); m_Segments_45_Only_Ctrl->SetToolTip( _("If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers.") );
bMiddleRightBoxSizer->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 ); bMiddleRightBoxSizer->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 );
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">connect</property> <property name="event_generation">connect</property>
<property name="file">dialog_generaloptions_BoardEditor_base</property> <property name="file">dialog_general_options_BoardEditor_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DialogGeneralOptionsBoardEditor_base</property> <property name="name">DialogGeneralOptionsBoardEditor_base</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">585,272</property> <property name="size">585,280</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="title">General settings</property> <property name="title">General settings</property>
...@@ -158,11 +158,11 @@ ...@@ -158,11 +158,11 @@
<property name="name">m_UnitsSelection</property> <property name="name">m_UnitsSelection</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="selection">0</property> <property name="selection">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Selection of units used for display diemsions and positions</property> <property name="tooltip">Selection of units used to display dimensions and positions of items</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
...@@ -767,7 +767,7 @@ ...@@ -767,7 +767,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">If enabled, force tracks directions to H, V or 40 degrees, when creating a track.</property> <property name="tooltip">If enabled, force tracks directions to H, V or 45 degrees, when creating a track.</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
...@@ -819,7 +819,7 @@ ...@@ -819,7 +819,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">If enabled, force segments directions to H, V or 40 degrees, when creatine a segment on technical layers.</property> <property name="tooltip">If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers.</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_generaloptions_BoardEditor_base__ #ifndef __dialog_general_options_BoardEditor_base__
#define __dialog_generaloptions_BoardEditor_base__ #define __dialog_general_options_BoardEditor_base__
#include <wx/intl.h> #include <wx/intl.h>
...@@ -78,9 +78,9 @@ class DialogGeneralOptionsBoardEditor_base : public wxDialog ...@@ -78,9 +78,9 @@ class DialogGeneralOptionsBoardEditor_base : public wxDialog
public: public:
DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,272 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,280 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DialogGeneralOptionsBoardEditor_base(); ~DialogGeneralOptionsBoardEditor_base();
}; };
#endif //__dialog_generaloptions_BoardEditor_base__ #endif //__dialog_general_options_BoardEditor_base__
...@@ -79,7 +79,8 @@ OBJECTS= $(TARGET).o classpcb.o\ ...@@ -79,7 +79,8 @@ OBJECTS= $(TARGET).o classpcb.o\
loadcmp.o \ loadcmp.o \
dialog_setup_libs.o \ dialog_setup_libs.o \
dialog_general_options.o \ dialog_general_options.o \
dialog_generaloptions_BoardEditor_base.o\ dialog_general_options_BoardEditor_base.o\
dialog_display_options_base.o\
dialog_orient_footprints.o\ dialog_orient_footprints.o\
muwave_command.o \ muwave_command.o \
initpcb.o\ initpcb.o\
...@@ -139,10 +140,10 @@ setpage.o: ../share/setpage.cpp ...@@ -139,10 +140,10 @@ setpage.o: ../share/setpage.cpp
menubarpcb.o: menubarpcb.cpp menubarpcb.o: menubarpcb.cpp
dialog_general_options.o: dialog_general_options.cpp dialog_track_options.cpp dialog_display_options.cpp\ dialog_general_options.o: dialog_general_options.cpp dialog_track_options.cpp\
dialog_graphic_items_options.cpp dialog_generaloptions_BoardEditor_base.h dialog_graphic_items_options.cpp dialog_general_options_BoardEditor_base.h dialog_general_options.h
dialog_generaloptions_BoardEditor_base.o: dialog_generaloptions_BoardEditor_base.cpp dialog_generaloptions_BoardEditor_base.h dialog_generaloptions_BoardEditor_base.o: dialog_general_options_BoardEditor_base.cpp dialog_generaloptions_BoardEditor_base.h
menubarmodedit.o: menubarmodedit.cpp menubarmodedit.o: menubarmodedit.cpp
......
Here are some source code maintenance tasks that need to be done, and maybe some
folks will see these items and volunteer to do them.
*** @todo: grep for @todo and finish off those tasks, scattered throughout the source.
*** use BOARD_ITEM::MenuIcon() in the onrightclick.cpp
*** Use DOXYGEN compatible comments on member functions. As configured,
Doxygen gives priority to comments in header files over *.cpp files.
Review the generated docs and start to go through the source and make the
generated doxygen docs readable and clear using the JavaDoc style comments,
mostly in the header files. The error and warning output of the doxygen
compiler can help with this too.
*** Translate comments that are in French to English so there can be a broader
understanding by new developers.
*** Add tooltip text to all non-obvious controls in every dialog window.
Need to do this using DialogBlocks.
2008-Dec-6 Assigned To:
asked by: Dick Hollenbeck
================================================================================
1) Gerbview needs to work at least as well as gerv, that means adding named layers,
and a list control to sort the layer stack on the fly. There seems to be a polygon bug
of some kind, don't know how long that's been in there. (Dick)
2) Add net class support to PCBNEW, so the round tripping to freerouter
is a dream (Dick)
3) Document the specctra round tripper, and fix up the english translation
of help. (Dick, native english speaker)
4) Expose layer name editing in pcbnew (anyone), should dove tail with net
class editor from a UI perspective.
2008-Feb-8 Assigned To: dick
asked by: dick
================================================================================
specctra:
Add net class support to pcbnew so that the export to specctra becomes richer.
A netclass should hold a list of nets, track width, track spacing,
via drill size and via copper diameter.
2007-Nov-4 Assigned To: nobody
asked by: jp Charras
================================================================================
Use the collector classes in eeschema.
2008-Apr-29 Assigned To:
asked by: Dick Hollenbeck
================================================================================
+pcbnew
When picking new board from the menu, when an existing board is already
in memory, the number of layers in the new board is not set to the default
but rather to the number of layers in the previously loaded board, and with
the default layer names, rather than the layer names of the previously
loaded board. I think the number of layers should be reduced to the
default and the default layer names should be used.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment