Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
7c0af1bf
Commit
7c0af1bf
authored
Oct 04, 2012
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More dialogs derived from DIALO_SHIM
parent
bae892df
Changes
28
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
1150 additions
and
679 deletions
+1150
-679
class_page_info.cpp
common/class_page_info.cpp
+1
-1
dialog_page_settings.cpp
common/dialogs/dialog_page_settings.cpp
+1
-34
dialog_page_settings.h
common/dialogs/dialog_page_settings.h
+0
-11
dialog_page_settings_base.cpp
common/dialogs/dialog_page_settings_base.cpp
+2
-2
dialog_page_settings_base.fbp
common/dialogs/dialog_page_settings_base.fbp
+2
-56
dialog_page_settings_base.h
common/dialogs/dialog_page_settings_base.h
+3
-2
dialog_cvpcb_config_fbp.cpp
cvpcb/dialogs/dialog_cvpcb_config_fbp.cpp
+13
-2
dialog_cvpcb_config_fbp.fbp
cvpcb/dialogs/dialog_cvpcb_config_fbp.fbp
+633
-10
dialog_cvpcb_config_fbp.h
cvpcb/dialogs/dialog_cvpcb_config_fbp.h
+10
-8
dialog_display_options_base.cpp
cvpcb/dialogs/dialog_display_options_base.cpp
+3
-3
dialog_display_options_base.fbp
cvpcb/dialogs/dialog_display_options_base.fbp
+2
-40
dialog_display_options_base.h
cvpcb/dialogs/dialog_display_options_base.h
+3
-2
dialog_layers_select_to_pcb_base.cpp
gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp
+11
-3
dialog_layers_select_to_pcb_base.fbp
gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp
+1
-1
dialog_layers_select_to_pcb_base.h
gerbview/dialogs/dialog_layers_select_to_pcb_base.h
+10
-9
dialog_print_using_printer.cpp
gerbview/dialogs/dialog_print_using_printer.cpp
+417
-451
dialog_print_using_printer_base.cpp
gerbview/dialogs/dialog_print_using_printer_base.cpp
+11
-2
dialog_print_using_printer_base.fbp
gerbview/dialogs/dialog_print_using_printer_base.fbp
+1
-1
dialog_print_using_printer_base.h
gerbview/dialogs/dialog_print_using_printer_base.h
+10
-8
dialog_show_page_borders_base.cpp
gerbview/dialogs/dialog_show_page_borders_base.cpp
+6
-2
dialog_show_page_borders_base.fbp
gerbview/dialogs/dialog_show_page_borders_base.fbp
+1
-1
dialog_show_page_borders_base.h
gerbview/dialogs/dialog_show_page_borders_base.h
+3
-2
gerbview_dialog_display_options_frame_base.cpp
...ew/dialogs/gerbview_dialog_display_options_frame_base.cpp
+2
-2
gerbview_dialog_display_options_frame_base.fbp
...ew/dialogs/gerbview_dialog_display_options_frame_base.fbp
+1
-1
gerbview_dialog_display_options_frame_base.h
...view/dialogs/gerbview_dialog_display_options_frame_base.h
+3
-2
dialog_drc.cpp
pcbnew/dialogs/dialog_drc.cpp
+0
-7
dialog_drc.h
pcbnew/dialogs/dialog_drc.h
+0
-8
dialog_layers_setup.cpp
pcbnew/dialogs/dialog_layers_setup.cpp
+0
-8
No files found.
common/class_page_info.cpp
View file @
7c0af1bf
...
@@ -139,7 +139,7 @@ void PAGE_INFO::setMargins()
...
@@ -139,7 +139,7 @@ void PAGE_INFO::setMargins()
m_left_margin
=
m_left_margin
=
m_right_margin
=
m_right_margin
=
m_top_margin
=
m_top_margin
=
m_bottom_margin
=
400
;
m_bottom_margin
=
400
;
// Units = mils
}
}
}
}
...
...
common/dialogs/dialog_page_settings.cpp
View file @
7c0af1bf
...
@@ -45,10 +45,6 @@
...
@@ -45,10 +45,6 @@
#include <dialog_page_settings.h>
#include <dialog_page_settings.h>
// dialog should remember its previous screen position and size
wxPoint
DIALOG_PAGES_SETTINGS
::
s_LastPos
(
-
1
,
-
1
);
wxSize
DIALOG_PAGES_SETTINGS
::
s_LastSize
;
// List of page formats.
// List of page formats.
// should be statically initialized, because we need both
// should be statically initialized, because we need both
// the translated and the not translated version.
// the translated and the not translated version.
...
@@ -130,7 +126,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
...
@@ -130,7 +126,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
#ifdef EESCHEMA
#ifdef EESCHEMA
// Init display value for s
heet User size
// Init display value for s
chematic sub-sheet number
wxString
format
=
m_TextSheetCount
->
GetLabel
();
wxString
format
=
m_TextSheetCount
->
GetLabel
();
msg
.
Printf
(
format
,
m_Screen
->
m_NumberOfScreens
);
msg
.
Printf
(
format
,
m_Screen
->
m_NumberOfScreens
);
m_TextSheetCount
->
SetLabel
(
msg
);
m_TextSheetCount
->
SetLabel
(
msg
);
...
@@ -214,35 +210,6 @@ void DIALOG_PAGES_SETTINGS::initDialog()
...
@@ -214,35 +210,6 @@ void DIALOG_PAGES_SETTINGS::initDialog()
}
}
bool
DIALOG_PAGES_SETTINGS
::
Show
(
bool
show
)
{
bool
ret
;
if
(
show
)
{
ret
=
DIALOG_PAGES_SETTINGS_BASE
::
Show
(
show
);
if
(
s_LastPos
.
x
!=
-
1
)
{
SetSize
(
s_LastPos
.
x
,
s_LastPos
.
y
,
s_LastSize
.
x
,
s_LastSize
.
y
,
0
);
}
else
{
// Do nothing: last position not yet saved.
}
}
else
{
// Save the dialog's position before hiding
s_LastPos
=
GetPosition
();
s_LastSize
=
GetSize
();
ret
=
DIALOG_PAGES_SETTINGS_BASE
::
Show
(
show
);
}
return
ret
;
}
void
DIALOG_PAGES_SETTINGS
::
OnCloseWindow
(
wxCloseEvent
&
event
)
void
DIALOG_PAGES_SETTINGS
::
OnCloseWindow
(
wxCloseEvent
&
event
)
{
{
EndModal
(
m_modified
);
EndModal
(
m_modified
);
...
...
common/dialogs/dialog_page_settings.h
View file @
7c0af1bf
...
@@ -47,21 +47,10 @@ private:
...
@@ -47,21 +47,10 @@ private:
PAGE_INFO
m_pageInfo
;
/// Temporary page info.
PAGE_INFO
m_pageInfo
;
/// Temporary page info.
TITLE_BLOCK
m_tb
;
/// Temporary title block (basic inscriptions).
TITLE_BLOCK
m_tb
;
/// Temporary title block (basic inscriptions).
static
wxSize
s_LastSize
;
/// Last position and size.
static
wxPoint
s_LastPos
;
public
:
public
:
DIALOG_PAGES_SETTINGS
(
EDA_DRAW_FRAME
*
parent
);
DIALOG_PAGES_SETTINGS
(
EDA_DRAW_FRAME
*
parent
);
~
DIALOG_PAGES_SETTINGS
();
~
DIALOG_PAGES_SETTINGS
();
/**
* Function Show
* overloads the wxDialog::Show() function so it can position the
* dialog at its remembered size and position.
*/
bool
Show
(
bool
show
);
private
:
private
:
/// Initialises member variables
/// Initialises member variables
void
initDialog
();
void
initDialog
();
...
...
common/dialogs/dialog_page_settings_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_PAGES_SETTINGS_BASE
::
DIALOG_PAGES_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_PAGES_SETTINGS_BASE
::
DIALOG_PAGES_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
...
common/dialogs/dialog_page_settings_base.fbp
View file @
7c0af1bf
...
@@ -25,62 +25,28 @@
...
@@ -25,62 +25,28 @@
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
<object
class=
"Dialog"
expanded=
"1"
>
<property
name=
"BottomDockable"
>
1
</property>
<property
name=
"LeftDockable"
>
1
</property>
<property
name=
"RightDockable"
>
1
</property>
<property
name=
"TopDockable"
>
1
</property>
<property
name=
"aui_layer"
></property>
<property
name=
"aui_managed"
>
0
</property>
<property
name=
"aui_managed"
>
0
</property>
<property
name=
"aui_name"
></property>
<property
name=
"aui_manager_style"
>
wxAUI_MGR_DEFAULT
</property>
<property
name=
"aui_position"
></property>
<property
name=
"aui_row"
></property>
<property
name=
"best_size"
></property>
<property
name=
"bg"
></property>
<property
name=
"bg"
></property>
<property
name=
"caption"
></property>
<property
name=
"caption_visible"
>
1
</property>
<property
name=
"center"
></property>
<property
name=
"center"
></property>
<property
name=
"center_pane"
>
0
</property>
<property
name=
"close_button"
>
1
</property>
<property
name=
"context_help"
></property>
<property
name=
"context_help"
></property>
<property
name=
"context_menu"
>
1
</property>
<property
name=
"context_menu"
>
1
</property>
<property
name=
"default_pane"
>
0
</property>
<property
name=
"dock"
>
Dock
</property>
<property
name=
"dock_fixed"
>
0
</property>
<property
name=
"docking"
>
Left
</property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"event_handler"
>
impl_virtual
</property>
<property
name=
"event_handler"
>
impl_virtual
</property>
<property
name=
"extra_style"
></property>
<property
name=
"extra_style"
></property>
<property
name=
"fg"
></property>
<property
name=
"fg"
></property>
<property
name=
"floatable"
>
1
</property>
<property
name=
"font"
></property>
<property
name=
"font"
></property>
<property
name=
"gripper"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"moveable"
>
1
</property>
<property
name=
"name"
>
DIALOG_PAGES_SETTINGS_BASE
</property>
<property
name=
"name"
>
DIALOG_PAGES_SETTINGS_BASE
</property>
<property
name=
"pane_border"
>
1
</property>
<property
name=
"pane_position"
></property>
<property
name=
"pane_size"
></property>
<property
name=
"pin_button"
>
1
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"resize"
>
Resizable
</property>
<property
name=
"show"
>
1
</property>
<property
name=
"size"
>
748,495
</property>
<property
name=
"size"
>
748,495
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Page Settings
</property>
<property
name=
"title"
>
Page Settings
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
@@ -216,10 +182,6 @@
...
@@ -216,10 +182,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
@@ -391,10 +353,6 @@
...
@@ -391,10 +353,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
@@ -843,10 +801,6 @@
...
@@ -843,10 +801,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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"
>
wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER
</property>
<property
name=
"window_style"
>
wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER
</property>
...
@@ -980,10 +934,6 @@
...
@@ -980,10 +934,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
@@ -1077,10 +1027,6 @@
...
@@ -1077,10 +1027,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
...
common/dialogs/dialog_page_settings_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
...
@@ -54,7 +55,7 @@
...
@@ -54,7 +55,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAGES_SETTINGS_BASE
/// Class DIALOG_PAGES_SETTINGS_BASE
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_PAGES_SETTINGS_BASE
:
public
wxDialog
class
DIALOG_PAGES_SETTINGS_BASE
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
...
cvpcb/dialogs/dialog_cvpcb_config_fbp.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Sep 8 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_CVPCB_CONFIG_FBP
::
DIALOG_CVPCB_CONFIG_FBP
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_CVPCB_CONFIG_FBP
::
DIALOG_CVPCB_CONFIG_FBP
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
@@ -49,8 +49,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -49,8 +49,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
m_buttonLibDown
=
new
wxButton
(
this
,
ID_LIB_DOWN
,
_
(
"Down"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonLibDown
=
new
wxButton
(
this
,
ID_LIB_DOWN
,
_
(
"Down"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerLibButtons
->
Add
(
m_buttonLibDown
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
bSizerLibButtons
->
Add
(
m_buttonLibDown
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
sbLibsChoiceSizer
->
Add
(
bSizerLibButtons
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
sbLibsChoiceSizer
->
Add
(
bSizerLibButtons
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bMainSizer
->
Add
(
sbLibsChoiceSizer
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbLibsChoiceSizer
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
wxStaticBoxSizer
*
sbEquivChoiceSizer
;
wxStaticBoxSizer
*
sbEquivChoiceSizer
;
...
@@ -86,8 +88,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -86,8 +88,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
m_buttonEquDown
=
new
wxButton
(
this
,
ID_EQU_DOWN
,
_
(
"Down"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonEquDown
=
new
wxButton
(
this
,
ID_EQU_DOWN
,
_
(
"Down"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerEquButtons
->
Add
(
m_buttonEquDown
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
bSizerEquButtons
->
Add
(
m_buttonEquDown
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
sbEquivChoiceSizer
->
Add
(
bSizerEquButtons
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
sbEquivChoiceSizer
->
Add
(
bSizerEquButtons
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bMainSizer
->
Add
(
sbEquivChoiceSizer
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbEquivChoiceSizer
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
wxStaticBoxSizer
*
sbModulesDocSizer
;
wxStaticBoxSizer
*
sbModulesDocSizer
;
...
@@ -99,6 +103,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -99,6 +103,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
m_buttonModDoc
=
new
wxButton
(
this
,
ID_BROWSE_MOD_DOC
,
_
(
"Browse"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonModDoc
=
new
wxButton
(
this
,
ID_BROWSE_MOD_DOC
,
_
(
"Browse"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbModulesDocSizer
->
Add
(
m_buttonModDoc
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
sbModulesDocSizer
->
Add
(
m_buttonModDoc
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbModulesDocSizer
,
0
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbModulesDocSizer
,
0
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
wxStaticBoxSizer
*
sbSizer4
;
wxStaticBoxSizer
*
sbSizer4
;
...
@@ -113,6 +118,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -113,6 +118,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
bUserListSizer
->
Add
(
m_listUserPaths
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxEXPAND
|
wxRIGHT
|
wxLEFT
,
5
);
bUserListSizer
->
Add
(
m_listUserPaths
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxEXPAND
|
wxRIGHT
|
wxLEFT
,
5
);
sbSizer4
->
Add
(
bUserListSizer
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
sbSizer4
->
Add
(
bUserListSizer
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
wxBoxSizer
*
bUserPathsButtonsSizer
;
wxBoxSizer
*
bUserPathsButtonsSizer
;
...
@@ -127,8 +133,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -127,8 +133,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
m_buttonRemovePath
=
new
wxButton
(
this
,
ID_REMOVE_PATH
,
_
(
"Remove"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonRemovePath
=
new
wxButton
(
this
,
ID_REMOVE_PATH
,
_
(
"Remove"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bUserPathsButtonsSizer
->
Add
(
m_buttonRemovePath
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
bUserPathsButtonsSizer
->
Add
(
m_buttonRemovePath
,
0
,
wxRIGHT
|
wxLEFT
,
5
);
sbSizer4
->
Add
(
bUserPathsButtonsSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
sbSizer4
->
Add
(
bUserPathsButtonsSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bMainSizer
->
Add
(
sbSizer4
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbSizer4
,
1
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
wxStaticBoxSizer
*
sbSizer6
;
wxStaticBoxSizer
*
sbSizer6
;
...
@@ -140,6 +148,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -140,6 +148,7 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
sbSizer6
->
Add
(
m_DefaultLibraryPathslistBox
,
1
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
,
5
);
sbSizer6
->
Add
(
m_DefaultLibraryPathslistBox
,
1
,
wxEXPAND
|
wxRIGHT
|
wxLEFT
,
5
);
bMainSizer
->
Add
(
sbSizer6
,
1
,
wxALL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
sbSizer6
,
1
,
wxALL
|
wxEXPAND
,
5
);
m_staticline2
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
m_staticline2
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
...
@@ -151,8 +160,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
...
@@ -151,8 +160,10 @@ DIALOG_CVPCB_CONFIG_FBP::DIALOG_CVPCB_CONFIG_FBP( wxWindow* parent, wxWindowID i
m_sdbSizer2Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizer2Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizer2
->
AddButton
(
m_sdbSizer2Cancel
);
m_sdbSizer2
->
AddButton
(
m_sdbSizer2Cancel
);
m_sdbSizer2
->
Realize
();
m_sdbSizer2
->
Realize
();
bMainSizer
->
Add
(
m_sdbSizer2
,
0
,
wxALL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
m_sdbSizer2
,
0
,
wxALL
|
wxEXPAND
,
5
);
this
->
SetSizer
(
bMainSizer
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
cvpcb/dialogs/dialog_cvpcb_config_fbp.fbp
View file @
7c0af1bf
This diff is collapsed.
Click to expand it.
cvpcb/dialogs/dialog_cvpcb_config_fbp.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Sep 8 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
#ifndef __
dialog_cvpcb_config_fbp
__
#ifndef __
DIALOG_CVPCB_CONFIG_FBP_H
__
#define __
dialog_cvpcb_config_fbp
__
#define __
DIALOG_CVPCB_CONFIG_FBP_H
__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/listbox.h>
#include <wx/listbox.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
...
@@ -28,7 +30,7 @@
...
@@ -28,7 +30,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_CVPCB_CONFIG_FBP
/// Class DIALOG_CVPCB_CONFIG_FBP
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_CVPCB_CONFIG_FBP
:
public
wxDialog
class
DIALOG_CVPCB_CONFIG_FBP
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
@@ -48,7 +50,7 @@ class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
...
@@ -48,7 +50,7 @@ class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
ID_BROWSE_MOD_DOC
,
ID_BROWSE_MOD_DOC
,
ID_LIB_PATH_SEL
,
ID_LIB_PATH_SEL
,
ID_INSERT_PATH
,
ID_INSERT_PATH
,
ID_REMOVE_PATH
,
ID_REMOVE_PATH
};
};
wxListBox
*
m_ListLibr
;
wxListBox
*
m_ListLibr
;
...
@@ -90,9 +92,9 @@ class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
...
@@ -90,9 +92,9 @@ class DIALOG_CVPCB_CONFIG_FBP : public wxDialog
public
:
public
:
DIALOG_CVPCB_CONFIG_FBP
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
wxEmptyString
,
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
570
,
625
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_CVPCB_CONFIG_FBP
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
wxEmptyString
,
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
570
,
625
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_CVPCB_CONFIG_FBP
();
~
DIALOG_CVPCB_CONFIG_FBP
();
};
};
#endif //__
dialog_cvpcb_config_fbp
__
#endif //__
DIALOG_CVPCB_CONFIG_FBP_H
__
cvpcb/dialogs/dialog_display_options_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
::
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
::
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
@@ -53,7 +53,7 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(
...
@@ -53,7 +53,7 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(
bSizerRight
->
Add
(
sbSizerPads
,
1
,
wxEXPAND
|
wxALL
,
5
);
bSizerRight
->
Add
(
sbSizerPads
,
1
,
wxEXPAND
|
wxALL
,
5
);
wxStaticBoxSizer
*
sbSizerViewOpt
;
wxStaticBoxSizer
*
sbSizerViewOpt
;
sbSizerViewOpt
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"
View
:"
)
),
wxVERTICAL
);
sbSizerViewOpt
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"
Pan
:"
)
),
wxVERTICAL
);
m_IsMiddleButtonPan
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Middle Button PAN Enabled"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_IsMiddleButtonPan
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Middle Button PAN Enabled"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbSizerViewOpt
->
Add
(
m_IsMiddleButtonPan
,
0
,
wxALL
|
wxEXPAND
,
5
);
sbSizerViewOpt
->
Add
(
m_IsMiddleButtonPan
,
0
,
wxALL
|
wxEXPAND
,
5
);
...
...
cvpcb/dialogs/dialog_display_options_base.fbp
View file @
7c0af1bf
...
@@ -25,62 +25,28 @@
...
@@ -25,62 +25,28 @@
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
<object
class=
"Dialog"
expanded=
"1"
>
<property
name=
"BottomDockable"
>
1
</property>
<property
name=
"LeftDockable"
>
1
</property>
<property
name=
"RightDockable"
>
1
</property>
<property
name=
"TopDockable"
>
1
</property>
<property
name=
"aui_layer"
></property>
<property
name=
"aui_managed"
>
0
</property>
<property
name=
"aui_managed"
>
0
</property>
<property
name=
"aui_name"
></property>
<property
name=
"aui_manager_style"
>
wxAUI_MGR_DEFAULT
</property>
<property
name=
"aui_position"
></property>
<property
name=
"aui_row"
></property>
<property
name=
"best_size"
></property>
<property
name=
"bg"
></property>
<property
name=
"bg"
></property>
<property
name=
"caption"
></property>
<property
name=
"caption_visible"
>
1
</property>
<property
name=
"center"
></property>
<property
name=
"center"
></property>
<property
name=
"center_pane"
>
0
</property>
<property
name=
"close_button"
>
1
</property>
<property
name=
"context_help"
></property>
<property
name=
"context_help"
></property>
<property
name=
"context_menu"
>
1
</property>
<property
name=
"context_menu"
>
1
</property>
<property
name=
"default_pane"
>
0
</property>
<property
name=
"dock"
>
Dock
</property>
<property
name=
"dock_fixed"
>
0
</property>
<property
name=
"docking"
>
Left
</property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"event_handler"
>
impl_virtual
</property>
<property
name=
"event_handler"
>
impl_virtual
</property>
<property
name=
"extra_style"
></property>
<property
name=
"extra_style"
></property>
<property
name=
"fg"
></property>
<property
name=
"fg"
></property>
<property
name=
"floatable"
>
1
</property>
<property
name=
"font"
></property>
<property
name=
"font"
></property>
<property
name=
"gripper"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"moveable"
>
1
</property>
<property
name=
"name"
>
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
</property>
<property
name=
"name"
>
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
</property>
<property
name=
"pane_border"
>
1
</property>
<property
name=
"pane_position"
></property>
<property
name=
"pane_size"
></property>
<property
name=
"pin_button"
>
1
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"resize"
>
Resizable
</property>
<property
name=
"show"
>
1
</property>
<property
name=
"size"
>
362,251
</property>
<property
name=
"size"
>
362,251
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Display Options
</property>
<property
name=
"title"
>
Display Options
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
@@ -771,10 +737,6 @@
...
@@ -771,10 +737,6 @@
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"validator_data_type"
></property>
<property
name=
"validator_style"
>
wxFILTER_NONE
</property>
<property
name=
"validator_type"
>
wxDefaultValidator
</property>
<property
name=
"validator_variable"
></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>
...
...
cvpcb/dialogs/dialog_display_options_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/radiobox.h>
#include <wx/radiobox.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
...
@@ -33,7 +34,7 @@
...
@@ -33,7 +34,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
/// Class DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
:
public
wxDialog
class
DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
...
gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Nov 17 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE
(
LAYERS_MAP_DIALOG_BASE
,
wxDialog
)
BEGIN_EVENT_TABLE
(
LAYERS_MAP_DIALOG_BASE
,
DIALOG_SHIM
)
EVT_COMBOBOX
(
ID_M_COMBOCOPPERLAYERSCOUNT
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnBrdLayersCountSelection
)
EVT_COMBOBOX
(
ID_M_COMBOCOPPERLAYERSCOUNT
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnBrdLayersCountSelection
)
EVT_BUTTON
(
ID_STORE_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnStoreSetup
)
EVT_BUTTON
(
ID_STORE_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnStoreSetup
)
EVT_BUTTON
(
ID_GET_PREVIOUS_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnGetSetup
)
EVT_BUTTON
(
ID_GET_PREVIOUS_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnGetSetup
)
...
@@ -18,7 +18,7 @@ BEGIN_EVENT_TABLE( LAYERS_MAP_DIALOG_BASE, wxDialog )
...
@@ -18,7 +18,7 @@ BEGIN_EVENT_TABLE( LAYERS_MAP_DIALOG_BASE, wxDialog )
EVT_BUTTON
(
wxID_OK
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnOkClick
)
EVT_BUTTON
(
wxID_OK
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnOkClick
)
END_EVENT_TABLE
()
END_EVENT_TABLE
()
LAYERS_MAP_DIALOG_BASE
::
LAYERS_MAP_DIALOG_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
LAYERS_MAP_DIALOG_BASE
::
LAYERS_MAP_DIALOG_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
@@ -38,11 +38,13 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
...
@@ -38,11 +38,13 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
m_flexLeftColumnBoxSizer
->
SetFlexibleDirection
(
wxBOTH
);
m_flexLeftColumnBoxSizer
->
SetFlexibleDirection
(
wxBOTH
);
m_flexLeftColumnBoxSizer
->
SetNonFlexibleGrowMode
(
wxFLEX_GROWMODE_SPECIFIED
);
m_flexLeftColumnBoxSizer
->
SetNonFlexibleGrowMode
(
wxFLEX_GROWMODE_SPECIFIED
);
sbSizerLayersTable
->
Add
(
m_flexLeftColumnBoxSizer
,
1
,
wxEXPAND
,
5
);
sbSizerLayersTable
->
Add
(
m_flexLeftColumnBoxSizer
,
1
,
wxEXPAND
,
5
);
m_staticlineSep
=
new
wxStaticLine
(
this
,
ID_M_STATICLINESEP
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_VERTICAL
);
m_staticlineSep
=
new
wxStaticLine
(
this
,
ID_M_STATICLINESEP
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_VERTICAL
);
sbSizerLayersTable
->
Add
(
m_staticlineSep
,
0
,
wxEXPAND
|
wxALL
,
5
);
sbSizerLayersTable
->
Add
(
m_staticlineSep
,
0
,
wxEXPAND
|
wxALL
,
5
);
sbUpperSizer
->
Add
(
sbSizerLayersTable
,
1
,
wxEXPAND
,
5
);
sbUpperSizer
->
Add
(
sbSizerLayersTable
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bRightSizer
;
wxBoxSizer
*
bRightSizer
;
...
@@ -66,6 +68,7 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
...
@@ -66,6 +68,7 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
m_comboCopperLayersCount
->
Append
(
_
(
"16 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"16 Layers"
)
);
bSizerLyrCnt
->
Add
(
m_comboCopperLayersCount
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
bSizerLyrCnt
->
Add
(
m_comboCopperLayersCount
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
bRightSizer
->
Add
(
bSizerLyrCnt
,
0
,
wxEXPAND
,
5
);
bRightSizer
->
Add
(
bSizerLyrCnt
,
0
,
wxEXPAND
,
5
);
...
@@ -83,10 +86,13 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
...
@@ -83,10 +86,13 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
m_buttonReset
=
new
wxButton
(
this
,
ID_RESET_CHOICE
,
_
(
"Reset"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonReset
=
new
wxButton
(
this
,
ID_RESET_CHOICE
,
_
(
"Reset"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerButtons
->
Add
(
m_buttonReset
,
0
,
wxALL
|
wxEXPAND
,
5
);
bSizerButtons
->
Add
(
m_buttonReset
,
0
,
wxALL
|
wxEXPAND
,
5
);
bRightSizer
->
Add
(
bSizerButtons
,
0
,
wxEXPAND
,
5
);
bRightSizer
->
Add
(
bSizerButtons
,
0
,
wxEXPAND
,
5
);
sbUpperSizer
->
Add
(
bRightSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
sbUpperSizer
->
Add
(
bRightSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bSizerMain
->
Add
(
sbUpperSizer
,
1
,
wxEXPAND
,
5
);
bSizerMain
->
Add
(
sbUpperSizer
,
1
,
wxEXPAND
,
5
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
...
@@ -98,8 +104,10 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
...
@@ -98,8 +104,10 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id,
m_sdbSizerButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerButtons
->
AddButton
(
m_sdbSizerButtonsCancel
);
m_sdbSizerButtons
->
AddButton
(
m_sdbSizerButtonsCancel
);
m_sdbSizerButtons
->
Realize
();
m_sdbSizerButtons
->
Realize
();
bSizerMain
->
Add
(
m_sdbSizerButtons
,
0
,
wxALIGN_RIGHT
|
wxALL
,
5
);
bSizerMain
->
Add
(
m_sdbSizerButtons
,
0
,
wxALIGN_RIGHT
|
wxALL
,
5
);
this
->
SetSizer
(
bSizerMain
);
this
->
SetSizer
(
bSizerMain
);
this
->
Layout
();
this
->
Layout
();
...
...
gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp
View file @
7c0af1bf
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
400,286
</property>
<property
name=
"size"
>
400,286
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Layer selection:
</property>
<property
name=
"title"
>
Layer selection:
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_extra_style"
></property>
...
...
gerbview/dialogs/dialog_layers_select_to_pcb_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Nov 17 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
#ifndef __
dialog_layers_select_to_pcb_base
__
#ifndef __
DIALOG_LAYERS_SELECT_TO_PCB_BASE_H
__
#define __
dialog_layers_select_to_pcb_base
__
#define __
DIALOG_LAYERS_SELECT_TO_PCB_BASE_H
__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/sizer.h>
#include <wx/sizer.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
#include <wx/statline.h>
#include <wx/statline.h>
#include <wx/string.h>
#include <wx/font.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/settings.h>
#include <wx/string.h>
#include <wx/statbox.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/combobox.h>
...
@@ -28,7 +30,7 @@
...
@@ -28,7 +30,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class LAYERS_MAP_DIALOG_BASE
/// Class LAYERS_MAP_DIALOG_BASE
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
LAYERS_MAP_DIALOG_BASE
:
public
wxDialog
class
LAYERS_MAP_DIALOG_BASE
:
public
DIALOG_SHIM
{
{
DECLARE_EVENT_TABLE
()
DECLARE_EVENT_TABLE
()
private
:
private
:
...
@@ -51,7 +53,7 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
...
@@ -51,7 +53,7 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
ID_M_COMBOCOPPERLAYERSCOUNT
,
ID_M_COMBOCOPPERLAYERSCOUNT
,
ID_STORE_CHOICE
,
ID_STORE_CHOICE
,
ID_GET_PREVIOUS_CHOICE
,
ID_GET_PREVIOUS_CHOICE
,
ID_RESET_CHOICE
,
ID_RESET_CHOICE
};
};
wxStaticBoxSizer
*
sbSizerLayersTable
;
wxStaticBoxSizer
*
sbSizerLayersTable
;
...
@@ -59,7 +61,6 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
...
@@ -59,7 +61,6 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
wxStaticLine
*
m_staticlineSep
;
wxStaticLine
*
m_staticlineSep
;
wxStaticText
*
m_staticTextCopperlayerCount
;
wxStaticText
*
m_staticTextCopperlayerCount
;
wxComboBox
*
m_comboCopperLayersCount
;
wxComboBox
*
m_comboCopperLayersCount
;
wxButton
*
m_buttonStore
;
wxButton
*
m_buttonStore
;
wxButton
*
m_buttonRetrieve
;
wxButton
*
m_buttonRetrieve
;
wxButton
*
m_buttonReset
;
wxButton
*
m_buttonReset
;
...
@@ -84,4 +85,4 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
...
@@ -84,4 +85,4 @@ class LAYERS_MAP_DIALOG_BASE : public wxDialog
};
};
#endif //__
dialog_layers_select_to_pcb_base
__
#endif //__
DIALOG_LAYERS_SELECT_TO_PCB_BASE_H
__
gerbview/dialogs/dialog_print_using_printer.cpp
View file @
7c0af1bf
This diff is collapsed.
Click to expand it.
gerbview/dialogs/dialog_print_using_printer_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Sep 8 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_PRINT_USING_PRINTER_base
::
DIALOG_PRINT_USING_PRINTER_base
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_PRINT_USING_PRINTER_base
::
DIALOG_PRINT_USING_PRINTER_base
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxSize
(
-
1
,
-
1
),
wxDefaultSize
);
this
->
SetSizeHints
(
wxSize
(
-
1
,
-
1
),
wxDefaultSize
);
...
@@ -24,14 +24,18 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
...
@@ -24,14 +24,18 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
m_leftLayersBoxSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Layers:"
)
),
wxVERTICAL
);
m_leftLayersBoxSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Layers:"
)
),
wxVERTICAL
);
bleftSizer
->
Add
(
m_leftLayersBoxSizer
,
1
,
wxALL
,
5
);
bleftSizer
->
Add
(
m_leftLayersBoxSizer
,
1
,
wxALL
,
5
);
m_rightLayersBoxSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Layers:"
)
),
wxVERTICAL
);
m_rightLayersBoxSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Layers:"
)
),
wxVERTICAL
);
bleftSizer
->
Add
(
m_rightLayersBoxSizer
,
1
,
wxALL
,
5
);
bleftSizer
->
Add
(
m_rightLayersBoxSizer
,
1
,
wxALL
,
5
);
sbLayersSizer
->
Add
(
bleftSizer
,
1
,
wxEXPAND
,
5
);
sbLayersSizer
->
Add
(
bleftSizer
,
1
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
sbLayersSizer
,
1
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
sbLayersSizer
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bmiddleLeftSizer
;
wxBoxSizer
*
bmiddleLeftSizer
;
...
@@ -61,6 +65,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
...
@@ -61,6 +65,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
bmiddleLeftSizer
->
Add
(
m_FineAdjustYscaleOpt
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
bmiddleLeftSizer
->
Add
(
m_FineAdjustYscaleOpt
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bmiddleLeftSizer
,
0
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bmiddleLeftSizer
,
0
,
wxEXPAND
,
5
);
wxBoxSizer
*
bmiddleRightSizer
;
wxBoxSizer
*
bmiddleRightSizer
;
...
@@ -72,6 +77,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
...
@@ -72,6 +77,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
m_Print_Mirror
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Mirror"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_Print_Mirror
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Mirror"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbOptionsSizer
->
Add
(
m_Print_Mirror
,
0
,
wxALL
,
5
);
sbOptionsSizer
->
Add
(
m_Print_Mirror
,
0
,
wxALL
,
5
);
bmiddleRightSizer
->
Add
(
sbOptionsSizer
,
0
,
wxEXPAND
|
wxALL
,
5
);
bmiddleRightSizer
->
Add
(
sbOptionsSizer
,
0
,
wxEXPAND
|
wxALL
,
5
);
wxString
m_ModeColorOptionChoices
[]
=
{
_
(
"Color"
),
_
(
"Black and white"
)
};
wxString
m_ModeColorOptionChoices
[]
=
{
_
(
"Color"
),
_
(
"Black and white"
)
};
...
@@ -82,6 +88,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
...
@@ -82,6 +88,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
bmiddleRightSizer
->
Add
(
m_ModeColorOption
,
0
,
wxALL
|
wxEXPAND
,
5
);
bmiddleRightSizer
->
Add
(
m_ModeColorOption
,
0
,
wxALL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bmiddleRightSizer
,
0
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bmiddleRightSizer
,
0
,
wxEXPAND
,
5
);
wxBoxSizer
*
b_buttonsSizer
;
wxBoxSizer
*
b_buttonsSizer
;
...
@@ -99,8 +106,10 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
...
@@ -99,8 +106,10 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
m_buttonQuit
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonQuit
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
b_buttonsSizer
->
Add
(
m_buttonQuit
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
b_buttonsSizer
->
Add
(
m_buttonQuit
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
b_buttonsSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bMainSizer
->
Add
(
b_buttonsSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
this
->
SetSizer
(
bMainSizer
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
gerbview/dialogs/dialog_print_using_printer_base.fbp
View file @
7c0af1bf
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
551,314
</property>
<property
name=
"size"
>
551,314
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Print
</property>
<property
name=
"title"
>
Print
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_extra_style"
></property>
...
...
gerbview/dialogs/dialog_print_using_printer_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Sep 8 2010
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
#ifndef __
dialog_print_using_printer_base
__
#ifndef __
DIALOG_PRINT_USING_PRINTER_BASE_H
__
#define __
dialog_print_using_printer_base
__
#define __
DIALOG_PRINT_USING_PRINTER_BASE_H
__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/sizer.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/statbox.h>
...
@@ -29,7 +31,7 @@
...
@@ -29,7 +31,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PRINT_USING_PRINTER_base
/// Class DIALOG_PRINT_USING_PRINTER_base
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_PRINT_USING_PRINTER_base
:
public
wxDialog
class
DIALOG_PRINT_USING_PRINTER_base
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
@@ -38,7 +40,7 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
...
@@ -38,7 +40,7 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
{
{
wxID_PRINT_MODE
=
1000
,
wxID_PRINT_MODE
=
1000
,
wxID_PRINT_OPTIONS
,
wxID_PRINT_OPTIONS
,
wxID_PRINT_ALL
,
wxID_PRINT_ALL
};
};
wxStaticBoxSizer
*
m_leftLayersBoxSizer
;
wxStaticBoxSizer
*
m_leftLayersBoxSizer
;
...
@@ -66,9 +68,9 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
...
@@ -66,9 +68,9 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
public
:
public
:
DIALOG_PRINT_USING_PRINTER_base
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Print"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
551
,
314
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_PRINT_USING_PRINTER_base
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Print"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
551
,
314
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_PRINT_USING_PRINTER_base
();
~
DIALOG_PRINT_USING_PRINTER_base
();
};
};
#endif //__
dialog_print_using_printer_base
__
#endif //__
DIALOG_PRINT_USING_PRINTER_BASE_H
__
gerbview/dialogs/dialog_show_page_borders_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Jun 30 2011
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
::
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
::
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
@@ -28,8 +28,10 @@ DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE::DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE( wxWindow
...
@@ -28,8 +28,10 @@ DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE::DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE( wxWindow
m_ShowPageLimits
->
SetSelection
(
0
);
m_ShowPageLimits
->
SetSelection
(
0
);
bRightSizer
->
Add
(
m_ShowPageLimits
,
0
,
wxALL
|
wxEXPAND
,
5
);
bRightSizer
->
Add
(
m_ShowPageLimits
,
0
,
wxALL
|
wxEXPAND
,
5
);
bUpperSizer
->
Add
(
bRightSizer
,
1
,
wxEXPAND
,
5
);
bUpperSizer
->
Add
(
bRightSizer
,
1
,
wxEXPAND
,
5
);
bDialogSizer
->
Add
(
bUpperSizer
,
1
,
wxEXPAND
,
5
);
bDialogSizer
->
Add
(
bUpperSizer
,
1
,
wxEXPAND
,
5
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
...
@@ -41,8 +43,10 @@ DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE::DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE( wxWindow
...
@@ -41,8 +43,10 @@ DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE::DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE( wxWindow
m_sdbSizer1Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizer1Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizer1
->
AddButton
(
m_sdbSizer1Cancel
);
m_sdbSizer1
->
AddButton
(
m_sdbSizer1Cancel
);
m_sdbSizer1
->
Realize
();
m_sdbSizer1
->
Realize
();
bDialogSizer
->
Add
(
m_sdbSizer1
,
0
,
wxEXPAND
|
wxALL
,
5
);
bDialogSizer
->
Add
(
m_sdbSizer1
,
0
,
wxEXPAND
|
wxALL
,
5
);
this
->
SetSizer
(
bDialogSizer
);
this
->
SetSizer
(
bDialogSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
gerbview/dialogs/dialog_show_page_borders_base.fbp
View file @
7c0af1bf
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
263,254
</property>
<property
name=
"size"
>
263,254
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Page Borders
</property>
<property
name=
"title"
>
Page Borders
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_extra_style"
></property>
...
...
gerbview/dialogs/dialog_show_page_borders_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Jun 30 2011
)
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/radiobox.h>
#include <wx/radiobox.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
/// Class DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
:
public
wxDialog
class
DIALOG_PAGE_SHOW_PAGE_BORDERS_BASE
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
...
gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
DIALOG_DISPLAY_OPTIONS_BASE
::
DIALOG_DISPLAY_OPTIONS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_DISPLAY_OPTIONS_BASE
::
DIALOG_DISPLAY_OPTIONS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
...
gerbview/dialogs/gerbview_dialog_display_options_frame_base.fbp
View file @
7c0af1bf
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
446,330
</property>
<property
name=
"size"
>
446,330
</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"
>
DIALOG_SHIM; dialog_shim.h
</property>
<property
name=
"title"
>
Gerbview Options
</property>
<property
name=
"title"
>
Gerbview Options
</property>
<property
name=
"tooltip"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_extra_style"
></property>
...
...
gerbview/dialogs/gerbview_dialog_display_options_frame_base.h
View file @
7c0af1bf
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17
2012)
// C++ code generated with wxFormBuilder (version
Apr 10
2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/radiobox.h>
#include <wx/radiobox.h>
#include <wx/gdicmn.h>
#include <wx/gdicmn.h>
...
@@ -30,7 +31,7 @@
...
@@ -30,7 +31,7 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_DISPLAY_OPTIONS_BASE
/// Class DIALOG_DISPLAY_OPTIONS_BASE
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_DISPLAY_OPTIONS_BASE
:
public
wxDialog
class
DIALOG_DISPLAY_OPTIONS_BASE
:
public
DIALOG_SHIM
{
{
private
:
private
:
...
...
pcbnew/dialogs/dialog_drc.cpp
View file @
7c0af1bf
...
@@ -55,13 +55,6 @@ DIALOG_DRC_CONTROL::DIALOG_DRC_CONTROL( DRC* aTester, PCB_EDIT_FRAME* parent ) :
...
@@ -55,13 +55,6 @@ DIALOG_DRC_CONTROL::DIALOG_DRC_CONTROL( DRC* aTester, PCB_EDIT_FRAME* parent ) :
}
}
bool
DIALOG_DRC_CONTROL
::
Show
(
bool
show
)
{
return
DIALOG_DRC_CONTROL_BASE
::
Show
(
show
);
}
void
DIALOG_DRC_CONTROL
::
InitValues
()
void
DIALOG_DRC_CONTROL
::
InitValues
()
{
{
// Connect events and objects
// Connect events and objects
...
...
pcbnew/dialogs/dialog_drc.h
View file @
7c0af1bf
...
@@ -60,14 +60,6 @@ public:
...
@@ -60,14 +60,6 @@ public:
DIALOG_DRC_CONTROL
(
DRC
*
aTester
,
PCB_EDIT_FRAME
*
parent
);
DIALOG_DRC_CONTROL
(
DRC
*
aTester
,
PCB_EDIT_FRAME
*
parent
);
~
DIALOG_DRC_CONTROL
(){};
~
DIALOG_DRC_CONTROL
(){};
/**
* Function Show
* overloads the wxDialog::Show() function so it can position the
* dialog at its remembered size and position.
*/
bool
Show
(
bool
show
);
private
:
private
:
/**
/**
* Function writeReport
* Function writeReport
...
...
pcbnew/dialogs/dialog_layers_setup.cpp
View file @
7c0af1bf
...
@@ -155,8 +155,6 @@ public:
...
@@ -155,8 +155,6 @@ public:
DIALOG_LAYERS_SETUP
(
PCB_EDIT_FRAME
*
parent
);
DIALOG_LAYERS_SETUP
(
PCB_EDIT_FRAME
*
parent
);
~
DIALOG_LAYERS_SETUP
(
)
{
};
~
DIALOG_LAYERS_SETUP
(
)
{
};
bool
Show
(
bool
show
);
// overload stock function
/**
/**
* Function Layout
* Function Layout
* overrides the standard Layout() function so that the column titles can
* overrides the standard Layout() function so that the column titles can
...
@@ -307,12 +305,6 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( PCB_EDIT_FRAME* parent ) :
...
@@ -307,12 +305,6 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( PCB_EDIT_FRAME* parent ) :
}
}
bool
DIALOG_LAYERS_SETUP
::
Show
(
bool
show
)
{
return
DIALOG_LAYERS_SETUP_BASE
::
Show
(
show
);
}
void
DIALOG_LAYERS_SETUP
::
showCopperChoice
(
int
copperCount
)
void
DIALOG_LAYERS_SETUP
::
showCopperChoice
(
int
copperCount
)
{
{
static
const
int
copperCounts
[]
=
{
2
,
4
,
6
,
8
,
10
,
12
,
14
,
16
};
static
const
int
copperCounts
[]
=
{
2
,
4
,
6
,
8
,
10
,
12
,
14
,
16
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment