glm94/advertising-profit-control
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed a bug in the report settings that stopped the back page's height from being saved.

Browse Source
This commit is contained in:
glm94
2017-05-10 22:57:00 -05:00
parent a569a21294
commit 26705bbd7e
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AdvertsingProfitControl/FrmReportSettings.cs
+11 -2
View File
@@ -40,6 +40,7 @@ namespace AdvertsingProfitControl
} }
Properties.Settings.Default.ApcReportWidth = apcReportWidthNumericUpDown.Value + unit; Properties.Settings.Default.ApcReportWidth = apcReportWidthNumericUpDown.Value + unit;
Properties.Settings.Default.Save();
} }
private void UpdateApcReportHeight(object sender, EventArgs e) private void UpdateApcReportHeight(object sender, EventArgs e)
@@ -59,6 +60,7 @@ namespace AdvertsingProfitControl
} }
Properties.Settings.Default.ApcReportHeight = apcReportHeightNumericUpDown.Value + unit; Properties.Settings.Default.ApcReportHeight = apcReportHeightNumericUpDown.Value + unit;
Properties.Settings.Default.Save();
} }
private void ApcRadioButtonChecked(object sender, EventArgs e) private void ApcRadioButtonChecked(object sender, EventArgs e)
@@ -74,14 +76,18 @@ namespace AdvertsingProfitControl
wicFontSizeNumericUpdown.ValueChanged -= UpdateBackPageFontSize; wicFontSizeNumericUpdown.ValueChanged -= UpdateBackPageFontSize;
apcReportWidthNumericUpDown.ValueChanged -= UpdateApcReportWidth; apcReportWidthNumericUpDown.ValueChanged -= UpdateApcReportWidth;
apcReportHeightNumericUpDown.ValueChanged -= UpdateApcReportHeight; apcReportHeightNumericUpDown.ValueChanged -= UpdateApcReportHeight;
wicReportWidthNumericUpDown.ValueChanged -= UpdateWicReportWidth;
wicReportHeightNumericUpDown.ValueChanged -= UpdateWicHeight;
//Load the current settings for font sizes //Load the current settings for font sizes
apcFontSizeNumericUpDown.Text = Properties.Settings.Default.ApcFontSize.Replace("px", ""); apcFontSizeNumericUpDown.Text = Properties.Settings.Default.ApcFontSize.Replace("px", "");
wicFontSizeNumericUpdown.Text = Properties.Settings.Default.WicFontSize.Replace("px", ""); wicFontSizeNumericUpdown.Text = Properties.Settings.Default.WicFontSize.Replace("px", "");
//Load the width and height settings for the front page. //Load the width and height settings for the front page.
apcFontSizeNumericUpDown.ValueChanged += UpdateFrontPageFontSize;
wicFontSizeNumericUpdown.ValueChanged += UpdateBackPageFontSize;
LoadApcSettings(); LoadApcSettings();
LoadWicSettings(); LoadWicSettings();
apcFontSizeNumericUpDown.ValueChanged += UpdateFrontPageFontSize;
wicFontSizeNumericUpdown.ValueChanged += UpdateBackPageFontSize;
wicReportWidthNumericUpDown.ValueChanged += UpdateWicReportWidth;
wicReportHeightNumericUpDown.ValueChanged += UpdateWicHeight;
apcReportWidthNumericUpDown.ValueChanged += UpdateApcReportWidth; apcReportWidthNumericUpDown.ValueChanged += UpdateApcReportWidth;
apcReportHeightNumericUpDown.ValueChanged += UpdateApcReportHeight; apcReportHeightNumericUpDown.ValueChanged += UpdateApcReportHeight;
//Grab the paper kinds //Grab the paper kinds
@@ -287,6 +293,7 @@ namespace AdvertsingProfitControl
} }
Properties.Settings.Default.WicReportWidth = wicReportWidthNumericUpDown.Value + unit; Properties.Settings.Default.WicReportWidth = wicReportWidthNumericUpDown.Value + unit;
Properties.Settings.Default.Save();
} }
private void UpdateWicHeight(object sender, EventArgs e) private void UpdateWicHeight(object sender, EventArgs e)
@@ -306,6 +313,7 @@ namespace AdvertsingProfitControl
} }
Properties.Settings.Default.WicReportHeight = wicReportHeightNumericUpDown.Value + unit; Properties.Settings.Default.WicReportHeight = wicReportHeightNumericUpDown.Value + unit;
Properties.Settings.Default.Save();
} }
private void WicRadioButtonCheckedChanged(object sender, EventArgs e) private void WicRadioButtonCheckedChanged(object sender, EventArgs e)
@@ -317,6 +325,7 @@ namespace AdvertsingProfitControl
private void UpdatePaperKind(object sender, EventArgs e) private void UpdatePaperKind(object sender, EventArgs e)
{ {
Properties.Settings.Default.ReportPaperKind = paperKindComboBox.SelectedItem.ToString(); Properties.Settings.Default.ReportPaperKind = paperKindComboBox.SelectedItem.ToString();
Properties.Settings.Default.Save();
} }
} }
} }
AdvertsingProfitControl/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.5.0.1")] [assembly: AssemblyVersion("2.5.1.1")]
[assembly: AssemblyFileVersion("2.5.0.1")] [assembly: AssemblyFileVersion("2.5.1.1")]
SetupProject/Product.wxs
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Advertising Profit Control" Language="1033" Version="2.5.0.1" Manufacturer="Garritt McCune" UpgradeCode="a416a558-d7c0-4f24-8b1e-2d01761ad15f"> <Product Id="*" Name="Advertising Profit Control" Language="1033" Version="2.5.1.1" Manufacturer="Garritt McCune" UpgradeCode="a416a558-d7c0-4f24-8b1e-2d01761ad15f">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="Custom Profit Control Recording Software" Comments="Profit Control Recording Software"/> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="Custom Profit Control Recording Software" Comments="Profit Control Recording Software"/>
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<!--Not set by default, EmbedCab="yes" embeds the cabinet file into the installer--> <!--Not set by default, EmbedCab="yes" embeds the cabinet file into the installer-->