From 66eafc56bba8349d83a4b014916a4e277e6c88fe Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 23 Dec 2022 12:39:57 +0000
Subject: [PATCH] Don't suggest we're going to cancel already-added signals.

---
 eeschema/dialogs/dialog_signal_list.cpp      | 4 +++-
 eeschema/dialogs/dialog_signal_list.h        | 1 +
 eeschema/dialogs/dialog_signal_list_base.cpp | 2 +-
 eeschema/dialogs/dialog_signal_list_base.fbp | 7 +++++--
 eeschema/dialogs/dialog_signal_list_base.h   | 7 ++++---
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index da2893c378..fee4d6405f 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -109,7 +109,9 @@ bool DIALOG_SIGNAL_LIST::addSignalToPlotFrame( const wxString& aPlotName )
             return false;
     }
     else
+    {
         return false;
+    }
 
     return true;
 }
@@ -117,7 +119,7 @@ bool DIALOG_SIGNAL_LIST::addSignalToPlotFrame( const wxString& aPlotName )
 
 void DIALOG_SIGNAL_LIST::addSelectionToPlotFrame()
 {
-    for( unsigned int i = 0; i < m_signals->GetCount(); ++i )
+    for( int i = 0; i < (int) m_signals->GetCount(); ++i )
     {
         if( m_signals->IsSelected( i ) )
         {
diff --git a/eeschema/dialogs/dialog_signal_list.h b/eeschema/dialogs/dialog_signal_list.h
index 4f21b482ee..a6ad3397c6 100644
--- a/eeschema/dialogs/dialog_signal_list.h
+++ b/eeschema/dialogs/dialog_signal_list.h
@@ -42,6 +42,7 @@ private:
     void onSignalAdd( wxCommandEvent& event ) override
     {
         addSelectionToPlotFrame();
+        m_sdbSizerCancel->SetLabel( _( "Done" ) );
     }
 
     void addSelectionToPlotFrame();
diff --git a/eeschema/dialogs/dialog_signal_list_base.cpp b/eeschema/dialogs/dialog_signal_list_base.cpp
index 7626a2be95..10ab43a4d7 100644
--- a/eeschema/dialogs/dialog_signal_list_base.cpp
+++ b/eeschema/dialogs/dialog_signal_list_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_signal_list_base.fbp b/eeschema/dialogs/dialog_signal_list_base.fbp
index 5eb2f5fd00..43ebbfcf2d 100644
--- a/eeschema/dialogs/dialog_signal_list_base.fbp
+++ b/eeschema/dialogs/dialog_signal_list_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="15" />
+    <FileVersion major="1" minor="16" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -14,6 +14,7 @@
         <property name="file">dialog_signal_list_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">DIALOG_SIGNAL_LIST_BASE</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -48,8 +50,9 @@
             <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
-            <property name="title"></property>
+            <property name="title">Add Signals</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
diff --git a/eeschema/dialogs/dialog_signal_list_base.h b/eeschema/dialogs/dialog_signal_list_base.h
index 75d62d15e9..0a5bbdc36c 100644
--- a/eeschema/dialogs/dialog_signal_list_base.h
+++ b/eeschema/dialogs/dialog_signal_list_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -41,13 +41,14 @@ class DIALOG_SIGNAL_LIST_BASE : public DIALOG_SHIM
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerCancel;
 
-		// Virtual event handlers, overide them in your derived class
+		// Virtual event handlers, override them in your derived class
 		virtual void onSignalAdd( wxCommandEvent& event ) { event.Skip(); }
 
 
 	public:
 
-		DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Add Signals"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
 		~DIALOG_SIGNAL_LIST_BASE();
 
 };