aboutsummaryrefslogtreecommitdiff
path: root/Histacom2.Engine
diff options
context:
space:
mode:
Diffstat (limited to 'Histacom2.Engine')
-rw-r--r--Histacom2.Engine/Histacom2.Engine.csproj2
-rw-r--r--Histacom2.Engine/Properties/Resources.Designer.cs20
-rw-r--r--Histacom2.Engine/Properties/Resources.resx6
-rw-r--r--Histacom2.Engine/Resources/WinXP/Window/WinXP_CloseHover.pngbin0 -> 1140 bytes
-rw-r--r--Histacom2.Engine/Resources/WinXP/Window/WinXP_ClosePress.pngbin0 -> 984 bytes
-rw-r--r--Histacom2.Engine/Template/WinXP.Designer.cs16
-rw-r--r--Histacom2.Engine/Template/WinXP.cs15
-rw-r--r--Histacom2.Engine/WindowManager.cs2
8 files changed, 55 insertions, 6 deletions
diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj
index 3dee2f9..6abc85d 100644
--- a/Histacom2.Engine/Histacom2.Engine.csproj
+++ b/Histacom2.Engine/Histacom2.Engine.csproj
@@ -221,6 +221,8 @@
<Content Include="Resources\Win95PlusTravelWallpaper.jpg" />
<Content Include="Resources\WinXP\Window\WinXP_Bottom.png" />
<Content Include="Resources\WinXP\Window\WinXP_Close.png" />
+ <None Include="Resources\WinXP\Window\WinXP_CloseHover.png" />
+ <None Include="Resources\WinXP\Window\WinXP_ClosePress.png" />
<Content Include="Resources\WinXP\Window\WinXP_LBCorner.png" />
<Content Include="Resources\WinXP\Window\WinXP_LeftSide.png" />
<Content Include="Resources\WinXP\Window\WinXP_Max.png" />
diff --git a/Histacom2.Engine/Properties/Resources.Designer.cs b/Histacom2.Engine/Properties/Resources.Designer.cs
index 4fd3960..2702b7c 100644
--- a/Histacom2.Engine/Properties/Resources.Designer.cs
+++ b/Histacom2.Engine/Properties/Resources.Designer.cs
@@ -1163,6 +1163,26 @@ namespace Histacom2.Engine.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ public static System.Drawing.Bitmap WinXP_CloseHover {
+ get {
+ object obj = ResourceManager.GetObject("WinXP_CloseHover", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ public static System.Drawing.Bitmap WinXP_ClosePress {
+ get {
+ object obj = ResourceManager.GetObject("WinXP_ClosePress", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
public static System.Drawing.Bitmap WinXP_LeftSide {
get {
object obj = ResourceManager.GetObject("WinXP_LeftSide", resourceCulture);
diff --git a/Histacom2.Engine/Properties/Resources.resx b/Histacom2.Engine/Properties/Resources.resx
index bcc179d..e41840c 100644
--- a/Histacom2.Engine/Properties/Resources.resx
+++ b/Histacom2.Engine/Properties/Resources.resx
@@ -499,4 +499,10 @@
<data name="Win95PlusTravelWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\win95plustravelwallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="WinXP_CloseHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WinXP\Window\WinXP_CloseHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="WinXP_ClosePress" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WinXP\Window\WinXP_ClosePress.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root> \ No newline at end of file
diff --git a/Histacom2.Engine/Resources/WinXP/Window/WinXP_CloseHover.png b/Histacom2.Engine/Resources/WinXP/Window/WinXP_CloseHover.png
new file mode 100644
index 0000000..74c1638
--- /dev/null
+++ b/Histacom2.Engine/Resources/WinXP/Window/WinXP_CloseHover.png
Binary files differ
diff --git a/Histacom2.Engine/Resources/WinXP/Window/WinXP_ClosePress.png b/Histacom2.Engine/Resources/WinXP/Window/WinXP_ClosePress.png
new file mode 100644
index 0000000..80536ae
--- /dev/null
+++ b/Histacom2.Engine/Resources/WinXP/Window/WinXP_ClosePress.png
Binary files differ
diff --git a/Histacom2.Engine/Template/WinXP.Designer.cs b/Histacom2.Engine/Template/WinXP.Designer.cs
index 77cabff..02e104b 100644
--- a/Histacom2.Engine/Template/WinXP.Designer.cs
+++ b/Histacom2.Engine/Template/WinXP.Designer.cs
@@ -55,8 +55,8 @@
// program
//
this.program.BackColor = System.Drawing.Color.OldLace;
- this.program.Controls.Add(this.flowLayoutPanel1);
this.program.Controls.Add(this.bottomleftcorner);
+ this.program.Controls.Add(this.flowLayoutPanel1);
this.program.Controls.Add(this.toprightcorner);
this.program.Controls.Add(this.bottomrightcorner);
this.program.Controls.Add(this.topleftcorner);
@@ -82,9 +82,10 @@
//
this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.bottomleftcorner.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_BottomLeft;
+ this.bottomleftcorner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.bottomleftcorner.Location = new System.Drawing.Point(0, 296);
this.bottomleftcorner.Name = "bottomleftcorner";
- this.bottomleftcorner.Size = new System.Drawing.Size(5, 4);
+ this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
this.bottomleftcorner.TabIndex = 10;
//
// toprightcorner
@@ -120,6 +121,7 @@
// bottom
//
this.bottom.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_Bottom;
+ this.bottom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.bottom.Cursor = System.Windows.Forms.Cursors.SizeNS;
this.bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottom.Location = new System.Drawing.Point(4, 296);
@@ -131,6 +133,7 @@
//
this.top.BackColor = System.Drawing.Color.Transparent;
this.top.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_TopBar;
+ this.top.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.top.Controls.Add(this.programIcon);
this.top.Controls.Add(this.maximizebutton);
this.top.Controls.Add(this.minimizebutton);
@@ -178,11 +181,11 @@
//
this.programname.AutoSize = true;
this.programname.BackColor = System.Drawing.Color.Transparent;
- this.programname.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.programname.Font = new System.Drawing.Font("Trebuchet MS", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.programname.ForeColor = System.Drawing.Color.White;
- this.programname.Location = new System.Drawing.Point(25, 7);
+ this.programname.Location = new System.Drawing.Point(25, 6);
this.programname.Name = "programname";
- this.programname.Size = new System.Drawing.Size(112, 16);
+ this.programname.Size = new System.Drawing.Size(110, 18);
this.programname.TabIndex = 3;
this.programname.Text = "Application Title";
this.programname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.top_MouseDown);
@@ -197,6 +200,9 @@
this.closebutton.TabIndex = 4;
this.closebutton.TabStop = false;
this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+ this.closebutton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseDown);
+ this.closebutton.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
+ this.closebutton.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
//
// right
//
diff --git a/Histacom2.Engine/Template/WinXP.cs b/Histacom2.Engine/Template/WinXP.cs
index 9406b87..d9b396d 100644
--- a/Histacom2.Engine/Template/WinXP.cs
+++ b/Histacom2.Engine/Template/WinXP.cs
@@ -45,6 +45,21 @@ namespace Histacom2.Engine.Template
HTBOTTOMLEFT = 16,
HTBOTTOMRIGHT = 17;
+ private void closebutton_MouseDown(object sender, MouseEventArgs e)
+ {
+ closebutton.BackgroundImage = Properties.Resources.WinXP_ClosePress;
+ }
+
+ private void closebutton_MouseLeave(object sender, EventArgs e)
+ {
+ closebutton.BackgroundImage = Properties.Resources.WinXP_Close;
+ }
+
+ private void closebutton_MouseEnter(object sender, EventArgs e)
+ {
+ closebutton.BackgroundImage = Properties.Resources.WinXP_CloseHover;
+ }
+
private void closebutton_Click(object sender, EventArgs e)
{
if (!closeDisabled) this.Close();
diff --git a/Histacom2.Engine/WindowManager.cs b/Histacom2.Engine/WindowManager.cs
index dec647f..6dacee4 100644
--- a/Histacom2.Engine/WindowManager.cs
+++ b/Histacom2.Engine/WindowManager.cs
@@ -112,7 +112,7 @@ namespace Histacom2.Engine
{
app.programIcon.Hide();
app.programIcon.Image = Properties.Resources.nullIcon;
- app.programname.Location = new Point(6, 7);
+ app.programname.Location = new Point(6, 6);
}
else app.programIcon.Image = icon;