From dc7533184a88271bfd2a3aae299532ec7632144d Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Mon, 25 Sep 2017 17:49:40 -0500 Subject: Added titlebar button hughlighting / pushing --- ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs | 6 +++--- ShiftOS.Main/ShiftOS/Apps/TestForm.cs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'ShiftOS.Main/ShiftOS') diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs index 175d1cb..9062947 100644 --- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs +++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs @@ -32,9 +32,9 @@ namespace ShiftOS.Main.ShiftOS.Apps colorType2 = Convert.ToInt32(textBox2.Text); colorType3 = Convert.ToInt32(textBox3.Text); } - catch + catch(Exception ex) { - shiftWM.StartInfoboxSession("Error!", "Cannot parse a string.", InfoboxTemplate.buttonType.OK); + shiftWM.StartInfoboxSession("Error!", "Failed to parse integer. Error:\n" + ex, InfoboxTemplate.buttonType.OK); } if (colorType1 > 255 || colorType2 > 255 || colorType3 > 255) @@ -52,7 +52,7 @@ namespace ShiftOS.Main.ShiftOS.Apps } catch (Exception ex) { - shiftWM.StartInfoboxSession("Error!", "An exception occured while setting the color! Exception: \n" + ex, InfoboxTemplate.buttonType.OK); + shiftWM.StartInfoboxSession("Error!", "An error occured while setting the color.", InfoboxTemplate.buttonType.OK); } } } diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs index c8cd086..e2b5bf7 100644 --- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs +++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs @@ -24,7 +24,6 @@ namespace ShiftOS.Main private void button2_Click(object sender, EventArgs e) { - shiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter); - } + shiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter); } } } -- cgit v1.2.3