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
367bfb4e
Commit
367bfb4e
authored
Aug 15, 2012
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix problem with eeschema print dialog showing up on missing monitor
parent
6bb2fce7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
932 additions
and
932 deletions
+932
-932
CMakeLists.txt
CMakeLists.txt
+5
-5
base_screen.cpp
common/base_screen.cpp
+1
-1
dialog_print_using_printer.cpp
eeschema/dialogs/dialog_print_using_printer.cpp
+48
-11
dialog_print_using_printer_base.cpp
eeschema/dialogs/dialog_print_using_printer_base.cpp
+82
-82
dialog_print_using_printer_base.fbp
eeschema/dialogs/dialog_print_using_printer_base.fbp
+730
-768
dialog_print_using_printer_base.h
eeschema/dialogs/dialog_print_using_printer_base.h
+60
-59
legacy_plugin.cpp
pcbnew/legacy_plugin.cpp
+6
-6
No files found.
CMakeLists.txt
View file @
367bfb4e
...
@@ -83,11 +83,11 @@ else (KICAD_STABLE_VERSION )
...
@@ -83,11 +83,11 @@ else (KICAD_STABLE_VERSION )
endif
(
KICAD_STABLE_VERSION
)
endif
(
KICAD_STABLE_VERSION
)
# Nanometers must be enabled when USE_PCBNEW_SEXPR_FILE_FORMAT=ON.
# Nanometers must be enabled when USE_PCBNEW_SEXPR_FILE_FORMAT=ON.
#
if( USE_PCBNEW_SEXPR_FILE_FORMAT AND NOT USE_PCBNEW_NANOMETRES )
if
(
USE_PCBNEW_SEXPR_FILE_FORMAT AND NOT USE_PCBNEW_NANOMETRES
)
#
set( TMP "The Pcbnew s-expression file format requires nano-meter internal units to be " )
set
(
TMP
"The Pcbnew s-expression file format requires nano-meter internal units to be "
)
#
set( TMP "${TMP} enabled using -DUSE_PCBNEW_NANOMETRES=ON." )
set
(
TMP
"
${
TMP
}
enabled using -DUSE_PCBNEW_NANOMETRES=ON."
)
#
message( FATAL_ERROR ${TMP} )
message
(
FATAL_ERROR
${
TMP
}
)
#
endif( USE_PCBNEW_SEXPR_FILE_FORMAT AND NOT USE_PCBNEW_NANOMETRES )
endif
(
USE_PCBNEW_SEXPR_FILE_FORMAT AND NOT USE_PCBNEW_NANOMETRES
)
#================================================
#================================================
# Set flags for GCC.
# Set flags for GCC.
...
...
common/base_screen.cpp
View file @
367bfb4e
...
@@ -119,7 +119,7 @@ bool BASE_SCREEN::SetZoom( double iu_per_du )
...
@@ -119,7 +119,7 @@ bool BASE_SCREEN::SetZoom( double iu_per_du )
if
(
iu_per_du
==
m_Zoom
)
if
(
iu_per_du
==
m_Zoom
)
return
false
;
return
false
;
wxLogDebug
(
"Zoom:%.16g 1/Zoom:%.16g"
,
iu_per_du
,
1
/
iu_per_du
);
//
wxLogDebug( "Zoom:%.16g 1/Zoom:%.16g", iu_per_du, 1/iu_per_du );
if
(
iu_per_du
<
GetMinAllowedZoom
()
)
if
(
iu_per_du
<
GetMinAllowedZoom
()
)
return
false
;
return
false
;
...
...
eeschema/dialogs/dialog_print_using_printer.cpp
View file @
367bfb4e
...
@@ -62,23 +62,41 @@ public:
...
@@ -62,23 +62,41 @@ public:
return
(
DIALOG_PRINT_USING_PRINTER
*
)
wxWindow
::
GetParent
();
return
(
DIALOG_PRINT_USING_PRINTER
*
)
wxWindow
::
GetParent
();
}
}
void
OnCloseWindow
(
wxCloseEvent
&
event
)
bool
Show
(
bool
show
)
// overload
{
{
if
(
!
IsIconized
()
)
bool
ret
;
// Show or hide the window. If hiding, save current position and size.
// If showing, use previous position and size.
if
(
show
)
{
{
GetParent
()
->
GetParent
()
->
SetPreviewPosition
(
GetPosition
()
);
ret
=
wxPreviewFrame
::
Show
(
show
);
GetParent
()
->
GetParent
()
->
SetPreviewSize
(
GetSize
()
);
if
(
s_size
.
x
!=
0
&&
s_size
.
y
!=
0
)
SetSize
(
s_pos
.
x
,
s_pos
.
y
,
s_size
.
x
,
s_size
.
y
,
0
);
}
}
else
{
// Save the dialog's position & size before hiding
s_size
=
GetSize
();
s_pos
=
GetPosition
();
wxPreviewFrame
::
OnCloseWindow
(
event
);
ret
=
wxPreviewFrame
::
Show
(
show
);
}
return
ret
;
}
}
private
:
private
:
static
wxPoint
s_pos
;
static
wxSize
s_size
;
DECLARE_CLASS
(
SCH_PREVIEW_FRAME
)
DECLARE_CLASS
(
SCH_PREVIEW_FRAME
)
DECLARE_EVENT_TABLE
()
DECLARE_EVENT_TABLE
()
DECLARE_NO_COPY_CLASS
(
SCH_PREVIEW_FRAME
)
DECLARE_NO_COPY_CLASS
(
SCH_PREVIEW_FRAME
)
};
};
wxPoint
SCH_PREVIEW_FRAME
::
s_pos
;
wxSize
SCH_PREVIEW_FRAME
::
s_size
;
IMPLEMENT_CLASS
(
SCH_PREVIEW_FRAME
,
wxPreviewFrame
)
IMPLEMENT_CLASS
(
SCH_PREVIEW_FRAME
,
wxPreviewFrame
)
...
@@ -133,6 +151,15 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
...
@@ -133,6 +151,15 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
if
(
GetSizer
()
)
if
(
GetSizer
()
)
GetSizer
()
->
SetSizeHints
(
this
);
GetSizer
()
->
SetSizeHints
(
this
);
#if 0
Does not work on a two monitor system when the 2nd monitor is not attached,
and when the coords were saved to disk when the playground was bigger while the
2nd monitor was attached.
Simply rely on the policy in class DIALOG_SHIM, which centers the dialog
initially during a runtime session but gives user the ability to move it in
that session.
if( parent->GetPrintDialogPosition() == wxDefaultPosition &&
if( parent->GetPrintDialogPosition() == wxDefaultPosition &&
parent->GetPrintDialogSize() == wxDefaultSize )
parent->GetPrintDialogSize() == wxDefaultSize )
{
{
...
@@ -143,12 +170,18 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
...
@@ -143,12 +170,18 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
SetPosition( parent->GetPrintDialogPosition() );
SetPosition( parent->GetPrintDialogPosition() );
SetSize( parent->GetPrintDialogSize() );
SetSize( parent->GetPrintDialogSize() );
}
}
#else
// This dialog may get moved and resized in Show(), but in case this is
// the first time, center it for starters.
Center
();
#endif
SetFocus
();
m_buttonPrint
->
SetDefault
();
// on linux, this is inadequate to determine
// what ENTER does. Must also SetFocus().
m_buttonPrint
->
Set
Default
();
m_buttonPrint
->
Set
Focus
();
}
}
void
DIALOG_PRINT_USING_PRINTER
::
GetPrintOptions
()
void
DIALOG_PRINT_USING_PRINTER
::
GetPrintOptions
()
{
{
SCH_EDIT_FRAME
*
parent
=
GetParent
();
SCH_EDIT_FRAME
*
parent
=
GetParent
();
...
@@ -210,9 +243,13 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
...
@@ -210,9 +243,13 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
preview
->
SetZoom
(
100
);
preview
->
SetZoom
(
100
);
SCH_PREVIEW_FRAME
*
frame
=
new
SCH_PREVIEW_FRAME
(
preview
,
this
,
title
,
SCH_PREVIEW_FRAME
*
frame
=
new
SCH_PREVIEW_FRAME
(
preview
,
this
,
title
);
parent
->
GetPreviewPosition
(),
parent
->
GetPreviewSize
()
);
// on first invocation in this runtime session, set to 2/3 size of my parent,
// but will be changed in Show() if not first time as will position.
frame
->
SetSize
(
(
2
*
parent
->
GetSize
())
/
3
);
frame
->
Center
();
frame
->
Initialize
();
frame
->
Initialize
();
frame
->
Show
(
true
);
frame
->
Show
(
true
);
}
}
...
...
eeschema/dialogs/dialog_print_using_printer_base.cpp
View file @
367bfb4e
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 17 2012)
// C++ code generated with wxFormBuilder (version
Apr 11 2012)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
#include "dialog_print_using_printer_base.h"
#include "dialog_print_using_printer_base.h"
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
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
);
wxBoxSizer
*
bMainSizer
;
wxBoxSizer
*
bMainSizer
;
bMainSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
bMainSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
wxBoxSizer
*
bleftSizer
;
wxBoxSizer
*
bleftSizer
;
bleftSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
bleftSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticText1
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Print options:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText1
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Print options:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText1
->
Wrap
(
-
1
);
m_staticText1
->
Wrap
(
-
1
);
m_staticText1
->
SetFont
(
wxFont
(
wxNORMAL_FONT
->
GetPointSize
(),
70
,
90
,
92
,
false
,
wxEmptyString
)
);
m_staticText1
->
SetFont
(
wxFont
(
wxNORMAL_FONT
->
GetPointSize
(),
70
,
90
,
92
,
false
,
wxEmptyString
)
);
bleftSizer
->
Add
(
m_staticText1
,
0
,
wxTOP
|
wxRIGHT
,
5
);
bleftSizer
->
Add
(
m_staticText1
,
0
,
wxTOP
|
wxRIGHT
,
5
);
m_checkReference
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Print sheet &reference and title block"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_checkReference
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Print sheet &reference and title block"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_checkReference
->
SetValue
(
true
);
m_checkReference
->
SetValue
(
true
);
m_checkReference
->
SetToolTip
(
_
(
"Print (or not) the Frame references."
)
);
m_checkReference
->
SetToolTip
(
_
(
"Print (or not) the Frame references."
)
);
bleftSizer
->
Add
(
m_checkReference
,
0
,
wxALL
,
10
);
bleftSizer
->
Add
(
m_checkReference
,
0
,
wxALL
,
10
);
m_checkMonochrome
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Print in &black and white only"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_checkMonochrome
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Print in &black and white only"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_checkMonochrome
->
SetValue
(
true
);
m_checkMonochrome
->
SetValue
(
true
);
bleftSizer
->
Add
(
m_checkMonochrome
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
10
);
bleftSizer
->
Add
(
m_checkMonochrome
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
10
);
bMainSizer
->
Add
(
bleftSizer
,
1
,
wxBOTTOM
|
wxEXPAND
|
wxLEFT
|
wxTOP
,
12
);
bMainSizer
->
Add
(
bleftSizer
,
1
,
wxBOTTOM
|
wxEXPAND
|
wxLEFT
|
wxTOP
,
12
);
wxBoxSizer
*
bbuttonsSizer
;
wxBoxSizer
*
bbuttonsSizer
;
bbuttonsSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
bbuttonsSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_buttonPageSetup
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Page Setup"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonPageSetup
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Page Setup"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bbuttonsSizer
->
Add
(
m_buttonPageSetup
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
|
wxEXPAND
,
5
);
bbuttonsSizer
->
Add
(
m_buttonPageSetup
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
|
wxEXPAND
,
5
);
m_buttonPreview
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Preview"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonPreview
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Preview"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bbuttonsSizer
->
Add
(
m_buttonPreview
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bbuttonsSizer
->
Add
(
m_buttonPreview
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
m_buttonPrint
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Print"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonPrint
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Print"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bbuttonsSizer
->
Add
(
m_buttonPrint
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bbuttonsSizer
->
Add
(
m_buttonPrint
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
m_buttonQuit
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_buttonQuit
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bbuttonsSizer
->
Add
(
m_buttonQuit
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bbuttonsSizer
->
Add
(
m_buttonQuit
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bbuttonsSizer
,
0
,
wxALL
,
12
);
bMainSizer
->
Add
(
bbuttonsSizer
,
0
,
wxALL
,
12
);
this
->
SetSizer
(
bMainSizer
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
this
->
Layout
();
// Connect Events
// Connect Events
this
->
Connect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnCloseWindow
)
);
this
->
Connect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnCloseWindow
)
);
this
->
Connect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnInitDialog
)
);
this
->
Connect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnInitDialog
)
);
m_buttonPageSetup
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPageSetup
),
NULL
,
this
);
m_buttonPageSetup
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPageSetup
),
NULL
,
this
);
m_buttonPreview
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintPreview
),
NULL
,
this
);
m_buttonPreview
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintPreview
),
NULL
,
this
);
m_buttonPrint
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintButtonClick
),
NULL
,
this
);
m_buttonPrint
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintButtonClick
),
NULL
,
this
);
m_buttonQuit
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnButtonCancelClick
),
NULL
,
this
);
m_buttonQuit
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnButtonCancelClick
),
NULL
,
this
);
}
}
DIALOG_PRINT_USING_PRINTER_BASE
::~
DIALOG_PRINT_USING_PRINTER_BASE
()
DIALOG_PRINT_USING_PRINTER_BASE
::~
DIALOG_PRINT_USING_PRINTER_BASE
()
{
{
// Disconnect Events
// Disconnect Events
this
->
Disconnect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnCloseWindow
)
);
this
->
Disconnect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnCloseWindow
)
);
this
->
Disconnect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnInitDialog
)
);
this
->
Disconnect
(
wxEVT_INIT_DIALOG
,
wxInitDialogEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnInitDialog
)
);
m_buttonPageSetup
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPageSetup
),
NULL
,
this
);
m_buttonPageSetup
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPageSetup
),
NULL
,
this
);
m_buttonPreview
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintPreview
),
NULL
,
this
);
m_buttonPreview
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintPreview
),
NULL
,
this
);
m_buttonPrint
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintButtonClick
),
NULL
,
this
);
m_buttonPrint
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnPrintButtonClick
),
NULL
,
this
);
m_buttonQuit
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnButtonCancelClick
),
NULL
,
this
);
m_buttonQuit
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_PRINT_USING_PRINTER_BASE
::
OnButtonCancelClick
),
NULL
,
this
);
}
}
eeschema/dialogs/dialog_print_using_printer_base.fbp
View file @
367bfb4e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
eeschema/dialogs/dialog_print_using_printer_base.h
View file @
367bfb4e
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 17 2012)
// C++ code generated with wxFormBuilder (version Apr 11 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_H__
#ifndef __DIALOG_PRINT_USING_PRINTER_BASE_H__
#define __DIALOG_PRINT_USING_PRINTER_BASE_H__
#define __DIALOG_PRINT_USING_PRINTER_BASE_H__
#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 <wx/string.h>
#include "dialog_shim.h"
#include <wx/stattext.h>
#include <wx/string.h>
#include <wx/gdicmn.h>
#include <wx/stattext.h>
#include <wx/font.h>
#include <wx/gdicmn.h>
#include <wx/colour.h>
#include <wx/font.h>
#include <wx/settings.h>
#include <wx/colour.h>
#include <wx/checkbox.h>
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/checkbox.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/dialog.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// 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
:
protected
:
wxStaticText
*
m_staticText1
;
protected
:
wxCheckBox
*
m_checkReference
;
wxStaticText
*
m_staticText1
;
wxCheckBox
*
m_checkMonochrome
;
wxCheckBox
*
m_checkReference
;
wxButton
*
m_buttonPageSetup
;
wxCheckBox
*
m_checkMonochrome
;
wxButton
*
m_buttonPreview
;
wxButton
*
m_buttonPageSetup
;
wxButton
*
m_buttonPrint
;
wxButton
*
m_buttonPreview
;
wxButton
*
m_buttonQuit
;
wxButton
*
m_buttonPrint
;
wxButton
*
m_buttonQuit
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnCloseWindow
(
wxCloseEvent
&
event
)
{
event
.
Skip
();
}
// Virtual event handlers, overide them in your derived class
virtual
void
OnInitDialog
(
wxInitDialogEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnCloseWindow
(
wxCloseEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPageSetup
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnInitDialog
(
wxInitDialogEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPrintPreview
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPageSetup
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPrintButtonClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPrintPreview
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnButtonCancelClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnPrintButtonClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnButtonCancelClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
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
(
388
,
185
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_PRINT_USING_PRINTER_BASE
();
DIALOG_PRINT_USING_PRINTER_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Print"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
388
,
185
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_PRINT_USING_PRINTER_BASE
();
};
};
#endif //__DIALOG_PRINT_USING_PRINTER_BASE_H__
#endif //__DIALOG_PRINT_USING_PRINTER_BASE_H__
pcbnew/legacy_plugin.cpp
View file @
367bfb4e
...
@@ -177,7 +177,7 @@ static inline const char* ShowHorizJustify( EDA_TEXT_HJUSTIFY_T horizontal )
...
@@ -177,7 +177,7 @@ static inline const char* ShowHorizJustify( EDA_TEXT_HJUSTIFY_T horizontal )
return
rs
;
return
rs
;
}
}
static
inline
EDA_TEXT_HJUSTIFY_T
H
orizJustify
(
const
char
*
horizontal
)
static
EDA_TEXT_HJUSTIFY_T
h
orizJustify
(
const
char
*
horizontal
)
{
{
if
(
!
strcmp
(
"L"
,
horizontal
)
)
if
(
!
strcmp
(
"L"
,
horizontal
)
)
return
GR_TEXT_HJUSTIFY_LEFT
;
return
GR_TEXT_HJUSTIFY_LEFT
;
...
@@ -186,7 +186,7 @@ static inline EDA_TEXT_HJUSTIFY_T HorizJustify( const char* horizontal )
...
@@ -186,7 +186,7 @@ static inline EDA_TEXT_HJUSTIFY_T HorizJustify( const char* horizontal )
return
GR_TEXT_HJUSTIFY_CENTER
;
return
GR_TEXT_HJUSTIFY_CENTER
;
}
}
static
inline
EDA_TEXT_VJUSTIFY_T
V
ertJustify
(
const
char
*
vertical
)
static
EDA_TEXT_VJUSTIFY_T
v
ertJustify
(
const
char
*
vertical
)
{
{
if
(
!
strcmp
(
"T"
,
vertical
)
)
if
(
!
strcmp
(
"T"
,
vertical
)
)
return
GR_TEXT_VJUSTIFY_TOP
;
return
GR_TEXT_VJUSTIFY_TOP
;
...
@@ -1582,10 +1582,10 @@ void LEGACY_PLUGIN::loadMODULE_TEXT( TEXTE_MODULE* aText )
...
@@ -1582,10 +1582,10 @@ void LEGACY_PLUGIN::loadMODULE_TEXT( TEXTE_MODULE* aText )
aText
->
SetItalic
(
italic
&&
*
italic
==
'I'
);
aText
->
SetItalic
(
italic
&&
*
italic
==
'I'
);
if
(
hjust
)
if
(
hjust
)
aText
->
SetHorizJustify
(
H
orizJustify
(
hjust
)
);
aText
->
SetHorizJustify
(
h
orizJustify
(
hjust
)
);
if
(
vjust
)
if
(
vjust
)
aText
->
SetVertJustify
(
V
ertJustify
(
vjust
)
);
aText
->
SetVertJustify
(
v
ertJustify
(
vjust
)
);
if
(
layer
<
0
)
if
(
layer
<
0
)
layer
=
0
;
layer
=
0
;
...
@@ -1908,7 +1908,7 @@ void LEGACY_PLUGIN::loadPCB_TEXT()
...
@@ -1908,7 +1908,7 @@ void LEGACY_PLUGIN::loadPCB_TEXT()
pcbtxt
->
SetItalic
(
!
strcmp
(
style
,
"Italic"
)
);
pcbtxt
->
SetItalic
(
!
strcmp
(
style
,
"Italic"
)
);
if
(
hJustify
)
if
(
hJustify
)
pcbtxt
->
SetHorizJustify
(
H
orizJustify
(
hJustify
)
);
pcbtxt
->
SetHorizJustify
(
h
orizJustify
(
hJustify
)
);
else
else
{
{
// boom, somebody changed a constructor, I was relying on this:
// boom, somebody changed a constructor, I was relying on this:
...
@@ -1916,7 +1916,7 @@ void LEGACY_PLUGIN::loadPCB_TEXT()
...
@@ -1916,7 +1916,7 @@ void LEGACY_PLUGIN::loadPCB_TEXT()
}
}
if
(
vJustify
)
if
(
vJustify
)
pcbtxt
->
SetVertJustify
(
V
ertJustify
(
vJustify
)
);
pcbtxt
->
SetVertJustify
(
v
ertJustify
(
vJustify
)
);
if
(
layer
<
FIRST_COPPER_LAYER
)
if
(
layer
<
FIRST_COPPER_LAYER
)
layer
=
FIRST_COPPER_LAYER
;
layer
=
FIRST_COPPER_LAYER
;
...
...
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