Correção na janela de diálogo de exportação no modo Landscape

Ajustes na versão em AboutForm
MGODOY-BR · Nov 4, 2016 · c5fe5f8 · c5fe5f8
1 parent 9731f2a
commit c5fe5f8
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 47 deletions.
diff --git a/Lab/tmp2/TremAbandonado.png b/Lab/tmp2/TremAbandonado.png
diff --git a/Lab/tmp2/TremAbandonado2020.png b/Lab/tmp2/TremAbandonado2020.png
diff --git a/Lab/tmp2/UrbanWaysFacebookProfile.png b/Lab/tmp2/UrbanWaysFacebookProfile.png
diff --git a/Lab/tmp2/filtered/TremAbandonado.0.filtered.png b/Lab/tmp2/filtered/TremAbandonado.0.filtered.png
diff --git a/Lab/tmp2/filtered/TremAbandonado2020.1.filtered.png b/Lab/tmp2/filtered/TremAbandonado2020.1.filtered.png
diff --git a/Lab/tmp2/filtered/UrbanWaysFacebookProfile.2.filtered.png b/Lab/tmp2/filtered/UrbanWaysFacebookProfile.2.filtered.png
diff --git a/[POC]/temp3/Sprite2DObject 1/Sprite2DObject 1.png b/[POC]/temp3/Sprite2DObject 1/Sprite2DObject 1.png
diff --git a/[POC]/temp3/Sprite2DObject 2/Sprite2DObject 2.png b/[POC]/temp3/Sprite2DObject 2/Sprite2DObject 2.png
diff --git a/src/smartSprite/.vs/smartSprite/v14/.suo b/src/smartSprite/.vs/smartSprite/v14/.suo
diff --git a/src/smartSprite/smartSuite/smartSprite/Forms/AboutBoxForm.cs b/src/smartSprite/smartSuite/smartSprite/Forms/AboutBoxForm.cs
@@ -16,7 +16,7 @@ public AboutBoxForm()
             InitializeComponent();
             this.Text = String.Format("About {0}", AssemblyTitle);
             this.labelProductName.Text = AssemblyProduct;
-            this.labelVersion.Text = String.Format("Version {0}", AssemblyVersion);
+            this.labelVersion.Text = String.Format("Version {0}", AssemblyFileVersion);
             this.labelCopyright.Text = AssemblyCopyright;
             this.labelCompanyName.Text = AssemblyCompany;
             this.textBoxDescription.Text = AssemblyDescription;
@@ -49,6 +49,15 @@ public string AssemblyVersion
             }
         }
 
+        public string AssemblyFileVersion
+        {
+            get
+            {
+                var attributes = this.GetType().Assembly.GetCustomAttributes<AssemblyFileVersionAttribute>();
+                return attributes.First().Version;
+            }
+        }
+
         public string AssemblyDescription
         {
             get

diff --git a/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.Designer.cs b/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.Designer.cs
diff --git a/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.cs b/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.cs
@@ -213,31 +213,49 @@ private void EnableForm(bool enabled)
         /// </summary>
         private void DoOpenDraft(String fileName)
         {
-            // Loading the picture
-            this.draftControl1.LoadDraftPicture(fileName);
-            this.SetupScroll();
-            this._dataTreeNodeList.Clear();
-            this._projectBrowser.ClearText();
-            this.RebuidTreeView();
+            try
+            {
+                this.Cursor = Cursors.WaitCursor;
+
+                // Loading the picture
+                this.draftControl1.LoadDraftPicture(fileName);
+                this.SetupScroll();
+                this._dataTreeNodeList.Clear();
+                this._projectBrowser.ClearText();
+                this.RebuidTreeView();
+            }
+            finally
+            {
+                this.Cursor = Cursors.Default;
+            }
         }
 
         /// <summary>
         /// Opens the project
         /// </summary>
         private void DoOpenProject(String fileName)
         {
-            this._dataTreeNodeList.Clear();
-            // Loading the picture
-            this.draftControl1.LoadProject(fileName);
-            // Filling TreeNodeList
-            foreach (var pieceItem in this.draftControl1.Pieces.PieceList)
+            try
             {
-                this.FillTreeNodeList(pieceItem);
-            }
+                this.Cursor = Cursors.WaitCursor;
 
-            this.RebuidTreeView();
-            this.SetupScroll();
-            this._draftBrowser.ClearText();
+                this._dataTreeNodeList.Clear();
+                // Loading the picture
+                this.draftControl1.LoadProject(fileName);
+                // Filling TreeNodeList
+                foreach (var pieceItem in this.draftControl1.Pieces.PieceList)
+                {
+                    this.FillTreeNodeList(pieceItem);
+                }
+
+                this.RebuidTreeView();
+                this.SetupScroll();
+                this._draftBrowser.ClearText();
+            }
+            finally
+            {
+                this.Cursor = Cursors.Default;
+            }
         }
 
         /// <summary>
@@ -738,15 +756,11 @@ private void TreeView1_AfterSelect(object sender, TreeViewEventArgs e)
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnExportToUnity_Click(object sender, EventArgs e)
+        private void btnCutInPieces_Click(object sender, EventArgs e)
         {
-            //if (!String.IsNullOrEmpty(this.txtLoadSprite.Text))
-            //{
-            //    this.exportToUnityDialog1.SelectedPath = Path.GetDirectoryName(this.txtLoadSprite.Text);
-            //}
-            var result = this.exportToUnityDialog1.ShowDialog();
+            var result = this.cutInPiecesDialog.ShowDialog();
 
-            var selectedPath = this.exportToUnityDialog1.SelectedPath;
+            var selectedPath = this.cutInPiecesDialog.SelectedPath;
             if (result == DialogResult.OK)
             {
                 this.Cursor = Cursors.WaitCursor;

diff --git a/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.resx b/src/smartSprite/smartSuite/smartSprite/Forms/LandscapeForm.resx
@@ -126,22 +126,31 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>356, 56</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>356, 56</value>
+  </metadata>
   <metadata name="openDraftFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="openSmartSpriteFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>300, 17</value>
   </metadata>
   <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>609, 17</value>
+    <value>526, 56</value>
   </metadata>
-  <metadata name="exportToUnityDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>745, 17</value>
+  <metadata name="cutInPiecesDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>602, 17</value>
   </metadata>
   <metadata name="savePiecesBackgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
   <metadata name="progressTime.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>231, 56</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>356, 56</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>112</value>
+  </metadata>
 </root>
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/57ca28d6-afe2-430a-bf13-7852bf056b10 b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/57ca28d6-afe2-430a-bf13-7852bf056b10
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/584342b6-0a05-42d6-b2e8-d214cb0da145 b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/584342b6-0a05-42d6-b2e8-d214cb0da145
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/66ecf633-6eec-4b84-8bd0-ea9ee098fe23 b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/66ecf633-6eec-4b84-8bd0-ea9ee098fe23
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/8113fae3-49b1-42c6-8704-ef890400ad57 b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/8113fae3-49b1-42c6-8704-ef890400ad57
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/872abc6a-a94e-4592-b639-82fb7ac87986 b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/872abc6a-a94e-4592-b639-82fb7ac87986
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/adaffdaa-4413-49c5-8c4e-0f82de71b2fc b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/adaffdaa-4413-49c5-8c4e-0f82de71b2fc
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/empty.txt b/src/smartSprite/smartSuite/smartSprite/bin/Debug/Temp/empty.txt
@@ -0,0 +1 @@
+
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/smartSpriteFX.exe b/src/smartSprite/smartSuite/smartSprite/bin/Debug/smartSpriteFX.exe
diff --git a/src/smartSprite/smartSuite/smartSprite/bin/Debug/smartSpriteFX.pdb b/src/smartSprite/smartSuite/smartSprite/bin/Debug/smartSpriteFX.pdb
diff --git a/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSprite.csproj.GenerateResource.Cache b/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSprite.csproj.GenerateResource.Cache
diff --git a/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSpriteFX.exe b/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSpriteFX.exe
diff --git a/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSpriteFX.pdb b/src/smartSprite/smartSuite/smartSprite/obj/Debug/smartSpriteFX.pdb