Skip to content

Commit

Permalink
bugfixes, restructuring, new project option added
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepycharlyy committed Jun 25, 2020
1 parent f208235 commit 92d00bf
Show file tree
Hide file tree
Showing 24 changed files with 319 additions and 155 deletions.
Binary file modified Commission_Price_Calc/.vs/Commission_Price_Calc/v16/.suo
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<TargetCulture>en-DE</TargetCulture>
<ProductName>Comission Price Calculator</ProductName>
<PublisherName>SleepyCharlyy</PublisherName>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 18 additions & 21 deletions Commission_Price_Calc/Commission_Price_Calc/Info.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,26 @@ public Info(MainForm mainForm)
InitializeComponent();
}

private void buttonSourceCode_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/sleepycharlyy/commission_price_calculator");
}

private void buttonBugs_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/sleepycharlyy/commission_price_calculator/issues");
}

private void buttonTumblr_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://sleepycharlyy.tumblr.com");
}
#region Design and Interactivity
private void buttonSourceCode_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/sleepycharlyy/commission_price_calculator");
}

private void buttonOK_Click(object sender, EventArgs e)
{
this.Close();
}
private void buttonBugs_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/sleepycharlyy/commission_price_calculator/issues");
}

private void labelText_Click(object sender, EventArgs e)
{
private void buttonTumblr_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://sleepycharlyy.tumblr.com");
}

}
private void buttonOK_Click(object sender, EventArgs e)
{
this.Close();
}
#endregion
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

197 changes: 114 additions & 83 deletions Commission_Price_Calc/Commission_Price_Calc/MainForm.cs

Large diffs are not rendered by default.

70 changes: 36 additions & 34 deletions Commission_Price_Calc/Commission_Price_Calc/Preferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,43 +25,45 @@ public Preferences(MainForm mainForm)
changeLabelLang();
}

private void buttonOK_Click(object sender, EventArgs e)
{
this.Close();
}
#region Design and Interactivity
private void buttonOK_Click(object sender, EventArgs e)
{
this.Close();
}

private void comboBoxLanguage_SelectedIndexChanged(object sender, EventArgs e)
{
Settings.Default.Language = comboBoxLanguage.Text;
Settings.Default.Save();
changeLabelLang();
_mainForm.settingsLangLabelsSetter();
}
private void comboBoxLanguage_SelectedIndexChanged(object sender, EventArgs e)
{
Settings.Default.Language = comboBoxLanguage.Text;
Settings.Default.Save();
changeLabelLang();
_mainForm.settings_lang_settings_set();
}

private void comboBoxCurrency_SelectedIndexChanged(object sender, EventArgs e)
{
Settings.Default.Currency = comboBoxCurrency.Text;
Settings.Default.Save();
_mainForm.settingsCurrencySettingGetter();
_mainForm.settingsLangLabelsSetter();
}
private void comboBoxCurrency_SelectedIndexChanged(object sender, EventArgs e)
{
Settings.Default.Currency = comboBoxCurrency.Text;
Settings.Default.Save();
_mainForm.settings_currency_setting_get();
_mainForm.settings_lang_settings_set();
}

public void changeLabelLang()
{
switch (_mainForm.settingsLangSettingGetter())
{
case "English":
labelCurrency.Text = "Currency";
labelLanguage.Text = "Language";
this.Text = "Preferences";
break;
case "Deutsch":
labelCurrency.Text = "Währung";
labelLanguage.Text = "Sprachen";
this.Text = "Einstellungen";
break;
}
}
public void changeLabelLang()
{
switch (_mainForm.settings_lang_setting_get())
{
case "English":
labelCurrency.Text = "Currency";
labelLanguage.Text = "Language";
this.Text = "Preferences";
break;
case "Deutsch":
labelCurrency.Text = "Währung";
labelLanguage.Text = "Sprachen";
this.Text = "Einstellungen";
break;
}
}
#endregion

}
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="Commission_Price_Calc.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<assemblyIdentity name="Commission_Price_Calc.application" version="1.0.0.2" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="SleepyCharlyy" asmv2:product="Comission Price Calculator" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" co.v1:createDesktopShortcut="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.7.2" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="Commission_Price_Calc.exe.manifest" size="5162">
<assemblyIdentity name="Commission_Price_Calc.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" type="win32" />
<assemblyIdentity name="Commission_Price_Calc.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>0Vj+hfAR8UWoPhCKBWe9zdVbui3UIlHdr2KSuagS54g=</dsig:DigestValue>
<dsig:DigestValue>987MSbv8tNP/rFZdWDRpDrxB7wBMF67+GU/EJdaoA9k=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="Commission_Price_Calc.exe" version="1.0.0.1" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" type="win32" />
<asmv1:assemblyIdentity name="Commission_Price_Calc.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="en-DE" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="comission_price_calculator.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
Expand Down Expand Up @@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Commission_Price_Calc.exe" size="274408">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Commission_Price_Calc.exe" size="274920">
<assemblyIdentity name="Commission_Price_Calc" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>YBJ7gaXdwdXqE7JyCz3AauIK7TQzRFGdR3AG8lwL0R4=</dsig:DigestValue>
<dsig:DigestValue>Ssi46ZGHyeOVcvw3nEAkD9NJA6ckA1hVP5b036Q/kjg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Commission_Price_Calc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<Commission_Price_Calc.Properties.Settings>
<setting name="Language" serializeAs="String">
<value>English</value>
</setting>
<setting name="Currency" serializeAs="String">
<value>€</value>
</setting>
</Commission_Price_Calc.Properties.Settings>
</userSettings>
</configuration>
Loading

0 comments on commit 92d00bf

Please sign in to comment.