From a074fa1bc8bff4b85a1dbe7de4e839a66db69bed Mon Sep 17 00:00:00 2001
From: Wolfgang Spraul <wolfgang@sharism.cc>
Date: Sun, 13 Mar 2011 07:26:18 +0000
Subject: [PATCH] merged Werner's patch, fixed eeschema background color bug

---
 kicad-patches/exclude-pcb-edge.patch | 23 -----------------------
 kicad-patches/scripted-new.patch     | 15 ++++++++++-----
 kicad-patches/series                 |  1 -
 3 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 kicad-patches/exclude-pcb-edge.patch

diff --git a/kicad-patches/exclude-pcb-edge.patch b/kicad-patches/exclude-pcb-edge.patch
deleted file mode 100644
index 1a81b93..0000000
--- a/kicad-patches/exclude-pcb-edge.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: kicad.bzr/pcbnew/pcbnew_scripted.cpp
-===================================================================
---- kicad.bzr.orig/pcbnew/pcbnew_scripted.cpp	2011-03-12 21:32:36.000000000 -0300
-+++ kicad.bzr/pcbnew/pcbnew_scripted.cpp	2011-03-12 21:50:13.000000000 -0300
-@@ -55,6 +55,7 @@
-      { wxCMD_LINE_OPTION, wxT("ps-pads-drill-opt"), wxT("ps-pads-drill-opt"), wxT("Postscript pads drill option [none|small|real] (default:small)"),
-           wxCMD_LINE_VAL_STRING },
-      { wxCMD_LINE_SWITCH, wxT("mirror"), wxT("mirror"), wxT("mirror plot (HPGL and Postscript only)") },
-+     { wxCMD_LINE_SWITCH, wxT("e"), wxT("exclude-pcb-edge"), wxT("exclude PCB edge (Gerber only)") },
-      { wxCMD_LINE_SWITCH, wxT("fill-all-zones"), wxT("fill-all-zones"), wxT("fill zones before plotting") },
-      { wxCMD_LINE_SWITCH, wxT("drc"), wxT("drc"), wxT("generates a design rule check report (.rpt)") },
-      { wxCMD_LINE_SWITCH, wxT("svg"), wxT("svg"), wxT("plots the board in SVG format") },
-@@ -223,6 +224,10 @@
-         if ( parser.Found( wxT("mirror") ) )
-             g_pcb_plot_options.PlotOrient = PLOT_MIROIR;
- 
-+        // --exclude-pcb-edge
-+        if ( parser.Found( wxT("exclude-pcb-edge") ) )
-+            g_pcb_plot_options.Exclude_Edges_Pcb = true;
-+
-         if ( parser.Found( wxT("fill-all-zones") ) )
-             frame->Fill_All_Zones( false /* verbose */ );
- 
diff --git a/kicad-patches/scripted-new.patch b/kicad-patches/scripted-new.patch
index 5ca7c15..c3789e4 100644
--- a/kicad-patches/scripted-new.patch
+++ b/kicad-patches/scripted-new.patch
@@ -1,7 +1,7 @@
 diff -ruN kicad.orig/eeschema/eeschema_scripted.cpp kicad/eeschema/eeschema_scripted.cpp
 --- kicad.orig/eeschema/eeschema_scripted.cpp	1970-01-01 00:00:00.000000000 +0000
-+++ kicad/eeschema/eeschema_scripted.cpp	2011-01-02 17:25:27.428837658 +0000
-@@ -0,0 +1,237 @@
++++ kicad/eeschema/eeschema_scripted.cpp	2011-03-13 02:25:17.039706999 +0000
+@@ -0,0 +1,236 @@
 +/////////////////////////////////////////////////////////////////////////////
 +// Name:        eeschema_scripted.cpp
 +// Copyright:   Werner Almesberger, Wolfgang Spraul
@@ -128,7 +128,6 @@ diff -ruN kicad.orig/eeschema/eeschema_scripted.cpp kicad/eeschema/eeschema_scri
 +    }
 +    wxSetWorkingDirectory( fn.GetPath() );
 +
-+    g_DrawBgColor = BLACK;
 +    SeedLayers();
 +    frame = new WinEDA_SchematicFrame( NULL, wxT( "EESchema" ),
 +                                       wxPoint( 0, 0 ), wxSize( 600, 400 ) );
@@ -259,8 +258,8 @@ diff -ruN kicad.orig/eeschema/eeschema_scripted.h kicad/eeschema/eeschema_script
 +extern EESCHEMA_SCRIPTED g_EESchemaScripted;
 diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
 --- kicad.orig/pcbnew/pcbnew_scripted.cpp	1970-01-01 00:00:00.000000000 +0000
-+++ kicad/pcbnew/pcbnew_scripted.cpp	2011-01-02 17:30:48.624837659 +0000
-@@ -0,0 +1,546 @@
++++ kicad/pcbnew/pcbnew_scripted.cpp	2011-03-13 06:55:03.227707000 +0000
+@@ -0,0 +1,552 @@
 +/////////////////////////////////////////////////////////////////////////////
 +// Name:        pcbnew_scripted.cpp
 +// Copyright:   Wolfgang Spraul
@@ -318,6 +317,7 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
 +     { wxCMD_LINE_OPTION, wxT("ps-pads-drill-opt"), wxT("ps-pads-drill-opt"), wxT("Postscript pads drill option [none|small|real] (default:small)"),
 +          wxCMD_LINE_VAL_STRING },
 +     { wxCMD_LINE_SWITCH, wxT("mirror"), wxT("mirror"), wxT("mirror plot (HPGL and Postscript only)") },
++     { wxCMD_LINE_SWITCH, wxT("e"), wxT("exclude-pcb-edge"), wxT("exclude PCB edge (Gerber only)") },
 +     { wxCMD_LINE_SWITCH, wxT("fill-all-zones"), wxT("fill-all-zones"), wxT("fill zones before plotting") },
 +     { wxCMD_LINE_SWITCH, wxT("drc"), wxT("drc"), wxT("generates a design rule check report (.rpt)") },
 +     { wxCMD_LINE_SWITCH, wxT("svg"), wxT("svg"), wxT("plots the board in SVG format") },
@@ -486,6 +486,11 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
 +        if ( parser.Found( wxT("mirror") ) )
 +            g_pcb_plot_options.PlotOrient = PLOT_MIROIR;
 +
++        // --exclude-pcb-edge
++        if ( parser.Found( wxT("exclude-pcb-edge") ) )
++            g_pcb_plot_options.Exclude_Edges_Pcb = true;
++
++        // --fill-all-zones
 +        if ( parser.Found( wxT("fill-all-zones") ) )
 +            frame->Fill_All_Zones( false /* verbose */ );
 +
diff --git a/kicad-patches/series b/kicad-patches/series
index a651fbc..6b1fcd0 100644
--- a/kicad-patches/series
+++ b/kicad-patches/series
@@ -16,4 +16,3 @@ scripted-new.patch
 scripted-common.patch
 scripted-eeschema.patch
 scripted-pcbnew.patch
-exclude-pcb-edge.patch