[Roam-commit] SF.net SVN: roam: [69] Trunk/Source

[<jon...@us...>]

Revision: 69
          http://roam.svn.sourceforge.net/roam/?rev=69&view=rev
Author:   jonfroehlich
Date:     2007-03-21 13:36:36 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
1. added exit to RoundedRectTest2
2. made ismodal go false after ShowDialog returned in RoamForm

Modified Paths:
--------------
    Trunk/Source/Roam.Test/Roam.Test.csproj
    Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.Designer.cs
    Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.cs
    Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.resx
    Trunk/Source/Roam.UI/Forms/RoamForm.cs
    Trunk/Source/Roam.suo

Modified: Trunk/Source/Roam.Test/Roam.Test.csproj
===================================================================
--- Trunk/Source/Roam.Test/Roam.Test.csproj	2007-03-21 07:24:49 UTC (rev 68)
+++ Trunk/Source/Roam.Test/Roam.Test.csproj	2007-03-21 20:36:36 UTC (rev 69)
@@ -589,7 +589,7 @@
       <DependentUpon>SystemColorTest.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\TabControlTest.cs">
-      <SubType>Component</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\Controls\TabControlTest.Designer.cs">
       <DependentUpon>TabControlTest.cs</DependentUpon>

Modified: Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.Designer.cs
===================================================================
--- Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.Designer.cs	2007-03-21 07:24:49 UTC (rev 68)
+++ Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.Designer.cs	2007-03-21 20:36:36 UTC (rev 69)
@@ -29,7 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.Label label1;
+            this.label1 = new System.Windows.Forms.Label();
             this.mainMenu1 = new System.Windows.Forms.MainMenu();
             this.menuItem1 = new System.Windows.Forms.MenuItem();
             this.menuItem2 = new System.Windows.Forms.MenuItem();
@@ -42,9 +42,16 @@
             this.label5 = new System.Windows.Forms.Label();
             this._numericTextBoxRoundedCornerHeight = new Roam.UI.Controls.NumericTextBox();
             this._numericTextBoxRoundedCornerWidth = new Roam.UI.Controls.NumericTextBox();
-            label1 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
+            // label1
+            // 
+            this.label1.Font = new System.Drawing.Font("Segoe Condensed", 7F, System.Drawing.FontStyle.Bold);
+            this.label1.Location = new System.Drawing.Point(3, 12);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(61, 18);
+            this.label1.Text = "BackColor:";
+            // 
             // mainMenu1
             // 
             this.mainMenu1.MenuItems.Add(this.menuItem1);
@@ -53,19 +60,12 @@
             // menuItem1
             // 
             this.menuItem1.Text = "Exit";
+            this.menuItem1.Click += new System.EventHandler(this.menuItem1_Click);
             // 
             // menuItem2
             // 
             this.menuItem2.Text = "Menu";
             // 
-            // label1
-            // 
-            label1.Font = new System.Drawing.Font("Segoe Condensed", 7F, System.Drawing.FontStyle.Bold);
-            label1.Location = new System.Drawing.Point(3, 12);
-            label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(61, 18);
-            label1.Text = "BackColor:";
-            // 
             // label2
             // 
             this.label2.Font = new System.Drawing.Font("Segoe Condensed", 7F, System.Drawing.FontStyle.Bold);
@@ -156,7 +156,7 @@
             this.Controls.Add(this._comboBoxBackColor);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
-            this.Controls.Add(label1);
+            this.Controls.Add(this.label1);
             this.Menu = this.mainMenu1;
             this.Name = "RoundedRectTest2";
             this.Text = "RoundedRectTest2";
@@ -177,5 +177,6 @@
         private System.Windows.Forms.Label label5;
         private Roam.UI.Controls.NumericTextBox _numericTextBoxRoundedCornerHeight;
         private Roam.UI.Controls.NumericTextBox _numericTextBoxRoundedCornerWidth;
+        private System.Windows.Forms.Label label1;
     }
 }
\ No newline at end of file

Modified: Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.cs
===================================================================
--- Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.cs	2007-03-21 07:24:49 UTC (rev 68)
+++ Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.cs	2007-03-21 20:36:36 UTC (rev 69)
@@ -112,5 +112,10 @@
 
             base.OnPaint(e);
         }
+
+        private void menuItem1_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
     }
 }
\ No newline at end of file

Modified: Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.resx
===================================================================
--- Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.resx	2007-03-21 07:24:49 UTC (rev 68)
+++ Trunk/Source/Roam.Test/UI/Controls/RoundedRectTest2.resx	2007-03-21 20:36:36 UTC (rev 69)
@@ -120,9 +120,6 @@
   <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
     <value>Smartphone QVGA</value>
   </metadata>

Modified: Trunk/Source/Roam.UI/Forms/RoamForm.cs
===================================================================
--- Trunk/Source/Roam.UI/Forms/RoamForm.cs	2007-03-21 07:24:49 UTC (rev 68)
+++ Trunk/Source/Roam.UI/Forms/RoamForm.cs	2007-03-21 20:36:36 UTC (rev 69)
@@ -61,13 +61,6 @@
                 //The following is a workaround relating to the differences between form.ShowDialog()
                 //and Application2.ShowDialog()
                 //
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <remarks>
-                /// 
-                /// </remarks>
-                /// <author>Jon Froehlich</author>
                 //Setting the DialogResult property with a value from the DialogResult enumeration 
                 //sets the value of the dialog box result for the form, hides the modal 
                 //dialog box, and returns control to the calling form. However, this does
@@ -87,7 +80,9 @@
         public new DialogResult ShowDialog()
         {
             _isModal = true;
-            return ShowDialog();
+            DialogResult dr = ShowDialog();
+            _isModal = false;
+            return dr;
         }
 
         public new void Show()

Modified: Trunk/Source/Roam.suo
===================================================================
(Binary files differ)


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