From 3a0e90c45ed625e4c7bd10e6193062d2572a1014 Mon Sep 17 00:00:00 2001
From: mark-sil <83427558+mark-sil@users.noreply.github.com>
Date: Thu, 29 Jan 2026 11:14:01 -0500
Subject: [PATCH] LT-21551: Remove ShowSidebar
Cherry-pick from the PubSub branch to the main branch using
the following command:
git cherry-pick --no-commit 3a9e72bc
---
.../Language Explorer/Configuration/Main.xml | 6 -----
Src/Common/Framework/FwRegistrySettings.cs | 15 -------------
Src/XCore/xWindow.cs | 22 ++++---------------
.../ConfigurationSettings/Settings.xml | 6 -----
4 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/DistFiles/Language Explorer/Configuration/Main.xml b/DistFiles/Language Explorer/Configuration/Main.xml
index b906a001a2..8966aa6986 100644
--- a/DistFiles/Language Explorer/Configuration/Main.xml
+++ b/DistFiles/Language Explorer/Configuration/Main.xml
@@ -953,12 +953,6 @@ I (RandyR) brought them into this file, just to keep track of them for the time
-
-
diff --git a/Src/Common/Framework/FwRegistrySettings.cs b/Src/Common/Framework/FwRegistrySettings.cs
index 0c6ee073ae..28310bf9b4 100644
--- a/Src/Common/Framework/FwRegistrySettings.cs
+++ b/Src/Common/Framework/FwRegistrySettings.cs
@@ -21,7 +21,6 @@ public class FwRegistrySettings: IDisposable
{
#region Member Variables
private readonly RegistryBoolSetting m_firstTimeAppHasBeenRun;
- private readonly RegistryBoolSetting m_showSideBar;
private readonly RegistryBoolSetting m_showStatusBar;
private readonly RegistryBoolSetting m_openLastEditedProject;
private readonly RegistryIntSetting m_loadingProcessId;
@@ -78,7 +77,6 @@ public FwRegistrySettings(FwApp app)
if (app == null)
throw new ArgumentNullException("app");
m_firstTimeAppHasBeenRun = new RegistryBoolSetting(app.SettingsKey, "FirstTime", true);
- m_showSideBar = new RegistryBoolSetting(app.SettingsKey, "ShowSideBar", true);
m_showStatusBar = new RegistryBoolSetting(app.SettingsKey, "ShowStatusBar", true);
m_openLastEditedProject = new RegistryBoolSetting(app.SettingsKey, "OpenLastEditedProject", false);
m_loadingProcessId = new RegistryIntSetting(app.SettingsKey, "LoadingProcessId", 0);
@@ -119,7 +117,6 @@ protected virtual void Dispose(bool fDisposing)
{
// dispose managed and unmanaged objects
m_firstTimeAppHasBeenRun.Dispose();
- m_showSideBar.Dispose();
m_showStatusBar.Dispose();
m_openLastEditedProject.Dispose();
m_loadingProcessId.Dispose();
@@ -243,17 +240,6 @@ public string LatestProject
set { m_latestProject.Value = value; }
}
- /// ------------------------------------------------------------------------------------
- ///
- /// Gets or sets the value in the registry for the sidebar's visibility.
- ///
- /// ------------------------------------------------------------------------------------
- public bool ShowSideBarSetting
- {
- get {return m_showSideBar.Value;}
- set {m_showSideBar.Value = value;}
- }
-
/// ------------------------------------------------------------------------------------
///
/// Gets or sets the value in the registry for the statusbar's visibility.
@@ -318,7 +304,6 @@ public void AddErrorReportingInfo()
ErrorReporter.AddProperty("NumberOfAnnoyingCrashes", NumberOfAnnoyingCrashes.ToString());
ErrorReporter.AddProperty("RuntimeBeforeCrash", "0:00");
ErrorReporter.AddProperty("LoadingProcessId", LoadingProcessId.ToString());
- ErrorReporter.AddProperty("ShowSideBarSetting", ShowSideBarSetting.ToString());
ErrorReporter.AddProperty("ShowStatusBarSetting", ShowStatusBarSetting.ToString());
ErrorReporter.AddProperty("AutoOpenLastEditedProjectSetting", AutoOpenLastEditedProject.ToString());
ErrorReporter.AddProperty("DisableSplashScreenSetting", DisableSplashScreenSetting.ToString());
diff --git a/Src/XCore/xWindow.cs b/Src/XCore/xWindow.cs
index 9be1a47eaa..199f86d168 100644
--- a/Src/XCore/xWindow.cs
+++ b/Src/XCore/xWindow.cs
@@ -35,8 +35,6 @@ public class XWindow : Form, IxCoreColleague, IxWindow
/// when the record list and the main control are both showing.
///
/// Controlling properties are:
- /// This is always true.
- /// property name="ShowSidebar" bool="true" persist="true"
/// This is the splitter distance for the sidebar/secondary splitter pair of controls.
/// property name="SidebarWidthGlobal" intValue="140" persist="true"
/// This property is driven by the needs of the current main control, not the user.
@@ -767,7 +765,7 @@ protected virtual void LoadUIFromXmlDocument(XmlDocument configuration, string c
m_mainSplitContainer.FirstControl = m_sidebar;
m_mainSplitContainer.Tag = "SidebarWidthGlobal";
m_mainSplitContainer.Panel1MinSize = CollapsingSplitContainer.kCollapsedSize;
- m_mainSplitContainer.Panel1Collapsed = !m_propertyTable.GetBoolProperty("ShowSidebar", false); // Andy Black wants to collapse it for one of his XCore apps.
+ m_mainSplitContainer.Panel1Collapsed = false;
m_mainSplitContainer.Panel2Collapsed = false; // Never collapse the main content control, plus optional record list.
int sd = m_propertyTable.GetIntProperty("SidebarWidthGlobal", 140);
if (!m_mainSplitContainer.Panel1Collapsed)
@@ -1896,9 +1894,6 @@ public virtual void OnPropertyChanged(string name)
case "DocumentName":
UpdateCaptionBar();
break;
- // Obsolete case "ShowSidebarControls": // Fall through.
- case "ShowSidebar": // Fall through.
- // Obsolete case "ShowTreeBar": // Fall through.
case "ShowRecordList": // Replaces obsolete "ShowTreeBar".
UpdateSidebarAndRecordBarDisplay(true);
break;
@@ -1982,18 +1977,9 @@ private void UpdateSidebarAndRecordBarDisplay(bool suspendAndResumeLayout)
if (suspendAndResumeLayout)
this.SuspendLayout();
- if (m_propertyTable.GetBoolProperty("ShowSidebar", true))
- {
- // Show side bar.
- if (m_mainSplitContainer.Panel1Collapsed)
- m_mainSplitContainer.Panel1Collapsed = false;
- }
- else
- {
- // Get rid of side bar.
- if (!m_mainSplitContainer.Panel1Collapsed)
- m_mainSplitContainer.Panel1Collapsed = true;
- }
+ // Show side bar.
+ if (m_mainSplitContainer.Panel1Collapsed)
+ m_mainSplitContainer.Panel1Collapsed = false;
if (m_propertyTable.GetBoolProperty("ShowRecordList", false))
{
diff --git a/TestLangProj/ConfigurationSettings/Settings.xml b/TestLangProj/ConfigurationSettings/Settings.xml
index 47300d1832..e979abe711 100644
--- a/TestLangProj/ConfigurationSettings/Settings.xml
+++ b/TestLangProj/ConfigurationSettings/Settings.xml
@@ -18,12 +18,6 @@
true
false
-
- ShowSidebar
- true
- true
- false
-
SidebarWidthGlobal
140