From 35b0a8a00fde4d519c846b17cf48e5cf6addafe2 Mon Sep 17 00:00:00 2001
From: charras <Unknown>
Date: Sun, 21 Dec 2008 18:02:19 +0000
Subject: [PATCH] soved a bug in my last commit: incorrect number of layers
 shown in the dialog box

---
 TODO.txt                          | 67 -------------------------------
 pcbnew/dialog_general_options.cpp |  3 +-
 pcbnew/initpcb.cpp                |  2 +-
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 TODO.txt

diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index ad33c3c9b7..0000000000
--- a/TODO.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-
-Here are some source code maintenance tasks that need to be done, and maybe some
-folks will see these items and volunteer to do them.
-
-
-*** @todo: grep for @todo and finish off those tasks, scattered throughout the source.
-
-
-*** use BOARD_ITEM::MenuIcon() in the onrightclick.cpp
-
-
-*** Use DOXYGEN compatible comments on member functions.  As configured,
-Doxygen gives priority to comments in header files over *.cpp files.
-Review the generated docs and start to go through the source and make the
-generated doxygen docs readable and clear using the JavaDoc style comments,
-mostly in the header files.  The error and warning output of the doxygen
-compiler can help with this too.
-
-
-*** Translate comments that are in French to English so there can be a broader
-understanding by new developers.
-
-
-*** Add tooltip text to all non-obvious controls in every dialog window.
-Need to do this using DialogBlocks.
-
-
-2008-Dec-6 Assigned To:
-asked by: Dick Hollenbeck
-================================================================================
-1) Gerbview needs to work at least as well as gerv, that means adding named layers,
-   and a list control to sort the layer stack on the fly.  There seems to be a polygon bug
-   of some kind, don't know how long that's been in there.  (Dick)
-2) Add net class support to PCBNEW, so the round tripping to freerouter
-   is a dream (Dick)
-3) Document the specctra round tripper, and fix up the english translation
-   of help.  (Dick, native english speaker)
-4) Expose layer name editing in pcbnew (anyone), should dove tail with net
-   class editor from a UI perspective.
-
-
-2008-Feb-8 Assigned To: dick
-asked by: dick
-================================================================================
-specctra:
-Add net class support to pcbnew so that the export to specctra becomes richer.
-A netclass should hold a list of nets, track width, track spacing,
-via drill size and via copper diameter.
-
-
-2007-Nov-4 Assigned To: nobody
-asked by: jp Charras
-================================================================================
-Use the collector classes in eeschema.
-
-
-
-2008-Apr-29 Assigned To:
-asked by: Dick Hollenbeck
-================================================================================
-+pcbnew
-    When picking new board from the menu, when an existing board is already
-    in memory, the number of layers in the new board is not set to the default
-    but rather to the number of layers in the previously loaded board, and with
-    the default layer names, rather than the layer names of the previously
-    loaded board.   I think the number of layers should be reduced to the
-    default and the default layer names should be used.
diff --git a/pcbnew/dialog_general_options.cpp b/pcbnew/dialog_general_options.cpp
index ee999ad19c..31857e3565 100644
--- a/pcbnew/dialog_general_options.cpp
+++ b/pcbnew/dialog_general_options.cpp
@@ -46,13 +46,12 @@ void Dialog_GeneralOptions::OnInitDialog( wxInitDialogEvent& event )
 	m_LayerNumber->SetSelection(1);
 	for ( unsigned ii = 0; ii < sizeof(layer_count); ii++ )
 	{
-		if ( g_DesignSettings.m_CopperLayerCount == layer_count[ii] )
+		if ( g_DesignSettings.m_CopperLayerCount != layer_count[ii] )
 			continue;
 		m_LayerNumber->SetSelection(ii);
 		break;
 	}
 
-    m_LayerNumber->SetSelection( g_DesignSettings.m_CopperLayerCount );
     m_MaxShowLinks->SetValue( g_MaxLinksShowed );
 
     m_DrcOn->SetValue( Drc_On );
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index 93590adc03..425f1a35fc 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -161,9 +161,9 @@ bool WinEDA_BasePcbFrame::Clear_Pcb( bool query )
 
     g_DesignSettings.m_TrackWidthHistory[0] = g_DesignSettings.m_CurrentTrackWidth;
     g_DesignSettings.m_ViaSizeHistory[0]    = g_DesignSettings.m_CurrentViaSize;
+	g_DesignSettings.m_CopperLayerCount = 2;		// Default copper layers count set to 2: double layer board
 
     Zoom_Automatique( TRUE );
-    DrawPanel->Refresh( TRUE );
 
     return TRUE;
 }