Skip to content

LT-21551: Remove ShowSidebar #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-sil merged 1 commit into from
Jan 29, 2026
+4 −45
Merged

LT-21551: Remove ShowSidebar #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions DistFiles/Language Explorer/Configuration/Main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,12 +953,6 @@ I (RandyR) brought them into this file, just to keep track of them for the time
<include path="Extensions/*/MainConfigurationExtension.xml" query="root/defaultProperties/*"/>

<property name="PreferredUILibrary" value="FlexUIAdapter.dll" persist="false"/>
<!--
We want to only show the sidebar by default.
If the user turns it off, than the preference will be saved in their settings file
Note: As of 8 February 2007 (and even well before then), we don't support the user hiding the sidebar completely.
-->
<property name="ShowSidebar" bool="true" persist="true" settingsGroup="global"/>
<!-- This is the splitter distance for the sidebar/secondary splitter pair of controls. -->
<property name="SidebarWidthGlobal" intValue="140" persist="true"/>
<!-- Label when collapsed to icon. -->
Expand Down
15 changes: 0 additions & 15 deletions Src/Common/Framework/FwRegistrySettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -243,17 +240,6 @@ public string LatestProject
set { m_latestProject.Value = value; }
}

/// ------------------------------------------------------------------------------------
/// <summary>
/// Gets or sets the value in the registry for the sidebar's visibility.
/// </summary>
/// ------------------------------------------------------------------------------------
public bool ShowSideBarSetting
{
get {return m_showSideBar.Value;}
set {m_showSideBar.Value = value;}
}

/// ------------------------------------------------------------------------------------
/// <summary>
/// Gets or sets the value in the registry for the statusbar's visibility.
Expand Down Expand Up @@ -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());
Expand Down
22 changes: 4 additions & 18 deletions Src/XCore/xWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand Down
6 changes: 0 additions & 6 deletions TestLangProj/ConfigurationSettings/Settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
<doPersist>true</doPersist>
<doDispose>false</doDispose>
</Property>
<Property>
<name>ShowSidebar</name>
<value xsi:type="xsd:boolean">true</value>
<doPersist>true</doPersist>
<doDispose>false</doDispose>
</Property>
<Property>
<name>SidebarWidthGlobal</name>
<value xsi:type="xsd:int">140</value>
Expand Down
Loading