20200317

seto77 · Mar 17, 2020 · 0d163ee · 0d163ee
1 parent 8f4ea12
commit 0d163ee
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 57 deletions.
diff --git a/CSManager/FormMain.Designer.cs b/CSManager/FormMain.Designer.cs
diff --git a/CSManager/FormMain.cs b/CSManager/FormMain.cs
@@ -503,7 +503,6 @@ async private void readDatabase(string filename)
             {
                 stopwatch.Restart();
                 int progressStep = 500;
-                statusStrip.Visible = true;
                 this.bindingSourceMain.DataMember = "";
                 using (var fs = new FileStream(filename, FileMode.Open, FileAccess.Read))
                 {
@@ -736,7 +735,6 @@ private void saveDatabaseToolStripMenuItem_Click(object sender, EventArgs e)
         /// <param name="e"></param>
         private void toolStripMenuItemReadDefault2_Click(object sender, EventArgs e)
         {
-            statusStrip.Visible = true;
             var state = checkDatabaseFiles(UserAppDataPath + "COD.cdb3");
 
             if (state.Valid)
@@ -784,8 +782,10 @@ private void toolStripMenuItemReadDefault2_Click(object sender, EventArgs e)
             Directory.CreateDirectory(UserAppDataPath + "COD");
             new WebClient().DownloadFile(new Uri("https://github.com/seto77/CSManager/raw/master/COD/COD/CheckSum"), UserAppDataPath + "COD\\CheckSum");
             using (var fs = new FileStream(UserAppDataPath + "COD.cdb3", FileMode.Open))
+            {
+                readInt(fs);
                 state.FileNum = readInt(fs);
-
+            }
             var wc = new WebClient[state.FileNum];
             for (int i = 0; i < wc.Length; i++)
             {
@@ -807,8 +807,6 @@ private void toolStripMenuItemReadDefault2_Click(object sender, EventArgs e)
         /// </summary>
         private async void GetAllImport()
         {
-            statusStrip.Visible = true;
-
             var dlg = new FolderBrowserDialog() { SelectedPath = "D:\\Users\\seto\\Documents\\研究\\CrystallographyData" };
             if (dlg.ShowDialog() != DialogResult.OK) return;
 
@@ -867,7 +865,6 @@ await Task.Run(() =>
                     foreach (var s in failedFile)
                         writer.WriteLine(Path.GetFileNameWithoutExtension(s));
             }
-            statusStrip.Visible = false;
         }
 
         #endregion

diff --git a/CSManager/FormMain.resx b/CSManager/FormMain.resx
@@ -283,7 +283,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="crystalControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>681, 311</value>
+    <value>681, 287</value>
   </data>
   <data name="crystalControl.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -292,7 +292,7 @@
     <value>crystalControl</value>
   </data>
   <data name="&gt;&gt;crystalControl.Type" xml:space="preserve">
-    <value>Crystallography.Controls.CrystalControl, Crystallography.Controls, Version=2020.3.17.654, Culture=neutral, PublicKeyToken=null</value>
+    <value>Crystallography.Controls.CrystalControl, Crystallography.Controls, Version=2020.3.17.721, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;crystalControl.Parent" xml:space="preserve">
     <value>splitContainer2.Panel1</value>
@@ -2191,7 +2191,7 @@
     <value>1</value>
   </data>
   <data name="splitContainer2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>912, 349</value>
+    <value>912, 325</value>
   </data>
   <data name="splitContainer2.SplitterDistance" type="System.Int32, mscorlib">
     <value>688</value>
@@ -2224,7 +2224,7 @@
     <value>   </value>
   </data>
   <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 341</value>
+    <value>0, 325</value>
   </data>
   <data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">
     <value>912, 24</value>
@@ -2235,9 +2235,6 @@
   <data name="statusStrip.Text" xml:space="preserve">
     <value>statusStrip1</value>
   </data>
-  <data name="statusStrip.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;statusStrip.Name" xml:space="preserve">
     <value>statusStrip</value>
   </data>
@@ -3098,22 +3095,16 @@
   <data name="&gt;&gt;fileToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;readDatabaseToolStripMenuItem.Name" xml:space="preserve">
-    <value>readDatabaseToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;readDatabaseToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;saveDatabaseToolStripMenuItem.Name" xml:space="preserve">
-    <value>saveDatabaseToolStripMenuItem</value>
+  <data name="&gt;&gt;toolStripMenuItemReadDefault1.Name" xml:space="preserve">
+    <value>toolStripMenuItemReadDefault1</value>
   </data>
-  <data name="&gt;&gt;saveDatabaseToolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;toolStripMenuItemReadDefault1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;clearDatabaseToolStripMenuItem.Name" xml:space="preserve">
-    <value>clearDatabaseToolStripMenuItem</value>
+  <data name="&gt;&gt;toolStripMenuItemReadDefault2.Name" xml:space="preserve">
+    <value>toolStripMenuItemReadDefault2</value>
   </data>
-  <data name="&gt;&gt;clearDatabaseToolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;toolStripMenuItemReadDefault2.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;toolStripSeparator4.Name" xml:space="preserve">
@@ -3122,16 +3113,22 @@
   <data name="&gt;&gt;toolStripSeparator4.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItemReadDefault1.Name" xml:space="preserve">
-    <value>toolStripMenuItemReadDefault1</value>
+  <data name="&gt;&gt;readDatabaseToolStripMenuItem.Name" xml:space="preserve">
+    <value>readDatabaseToolStripMenuItem</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItemReadDefault1.Type" xml:space="preserve">
+  <data name="&gt;&gt;readDatabaseToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItemReadDefault2.Name" xml:space="preserve">
-    <value>toolStripMenuItemReadDefault2</value>
+  <data name="&gt;&gt;saveDatabaseToolStripMenuItem.Name" xml:space="preserve">
+    <value>saveDatabaseToolStripMenuItem</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItemReadDefault2.Type" xml:space="preserve">
+  <data name="&gt;&gt;saveDatabaseToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;clearDatabaseToolStripMenuItem.Name" xml:space="preserve">
+    <value>clearDatabaseToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;clearDatabaseToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;toolStripSeparator3.Name" xml:space="preserve">

diff --git a/CSManager/Properties/AssemblyInfo.cs b/CSManager/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2020.3.17.0709")]
-[assembly: AssemblyFileVersion("2020.3.17.0709")]
+[assembly: AssemblyVersion("2020.3.17.0802")]
+[assembly: AssemblyFileVersion("2020.3.17.0802")]
diff --git a/Crystallography.Controls/Properties/AssemblyInfo.cs b/Crystallography.Controls/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2020.3.17.0721")]
-[assembly: AssemblyFileVersion("2020.3.17.0721")]
+[assembly: AssemblyVersion("2020.3.17.0802")]
+[assembly: AssemblyFileVersion("2020.3.17.0802")]
diff --git a/Crystallography/Properties/AssemblyInfo.cs b/Crystallography/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // 下にあるように、'*' を使って、すべての値を指定するか、
 // ビルドおよびリビジョン番号を既定値にすることができます。
 
-[assembly: AssemblyVersion("2020.3.17.0721")]
+[assembly: AssemblyVersion("2020.3.17.0802")]
 
 //
 // アセンブリに署名するには、使用するキーを指定しなければなりません。
@@ -57,5 +57,5 @@
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
 [assembly: ComVisibleAttribute(true)]
-[assembly: AssemblyFileVersion("2020.3.17.0721")]
+[assembly: AssemblyFileVersion("2020.3.17.0802")]