diff --git a/Commission_Price_Calc/.vs/Commission_Price_Calc/v16/.suo b/Commission_Price_Calc/.vs/Commission_Price_Calc/v16/.suo
index d2ec93a..fb493e8 100644
Binary files a/Commission_Price_Calc/.vs/Commission_Price_Calc/v16/.suo and b/Commission_Price_Calc/.vs/Commission_Price_Calc/v16/.suo differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/Commission_Price_Calc.csproj b/Commission_Price_Calc/Commission_Price_Calc/Commission_Price_Calc.csproj
index c088b85..480c4fb 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/Commission_Price_Calc.csproj
+++ b/Commission_Price_Calc/Commission_Price_Calc/Commission_Price_Calc.csproj
@@ -26,7 +26,7 @@
en-DE
Comission Price Calculator
SleepyCharlyy
- 1
+ 3
1.0.0.%2a
false
true
diff --git a/Commission_Price_Calc/Commission_Price_Calc/Info.Designer.cs b/Commission_Price_Calc/Commission_Price_Calc/Info.Designer.cs
index c13d2b0..a6b901c 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/Info.Designer.cs
+++ b/Commission_Price_Calc/Commission_Price_Calc/Info.Designer.cs
@@ -76,7 +76,6 @@ private void InitializeComponent()
this.labelText.TabIndex = 3;
this.labelText.Text = "This Program is made by Sleepycharlyy. Icon made by Kszy. \nCommission Price Calcu" +
"lator";
- this.labelText.Click += new System.EventHandler(this.labelText_Click);
//
// buttonOK
//
diff --git a/Commission_Price_Calc/Commission_Price_Calc/Info.cs b/Commission_Price_Calc/Commission_Price_Calc/Info.cs
index 942e0cf..6fdd63e 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/Info.cs
+++ b/Commission_Price_Calc/Commission_Price_Calc/Info.cs
@@ -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
}
}
diff --git a/Commission_Price_Calc/Commission_Price_Calc/MainForm.Designer.cs b/Commission_Price_Calc/Commission_Price_Calc/MainForm.Designer.cs
index 5d890b8..562030c 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/MainForm.Designer.cs
+++ b/Commission_Price_Calc/Commission_Price_Calc/MainForm.Designer.cs
@@ -286,7 +286,7 @@ private void InitializeComponent()
// timer
//
this.timer.Interval = 1000;
- this.timer.Tick += new System.EventHandler(this.mainTimerOnTick);
+ this.timer.Tick += new System.EventHandler(this.main_timer_ontick);
//
// ButtonReset
//
@@ -423,6 +423,7 @@ private void InitializeComponent()
this.newProjectToolStripMenuItem.ShowShortcutKeys = false;
this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.newProjectToolStripMenuItem.Text = "New Project";
+ this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click);
//
// MainForm
//
diff --git a/Commission_Price_Calc/Commission_Price_Calc/MainForm.cs b/Commission_Price_Calc/Commission_Price_Calc/MainForm.cs
index f1df7e5..0986218 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/MainForm.cs
+++ b/Commission_Price_Calc/Commission_Price_Calc/MainForm.cs
@@ -28,10 +28,10 @@ public MainForm()
{
InitializeComponent();
- settingsLangLabelsSetter(); //write all the stuff on labels in correct language
- mainTimeLabelUpdate();
+ settings_lang_settings_set(); //write all the stuff on labels in correct language
+ main_time_label_update();
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
labelProject.Text = "New Project";
@@ -44,26 +44,31 @@ public MainForm()
//set icon
this.Icon = Properties.Resources.comission_price_calculator1;
}
-
+
#endregion
#region Functions
#region Settings Functions
- public string settingsLangSettingGetter() // returns string of the set language setting
+ public string settings_currency_setting_get() // returns current currency set in settings
+ {
+ return Settings.Default.Currency.ToString();
+ }
+
+ public string settings_lang_setting_get() // returns string of the set language setting
{
return Settings.Default["Language"].ToString();
}
- public void settingsLangLabelsSetter() // applies every string for the selected language to labels
+ public void settings_lang_settings_set() // applies every string for the selected language to labels
{
- switch (settingsLangSettingGetter()){
+ switch (settings_lang_setting_get()){
case "English":
ButtonCalculate.Text = "Calculate";
- LabelResult.Text = "Result: 0" + settingsCurrencySettingGetter();
+ LabelResult.Text = "Result: 0" + settings_currency_setting_get();
LabelLog.Text = "Log: ";
LabelTax.Text = "% Tax";
- LabelWage.Text = settingsCurrencySettingGetter() + " Per Hour";
- LabelBaseCosts.Text = settingsCurrencySettingGetter() + " Base Costs";
+ LabelWage.Text = settings_currency_setting_get() + " Per Hour";
+ LabelBaseCosts.Text = settings_currency_setting_get() + " Base Costs";
LabelHours.Text = "Hours";
LabelMinutes.Text = "Minutes";
ButtonAccept.Text = "Accept";
@@ -86,11 +91,11 @@ public string settingsLangSettingGetter() // returns string of the set language
break;
case "Deutsch":
ButtonCalculate.Text = "Berechnen";
- LabelResult.Text = "Ergebnis: 0" + settingsCurrencySettingGetter();
+ LabelResult.Text = "Ergebnis: 0" + settings_currency_setting_get();
LabelLog.Text = "Protokoll: ";
LabelTax.Text = "% Steuern";
- LabelWage.Text = settingsCurrencySettingGetter() + " pro Stunde";
- LabelBaseCosts.Text = settingsCurrencySettingGetter() + " Basiskosten";
+ LabelWage.Text = settings_currency_setting_get() + " pro Stunde";
+ LabelBaseCosts.Text = settings_currency_setting_get() + " Basiskosten";
LabelHours.Text = "Stunden";
LabelMinutes.Text = "Minuten";
ButtonAccept.Text = "Akzeptieren";
@@ -113,17 +118,12 @@ public string settingsLangSettingGetter() // returns string of the set language
break;
}
- mainTimeLabelUpdate();
- }
-
- public string settingsCurrencySettingGetter() // returns current currency set in settings
- {
- return Settings.Default.Currency.ToString();
+ main_time_label_update();
}
#endregion
#region File I/O Functions
- public void fileSave()
+ public void file_save() // project file saving function
{
SaveFileDialog sfd = new SaveFileDialog();
sfd.Filter = "Project File|*.xml";
@@ -147,21 +147,21 @@ public void fileSave()
textWriter.Close();
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[SAVE] File has been saved at " + sfd.FileName);
+ main_log_write("[SAVE] File has been saved at " + sfd.FileName);
break;
case "Deutsch":
- mainLogWrite("[SPEICHERN] Datei wurde als " + sfd.FileName + " gespeichert");
+ main_log_write("[SPEICHERN] Datei wurde als " + sfd.FileName + " gespeichert");
break;
}
labelProject.Text = sfd.FileName.Split('\\').Last();
}
- public void fileLoad()
- {
+ public void file_load() // project file loading function
+ {
OpenFileDialog ofd = new OpenFileDialog();
ofd.Filter = "Project File|*.xml";
if (!(ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK))
@@ -208,25 +208,25 @@ public void fileLoad()
textReader.Close();
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[LOAD] " + ofd.FileName + " has been loaded");
+ main_log_write("[LOAD] " + ofd.FileName + " has been loaded");
break;
case "Deutsch":
- mainLogWrite("[LADEN] " + ofd.FileName + " wurde geladen");
+ main_log_write("[LADEN] " + ofd.FileName + " wurde geladen");
break;
}
labelProject.Text = ofd.FileName.Split('\\').Last();
- mainTimeLabelUpdate();
- settingsLangLabelsSetter();
- settingsCurrencySettingGetter();
+ main_time_label_update();
+ settings_lang_settings_set();
+ settings_currency_setting_get();
}
#endregion
#region Main Functions
- public void mainLogWrite(string text) // writes to the log
+ public void main_log_write(string text) // writes to the log
{
if (Log.Text == "") { Log.Text = "[" + DateTime.Now + "]: " + text; }
else
@@ -235,7 +235,7 @@ public void mainLogWrite(string text) // writes to the log
}
}
- public double mainStringToDouble(string n) // convert string into double and removes any "weird symbols"
+ public double main_stringtodouble(string n) // convert string into double and removes any "weird symbols"
{
// deleting all €$ type characters
var charsToRemove = new string[] { "€", "$", " ", "%", "£" };
@@ -257,9 +257,9 @@ public double mainStringToDouble(string n) // convert string into double and rem
}
}
- public void mainTimeLabelUpdate() // updates the label showing the current time
+ public void main_time_label_update() // updates the label showing the current time
{
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
TotalTime.Text = "Total Time Worked: " + time_current_hours + "h " + time_current_minutes + "m " + time_current_seconds + "s";
@@ -271,7 +271,7 @@ public void mainTimeLabelUpdate() // updates the label showing the current time
}
- private void mainTimerOnTick(object sender, EventArgs e) // gets run every tick the timer makes (while on)
+ private void main_timer_ontick(object sender, EventArgs e) // gets run every tick the timer makes (while on)
{
time_current_seconds += 1;
@@ -287,12 +287,11 @@ private void mainTimerOnTick(object sender, EventArgs e) // gets run every tick
time_current_minutes = 0;
}
- mainTimeLabelUpdate();
+ main_time_label_update();
}
#endregion
#endregion
-
#region Events
#region Keyboard KeyPress Events
private void InputMinutes_KeyPress(object sender, KeyPressEventArgs e)
@@ -345,20 +344,52 @@ private void closeProgramToolStripMenuItem_Click(object sender, EventArgs e)
private void loadProjectToolStripMenuItem_Click(object sender, EventArgs e)
{
- fileLoad();
-
+ file_load();
}
private void saveProjectToolStripMenuItem_Click(object sender, EventArgs e)
{
- fileSave();
+ file_save();
}
-
private void newProjectToolStripMenuItem_Click(object sender, EventArgs e)
- {
- //TO:DO new project
- }
+ {
+ time_current_hours = 0.0;
+ time_current_minutes = 0.0;
+ time_current_seconds = 0.0;
+ main_timer_active = false;
+
+ main_time_label_update();
+ settings_lang_settings_set();
+ settings_currency_setting_get();
+
+ InputTax.Text = "0.0";
+ InputWage.Text = "10.00";
+ InputBaseCosts.Text = "0.0";
+
+
+ switch (settings_lang_setting_get())
+ {
+ case "English":
+ labelProject.Text = "New Project";
+ break;
+ case "Deutsch":
+ labelProject.Text = "Neues Projekt";
+ break;
+ }
+
+
+ //logging
+ switch (settings_lang_setting_get())
+ {
+ case "English":
+ main_log_write("[RESET] The project file was reset!");
+ break;
+ case "Deutsch":
+ main_log_write("[ZURÜCKSETZEN] Die Projektdatei wurde zurückgesetzt!");
+ break;
+ }
+ }
private void openPreferencesToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -383,16 +414,16 @@ private void ButtonReset_Click(object sender, EventArgs e)
time_current_hours = 0.0;
time_current_minutes = 0.0;
time_current_seconds = 0.0;
- mainTimeLabelUpdate();
+ main_time_label_update();
//logging
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[RESET] " + "Time was reset!");
+ main_log_write("[RESET] " + "Time was reset!");
break;
case "Deutsch":
- mainLogWrite("[ZURÜCKSETZEN] " + "Die Arbeitszeit wurde zurückgesetzt!");
+ main_log_write("[ZURÜCKSETZEN] " + "Die Arbeitszeit wurde zurückgesetzt!");
break;
}
}
@@ -411,13 +442,13 @@ private void ButtonStop_Click(object sender, EventArgs e)
timer.Stop(); //stop timer
//logging
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[TIMER] " + "Timer has stopped!");
+ main_log_write("[TIMER] " + "Timer has stopped!");
break;
case "Deutsch":
- mainLogWrite("[TIMER] " + "Der Timer wurde angehalten!");
+ main_log_write("[TIMER] " + "Der Timer wurde angehalten!");
break;
}
}
@@ -435,13 +466,13 @@ private void ButtonStart_Click(object sender, EventArgs e)
timer.Start(); //start timer
//logging
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[TIMER] " + "Timer has started!");
+ main_log_write("[TIMER] " + "Timer has started!");
break;
case "Deutsch":
- mainLogWrite("[TIMER] " + "Der Timer wurde gestarten!");
+ main_log_write("[TIMER] " + "Der Timer wurde gestarten!");
break;
}
}
@@ -450,9 +481,9 @@ private void ButtonCalculate_Click(object sender, EventArgs e)
{
//calculate result
//get variables
- double wage = mainStringToDouble(InputWage.Text.Replace(".", ","));
- double tax = mainStringToDouble(InputTax.Text.Replace(".", ","));
- double basecosts = mainStringToDouble(InputBaseCosts.Text.Replace(".", ","));
+ double wage = main_stringtodouble(InputWage.Text.Replace(".", ","));
+ double tax = main_stringtodouble(InputTax.Text.Replace(".", ","));
+ double basecosts = main_stringtodouble(InputBaseCosts.Text.Replace(".", ","));
double hours = (time_current_minutes / 60) + time_current_hours;
Double result = (hours * wage); //calculate base result
@@ -464,13 +495,13 @@ private void ButtonCalculate_Click(object sender, EventArgs e)
if (hours == 0)
{
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[CALCULATE] You need to add Time first!");
+ main_log_write("[CALCULATE] You need to add Time first!");
break;
case "Deutsch":
- mainLogWrite("[BERECHNUNG] Sie müssen Zeit zuvor hinzufügen!");
+ main_log_write("[BERECHNUNG] Sie müssen Zeit zuvor hinzufügen!");
break;
}
@@ -478,29 +509,29 @@ private void ButtonCalculate_Click(object sender, EventArgs e)
} //if u havent worked any time just exit this function
//set label
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- LabelResult.Text = "Result: " + export + settingsCurrencySettingGetter();
+ LabelResult.Text = "Result: " + export + settings_currency_setting_get();
break;
case "Deutsch":
- LabelResult.Text = "Ergebnis: " + export + settingsCurrencySettingGetter();
+ LabelResult.Text = "Ergebnis: " + export + settings_currency_setting_get();
break;
}
//logging
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[CALCULATE] " + "Time: " + time_current_hours + "h " + time_current_minutes + "m, "
- + "Basecosts: " + basecosts + settingsCurrencySettingGetter() + ", " + settingsCurrencySettingGetter() + " per h: " + wage + settingsCurrencySettingGetter() + ", " + "Tax: " + tax + "%, "
- + "Result: " + export + settingsCurrencySettingGetter());
+ main_log_write("[CALCULATE] " + "Time: " + time_current_hours + "h " + time_current_minutes + "m, "
+ + "Basecosts: " + basecosts + settings_currency_setting_get() + ", " + settings_currency_setting_get() + " per h: " + wage + settings_currency_setting_get() + ", " + "Tax: " + tax + "%, "
+ + "Result: " + export + settings_currency_setting_get());
break;
case "Deutsch":
- mainLogWrite("[BERECHNUNG] " + "Zeit: " + time_current_hours + "h " + time_current_minutes + "m, "
- + "Basiskosten: " + basecosts + settingsCurrencySettingGetter() + ", " + settingsCurrencySettingGetter() + " pro Stunde: " + wage + settingsCurrencySettingGetter() + ", " + "Steuern: " + tax + "%, "
- + "Ergebnis: " + export + settingsCurrencySettingGetter());
+ main_log_write("[BERECHNUNG] " + "Zeit: " + time_current_hours + "h " + time_current_minutes + "m, "
+ + "Basiskosten: " + basecosts + settings_currency_setting_get() + ", " + settings_currency_setting_get() + " pro Stunde: " + wage + settings_currency_setting_get() + ", " + "Steuern: " + tax + "%, "
+ + "Ergebnis: " + export + settings_currency_setting_get());
break;
}
}
@@ -508,8 +539,8 @@ private void ButtonCalculate_Click(object sender, EventArgs e)
private void ButtonAccept_Click(object sender, EventArgs e)
{
if (main_timer_active) { return; }
- double minutes = mainStringToDouble(InputMinutes.Text);
- double hours = mainStringToDouble(InputHours.Text);
+ double minutes = main_stringtodouble(InputMinutes.Text);
+ double hours = main_stringtodouble(InputHours.Text);
//delete decimals
if (minutes >= 60)
@@ -554,21 +585,21 @@ private void ButtonAccept_Click(object sender, EventArgs e)
time_current_hours = time_current_hours + Math.Floor(i);
}
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[MANUAL ADD] " + "Time Before: " + beforeHours + "h " + beforeMinutes + "m, "
+ main_log_write("[MANUAL ADD] " + "Time Before: " + beforeHours + "h " + beforeMinutes + "m, "
+ "Added: " + hours + "h " + minutes + "m, "
+ "Current Time: " + time_current_hours + "h " + time_current_minutes + "m");
break;
case "Deutsch":
- mainLogWrite("[ZEIT ADDITION] " + "Zeit davor: " + beforeHours + "h " + beforeMinutes + "m, "
+ main_log_write("[ZEIT ADDITION] " + "Zeit davor: " + beforeHours + "h " + beforeMinutes + "m, "
+ "Addierte Zeit: " + hours + "h " + minutes + "m, "
+ "Momentane Zeit: " + time_current_hours + "h " + time_current_minutes + "m");
break;
}
- mainTimeLabelUpdate();
+ main_time_label_update();
}
else //if removes checked
@@ -596,21 +627,21 @@ private void ButtonAccept_Click(object sender, EventArgs e)
time_current_minutes = 0;
}
- switch (settingsLangSettingGetter())
+ switch (settings_lang_setting_get())
{
case "English":
- mainLogWrite("[MANUAL REMOVE] " + "Time Before: " + beforeHours + "h " + beforeMinutes + "m, "
+ main_log_write("[MANUAL REMOVE] " + "Time Before: " + beforeHours + "h " + beforeMinutes + "m, "
+ "Removed: " + hours + "h " + minutes + "m, "
+ "Current Time: " + time_current_hours + "h " + time_current_minutes + "m");
break;
case "Deutsch":
- mainLogWrite("[ZEIT SUBTRAKTION] " + "Zeit davor: " + beforeHours + "h " + beforeMinutes + "m, "
+ main_log_write("[ZEIT SUBTRAKTION] " + "Zeit davor: " + beforeHours + "h " + beforeMinutes + "m, "
+ "Subtrahierte Zeit: " + hours + "h " + minutes + "m, "
+ "Momentane Zeit: " + time_current_hours + "m " + time_current_minutes + "m");
break;
}
- mainTimeLabelUpdate();
+ main_time_label_update();
}
@@ -618,12 +649,12 @@ private void ButtonAccept_Click(object sender, EventArgs e)
private void ButtonSave_Click(object sender, EventArgs e)
{
- fileSave();
+ file_save();
}
private void ButtonLoad_Click(object sender, EventArgs e)
{
- fileLoad();
+ file_load();
}
#endregion
#endregion
diff --git a/Commission_Price_Calc/Commission_Price_Calc/Preferences.cs b/Commission_Price_Calc/Commission_Price_Calc/Preferences.cs
index e36c889..eb75e8d 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/Preferences.cs
+++ b/Commission_Price_Calc/Commission_Price_Calc/Preferences.cs
@@ -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
}
}
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.application b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.application
index 4885dff..b77f145 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.application
+++ b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.application
@@ -1,6 +1,6 @@
-
+
@@ -8,13 +8,13 @@
-
+
- 0Vj+hfAR8UWoPhCKBWe9zdVbui3UIlHdr2KSuagS54g=
+ 987MSbv8tNP/rFZdWDRpDrxB7wBMF67+GU/EJdaoA9k=
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe
index 5e2b2ef..fad53d8 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe and b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe.manifest b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe.manifest
index 277c3ac..b84bb47 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe.manifest
+++ b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.exe.manifest
@@ -1,6 +1,6 @@
-
+
@@ -43,14 +43,14 @@
-
+
- YBJ7gaXdwdXqE7JyCz3AauIK7TQzRFGdR3AG8lwL0R4=
+ Ssi46ZGHyeOVcvw3nEAkD9NJA6ckA1hVP5b036Q/kjg=
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.pdb b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.pdb
index e6fbf27..e6eb090 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.pdb and b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/Commission_Price_Calc.pdb differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe
new file mode 100644
index 0000000..17796b6
Binary files /dev/null and b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.config b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.config
new file mode 100644
index 0000000..8614099
--- /dev/null
+++ b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.config
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ English
+
+
+ €
+
+
+
+
\ No newline at end of file
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.manifest b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.manifest
new file mode 100644
index 0000000..88921c5
--- /dev/null
+++ b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/Commission_Price_Calc.exe.manifest
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ssi46ZGHyeOVcvw3nEAkD9NJA6ckA1hVP5b036Q/kjg=
+
+
+
+
+
+
+
+
+
+ U2lKe+jyy8NxmiQY9FakXUvrorsex7/3K7QdeVmMFT8=
+
+
+
+
+
+
+
+
+ uUGclg9fJPE01hE4pPfH1QvlMB2evoIY09HhVC7MmaY=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+H5U7G1q02OkU3c5Qpt0nKP+gPYv5L8dmikH3S25zCP0=O/WgcpdmZF6Di+mLBbv3hmKzZu0aaYUDV4BtJvekj2GuBWnWm9ygXT4SV3Hmr7J5BF2CBiZYZZsvXkSXYi8bqkt1K8eKwzghGR3TPMaLSDB6kbCpt/X1hqiVc+9aXPzOef/UoYpJeNlAB2lWtYIsznuTiyHOKe4w/4PLXB/SL24=uaZiPJ5sV4f7VfP18rdv0GpZKB/p66s22Spa26oFV7lRGtpxBxIGwR9UL6LjyegTD1AzdUOwvFYhMHI5AnL6/j0qEW+Pd14zetBRX1a4a6EVFfy1Z2QSU+v3xh4MOKgdJx7L8M1ixCMNlO1Lh84RSeVfXe5jKdTdsvrjfBF84K0=AQABCN=DESKTOP-J9FKIVT\charlyqqIvJs4pUHh7tcGncK55ftZ6ZZWlClsh4QFI+h0dSNc=GnRCyo9rK0baphPPRKd/6SfLxykZtVuDaUy/CL4lHdfNojrNwQrpIbU2Lbs4Ybg0BVMc8ftKvuM5l1zwKveeVKf9GoenYc/uBvM+bVgpVyUBHbS5sG7uLNBR589SLd057hJrZ1qHBf+Zu/NYPojH9mpINcakvFTnjIMHjzw1U7o=uaZiPJ5sV4f7VfP18rdv0GpZKB/p66s22Spa26oFV7lRGtpxBxIGwR9UL6LjyegTD1AzdUOwvFYhMHI5AnL6/j0qEW+Pd14zetBRX1a4a6EVFfy1Z2QSU+v3xh4MOKgdJx7L8M1ixCMNlO1Lh84RSeVfXe5jKdTdsvrjfBF84K0=AQABMIIB8TCCAVqgAwIBAgIQQJowTzawzatOSFAK7emFlzANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDHiwARABFAFMASwBUAE8AUAAtAEoAOQBGAEsASQBWAFQAXABjAGgAYQByAGwAeTAeFw0xOTEyMTYxMzMyNTZaFw0yMDEyMTUxOTMyNTZaMDcxNTAzBgNVBAMeLABEAEUAUwBLAFQATwBQAC0ASgA5AEYASwBJAFYAVABcAGMAaABhAHIAbAB5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5pmI8nmxXh/tV8/Xyt2/QalkoH+nrqzbZKlrbqgVXuVEa2nEHEgbBH1QvouPJ6BMPUDN1Q7C8ViEwcjkCcvr+PSoRb493XjN60FFfVrhroRUV/LVnZBJT6/fGHgw4qB0nHsvwzWLEIw2U7UuHzhFJ5V9d7mMp1N2y+uN8EXzgrQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAKB2j3Nbj/bm/z1XOOQfYhdZr4fjkJxVM0AAFrtZeVU0sXrZN64lkkcDUyxQRVeOAOZUyonoQsdhimu4KbzSA06+BdFA92St+gCSJs5eg3l4UQWxJLBKzSUdHE7cm8KkFK5zLNh2S9ggr+UMyWZ5KD+HkI88u+eTuCmUSfpbzYDQ
\ No newline at end of file
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/comission_price_calculator.ico b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/comission_price_calculator.ico
new file mode 100644
index 0000000..2520f3c
Binary files /dev/null and b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Application Files/Commission_Price_Calc_1_0_0_2/comission_price_calculator.ico differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.application b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.application
new file mode 100644
index 0000000..dfe3ca2
--- /dev/null
+++ b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.application
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 7t53qUxJHQADGtxjJ1rq5W/7TW7gxB03HfGsOW90r4Y=
+
+
+
+/tAV0NknSrdbFE/c5zwYWozfj8FQxki/AiD28aO1VbE=NlfMaVXKC5EIpap1u3neMTf1ms7BC+NkRqAEQvvG/Rk57qiA/Qn83q1uxpK+bjofwbbanXHItNU0SbVYMKflgQLRsCgGuThrceyK3wsjU/6PKccah7aJcByS7/CfQi5rE3zV3HJGoFnRGKtIOs+4ouwObwebMxQhpHvSqEe6ziQ=uaZiPJ5sV4f7VfP18rdv0GpZKB/p66s22Spa26oFV7lRGtpxBxIGwR9UL6LjyegTD1AzdUOwvFYhMHI5AnL6/j0qEW+Pd14zetBRX1a4a6EVFfy1Z2QSU+v3xh4MOKgdJx7L8M1ixCMNlO1Lh84RSeVfXe5jKdTdsvrjfBF84K0=AQABCN=DESKTOP-J9FKIVT\charlypWvKJV87iVgu629Mwf9Yo3OOcyq/VRY/ODbIyHvZwYA=JMF7NDWTKY6KHABgSRGDQVgqQPunXQYQMXL4PjmKF7ZL+Unqyz08ZtHAY3BuZFBcu/OW8W5wcNZ80ZWqtHZkumm9zBGUT/5QprtdfIMQZmVyxN71c+RJmDagLCHyeORe68YEkrLsa+lYmDQoHyQf0SRJOUzRKUuqJLlHoAGe4hU=uaZiPJ5sV4f7VfP18rdv0GpZKB/p66s22Spa26oFV7lRGtpxBxIGwR9UL6LjyegTD1AzdUOwvFYhMHI5AnL6/j0qEW+Pd14zetBRX1a4a6EVFfy1Z2QSU+v3xh4MOKgdJx7L8M1ixCMNlO1Lh84RSeVfXe5jKdTdsvrjfBF84K0=AQABMIIB8TCCAVqgAwIBAgIQQJowTzawzatOSFAK7emFlzANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDHiwARABFAFMASwBUAE8AUAAtAEoAOQBGAEsASQBWAFQAXABjAGgAYQByAGwAeTAeFw0xOTEyMTYxMzMyNTZaFw0yMDEyMTUxOTMyNTZaMDcxNTAzBgNVBAMeLABEAEUAUwBLAFQATwBQAC0ASgA5AEYASwBJAFYAVABcAGMAaABhAHIAbAB5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5pmI8nmxXh/tV8/Xyt2/QalkoH+nrqzbZKlrbqgVXuVEa2nEHEgbBH1QvouPJ6BMPUDN1Q7C8ViEwcjkCcvr+PSoRb493XjN60FFfVrhroRUV/LVnZBJT6/fGHgw4qB0nHsvwzWLEIw2U7UuHzhFJ5V9d7mMp1N2y+uN8EXzgrQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAKB2j3Nbj/bm/z1XOOQfYhdZr4fjkJxVM0AAFrtZeVU0sXrZN64lkkcDUyxQRVeOAOZUyonoQsdhimu4KbzSA06+BdFA92St+gCSJs5eg3l4UQWxJLBKzSUdHE7cm8KkFK5zLNh2S9ggr+UMyWZ5KD+HkI88u+eTuCmUSfpbzYDQ
\ No newline at end of file
diff --git a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.exe b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.exe
index ca7c6a1..17796b6 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.exe and b/Commission_Price_Calc/Commission_Price_Calc/bin/Release/app.publish/Commission_Price_Calc.exe differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.application b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.application
index 4885dff..b77f145 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.application
+++ b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.application
@@ -1,6 +1,6 @@
-
+
@@ -8,13 +8,13 @@
-
+
- 0Vj+hfAR8UWoPhCKBWe9zdVbui3UIlHdr2KSuagS54g=
+ 987MSbv8tNP/rFZdWDRpDrxB7wBMF67+GU/EJdaoA9k=
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.FileListAbsolute.txt b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.FileListAbsolute.txt
index fb0af79..ac94429 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.FileListAbsolute.txt
+++ b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.FileListAbsolute.txt
@@ -3,6 +3,8 @@ C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Co
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\bin\Release\Commission_Price_Calc.application
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\bin\Release\Commission_Price_Calc.exe
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\bin\Release\Commission_Price_Calc.pdb
+C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.csprojAssemblyReference.cache
+C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.Info.resources
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.MainForm.resources
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.Preferences.resources
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.Properties.Resources.resources
@@ -13,5 +15,3 @@ C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Co
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.application
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.exe
C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.pdb
-C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.Info.resources
-C:\Users\charly\Desktop\Git\commission_price_calculator\Commission_Price_Calc\Commission_Price_Calc\obj\Release\Commission_Price_Calc.csprojAssemblyReference.cache
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.GenerateResource.cache b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.GenerateResource.cache
index 6061711..e70a3c0 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.GenerateResource.cache and b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csproj.GenerateResource.cache differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csprojAssemblyReference.cache b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csprojAssemblyReference.cache
index 66c955f..f81aff4 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csprojAssemblyReference.cache and b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.csprojAssemblyReference.cache differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe
index 5e2b2ef..fad53d8 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe and b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe differ
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe.manifest b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe.manifest
index 277c3ac..b84bb47 100644
--- a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe.manifest
+++ b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.exe.manifest
@@ -1,6 +1,6 @@
-
+
@@ -43,14 +43,14 @@
-
+
- YBJ7gaXdwdXqE7JyCz3AauIK7TQzRFGdR3AG8lwL0R4=
+ Ssi46ZGHyeOVcvw3nEAkD9NJA6ckA1hVP5b036Q/kjg=
diff --git a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.pdb b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.pdb
index e6fbf27..e6eb090 100644
Binary files a/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.pdb and b/Commission_Price_Calc/Commission_Price_Calc/obj/Release/Commission_Price_Calc.pdb differ