From 26705bbd7efc098cfd7acbe0d4d9bc138b732a01 Mon Sep 17 00:00:00 2001 From: Garritt McCune Date: Wed, 10 May 2017 22:57:00 -0500 Subject: [PATCH] Fixed a bug in the report settings that stopped the back page's height from being saved. --- AdvertsingProfitControl/FrmReportSettings.cs | 13 +++++++++++-- AdvertsingProfitControl/Properties/AssemblyInfo.cs | 4 ++-- SetupProject/Product.wxs | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/AdvertsingProfitControl/FrmReportSettings.cs b/AdvertsingProfitControl/FrmReportSettings.cs index 7885638..1e2c7ae 100644 --- a/AdvertsingProfitControl/FrmReportSettings.cs +++ b/AdvertsingProfitControl/FrmReportSettings.cs @@ -40,6 +40,7 @@ namespace AdvertsingProfitControl } Properties.Settings.Default.ApcReportWidth = apcReportWidthNumericUpDown.Value + unit; + Properties.Settings.Default.Save(); } private void UpdateApcReportHeight(object sender, EventArgs e) @@ -59,6 +60,7 @@ namespace AdvertsingProfitControl } Properties.Settings.Default.ApcReportHeight = apcReportHeightNumericUpDown.Value + unit; + Properties.Settings.Default.Save(); } private void ApcRadioButtonChecked(object sender, EventArgs e) @@ -74,14 +76,18 @@ namespace AdvertsingProfitControl wicFontSizeNumericUpdown.ValueChanged -= UpdateBackPageFontSize; apcReportWidthNumericUpDown.ValueChanged -= UpdateApcReportWidth; apcReportHeightNumericUpDown.ValueChanged -= UpdateApcReportHeight; + wicReportWidthNumericUpDown.ValueChanged -= UpdateWicReportWidth; + wicReportHeightNumericUpDown.ValueChanged -= UpdateWicHeight; //Load the current settings for font sizes apcFontSizeNumericUpDown.Text = Properties.Settings.Default.ApcFontSize.Replace("px", ""); wicFontSizeNumericUpdown.Text = Properties.Settings.Default.WicFontSize.Replace("px", ""); //Load the width and height settings for the front page. - apcFontSizeNumericUpDown.ValueChanged += UpdateFrontPageFontSize; - wicFontSizeNumericUpdown.ValueChanged += UpdateBackPageFontSize; LoadApcSettings(); LoadWicSettings(); + apcFontSizeNumericUpDown.ValueChanged += UpdateFrontPageFontSize; + wicFontSizeNumericUpdown.ValueChanged += UpdateBackPageFontSize; + wicReportWidthNumericUpDown.ValueChanged += UpdateWicReportWidth; + wicReportHeightNumericUpDown.ValueChanged += UpdateWicHeight; apcReportWidthNumericUpDown.ValueChanged += UpdateApcReportWidth; apcReportHeightNumericUpDown.ValueChanged += UpdateApcReportHeight; //Grab the paper kinds @@ -287,6 +293,7 @@ namespace AdvertsingProfitControl } Properties.Settings.Default.WicReportWidth = wicReportWidthNumericUpDown.Value + unit; + Properties.Settings.Default.Save(); } private void UpdateWicHeight(object sender, EventArgs e) @@ -306,6 +313,7 @@ namespace AdvertsingProfitControl } Properties.Settings.Default.WicReportHeight = wicReportHeightNumericUpDown.Value + unit; + Properties.Settings.Default.Save(); } private void WicRadioButtonCheckedChanged(object sender, EventArgs e) @@ -317,6 +325,7 @@ namespace AdvertsingProfitControl private void UpdatePaperKind(object sender, EventArgs e) { Properties.Settings.Default.ReportPaperKind = paperKindComboBox.SelectedItem.ToString(); + Properties.Settings.Default.Save(); } } } diff --git a/AdvertsingProfitControl/Properties/AssemblyInfo.cs b/AdvertsingProfitControl/Properties/AssemblyInfo.cs index 10f9750..9efcc34 100644 --- a/AdvertsingProfitControl/Properties/AssemblyInfo.cs +++ b/AdvertsingProfitControl/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("2.5.0.1")] -[assembly: AssemblyFileVersion("2.5.0.1")] +[assembly: AssemblyVersion("2.5.1.1")] +[assembly: AssemblyFileVersion("2.5.1.1")] diff --git a/SetupProject/Product.wxs b/SetupProject/Product.wxs index 387f160..7d96129 100644 --- a/SetupProject/Product.wxs +++ b/SetupProject/Product.wxs @@ -1,6 +1,6 @@ - +