From 9f1ecdd7156c048b44c6fa3bf9688fe77e2e5f03 Mon Sep 17 00:00:00 2001
From: Mikolaj Wielgus <wielgusmikolaj@gmail.com>
Date: Sat, 3 Jul 2021 16:24:44 +0200
Subject: [PATCH] Give Spice simulator "Save As" option Shift+Ctrl+S shortcut
 key

---
 eeschema/sim/sim_plot_frame_base.cpp |  2 +-
 eeschema/sim/sim_plot_frame_base.fbp |  8 ++++----
 eeschema/sim/sim_plot_frame_base.h   | 25 ++++++++++++-------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 9e18f4855e..cdda9d9eeb 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -30,7 +30,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_fileMenu->Append( m_saveWorkbook );
 
 	wxMenuItem* m_saveWorkbookAs;
-	m_saveWorkbookAs = new wxMenuItem( m_fileMenu, wxID_SAVE_AS, wxString( _("Save As...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_saveWorkbookAs = new wxMenuItem( m_fileMenu, wxID_SAVEAS, wxString( _("Save As...") ) + wxT('\t') + wxT("SHIFT+CTRL+S"), wxEmptyString, wxITEM_NORMAL );
 	m_fileMenu->Append( m_saveWorkbookAs );
 
 	m_fileMenu->AppendSeparator();
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 524fc21c83..09a79bfb28 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -76,7 +76,7 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style"></property>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -131,12 +131,12 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_SAVE_AS</property>
+                        <property name="id">wxID_SAVEAS</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Save As...</property>
                         <property name="name">m_saveWorkbookAs</property>
                         <property name="permission">none</property>
-                        <property name="shortcut"></property>
+                        <property name="shortcut">SHIFT+CTRL+S</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">menuSaveWorkbookAs</event>
                     </object>
@@ -402,7 +402,7 @@
                     </object>
                 </object>
             </object>
-            <object class="wxBoxSizer" expanded="1">
+            <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">m_sizerMain</property>
                 <property name="orient">wxVERTICAL</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 709acacc1c..9295e4b05a 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -33,19 +33,18 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-#define wxID_SAVE_AS 1000
-#define ID_SAVE_AS_IMAGE 1001
-#define ID_SAVE_AS_CSV 1002
-#define ID_MENU_RUN_SIM 1003
-#define ID_MENU_ADD_SIGNAL 1004
-#define ID_MENU_PROBE_SIGNALS 1005
-#define ID_MENU_TUNE_SIGNALS 1006
-#define ID_MENU_SHOW_NETLIST 1007
-#define ID_MENU_SET_SIMUL 1008
-#define ID_MENU_SHOW_GRID 1009
-#define ID_MENU_SHOW_LEGEND 1010
-#define ID_MENU_DOTTED 1011
-#define ID_MENU_WHITE_BG 1012
+#define ID_SAVE_AS_IMAGE 1000
+#define ID_SAVE_AS_CSV 1001
+#define ID_MENU_RUN_SIM 1002
+#define ID_MENU_ADD_SIGNAL 1003
+#define ID_MENU_PROBE_SIGNALS 1004
+#define ID_MENU_TUNE_SIGNALS 1005
+#define ID_MENU_SHOW_NETLIST 1006
+#define ID_MENU_SET_SIMUL 1007
+#define ID_MENU_SHOW_GRID 1008
+#define ID_MENU_SHOW_LEGEND 1009
+#define ID_MENU_DOTTED 1010
+#define ID_MENU_WHITE_BG 1011
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SIM_PLOT_FRAME_BASE