aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Main
diff options
context:
space:
mode:
authorFloppyDiskDrive <[email protected]>2017-09-25 17:49:40 -0500
committerFloppyDiskDrive <[email protected]>2017-09-25 17:49:40 -0500
commitdc7533184a88271bfd2a3aae299532ec7632144d (patch)
tree5ec80c52c6b500c543ee265a9936f75e42c5e569 /ShiftOS.Main
parent44d8d5c50749b70e93dd5ccf8718645d8c3d2fad (diff)
downloadshiftos-rewind-dc7533184a88271bfd2a3aae299532ec7632144d.tar.gz
shiftos-rewind-dc7533184a88271bfd2a3aae299532ec7632144d.tar.bz2
shiftos-rewind-dc7533184a88271bfd2a3aae299532ec7632144d.zip
Added titlebar button hughlighting / pushing
Diffstat (limited to 'ShiftOS.Main')
-rw-r--r--ShiftOS.Main/ShiftOS/Apps/ShifterStuff/SelectColor.cs6
-rw-r--r--ShiftOS.Main/ShiftOS/Apps/TestForm.cs3
2 files changed, 4 insertions, 5 deletions
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); }
}
}