Update "Swap Layers:" and "Layer selection" dialog boxes again

change_log.txt

@@ -4,6 +4,26 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Nov-05 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
+================================================================================
++ eeschema
+  * The previously provided "Close" button within the "Netlist" dialog box has
+    now been replaced with a "Cancel" button, and this dialog can now (otherwise)
+    be cancelled by pressing the "Esc" key. General cleanup and beautification of
+    eeschema/netlist_control.cpp.
++ pcbnew
+  * The color of each text string provided within the "Swap Layers:" dialog box is
+    now set to blue for each string specifying that the associated layer is *not*
+    being swapped with any other layer, or to fushia for each string specifying that
+    the associated layer *is* being swapped with another layer. (This change was
+    made after being suggested by Dick Hollenbeck.)
++ gerbview
+  * The color of each text string provided within the "Layer selection" dialog box
+    is similarly now set to blue for each string specifying that the associated
+    Gerber layer is *not* being exported to any pcbnew layer, or to fushia for each
+    string specifying that the associated Gerber layer *is* being exported to a
+    pcbnew layer.
+
 
 2007-Nov-2 UPDATE   Dick Hollenbeck <dick@softplc.com>
 ================================================================================

gerbview/select_layers_to_pcb.cpp

@@ -176,8 +176,8 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent) :
             // pcbnew layer that the Gerber layer has been mapped to). Each of those items are
             // placed into the left hand column, middle column, and right hand column
             // (respectively) of the Flexgrid sizer, and the color of the second text string
-            // is set to blue (to indicate that the actual text changes depending upon which
-            // pcbnew layer has been selected by the child dialog box).
+            // is set to fushia or blue (to respectively indicate whether the Gerber layer has
+            // been mapped to a pcbnew layer or is not being exported at all).
             // (Experimentation has shown that if a text control is used to depict which
             // pcbnew layer that each Gerber layer is mapped to (instead of a static text
             // string), then those controls do not behave in a fully satisfactory manner in
@@ -224,7 +224,7 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent) :
         // Provide another text string to specify which pcbnew layer that this
         // Gerber layer is initially mapped to, and set the initial text to
         // specify the appropriate pcbnew layer, and set the foreground color
-        // of the text to blue (to indicate that the text can be changed).
+        // of the text to fushia (to indicate that the layer is being exported).
         item_ID = ID_TEXT_0 + ii;
 
         // When the first of these text strings is being added, determine what size is necessary to
@@ -252,7 +252,7 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent) :
             text = new wxStaticText( this, item_ID, msg, wxDefaultPosition, wxDefaultSize, 0 );
         }
         text->SetMinSize( goodSize );
-        text->SetForegroundColour( *wxBLUE );
+        text->SetForegroundColour( wxColour(255, 0, 128) );
         FlexColumnBoxSizer->Add(text, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
         layer_list[ii] = text;
@@ -278,7 +278,7 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent) :
     // using that type of sizer results in those buttons being automatically
     // located in positions appropriate for each (OS) version of KiCad.
     StdDialogButtonSizer = new wxStdDialogButtonSizer;
-    OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxALIGN_RIGHT|wxALL, 10);
+    OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
 
     Button = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     Button->SetForegroundColour( *wxRED );
@@ -323,9 +323,19 @@ void WinEDA_SwapLayerFrame::Sel_Layer(wxCommandEvent& event)
     {
         LayerLookUpTable[ButtonTable[ii]] = jj;
         if( jj == NB_LAYERS )
+        {
             layer_list[ii]->SetLabel( _( "Do not export" ) );
+            // Change the text color to blue (to highlight
+            // that this layer is *not* being exported)
+            layer_list[ii]->SetForegroundColour( *wxBLUE );
+        }
         else
+        {
             layer_list[ii]->SetLabel( ReturnPcbLayerName( jj ) );
+            // Change the text color to fushia (to highlight
+            // that this layer *is* being exported)
+            layer_list[ii]->SetForegroundColour( wxColour(255, 0, 128) );
+        }
     }
 }
 

pcbnew/swap_layers.cpp

@@ -125,9 +125,9 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame* parent ) :
             // layer is mapped to), and a second static text string (to depict which layer
             // that the layer has been mapped to). Each of those items are placed into
             // the left hand column, middle column, and right hand column (respectively)
-            // of the Flexgrid sizer, and the color of the second text string is set to blue
-            // (to indicate that the actual text changes depending upon which layer has been
-            // selected by the child dialog box).
+            // of the Flexgrid sizer, and the color of the second text string is set to
+            // fushia or blue (to respectively indicate whether the layer has been
+            // swapped to another layer or is not being swapped at all).
             // (Experimentation has shown that if a text control is used to depict which
             // layer that each layer is mapped to (instead of a static text string), then
             // those controls do not behave in a fully satisfactory manner in the Linux
@@ -165,7 +165,8 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame* parent ) :
         // Provide another text string to specify which layer that this layer is
         // mapped to, set the initial text to "No Change" (to indicate that this
         // layer is currently unmapped to any other layer), and set the foreground
-        // color of the text to blue (to indicate that the text can be changed).
+        // color of the text to blue (which also indicates that the layer is
+        // currently unmapped to any other layer).
         item_ID = ID_TEXT_0 + ii;
 
         // When the first of these text strings is being added, determine what size is necessary to
@@ -213,7 +214,7 @@ WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame* parent ) :
     // using that type of sizer results in those buttons being automatically
     // located in positions appropriate for each (OS) version of KiCad.
     StdDialogButtonSizer = new wxStdDialogButtonSizer;
-    OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxALIGN_RIGHT|wxALL, 10);
+    OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
 
     Button = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     Button->SetForegroundColour( *wxRED );
@@ -270,9 +271,19 @@ void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
     {
         New_Layer[ii] = jj;
         if( jj == NB_LAYERS )
+        {
             layer_list[ii]->SetLabel( _( "No Change" ) );
+            // Change the text color to blue (to highlight
+            // that this layer is *not* being swapped)
+            layer_list[ii]->SetForegroundColour( *wxBLUE );
+        }
         else
+        {
             layer_list[ii]->SetLabel( ReturnPcbLayerName( jj ) );
+            // Change the text color to fushia (to highlight
+            // that this layer *is* being swapped)
+            layer_list[ii]->SetForegroundColour( wxColour(255, 0, 128) );
+        }
     }
 }