Skip to content

K
kicad-source-mirror
Commit 892b46c4 authored by g_harland's avatar g_harland
Browse files
Options

Three more dialogs enhanced

parent e4a6e4e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3346 additions and 1821 deletions
change_log.txt
View file @ 892b46c4
......@@ -4,6 +4,18 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2007-Nov-13 UPDATE Geoff Harland <gharlandau@yahoo.com.au>
================================================================================
+ eeschema & pcbnew
* The "Page Settings" dialog box has been enhanced; it now includes a
wxStdDialogButtonSizer, and is also now designed to be expandable.
+ pcbnew
* The "DRC Control" and "Netlist:" dialog boxes have also been enhanced. Each
of those dialogs now includes a wxStdDialogButtonSizer and a "Cancel" button,
(so each of those dialogs can now (otherwise) be cancelled by pressing the
"Esc" key), and is also now designed to be expandable.
2007-Nov-11 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+ pcbnew
......
pcbnew/dialog_drc.cpp
View file @ 892b46c4
This diff is collapsed.
pcbnew/dialog_drc.h
View file @ 892b46c4
......@@ -24,6 +24,7 @@
////@begin includes
#include "wx/valgen.h"
#include "wx/statline.h"
////@end includes
/*!
......@@ -32,6 +33,8 @@
////@begin forward declarations
class wxBoxSizer;
class wxStaticLine;
class wxStdDialogButtonSizer;
////@end forward declarations
/*!
......@@ -40,9 +43,9 @@ class wxBoxSizer;
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_TEXTCTRL1 10002
#define ID_TEXTCTRL_CLEARANCE 10002
#define ID_CHECKBOX_PAD2PAD 10009
#define ID_CHECKBOX 10008
#define ID_CHECKBOX_UNCONNECTED 10008
#define ID_CHECKBOX_TEST_ZONES 10007
#define ID_CHECKBOX_CREATE_FILE 10012
#define ID_DRC_RUN 10003
......@@ -52,7 +55,8 @@ class wxBoxSizer;
#define ID_BUTTON_BROWSE_RPT_FILE 10011
#define ID_TEXTCTRL_GET_RPT_FILENAME 10010
#define ID_TEXTCTRL 10001
#define SYMBOL_WINEDA_DRCFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define ID_STATICLINE 10013
#define SYMBOL_WINEDA_DRCFRAME_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
#define SYMBOL_WINEDA_DRCFRAME_TITLE _("DRC Control")
#define SYMBOL_WINEDA_DRCFRAME_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_DRCFRAME_SIZE wxSize(400, 300)
......@@ -80,7 +84,11 @@ public:
/// Constructors
WinEDA_DrcFrame( );
WinEDA_DrcFrame( WinEDA_PcbFrame* parent, wxDC * panelDC,
wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE, long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME,
const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE,
const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION,
const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE,
long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE, long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
......@@ -93,9 +101,6 @@ public:
////@begin WinEDA_DrcFrame event handler declarations
/// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
void OnCloseWindow( wxCloseEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DRC_RUN
void OnDrcRunClick( wxCommandEvent& event );
......@@ -108,12 +113,15 @@ public:
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_LIST_UNCONNECTED_PADS
void OnListUnconnectedPadsClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
void OnCloseClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON_BROWSE_RPT_FILE
void OnButtonBrowseRptFileClick( wxCommandEvent& event );
/// 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_DrcFrame event handler declarations
////@begin WinEDA_DrcFrame member function declarations
......@@ -128,9 +136,9 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void TestDrc(wxCommandEvent & event);
void DelDRCMarkers(wxCommandEvent & event);
void ListUnconnectedPads(wxCommandEvent & event);
void TestDrc(wxCommandEvent & event);
void DelDRCMarkers(wxCommandEvent & event);
void ListUnconnectedPads(wxCommandEvent & event);
////@begin WinEDA_DrcFrame member variables
wxBoxSizer* m_MainSizer;
......@@ -143,10 +151,12 @@ public:
wxCheckBox* m_CreateRptCtrl;
wxTextCtrl* m_RptFilenameCtrl;
wxTextCtrl* m_logWindow;
wxStaticLine* Line;
wxStdDialogButtonSizer* StdDialogButtonSizer;
////@end WinEDA_DrcFrame member variables
WinEDA_PcbFrame * m_Parent;
wxDC * m_DC;
int m_UnconnectedCount;
WinEDA_PcbFrame * m_Parent;
wxDC * m_DC;
int m_UnconnectedCount;
};
#endif
......
pcbnew/dialog_drc.pjd
View file @ 892b46c4
This diff is collapsed.
pcbnew/dialog_netlist.cpp
View file @ 892b46c4
......@@ -52,7 +52,7 @@ BEGIN_EVENT_TABLE( WinEDA_NetlistFrame, wxDialog )
EVT_BUTTON( ID_COMPILE_RATSNEST, WinEDA_NetlistFrame::OnCompileRatsnestClick )
EVT_BUTTON( wxID_CLOSE, WinEDA_NetlistFrame::OnCloseClick )
EVT_BUTTON( wxID_CANCEL, WinEDA_NetlistFrame::OnCancelClick )
////@end WinEDA_NetlistFrame event table entries
......@@ -69,17 +69,16 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( )
WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_PcbFrame* parent, wxDC * DC,
wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{
m_Parent = parent;
m_DC = DC;
/* Setup the NETLIST file name according to the board file name */
NetNameBuffer = m_Parent->m_CurrentScreen->m_FileName;
ChangeFileNameExt(NetNameBuffer, NetExtBuffer);
m_Parent = parent;
m_DC = DC;
/* Setup the NETLIST file name according to the board file name */
NetNameBuffer = m_Parent->m_CurrentScreen->m_FileName;
ChangeFileNameExt(NetNameBuffer, NetExtBuffer);
Create(parent, id, caption, pos, size, style);
wxString title = GetTitle() + NetNameBuffer;
SetTitle(title);
SetTitle(title);
}
/*!
......@@ -94,15 +93,18 @@ bool WinEDA_NetlistFrame::Create( wxWindow* parent, wxWindowID id, const wxStrin
m_ChangeExistantModuleCtrl = NULL;
m_DisplayWarningCtrl = NULL;
m_MessageWindow = NULL;
StdDialogButtonSizer = NULL;
////@end WinEDA_NetlistFrame member initialisation
////@begin WinEDA_NetlistFrame creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
if (GetSizer())
{
GetSizer()->SetSizeHints(this);
}
Centre();
////@end WinEDA_NetlistFrame creation
return true;
......@@ -114,9 +116,9 @@ bool WinEDA_NetlistFrame::Create( wxWindow* parent, wxWindowID id, const wxStrin
void WinEDA_NetlistFrame::CreateControls()
{
SetFont(*g_DialogFont);
SetFont( *g_DialogFont );
////@begin WinEDA_NetlistFrame content construction
// Generated by DialogBlocks, 26/02/2006 18:24:19 (unregistered)
// Generated by DialogBlocks, 13/11/2007 15:31:19 (unregistered)
WinEDA_NetlistFrame* itemDialog1 = this;
......@@ -124,40 +126,40 @@ void WinEDA_NetlistFrame::CreateControls()
itemDialog1->SetSizer(itemBoxSizer2);
wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
wxString m_Select_By_TimestampStrings[] = {
_("Reference"),
_("Timestamp")
};
m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, 2, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS );
wxArrayString m_Select_By_TimestampStrings;
m_Select_By_TimestampStrings.Add(_("Reference"));
m_Select_By_TimestampStrings.Add(_("Timestamp"));
m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS );
m_Select_By_Timestamp->SetSelection(0);
itemBoxSizer4->Add(m_Select_By_Timestamp, 0, wxGROW|wxALL, 5);
wxString m_DeleteBadTracksStrings[] = {
_("Keep"),
_("Delete")
};
m_DeleteBadTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Bad Tracks Deletion:"), wxDefaultPosition, wxDefaultSize, 2, m_DeleteBadTracksStrings, 1, wxRA_SPECIFY_COLS );
wxArrayString m_DeleteBadTracksStrings;
m_DeleteBadTracksStrings.Add(_("Keep"));
m_DeleteBadTracksStrings.Add(_("Delete"));
m_DeleteBadTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Bad Tracks Deletion:"), wxDefaultPosition, wxDefaultSize, m_DeleteBadTracksStrings, 1, wxRA_SPECIFY_COLS );
m_DeleteBadTracks->SetSelection(0);
itemBoxSizer4->Add(m_DeleteBadTracks, 0, wxGROW|wxALL, 5);
wxString m_ChangeExistantModuleCtrlStrings[] = {
_("Keep"),
_("Change")
};
m_ChangeExistantModuleCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Exchange Module:"), wxDefaultPosition, wxDefaultSize, 2, m_ChangeExistantModuleCtrlStrings, 1, wxRA_SPECIFY_COLS );
wxArrayString m_ChangeExistantModuleCtrlStrings;
m_ChangeExistantModuleCtrlStrings.Add(_("Keep"));
m_ChangeExistantModuleCtrlStrings.Add(_("Change"));
m_ChangeExistantModuleCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Exchange Module:"), wxDefaultPosition, wxDefaultSize, m_ChangeExistantModuleCtrlStrings, 1, wxRA_SPECIFY_COLS );
m_ChangeExistantModuleCtrl->SetSelection(0);
itemBoxSizer4->Add(m_ChangeExistantModuleCtrl, 0, wxGROW|wxALL, 5);
m_DisplayWarningCtrl = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Display Warnings"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_DisplayWarningCtrl->SetValue(false);
itemBoxSizer4->Add(m_DisplayWarningCtrl, 0, wxGROW|wxALL, 5);
itemBoxSizer4->Add(m_DisplayWarningCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer3->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
wxButton* itemButton11 = new wxButton( itemDialog1, ID_OPEN_NELIST, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton11->SetForegroundColour(wxColour(217, 0, 0));
......@@ -175,12 +177,20 @@ void WinEDA_NetlistFrame::CreateControls()
itemButton14->SetForegroundColour(wxColour(0, 0, 132));
itemBoxSizer10->Add(itemButton14, 0, wxGROW|wxALL, 5);
wxButton* itemButton15 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton15->SetForegroundColour(wxColour(128, 0, 128));
itemBoxSizer10->Add(itemButton15, 0, wxGROW|wxALL, 5);
m_MessageWindow = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(-1, 120), wxTE_MULTILINE|wxTE_READONLY );
itemBoxSizer2->Add(m_MessageWindow, 0, wxGROW|wxALL, 5);
itemBoxSizer2->Add(m_MessageWindow, 1, wxGROW|wxALL, 10);
wxStaticLine* itemStaticLine16 = new wxStaticLine( itemDialog1, ID_STATICLINE, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
itemBoxSizer2->Add(itemStaticLine16, 0, wxGROW|wxLEFT|wxRIGHT, 5);
StdDialogButtonSizer = new wxStdDialogButtonSizer;
itemBoxSizer2->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
wxButton* itemButton18 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton18->SetForegroundColour(wxColour(0, 0, 255));
StdDialogButtonSizer->AddButton(itemButton18);
StdDialogButtonSizer->Realize();
// Set validators
m_DisplayWarningCtrl->SetValidator( wxGenericValidator(& DisplayWarning) );
......@@ -227,7 +237,7 @@ wxIcon WinEDA_NetlistFrame::GetIconResource( const wxString& name )
void WinEDA_NetlistFrame::OnOpenNelistClick( wxCommandEvent& event )
{
Set_NetlisteName(event);
Set_NetlisteName(event);
}
/*!
......@@ -236,7 +246,7 @@ void WinEDA_NetlistFrame::OnOpenNelistClick( wxCommandEvent& event )
void WinEDA_NetlistFrame::OnReadNetlistFileClick( wxCommandEvent& event )
{
ReadPcbNetlist(event);
ReadPcbNetlist(event);
}
/*!
......@@ -254,16 +264,14 @@ void WinEDA_NetlistFrame::OnTestNetlistClick( wxCommandEvent& event )
void WinEDA_NetlistFrame::OnCompileRatsnestClick( wxCommandEvent& event )
{
m_Parent->Compile_Ratsnest(m_DC, TRUE);
m_Parent->Compile_Ratsnest(m_DC, TRUE);
}
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
*/
void WinEDA_NetlistFrame::OnCloseClick( wxCommandEvent& event )
void WinEDA_NetlistFrame::OnCancelClick( wxCommandEvent& event )
{
Close();
EndModal( -1 );
}
pcbnew/dialog_netlist.h
View file @ 892b46c4
......@@ -21,6 +21,7 @@
////@begin includes
#include "wx/valgen.h"
#include "wx/statline.h"
////@end includes
/*!
......@@ -28,6 +29,7 @@
*/
////@begin forward declarations
class wxStdDialogButtonSizer;
////@end forward declarations
/*!
......@@ -36,11 +38,6 @@
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_WINEDA_NETLISTFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_NETLISTFRAME_TITLE _("Netlist: ")
#define SYMBOL_WINEDA_NETLISTFRAME_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_NETLISTFRAME_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_NETLISTFRAME_POSITION wxDefaultPosition
#define ID_RADIOBOX 10005
#define ID_RADIOBOX1 10006
#define ID_RADIOBOX2 10007
......@@ -50,6 +47,12 @@
#define ID_TEST_NETLIST 10003
#define ID_COMPILE_RATSNEST 10004
#define ID_TEXTCTRL 10009
#define ID_STATICLINE 10010
#define SYMBOL_WINEDA_NETLISTFRAME_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
#define SYMBOL_WINEDA_NETLISTFRAME_TITLE _("Netlist: ")
#define SYMBOL_WINEDA_NETLISTFRAME_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_NETLISTFRAME_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_NETLISTFRAME_POSITION wxDefaultPosition
////@end control identifiers
/*!
......@@ -95,8 +98,8 @@ public:
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_COMPILE_RATSNEST
void OnCompileRatsnestClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
void OnCloseClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
void OnCancelClick( wxCommandEvent& event );
////@end WinEDA_NetlistFrame event handler declarations
......@@ -112,17 +115,16 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void ReadPcbNetlist(wxCommandEvent& event);
void Set_NetlisteName(wxCommandEvent& event);
bool OpenNetlistFile(wxCommandEvent& event);
int BuildListeNetModules(wxCommandEvent& event, wxArrayString & BufName);
void ModulesControle(wxCommandEvent& event);
int ReadListeModules(const wxString * RefCmp, long TimeStamp, wxString & NameModule);
int SetPadNetName( char * Line, MODULE * Module);
MODULE * ReadNetModule( char * Text,
int * UseFichCmp, int TstOnly);
void AddToList(const wxString & NameLibCmp, const wxString & NameCmp,int TimeStamp );
void LoadListeModules(wxDC *DC);
void ReadPcbNetlist(wxCommandEvent& event);
void Set_NetlisteName(wxCommandEvent& event);
bool OpenNetlistFile(wxCommandEvent& event);
int BuildListeNetModules(wxCommandEvent& event, wxArrayString & BufName);
void ModulesControle(wxCommandEvent& event);
int ReadListeModules(const wxString * RefCmp, long TimeStamp, wxString & NameModule);
int SetPadNetName( char * Line, MODULE * Module);
MODULE * ReadNetModule( char * Text, int * UseFichCmp, int TstOnly);
void AddToList(const wxString & NameLibCmp, const wxString & NameCmp,int TimeStamp );
void LoadListeModules(wxDC *DC);
////@begin WinEDA_NetlistFrame member variables
wxRadioBox* m_Select_By_Timestamp;
......@@ -130,9 +132,10 @@ public:
wxRadioBox* m_ChangeExistantModuleCtrl;
wxCheckBox* m_DisplayWarningCtrl;
wxTextCtrl* m_MessageWindow;
wxStdDialogButtonSizer* StdDialogButtonSizer;
////@end WinEDA_NetlistFrame member variables
WinEDA_PcbFrame * m_Parent;
wxDC * m_DC;
WinEDA_PcbFrame * m_Parent;
wxDC * m_DC;
};
#endif
......
pcbnew/dialog_netlist.pjd
View file @ 892b46c4
This diff is collapsed.
share/setpage.cpp
View file @ 892b46c4
This diff is collapsed.
share/setpage.h
View file @ 892b46c4
......@@ -3,13 +3,23 @@
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 06/02/2006 20:53:09
// Created: 13/11/2007 09:11:27
// RCS-ID:
// Copyright: License GNU
// Licence:
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 06/02/2006 20:53:09
/* The "Page Settings" dialog box created by this file (and setpage.cpp)
* contains seven checkboxes which *are* provided when that dialog box is
* invoked in EESchema, but which are *not* provided when that dialog box is
* invoked in Pcbnew instead. As such, various lines within this file
* (and setpage.cpp) are included on an appropriately conditional basis.
* (That aspect should be noted if the contents of this file (and setpage.cpp)
* are ever consequently modified as a consequence of setpage.pjd being
* opened in DialogBlocks (as that file now incorporates those checkboxes).)
*/
// Generated by DialogBlocks (unregistered), 13/11/2007 09:11:27
#ifndef _SETPAGE_H_
#define _SETPAGE_H_
......@@ -25,6 +35,7 @@
////@begin includes
#include "wx/valgen.h"
#include "wx/valtext.h"
#include "wx/statline.h"
////@end includes
/*!
......@@ -32,34 +43,50 @@
*/
////@begin forward declarations
class wxBoxSizer;
class wxFlexGridSizer;
class wxStaticLine;
class wxStdDialogButtonSizer;
////@end forward declarations
/*!
* Control identifiers
*/
// NOTE: The following code has been modified by listing the seven checkbox-
// related definitions *only* within the EESchema version of this dialog box.
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_RADIOBOX 10001
#define ID_TEXTCTRL7 10009
#define ID_TEXTCTRL8 10010
#define ID_TEXTCTRL 10002
#define ID_TEXTCTRL2 10004
#define ID_TEXTCTRL1 10003
#define ID_TEXTCTRL3 10005
#define ID_TEXTCTRL4 10006
#define ID_TEXTCTRL5 10007
#define ID_TEXTCTRL6 10008
#define SYMBOL_WINEDA_SETPAGEFRAME_STYLE wxDEFAULT_DIALOG_STYLE
#define ID_RADIOBOX_PAGE_SIZE 10001
#define ID_TEXTCTRL_USER_PAGE_SIZE_X 10002
#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 10003
#define ID_TEXTCTRL_REVISION 10004
#define ID_TEXTCTRL_TITLE 10005
#define ID_TEXTCTRL_COMPANY 10006
#define ID_TEXTCTRL_COMMENT1 10007
#define ID_TEXTCTRL_COMMENT2 10008
#define ID_TEXTCTRL_COMMENT3 10009
#define ID_TEXTCTRL_COMMENT4 10010
#ifdef EESCHEMA
#define ID_CHECKBOX_REVISION 10011
#define ID_CHECKBOX_TITLE 10012
#define ID_CHECKBOX_COMPANY 10013
#define ID_CHECKBOX_COMMENT1 10014
#define ID_CHECKBOX_COMMENT2 10015
#define ID_CHECKBOX_COMMENT3 10016
#define ID_CHECKBOX_COMMENT4 10017
#endif
#define ID_STATICLINE 10018
#define SYMBOL_WINEDA_SETPAGEFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_SETPAGEFRAME_TITLE _("Page Settings")
#define SYMBOL_WINEDA_SETPAGEFRAME_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_SETPAGEFRAME_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_SETPAGEFRAME_POSITION wxDefaultPosition
////@end control identifiers
/*!
* Compatibility
*/
/*!
* WinEDA_SetPageFrame class declaration
......@@ -74,24 +101,29 @@ public:
/// Constructors
WinEDA_SetPageFrame( );
WinEDA_SetPageFrame( WinEDA_DrawFrame* parent,
wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
/// Destructor
~WinEDA_SetPageFrame();
/// Initialises member variables
void Init();
/// Creates the controls and sizers
void CreateControls();
////@begin WinEDA_SetPageFrame event handler declarations
/// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
void OnCloseWindow( wxCloseEvent& event );
......@@ -104,7 +136,6 @@ public:
////@end WinEDA_SetPageFrame event handler declarations
////@begin WinEDA_SetPageFrame member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
......@@ -115,45 +146,65 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void SearchPageSizeSelection();
void SavePageSettings(wxCommandEvent& event);
void ReturnSizeSelected(wxCommandEvent& event);
void SearchPageSizeSelection();
void SavePageSettings(wxCommandEvent& event);
void ReturnSizeSelected(wxCommandEvent& event);
// NOTE: The following code has been modified by listing the seven
// checkboxes *only* within the EESchema version of this dialog box.
////@begin WinEDA_SetPageFrame member variables
wxBoxSizer* OuterSizer;
wxBoxSizer* MainSizer;
wxFlexGridSizer* LeftColumnSizer;
wxRadioBox* m_PageSizeBox;
wxBoxSizer* UserSizeXSizer;
wxStaticText* UserPageSizeX;
wxTextCtrl* m_TextUserSizeX;
wxBoxSizer* UserSizeYSizer;
wxStaticText* UserPageSizeY;
wxTextCtrl* m_TextUserSizeY;
wxFlexGridSizer* RightColumnSizer;
wxBoxSizer* SheetInfoSizer;
wxStaticText* m_TextSheetCount;
wxStaticText* m_TextSheetNumber;
wxStaticBoxSizer* m_RevisionSizer;
wxStaticBoxSizer* RevisionSizer;
wxTextCtrl* m_TextRevision;
wxStaticBoxSizer* m_NameSizer;
wxStaticBoxSizer* TitleSizer;
wxTextCtrl* m_TextTitle;
wxStaticBoxSizer* m_CompanySizer;
wxStaticBoxSizer* CompanySizer;
wxTextCtrl* m_TextCompany;
wxStaticBoxSizer* m_Comment1Sizer;
wxStaticBoxSizer* Comment1Sizer;
wxTextCtrl* m_TextComment1;
wxStaticBoxSizer* m_Comment2Sizer;
wxStaticBoxSizer* Comment2Sizer;
wxTextCtrl* m_TextComment2;
wxStaticBoxSizer* m_Comment3Sizer;
wxStaticBoxSizer* Comment3Sizer;
wxTextCtrl* m_TextComment3;
wxStaticBoxSizer* m_Comment4Sizer;
wxStaticBoxSizer* Comment4Sizer;
wxTextCtrl* m_TextComment4;
wxStaticLine* Line;
wxStdDialogButtonSizer* StdDialogButtonSizer;
wxButton* Button_OK;
wxButton* Button_Cancel;
#ifdef EESCHEMA
wxCheckBox* m_RevisionExport;
wxCheckBox* m_TitleExport;
wxCheckBox* m_CompanyExport;
wxCheckBox* m_Comment1Export;
wxCheckBox* m_Comment2Export;
wxCheckBox* m_Comment3Export;
wxCheckBox* m_Comment4Export;
#endif
////@end WinEDA_SetPageFrame member variables
wxCheckBox * m_RevisionExport;
wxCheckBox * m_TitleExport;
wxCheckBox * m_CompanyExport;
wxCheckBox * m_Comment1Export;
wxCheckBox * m_Comment2Export;
wxCheckBox * m_Comment3Export;
wxCheckBox * m_Comment4Export;
WinEDA_DrawFrame *m_ParentDrawFrame;
BASE_SCREEN * m_Screen;
int m_Modified;
Ki_PageDescr * m_SelectedSheet;
float UserSizeX, UserSizeY;
int m_CurrentSelection;
WinEDA_DrawFrame *m_ParentDrawFrame;
BASE_SCREEN * m_Screen;
int m_Modified;
Ki_PageDescr * m_SelectedSheet;
float UserSizeX, UserSizeY;
int m_CurrentSelection;
};
#endif
......
share/setpage.pjd
View file @ 892b46c4
This diff is collapsed.
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