Merge branch 'master' of https://github.com/phaselden/FlipIt

phaselden · Feb 6, 2021 · 058234b · 058234b
2 parents cb96e8e + b044d49
commit 058234b
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 138 deletions.
diff --git a/src/FlipIt/FlipItSettings.cs b/src/FlipIt/FlipItSettings.cs
@@ -14,6 +14,7 @@ private FlipItSettings()
         }
 
         public bool Display24HrTime { get; set; }
+        public bool ShowDstIndicator { get; set; }
         public int Scale { get; set; } = 70;
 
         public List<ScreenSetting> ScreenSettings { get; set; } = new List<ScreenSetting>();
@@ -35,6 +36,7 @@ public static FlipItSettings Load(Screen[] allScreens)
             {
                 iniFile = new IniFile(iniFilePath);
                 settings.Display24HrTime = iniFile.GetBool("General", "Display24Hr", false);
+                settings.ShowDstIndicator = iniFile.GetBool("General", "ShowDstIndicator", true);
                 settings.Scale = iniFile.GetInt("General", "Scale", 70);
             }
             else
@@ -101,6 +103,7 @@ public void Save()
 
             var iniFile = new IniFile(iniFilePath);
             iniFile.SetBool("General", "Display24Hr", Display24HrTime);
+            iniFile.SetBool("General", "ShowDstIndicator", ShowDstIndicator);
             iniFile.SetInt("General", "Scale", Scale);
 
             foreach (var screenSetting in ScreenSettings)

diff --git a/src/FlipIt/MainForm.cs b/src/FlipIt/MainForm.cs
@@ -132,8 +132,8 @@ private void PaintTime()
                     else if (_screenSetting.DisplayType == DisplayType.WorldTime)
                     {
                         _timeScreen = _screenSetting.Locations.Count > 0 
-                            ? new WorldTimesScreen(_screenSetting.Locations, this, _settings.Display24HrTime) 
-                            : new WorldTimesScreen(GetDefaultLocations(), this, _settings.Display24HrTime);
+                            ? new WorldTimesScreen(_screenSetting.Locations, this, _settings.Display24HrTime, _settings.ShowDstIndicator) 
+                            : new WorldTimesScreen(GetDefaultLocations(), this, _settings.Display24HrTime, _settings.ShowDstIndicator);
                     }
                     else
                     {

diff --git a/src/FlipIt/Properties/AssemblyInfo.cs b/src/FlipIt/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.5.*")]
-[assembly: AssemblyFileVersion("1.2.5")]
+[assembly: AssemblyVersion("1.3.0.*")]
+[assembly: AssemblyFileVersion("1.3.0")]
diff --git a/src/FlipIt/SettingsForm.Designer.cs b/src/FlipIt/SettingsForm.Designer.cs
diff --git a/src/FlipIt/SettingsForm.cs b/src/FlipIt/SettingsForm.cs
@@ -72,6 +72,8 @@ private void SettingsForm_Load(object sender, EventArgs e)
                 display12hrRadioButton.Checked = true;
             }
 
+            showDstIndicatorCheckBox.Checked = _settings.ShowDstIndicator;
+
             scaleTrackBar.Value = _settings.Scale / 10;
 
             screensListBox.Items.Clear();
@@ -423,9 +425,9 @@ private bool IsValidCity(string cityName)
             return cityName.Length > 0 && _availableCities.Exists(c => c.DisplayName.HasSameText(cityName));
         }
 
-        private void worldTimesListView_BeforeLabelEdit(object sender, LabelEditEventArgs e)
+        private void showDstIndicatorCheckBox_CheckedChanged(object sender, EventArgs e)
         {
-            MessageBox.Show("ioins");
+            _settings.ShowDstIndicator = showDstIndicatorCheckBox.Checked;
         }
     }
 }