Update text variables even when they're changed from other binary.

For instance, you might have PCBNew open but change the variable
value through EEschema > Schematic Setup.

Fixes https://gitlab.com/kicad/code/kicad/issues/4918

3d-viewer/3d_viewer/eda_3d_viewer.cpp

@@ -625,12 +625,12 @@ void EDA_3D_VIEWER::SynchroniseColoursWithBoard()
 }
 
 
-void EDA_3D_VIEWER::CommonSettingsChanged( bool aEnvVarsChanged )
+void EDA_3D_VIEWER::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
     wxLogTrace( m_logTrace, "EDA_3D_VIEWER::CommonSettingsChanged" );
 
     // Regen menu bars, etc
-    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     // There is no base class that handles toolbars for this frame
     ReCreateMainToolbar();

3d-viewer/3d_viewer/eda_3d_viewer.h

@@ -152,7 +152,7 @@ class EDA_3D_VIEWER : public EDA_3D_BOARD_HOLDER, public KIWAY_PLAYER
      * This would be private (and only called by the Kiway), but we need to do this manually
      * from the PCB frame because the 3D viewer isn't updated via the #KIWAY.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
 
     void SynchroniseColoursWithBoard();

common/eda_base_frame.cpp

@@ -325,9 +325,9 @@ void EDA_BASE_FRAME::ShowChangedLanguage()
 }
 
 
-void EDA_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void EDA_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    TOOLS_HOLDER::CommonSettingsChanged( aEnvVarsChanged );
+    TOOLS_HOLDER::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 
@@ -469,7 +469,7 @@ void EDA_BASE_FRAME::LoadWindowSettings( WINDOW_SETTINGS* aCfg )
     m_perspective = aCfg->perspective;
     m_mruPath = aCfg->mru_path;
 
-    TOOLS_HOLDER::CommonSettingsChanged( false );
+    TOOLS_HOLDER::CommonSettingsChanged( false, false );
 }
 
 
@@ -693,7 +693,7 @@ void EDA_BASE_FRAME::OnPreferences( wxCommandEvent& event )
         book->GetPage( i )->Layout();
 
     if( dlg.ShowModal() == wxID_OK )
-        dlg.Kiway().CommonSettingsChanged( false );
+        dlg.Kiway().CommonSettingsChanged( false, false );
 }
 
 

common/eda_draw_frame.cpp

@@ -205,9 +205,9 @@ void EDA_DRAW_FRAME::ToggleUserUnits()
 }
 
 
-void EDA_DRAW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void EDA_DRAW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     COMMON_SETTINGS*      settings = Pgm().GetCommonSettings();
     KIGFX::VIEW_CONTROLS* viewControls = GetCanvas()->GetViewControls();

common/kiway.cpp

@@ -473,7 +473,7 @@ void KIWAY::SetLanguage( int aLanguage )
     }
 }
 
-void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged )
+void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
 #if 1
     if( m_ctl & KFCTL_CPP_PROJECT_SUITE )
@@ -484,7 +484,7 @@ void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged )
         EDA_BASE_FRAME* top = static_cast<EDA_BASE_FRAME*>( m_top );
 
         if( top )
-            top->CommonSettingsChanged( aEnvVarsChanged );
+            top->CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
     }
 #endif
 
@@ -493,7 +493,7 @@ void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged )
         KIWAY_PLAYER* frame = GetPlayerFrame( ( FRAME_T )i );
 
         if( frame )
-            frame->CommonSettingsChanged( aEnvVarsChanged );
+            frame->CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
     }
 }
 

common/tool/common_control.cpp

@@ -98,7 +98,7 @@ int COMMON_CONTROL::ConfigurePaths( const TOOL_EVENT& aEvent )
         DIALOG_CONFIGURE_PATHS dlg( m_frame, nullptr );
 
         if( dlg.ShowModal() == wxID_OK )
-            m_frame->Kiway().CommonSettingsChanged( true );
+            m_frame->Kiway().CommonSettingsChanged( true, false );
     }
 
     return 0;

common/tool/tools_holder.cpp

@@ -114,7 +114,7 @@ bool TOOLS_HOLDER::IsCurrentTool( const TOOL_ACTION& aAction ) const
 }
 
 
-void TOOLS_HOLDER::CommonSettingsChanged( bool aEnvVarsChanged )
+void TOOLS_HOLDER::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
     if( GetToolManager() )
         GetToolManager()->GetActionManager()->UpdateHotKeys( false );

eeschema/dialogs/dialog_schematic_setup.h

@@ -30,6 +30,7 @@ class PANEL_SETUP_FORMATTING;
 class PANEL_SETUP_PINMAP;
 class PANEL_TEXT_VARIABLES;
 class PANEL_SETUP_NETCLASSES;
+class ERC_ITEM;
 
 
 class DIALOG_SCHEMATIC_SETUP : public PAGED_DIALOG

eeschema/eeschema_config.cpp

@@ -29,8 +29,10 @@
 #include <dialogs/panel_eeschema_template_fieldnames.h>
 #include <dialogs/panel_libedit_color_settings.h>
 #include <dialogs/panel_libedit_settings.h>
+#include <dialogs/dialog_schematic_setup.h>
 #include <eeschema_config.h>
 #include <fctsys.h>
+#include <kiway.h>
 #include <lib_edit_frame.h>
 #include <panel_gal_display_options.h>
 #include <panel_hotkeys_editor.h>
@@ -38,7 +40,6 @@
 #include <project/project_file.h>
 #include <project/net_settings.h>
 #include <sch_edit_frame.h>
-#include <sch_junction.h>
 #include <sch_painter.h>
 #include <schematic.h>
 #include <settings/app_settings.h>
@@ -47,8 +48,6 @@
 #include <widgets/paged_dialog.h>
 #include <wildcards_and_files_ext.h>
 #include <ws_data_model.h>
-#include <dialogs/dialog_schematic_setup.h>
-#include "erc.h"
 
 
 #define FieldNameTemplatesKey         wxT( "FieldNameTemplates" )
@@ -272,6 +271,7 @@ void SCH_EDIT_FRAME::ShowSchematicSetupDialog( const wxString& aInitialPage )
         Prj().GetProjectFile().NetSettings().ResolveNetClassAssignments();
         SaveProjectSettings();
 
+        Kiway().CommonSettingsChanged( false, true );
         GetCanvas()->Refresh();
     }
 }

eeschema/lib_view_frame.cpp

@@ -656,9 +656,9 @@ WINDOW_SETTINGS* LIB_VIEW_FRAME::GetWindowSettings( APP_SETTINGS_BASE* aCfg )
 }
 
 
-void LIB_VIEW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void LIB_VIEW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     if( aEnvVarsChanged )
         ReCreateListLib();

eeschema/lib_view_frame.h

@@ -104,7 +104,7 @@ public:
 
     WINDOW_SETTINGS* GetWindowSettings( APP_SETTINGS_BASE* aCfg ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     /**
      * Set a filter to display only libraries and/or components which match the filter.

eeschema/libedit/lib_edit_frame.cpp

@@ -731,9 +731,9 @@ void LIB_EDIT_FRAME::emptyScreen()
 }
 
 
-void LIB_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void LIB_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     GetCanvas()->GetGAL()->SetAxesColor( m_colorSettings->GetColor( LAYER_SCHEMATIC_GRID_AXES ) );
 

eeschema/libedit/lib_edit_frame.h

@@ -417,7 +417,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     void ShowChangedLanguage() override;
 

eeschema/sch_base_frame.cpp

@@ -418,9 +418,9 @@ COLOR4D SCH_BASE_FRAME::GetLayerColor( SCH_LAYER_ID aLayer )
 }
 
 
-void SCH_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void SCH_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
     m_colorSettings = Pgm().GetSettingsManager().GetColorSettings( cfg->m_ColorTheme );

eeschema/sch_base_frame.h

@@ -278,7 +278,7 @@ public:
      */
     virtual void OnModify() {}
 
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     /**
      * Helper to retrieve a layer color from the global color settings

eeschema/sch_edit_frame.cpp

@@ -1031,9 +1031,12 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_CLEANUP_FLAGS aCleanupFlags )
 }
 
 
-void SCH_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void SCH_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+
+    if( aTextVarsChanged )
+        GetCanvas()->GetView()->UpdateAllItems( KIGFX::ALL );
 
     RecreateToolbars();
     Layout();

eeschema/sch_edit_frame.h

@@ -937,7 +937,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     void ShowChangedLanguage() override;
 

gerbview/gerbview_frame.cpp

@@ -1170,9 +1170,9 @@ void GERBVIEW_FRAME::setupTools()
 }
 
 
-void GERBVIEW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void GERBVIEW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
 
     RecreateToolbars();
     Layout();

gerbview/gerbview_frame.h

@@ -562,7 +562,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     void SyncToolbars() override;
 

include/eda_base_frame.h

@@ -494,7 +494,7 @@ public:
      * Notification event that some of the common (suite-wide) settings have changed.
      * Update menus, toolbars, local variables, etc.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     const wxString& GetAboutTitle() const { return m_AboutTitle; }
 

include/eda_draw_frame.h

@@ -113,7 +113,7 @@ protected:
 
     void unitsChangeRefresh() override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     /**
      * Sets the common key-pair for exiting the application (Ctrl-Q) and ties it

include/kiway.h

@@ -380,7 +380,7 @@ public:
      * Calls CommonSettingsChanged() on all KIWAY_PLAYERs.
      * Used after changing suite-wide options such as panning, autosave interval, etc.
      */
-    VTBL_ENTRY void CommonSettingsChanged( bool aEnvVarsChanged );
+    VTBL_ENTRY void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged );
 
     KIWAY( PGM_BASE* aProgram, int aCtlBits, wxFrame* aTop = NULL );
 

include/pcb_base_frame.h

@@ -380,7 +380,7 @@ public:
 
     virtual MAGNETIC_SETTINGS* GetMagneticItemsSettings();
 
-    void CommonSettingsChanged( bool aEnvVarsChanged ) override;
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
     virtual void OnUpdateLayerAlpha( wxUpdateUIEvent& aEvent ) {}
 

include/tool/tools_holder.h

@@ -110,7 +110,7 @@ public:
      * Notification event that some of the common (suite-wide) settings have changed.
      * Update hotkeys, preferences, etc.
      */
-    virtual void CommonSettingsChanged( bool aEnvVarsChanged );
+    virtual void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged );
 
     /**
      * Canvas access.

kicad/kicad_manager_frame.cpp

@@ -516,7 +516,7 @@ void KICAD_MANAGER_FRAME::ShowChangedLanguage()
 }
 
 
-void KICAD_MANAGER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged )
+void KICAD_MANAGER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
 {
     int historySize = Pgm().GetCommonSettings()->m_System.file_history_size;
     GetFileHistory().SetMaxFiles( (unsigned) std::max( 0, historySize ) );