diff --git a/MangaColor/MangaColor/Fmark.cs b/MangaColor/MangaColor/Fmark.cs index f47f9f7..7a80d2f 100644 --- a/MangaColor/MangaColor/Fmark.cs +++ b/MangaColor/MangaColor/Fmark.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.Text; using System.Windows.Forms; -using XWolf.Aero; namespace MangaColor2 { diff --git a/MangaColor/MangaColor/Form1.Designer.cs b/MangaColor/MangaColor/Form1.Designer.cs index 2b9eb0d..b9ec2bf 100644 --- a/MangaColor/MangaColor/Form1.Designer.cs +++ b/MangaColor/MangaColor/Form1.Designer.cs @@ -157,13 +157,13 @@ // Form1 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(556, 168); + this.ClientSize = new System.Drawing.Size(560, 174); this.Controls.Add(this.panel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "Form1"; - this.Text = "MangaColor2 (C) XWolf 2012"; + this.Text = "MangaColor 3 (C) XWolf 2012-2015"; this.Load += new System.EventHandler(this.Form1_Load); this.Paint += new System.Windows.Forms.PaintEventHandler(this.Form1_Paint); this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.Form1_MouseClick); diff --git a/MangaColor/MangaColor/Form1.cs b/MangaColor/MangaColor/Form1.cs index 5510acd..d312231 100644 --- a/MangaColor/MangaColor/Form1.cs +++ b/MangaColor/MangaColor/Form1.cs @@ -4,14 +4,13 @@ using System.Drawing; using System.Text; using System.Windows.Forms; -using XWolf.Aero; using System.Drawing.Drawing2D; using System.Drawing.Imaging; using Win32; namespace MangaColor2 { - public partial class Form1 : XGlassForm + public partial class Form1 : Form { private const int TTLMAX = 15; private int ttl; @@ -37,7 +36,6 @@ InitializeComponent(); szm = sz * magnify; szh = sz / 2; - GlassMargins = new GlassMargins(szm + 5, 0, 0, 0); mask = new Bitmap(szm, szm); using (Graphics g = Graphics.FromImage(mask)) { @@ -56,7 +54,6 @@ GenerateAlphamask(); hook.KeyPressed += new EventHandler(hook_KeyPressed); hook.RegisterHotKey(Win32.ModifierKeys.Alt, Keys.F12); - GlassDrag = false; } void hook_KeyPressed(object sender, KeyPressedEventArgs e) diff --git a/MangaColor/MangaColor/MangaColor.csproj b/MangaColor/MangaColor/MangaColor.csproj index aebcdda..5fecce7 100644 --- a/MangaColor/MangaColor/MangaColor.csproj +++ b/MangaColor/MangaColor/MangaColor.csproj @@ -62,17 +62,15 @@ - - Glass.cs - Form - Form Fmark.cs - + + Form + Form1.cs diff --git a/MangaColor/MangaColor/Program.cs b/MangaColor/MangaColor/Program.cs index 91c4c9a..15cfa1c 100644 --- a/MangaColor/MangaColor/Program.cs +++ b/MangaColor/MangaColor/Program.cs @@ -6,6 +6,7 @@ { static class Program { + private static string version = "3.0"; /// /// Punto de entrada principal para la aplicación. /// @@ -16,5 +17,7 @@ Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); } + + public static string Version { get { return version; } } } } diff --git a/MangaColor/res/16.png b/MangaColor/res/16.png new file mode 100644 index 0000000..44057ee --- /dev/null +++ b/MangaColor/res/16.png Binary files differ diff --git a/MangaColor/res/MAINICON.ico b/MangaColor/res/MAINICON.ico new file mode 100644 index 0000000..a97b03c --- /dev/null +++ b/MangaColor/res/MAINICON.ico Binary files differ diff --git a/MangaColor/res/aspa.png b/MangaColor/res/aspa.png new file mode 100644 index 0000000..b00e2b3 --- /dev/null +++ b/MangaColor/res/aspa.png Binary files differ diff --git a/MangaColor/res/aspa2.png b/MangaColor/res/aspa2.png new file mode 100644 index 0000000..362054d --- /dev/null +++ b/MangaColor/res/aspa2.png Binary files differ diff --git a/MangaColor/res/mag2.ico b/MangaColor/res/mag2.ico new file mode 100644 index 0000000..e27178a --- /dev/null +++ b/MangaColor/res/mag2.ico Binary files differ