[Mwinapi-commits] SF.net SVN: mwinapi:[91] trunk/Tools

[<sch...@us...>]

Revision: 91
          http://mwinapi.svn.sourceforge.net/mwinapi/?rev=91&view=rev
Author:   schierlm
Date:     2010-01-02 19:08:51 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
- ShootNotes can be implemented completely without using managed API calls.
  * Update ShootNotes to not depend on ManagedWinapi any longer.
    (Although ShootNotes is not really an example of how to use
    ManagedWinapi, I will still leave it in the ManagedWinapi tools
    as I myself got used to using it every now and then.
  * Update copyright (it's a new year again)

Modified Paths:
--------------
    trunk/Tools/ShootNotes/MainForm.cs
    trunk/Tools/ShootNotes/NoteForm.cs
    trunk/Tools/ShootNotes/Properties/AssemblyInfo.cs
    trunk/Tools/ShootNotes/ShootNotes.csproj
    trunk/Tools/ShootNotes.sln

Modified: trunk/Tools/ShootNotes/MainForm.cs
===================================================================
--- trunk/Tools/ShootNotes/MainForm.cs	2010-01-02 19:04:16 UTC (rev 90)
+++ trunk/Tools/ShootNotes/MainForm.cs	2010-01-02 19:08:51 UTC (rev 91)
@@ -5,7 +5,6 @@
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using ManagedWinapi.Windows;
 using System.Drawing.Imaging;
 
 namespace ShootNotes
@@ -67,7 +66,7 @@
         private void shotButton_Click(object sender, EventArgs e)
         {
             Hide();
-            Rectangle range = new SystemWindow(rangePanel).Rectangle.ToRectangle();
+            Rectangle range = this.RectangleToScreen(rangePanel.Bounds);
             Bitmap bmp = new Bitmap(range.Width, range.Height);
             Graphics g = Graphics.FromImage(bmp);
             g.CopyFromScreen(range.Location, new Point(0, 0), range.Size);
@@ -82,7 +81,7 @@
         {
             Hide();
             NoteForm nf = new NoteForm(this);
-            Rectangle range = new SystemWindow(rangePanel).Rectangle.ToRectangle();
+            Rectangle range = this.RectangleToScreen(rangePanel.Bounds);
             nf.setNote(new Note(null, range, colorBox.BackColor), true);
             nf.Show();
         }

Modified: trunk/Tools/ShootNotes/NoteForm.cs
===================================================================
--- trunk/Tools/ShootNotes/NoteForm.cs	2010-01-02 19:04:16 UTC (rev 90)
+++ trunk/Tools/ShootNotes/NoteForm.cs	2010-01-02 19:08:51 UTC (rev 91)
@@ -6,7 +6,6 @@
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using ManagedWinapi.Windows;
 
 namespace ShootNotes
 {
@@ -49,8 +48,9 @@
 
         private void loadPos()
         {
-            Rectangle outer = new SystemWindow(this).Rectangle.ToRectangle();
-            Rectangle inner = new SystemWindow(mainNote).Rectangle.ToRectangle();
+            IntPtr q = this.Handle;
+            Rectangle outer = this.Bounds;
+            Rectangle inner = this.RectangleToScreen(mainNote.Bounds);
             this.Left = n.ScreenX - inner.X + outer.X;
             this.Top = n.ScreenY - inner.Y + outer.Y;
             this.Width = n.Width - inner.Width + outer.Width;
@@ -59,8 +59,9 @@
 
         private void savePos()
         {
-            Rectangle outer = new SystemWindow(this).Rectangle.ToRectangle();
-            Rectangle inner = new SystemWindow(mainNote).Rectangle.ToRectangle();
+            IntPtr q = this.Handle; 
+            Rectangle outer = this.Bounds;
+            Rectangle inner = this.RectangleToScreen(mainNote.Bounds);
             n.ScreenX = this.Left + inner.X - outer.X;
             n.ScreenY = this.Top + inner.Y - outer.Y;
             n.Width = this.Width + inner.Width - outer.Width;

Modified: trunk/Tools/ShootNotes/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/ShootNotes/Properties/AssemblyInfo.cs	2010-01-02 19:04:16 UTC (rev 90)
+++ trunk/Tools/ShootNotes/Properties/AssemblyInfo.cs	2010-01-02 19:08:51 UTC (rev 91)
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ShootNotes")]
-[assembly: AssemblyCopyright("Copyright ©  2006, 2007 Michael Schierl")]
+[assembly: AssemblyCopyright("Copyright ©  2006, 2007, 2010 Michael Schierl")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.2")]
-[assembly: AssemblyFileVersion("0.2")]
+[assembly: AssemblyVersion("0.2.0.1")]
+[assembly: AssemblyFileVersion("0.2.0.1")]

Modified: trunk/Tools/ShootNotes/ShootNotes.csproj
===================================================================
--- trunk/Tools/ShootNotes/ShootNotes.csproj	2010-01-02 19:04:16 UTC (rev 90)
+++ trunk/Tools/ShootNotes/ShootNotes.csproj	2010-01-02 19:08:51 UTC (rev 91)
@@ -72,12 +72,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ManagedWinapi\ManagedWinapi.csproj">
-      <Project>{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}</Project>
-      <Name>ManagedWinapi</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

Modified: trunk/Tools/ShootNotes.sln
===================================================================
--- trunk/Tools/ShootNotes.sln	2010-01-02 19:04:16 UTC (rev 90)
+++ trunk/Tools/ShootNotes.sln	2010-01-02 19:08:51 UTC (rev 91)
@@ -3,8 +3,6 @@
 # Visual C# Express 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShootNotes", "ShootNotes\ShootNotes.csproj", "{1AEAC6DE-68E2-46FE-B500-FCF19783DB9C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedWinapi", "..\ManagedWinapi\ManagedWinapi.csproj", "{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,10 +13,6 @@
 		{1AEAC6DE-68E2-46FE-B500-FCF19783DB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1AEAC6DE-68E2-46FE-B500-FCF19783DB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AEAC6DE-68E2-46FE-B500-FCF19783DB9C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBD3EC1E-47E2-4D2D-81C9-D6506125A09A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.