Skip to content

Commit d25b7ae

Browse files
LiorBanaiLiorBanai
committed
Reset all settings does not clear the layout settings fix #1558 
1 parent c05e317 commit d25b7ae

12 files changed

+117
-45
lines changed

‎Analogy/Analogy.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<PackageReference Include="Analogy.LogViewer.Template" Version="3.5.0" />
5353
<PackageReference Include="Analogy.CommonUtilities" Version="3.5.0" />
5454
<PackageReference Include="Analogy.LogViewer.XMLParser" Version="3.5.0" />
55-
<PackageReference Include="Analogy.LogViewer.Example" Version="3.5.0" />
55+
<PackageReference Include="Analogy.LogViewer.Example" Version="3.6.1" />
5656
<PackageReference Include="Analogy.LogViewer.IISLogsProvider" Version="3.5.0" />
5757
<PackageReference Include="Analogy.LogViewer.Log4Net" Version="3.5.0" />
5858
<PackageReference Include="Analogy.LogViewer.NLogProvider" Version="3.5.0" />

‎Analogy/App.config

+4-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,10 @@
303303
<setting name="ShowAdvancedSettingsRawSQLPopup" serializeAs="String">
304304
<value>True</value>
305305
</setting>
306-
<setting name="CombineProviders" serializeAs="String">
306+
<setting name="CombineOnlineProviders" serializeAs="String">
307+
<value>False</value>
308+
</setting>
309+
<setting name="CombineOfflineProviders" serializeAs="String">
307310
<value>True</value>
308311
</setting>
309312
</Analogy.Properties.Settings>

‎Analogy/ApplicationSettings/ApplicationUISettingsUC.Designer.cs

+38-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy/ApplicationSettings/ApplicationUISettingsUC.cs

+9-3
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,15 @@ private void SetupEventsHandlers()
9393
};
9494
fontEditControl.EditValueChanged += (s, e) => SetFonts();
9595
fontEditMenus.EditValueChanged += (s, e) => SetFonts();
96-
tsCombineProviders.Toggled += (s, e) =>
96+
tsCombineOfflineProviders.Toggled += (s, e) =>
9797
{
98-
Settings.CombineProviders = tsCombineProviders.IsOn;
98+
Settings.CombineOfflineProviders = tsCombineOfflineProviders.IsOn;
9999
};
100+
tsCombineOnlineProviders.Toggled += (s, e) =>
101+
{
102+
Settings.CombineOnlineProviders = tsCombineOnlineProviders.IsOn;
103+
};
104+
100105
}
101106

102107

@@ -177,7 +182,8 @@ private void LoadSettings()
177182
fontEditControl.EditValue = WindowsFormsSettings.DefaultFont.Name;
178183
fontEditMenus.Font = WindowsFormsSettings.DefaultMenuFont;
179184
fontEditMenus.EditValue = WindowsFormsSettings.DefaultMenuFont.Name;
180-
tsCombineProviders.IsOn = Settings.CombineProviders;
185+
tsCombineOfflineProviders.IsOn = Settings.CombineOfflineProviders;
186+
tsCombineOnlineProviders.IsOn = Settings.CombineOnlineProviders;
181187
}
182188

183189
private void SetFonts()

‎Analogy/CommonChangeLog.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
1111
{
1212
return new List<AnalogyChangeLog>
1313
{
14+
new AnalogyChangeLog("V4.10.2 - Reset all settings does not clear the layout settings #1558",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 10)),
1415
new AnalogyChangeLog("V4.10.2 - [Setting Menu Items] add missing items #1561",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2022, 12, 10)),
1516
new AnalogyChangeLog("V4.10.1 - Non Real time data provider are missing the call of InitializeDataProvider #1556",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 11, 12)),
1617
new AnalogyChangeLog("V4.10.0 - reverse connect/disconnect icons #1552",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2022, 11, 11)),

‎Analogy/DataTypes/UserSettings.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public class UserSettings
9898
public bool WarnNET5 { get; set; }
9999
public bool WarnNET3 { get; set; }
100100
public bool ShowAdvancedSettingsRawSQLPopup { get; set; }
101-
public bool CombineProviders { get; set; }
101+
public bool CombineOfflineProviders { get; set; }
102+
public bool CombineOnlineProviders { get; set; }
102103

103104
}
104105
}

‎Analogy/Forms/ApplicationSettingsForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private void DataProviderExternal_Click(object sender, EventArgs e)
184184

185185
private void bbtnReset_ItemClick(object sender, ItemClickEventArgs e)
186186
{
187-
var result = XtraMessageBox.Show("Are you sure you want to reset all settings to their defaults", @"Reset settings", MessageBoxButtons.YesNo,
187+
var result = XtraMessageBox.Show("Are you sure you want to reset all settings to their defaults (also columns' layout)?", @"Reset settings", MessageBoxButtons.YesNo,
188188
MessageBoxIcon.Information);
189189
if (result == DialogResult.Yes)
190190
{

‎Analogy/Forms/MainForm.cs

+18-6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
using Analogy.CommonControls.Managers;
3333
using Analogy.CommonControls.Plotting;
3434
using DevExpress.LookAndFeel;
35+
using DevExpress.XtraCharts;
3536

3637
namespace Analogy.Forms
3738
{
@@ -900,7 +901,14 @@ private void CreateOnlineAndOfflineProviders(IAnalogyFactory factory, IAnalogyDa
900901
RibbonPageGroup ribbonPageGroup = new RibbonPageGroup($"Data Provider: {dataSourceFactory.Title}") { AllowTextClipping = false };
901902
ribbonPage.Groups.Add(ribbonPageGroup);
902903

903-
AddFlatRealTimeDataSource(factory, ribbonPage, dataSourceFactory, ribbonPageGroup);
904+
if (settings.CombineOnlineProviders)
905+
{
906+
AddCombinedRealTimeDataSources(ribbonPage, dataSourceFactory);
907+
}
908+
else
909+
{
910+
AddFlatRealTimeDataSources(ribbonPage, dataSourceFactory);
911+
}
904912
AddSingleDataSources(factory, ribbonPage, dataSourceFactory, ribbonPageGroup);
905913
AddOfflineDataSource(factory, ribbonPage, dataSourceFactory, ribbonPageGroup);
906914
}
@@ -1053,7 +1061,7 @@ async void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
10531061
}
10541062
}
10551063

1056-
private void AddFlatRealTimeDataSource(IAnalogyFactory primaryFactory, RibbonPage ribbonPage, IAnalogyDataProvidersFactory dataSourceFactory, RibbonPageGroup group)
1064+
private void AddFlatRealTimeDataSources(RibbonPage ribbonPage, IAnalogyDataProvidersFactory dataSourceFactory)
10571065
{
10581066
var realTimes = dataSourceFactory.DataProviders.Where(f => f is IAnalogyRealTimeDataProvider)
10591067
.Cast<IAnalogyRealTimeDataProvider>().ToList();
@@ -1199,16 +1207,20 @@ async Task<bool> AutoOpenRealTime()
11991207
}
12001208
}
12011209

1202-
private void AddRealTimeDataSource(RibbonPage ribbonPage, IAnalogyDataProvidersFactory dataSourceFactory,
1203-
RibbonPageGroup group)
1210+
private void AddCombinedRealTimeDataSources(RibbonPage ribbonPage, IAnalogyDataProvidersFactory dataSourceFactory)
12041211
{
12051212
var realTimes = dataSourceFactory.DataProviders.Where(f => f is IAnalogyRealTimeDataProvider)
12061213
.Cast<IAnalogyRealTimeDataProvider>().ToList();
12071214
if (realTimes.Count == 0)
12081215
{
12091216
return;
12101217
}
1211-
1218+
string title = !string.IsNullOrEmpty(dataSourceFactory.Title)
1219+
? dataSourceFactory.Title
1220+
: "real time Provider";
1221+
RibbonPageGroup group = new RibbonPageGroup($"Real Time Providers: {title}");
1222+
group.AllowTextClipping = false;
1223+
ribbonPage.Groups.Insert(0, group);
12121224
if (realTimes.Count == 1)
12131225
{
12141226
AddSingleRealTimeDataSource(ribbonPage, realTimes.First(), dataSourceFactory.Title, group);
@@ -1574,7 +1586,7 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
15741586
if (offlineProviders.Any(i => !string.IsNullOrEmpty(i.FileOpenDialogFilters)))
15751587
{
15761588

1577-
if (settings.CombineProviders)
1589+
if (settings.CombineOfflineProviders)
15781590
{
15791591
//add Open files entry
15801592
BarSubItem openFiles = new BarSubItem();

‎Analogy/Interfaces/IAnalogyUserSettings.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public interface IAnalogyUserSettings: IUserSettingsManager
6666
/// </summary>
6767
int FilePoolingDelayInterval { get; set; }
6868
bool EnableFilePoolingDelay { get; set; }
69-
bool CombineProviders { get; set; }
69+
bool CombineOfflineProviders { get; set; }
70+
bool CombineOnlineProviders { get; set; }
7071
void IncreaseNumberOfLaunches();
7172
FactorySettings GetFactorySetting(Guid factoryID);
7273
FactorySettings GetOrAddFactorySetting(IAnalogyFactory factory);

‎Analogy/Managers/UserSettingsManager.cs

+22-6
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ public bool InlineJsonViewer
185185
public bool WarnNET5 { get; set; }
186186
public bool WarnNET3 { get; set; }
187187
public bool ShowAdvancedSettingsRawSQLPopup { get; set; }
188-
public bool CombineProviders { get; set; }
188+
public bool CombineOfflineProviders { get; set; }
189+
public bool CombineOnlineProviders { get; set; }
189190
public UserSettingsManager()
190191
{
191192
if (File.Exists(LocalSettingFileName))
@@ -335,7 +336,8 @@ private void LoadPerUserSettings()
335336
WarnNET3 = Settings.Default.WarnNET3;
336337
WarnNET5 = Settings.Default.WarnNET5;
337338
ShowAdvancedSettingsRawSQLPopup = Settings.Default.ShowAdvancedSettingsRawSQLPopup;
338-
CombineProviders = Settings.Default.CombineProviders;
339+
CombineOfflineProviders = Settings.Default.CombineOfflineProviders;
340+
CombineOnlineProviders = Settings.Default.CombineOnlineProviders;
339341
}
340342

341343
private void ApplyLocalSettings(UserSettings settings)
@@ -424,7 +426,8 @@ private void ApplyLocalSettings(UserSettings settings)
424426
WarnNET3 = settings.WarnNET3;
425427
WarnNET5 = settings.WarnNET5;
426428
ShowAdvancedSettingsRawSQLPopup = settings.ShowAdvancedSettingsRawSQLPopup;
427-
CombineProviders = settings.CombineProviders;
429+
CombineOfflineProviders = settings.CombineOfflineProviders;
430+
CombineOnlineProviders = settings.CombineOnlineProviders;
428431
}
429432

430433
private UserSettings CreateUserSettings()
@@ -513,7 +516,8 @@ private UserSettings CreateUserSettings()
513516
WarnNET3 = WarnNET3,
514517
WarnNET5 = WarnNET5,
515518
ShowAdvancedSettingsRawSQLPopup = ShowAdvancedSettingsRawSQLPopup,
516-
CombineProviders = CombineProviders
519+
CombineOfflineProviders = CombineOfflineProviders,
520+
CombineOnlineProviders = CombineOnlineProviders
517521
};
518522
return userSettings;
519523
}
@@ -682,9 +686,10 @@ private void SavePerUserSettings()
682686
Settings.Default.WarnNET3 = WarnNET3;
683687
Settings.Default.WarnNET5 = WarnNET5;
684688
Settings.Default.ShowAdvancedSettingsRawSQLPopup = ShowAdvancedSettingsRawSQLPopup;
685-
Settings.Default.CombineProviders = CombineProviders;
689+
Settings.Default.CombineOnlineProviders = CombineOfflineProviders;
690+
Settings.Default.CombineOnlineProviders = CombineOnlineProviders;
686691

687-
Settings.Default.Save();
692+
Settings.Default.Save();
688693
}
689694

690695
public void AddToRecentFiles(Guid iD, string file)
@@ -808,6 +813,17 @@ public void ResetSettings()
808813
MainFormType = MainFormType.RibbonForm;
809814
TimeOffsetType = TimeOffsetType.None;
810815
LoadPerUserSettings();
816+
try
817+
{
818+
if (File.Exists(LogGridFileName))
819+
{
820+
File.Delete(LogGridFileName);
821+
}
822+
}
823+
catch (Exception e)
824+
{
825+
//ignore
826+
}
811827
}
812828
}
813829
}

0 commit comments

Comments
 (0)