From 7a73afe926e52c647dcca4eff371c167a9f7a542 Mon Sep 17 00:00:00 2001
From: tsuji <ak.tsuji@screen.co.jp>
Date: Thu, 25 Nov 2021 10:26:41 +0900
Subject: [PATCH] =?UTF-8?q?Update=20RunBatch.cs=20=E3=83=BBtmp=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=80=E3=81=8B=E3=82=89=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AB=E3=83=80=E4=B8=B8=E3=81=94=E3=81=A8=E3=82=B3=E3=83=94?=
 =?UTF-8?q?=E3=83=BC=E3=81=99=E3=82=8B=E5=BD=A2=E3=81=AB=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20=E3=83=BB=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GetADoc/MainWindow.xaml    |  10 ++++-----
 GetADoc/MainWindow.xaml.cs |  44 ++++++++++++++++++-------------------
 GetADoc/RunBatch.cs        |  31 ++------------------------
 Release/GetADocGUI.exe     | Bin 19968 -> 19456 bytes
 Release/GetADocGUI.pdb     | Bin 48640 -> 48640 bytes
 5 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/GetADoc/MainWindow.xaml b/GetADoc/MainWindow.xaml
index d92f60d..00586e1 100644
--- a/GetADoc/MainWindow.xaml
+++ b/GetADoc/MainWindow.xaml
@@ -23,17 +23,17 @@
             AsciiDocの雛形を作成します
         </Label>
         <Label x:Name="label1" Content="作成先のフォルダ:" HorizontalAlignment="Left" Margin="10,40,0,0" VerticalAlignment="Top" Height="26" Width="94"/>
-        <TextBox x:Name="box1" Margin="10,67,8.667,2" AllowDrop="True" Drop="textBox_Drop" DragOver="textBox_PreviewDragOver" Panel.ZIndex="6" Grid.ColumnSpan="3" GotFocus="DeleteCompLabel">
+        <TextBox x:Name="FolderPathBox" Margin="10,67,8.667,2" AllowDrop="True" Drop="textBox_Drop" DragOver="textBox_PreviewDragOver" Panel.ZIndex="6" Grid.ColumnSpan="3" GotFocus="DeleteCompLabel">
             ＜フォルダ指定＞
         </TextBox>
         <Label x:Name="label2" Content="ドキュメント名:" Grid.Row="1" HorizontalAlignment="Left" Margin="10,11,0,0" VerticalAlignment="Top" Height="26" Width="92"/>
-        <TextBox x:Name="box2" Margin="10,37,9.667,18" Grid.Row="1" AllowDrop="True" Panel.ZIndex="2" Grid.ColumnSpan="2" GotFocus="DeleteCompLabel"/>
+        <TextBox x:Name="ADocNameBox" Margin="10,37,9.667,18" Grid.Row="1" AllowDrop="True" Panel.ZIndex="2" Grid.ColumnSpan="2" GotFocus="DeleteCompLabel"/>
         <Label x:Name="label3" Content="(.adoc)" HorizontalAlignment="Left" Margin="1.333,32,0,13" Grid.Row="1" Width="45" Grid.Column="2"/>
         <Button x:Name="button1" Content="参照" Grid.Column="3" HorizontalAlignment="Left" Margin="12.333,66,0,0" VerticalAlignment="Top" Width="46" Click="button1_Click" Panel.ZIndex="2" Height="20" GotFocus="DeleteCompLabel"/>
         <Button x:Name="button2" Content="作成" Grid.Column="3" Margin="6.333,0.667,0,0" Grid.Row="3" Panel.ZIndex="2" Click="button2_Click" Height="31" VerticalAlignment="Top" HorizontalAlignment="Left" Width="62" GotFocus="DeleteCompLabel"/>
-        <CheckBox x:Name="checkbox1" Content="SCREEN Logo" Grid.Row="3" Margin="7,9.667,2,-3.333" Panel.ZIndex="2" Height="53" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
-        <CheckBox x:Name="checkbox2" Content="カスタムアイコン" Grid.Row="3" Margin="5,9.667,1.667,-16.333" Panel.ZIndex="2" Grid.Column="1" Height="66" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
-        <CheckBox x:Name="checkbox3" Content="分割ドキュメント" Grid.Row="3" Margin="4.333,9.667,8.667,-16.333" Panel.ZIndex="2" Grid.Column="2" Height="66" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
+        <CheckBox x:Name="ScreenCheckbox" Content="SCREEN Logo" Grid.Row="3" Margin="7,9.667,2,-3.333" Panel.ZIndex="2" Height="53" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
+        <CheckBox x:Name="IconCheckbox" Content="カスタムアイコン" Grid.Row="3" Margin="5,9.667,1.667,-16.333" Panel.ZIndex="2" Grid.Column="1" Height="66" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
+        <CheckBox x:Name="SepaDocCheckbox" Content="分割ドキュメント" Grid.Row="3" Margin="4.333,9.667,8.667,-16.333" Panel.ZIndex="2" Grid.Column="2" Height="66" VerticalAlignment="Top" GotFocus="DeleteCompLabel"/>
         <TextBox x:Name="allBox"  TextWrapping="Wrap" Grid.ColumnSpan="4" Grid.RowSpan="4" Opacity="0" Cursor="Arrow" Margin="0,0,0.333,-0.333"/>
         <Label x:Name="CompletedLabel" Content="作成が完了しました!" Grid.Column="2" HorizontalAlignment="Left" Margin="51.333,32,0,0" Grid.Row="1" VerticalAlignment="Top" Grid.ColumnSpan="2" Width="139" Visibility="Hidden" FontWeight="Bold" Foreground="#FFD70B0B"/>
     </Grid>
diff --git a/GetADoc/MainWindow.xaml.cs b/GetADoc/MainWindow.xaml.cs
index 52fc170..27b8f1f 100644
--- a/GetADoc/MainWindow.xaml.cs
+++ b/GetADoc/MainWindow.xaml.cs
@@ -30,16 +30,16 @@ namespace GetADoc
             InitializeComponent();
 
             //デフォルトに前回の設定を表示
-            box1.Text = Properties.Settings.Default.box1Setting;
-            checkbox1.IsChecked = Properties.Settings.Default.checkbox1Setting;
-            checkbox2.IsChecked = Properties.Settings.Default.checkbox2Setting;
-            checkbox3.IsChecked = Properties.Settings.Default.checkbox3Setting;
+            FolderPathBox.Text = Properties.Settings.Default.box1Setting;
+            ScreenCheckbox.IsChecked = Properties.Settings.Default.checkbox1Setting;
+            IconCheckbox.IsChecked = Properties.Settings.Default.checkbox2Setting;
+            SepaDocCheckbox.IsChecked = Properties.Settings.Default.checkbox3Setting;
 
             //ドラッグ&ドロップイベントの追加
             allBox.AddHandler(TextBox.DragOverEvent, new DragEventHandler(textBox_PreviewDragOver), true);
             allBox.AddHandler(TextBox.DropEvent, new DragEventHandler(textBox_Drop), true);
-            box1.AddHandler(TextBox.DragOverEvent, new DragEventHandler(textBox_PreviewDragOver), true);
-            box1.AddHandler(TextBox.DropEvent, new DragEventHandler(textBox_Drop), true);
+            FolderPathBox.AddHandler(TextBox.DragOverEvent, new DragEventHandler(textBox_PreviewDragOver), true);
+            FolderPathBox.AddHandler(TextBox.DropEvent, new DragEventHandler(textBox_Drop), true);
         }
 
         //フォルダ指定のためにファイルをドラッグ
@@ -68,9 +68,9 @@ namespace GetADoc
                 dropFiles[0] = dropFiles[0].Substring(0, dropFiles[0].LastIndexOf(@"\"));
             }
 
-            box1.Text = dropFiles[0];
-            box1.Focus();
-            box1.Select(this.box1.Text.Length, 0);
+            FolderPathBox.Text = dropFiles[0];
+            FolderPathBox.Focus();
+            FolderPathBox.Select(this.FolderPathBox.Text.Length, 0);
         }
 
         //参照ボタンClickでフォルダ選択のダイアログを表示
@@ -84,7 +84,7 @@ namespace GetADoc
             {
                 return;
             }
-            box1.Text = selectFile.FileName;
+            FolderPathBox.Text = selectFile.FileName;
         }
 
         //作成ボタンClickでチェックボックスで要求された仕様のADocファイル一式を指定先フォルダに生成
@@ -94,21 +94,21 @@ namespace GetADoc
             bool IconFlag = false;
             bool SCREENFlag = false;
             bool SepaFlag = false;
-            if (checkbox2.IsChecked == true)//Iconsチェックボックスがオンのとき
+            if (IconCheckbox.IsChecked == true)//Iconsチェックボックスがオンのとき
             {
                 IconFlag = true;
             }
-            if (checkbox1.IsChecked == true)//SCREEN Logoチェックボックスがオンのとき
+            if (ScreenCheckbox.IsChecked == true)//SCREEN Logoチェックボックスがオンのとき
             {
                 SCREENFlag = true;
             }
-            if (checkbox3.IsChecked == true)//分割ドキュチェックボックスがオンのとき
+            if (SepaDocCheckbox.IsChecked == true)//分割ドキュチェックボックスがオンのとき
             {
                 SepaFlag = true;
             }
 
             //ファイルパスが指定されていない or 指定したフォルダが存在しない場合
-            if (box1.Text == "" || !Directory.Exists(box1.Text))
+            if (FolderPathBox.Text == "" || !Directory.Exists(FolderPathBox.Text))
             {
                 CustomMsgBox.Show(mainWindow, "保存先が存在しません", "Save destination does not exist", MessageBoxButton.OK, MessageBoxImage.Warning);
                 Properties.Settings.Default.box1Setting = "";   //記憶していたパスを初期化
@@ -117,13 +117,13 @@ namespace GetADoc
             }
 
             // テキストボックス2からfile名を取得
-            var fileName = box2.Text;
-            if (box2.Text == "")
+            var fileName = ADocNameBox.Text;
+            if (ADocNameBox.Text == "")
             {
                 fileName = "t";
             }
             //テキストボック1から保存場所を取得
-            var filePath = box1.Text + @"\";
+            var filePath = FolderPathBox.Text + @"\";
 
             // ファイル名に使用不可の文字が含まれている場合の処理
             char[] NgChars = System.IO.Path.GetInvalidFileNameChars();
@@ -133,7 +133,7 @@ namespace GetADoc
                 fileName = RunBatch.NameCalibration(fileName);
                 CustomMsgBox.Show(mainWindow, "ファイル名に使用できない文字が存在したため\n一部ファイル名を修正しました。" +
                     "\nもう一度作成ボタンをクリックしてください。", "Renamed this file", MessageBoxButton.OK, MessageBoxImage.Warning);
-                box2.Text = fileName;
+                ADocNameBox.Text = fileName;
                 return;
             }
 
@@ -165,10 +165,10 @@ namespace GetADoc
             CompletedLabel.Visibility = Visibility.Visible;
 
             //指定されたファイルパスとチェックボックスを保存
-            Properties.Settings.Default.box1Setting = box1.Text;
-            Properties.Settings.Default.checkbox1Setting = ((bool)checkbox1.IsChecked);
-            Properties.Settings.Default.checkbox2Setting = ((bool)checkbox2.IsChecked);
-            Properties.Settings.Default.checkbox3Setting = ((bool)checkbox3.IsChecked);
+            Properties.Settings.Default.box1Setting = FolderPathBox.Text;
+            Properties.Settings.Default.checkbox1Setting = ((bool)ScreenCheckbox.IsChecked);
+            Properties.Settings.Default.checkbox2Setting = ((bool)IconCheckbox.IsChecked);
+            Properties.Settings.Default.checkbox3Setting = ((bool)SepaDocCheckbox.IsChecked);
             Properties.Settings.Default.Save();
         }
 
diff --git a/GetADoc/RunBatch.cs b/GetADoc/RunBatch.cs
index 3ad9755..4d63ccf 100644
--- a/GetADoc/RunBatch.cs
+++ b/GetADoc/RunBatch.cs
@@ -85,44 +85,17 @@ namespace GetADoc
             process.Close();
 
             //指定されたフォルダに生成物を移動
-            RunBatch.MoveProduct(icon, sepa, fileName, tempPath, filePath);
+            RunBatch.MoveDirectory(tempPath, filePath);
 
             //テンポラリフォルダの消去
             TemporaryFolder.DeleteTempFolder(tempPath);
         }
 
-        //生成物を指定先フォルダへ移動
-        static public void MoveProduct(bool icon, bool sepa, 
-            string fileName, string tempPath, string filePath)
-        {
-			/*
-				個別移動ではなく、フォルダ全体を移動した方がよいが、とりあえずそのまま。理由：内部コマンドで生成物が増えたらまた追加修正が必要である。
-            */
-			File.Move(System.IO.Path.Combine(tempPath, fileName + ".adoc"), filePath + fileName + ".adoc");
-            File.Move(System.IO.Path.Combine(tempPath, "config.adoc"), System.IO.Path.Combine(filePath, "config.adoc"));
-            MoveDirectory(System.IO.Path.Combine(tempPath, "Images"), System.IO.Path.Combine(filePath, "Images")); // Directory.Move -> local MoveDirectory
-            if (icon == true)
-            {
-				MoveDirectory(System.IO.Path.Combine(tempPath, "icons"), System.IO.Path.Combine(filePath, "icons"));// Directory.Move -> local MoveDirectory
-            }
-            if (sepa == true)
-            {
-                File.Move(System.IO.Path.Combine(tempPath, "IncDoc.adoc"), System.IO.Path.Combine(filePath, "IncDoc.adoc"));
-                MoveDirectory(System.IO.Path.Combine(tempPath, "Sub_First"), System.IO.Path.Combine(filePath, "Sub_First"));// Directory.Move -> local MoveDirectory
-                MoveDirectory(System.IO.Path.Combine(tempPath, "Sub_Second"), System.IO.Path.Combine(filePath, "Sub_Second"));// Directory.Move -> local MoveDirectory
-            }
-        }
-
 		/// <summary>
 		/// ディレクトリを移動する。
 		/// </summary>
 		/// <param name="sourceDirName">移動するディレクトリ</param>
 		/// <param name="destDirName">移動先のディレクトリ</param>
-		/*
-			ref: https://johobase.com/copy-directory-csharp/ [ディレクトリ（フォルダー）をコピーする [C#]]
-		    最後に追加して、移動元のディレクトリをサブディレクトリ、ファイルを含めて削除
-			Directory.Delete(sourceDirName, true);
-		*/
 		public static void MoveDirectory(string sourceDirName, string destDirName)
 		{
 			// コピー先のディレクトリがないかどうか判定する
@@ -151,7 +124,7 @@ namespace GetADoc
 			string[] dirs = Directory.GetDirectories(sourceDirName);
 			foreach (string dir in dirs)
 			{
-				// コピー元のディレクトリのサブディレクトリで自メソッド（CopyDirectory）を再帰的に呼び出す
+				// コピー元のディレクトリのサブディレクトリで自メソッド（MoveDirectory）を再帰的に呼び出す
 				MoveDirectory(dir, destDirName + Path.GetFileName(dir));
 			}
 			Directory.Delete(sourceDirName, true);// 追加: 最後に元のフォルダを削除する
diff --git a/Release/GetADocGUI.exe b/Release/GetADocGUI.exe
index fc5ed18f6f449f61d064001fc6a89dac998f382b..d22b75027532d36a2ee8665427ecb1b922d98daa 100644
GIT binary patch
delta 6081
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

delta 6290
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
O)g&|LeaiZ)jQ;`kObNCC

diff --git a/Release/GetADocGUI.pdb b/Release/GetADocGUI.pdb
index 57d964e818a4c69dea2afe177dfcc14cfb2a7b58..e7f52edf7b0a183541da53dbd3bc34ef38e3c600 100644
GIT binary patch
delta 2645
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
Tx8Ci|Rici&bn4di?brVS)|7Jn

delta 2407
zcmd^=YfMx}6vyw}-Mi&3Y;;}3h2^DGo-XVzsKBD`>K0iPd0J6aM4rk^3(A7AEUB@6
z01F(WsR_0u#>75UxR{#MHq^wln9xMhv>$5Y2aNSYHP%8CTbuSj7fK*a+oWGRn=`+2
z&YYQ@xpQX5|3dV?5U=IvgZq1bJNw|YrPmj5-kx>4!cY=9m_6ja$cBUdsnMJx2K(#F
z%cI{P%KzGLo7mji@J2#N=6&9?KOiUAnmyjS>ywAxlSQ#R1Mb|H&)1r^s-s5U2-23`
z=@;l`V!Za(OPcHSD6vF4^q%>9awR<w^+6Q7Dw1Q{RtNc3-IMh}g23>Lq@g?$9kPzF
zI$D`r&zh(&xtVnmOKE1^bU39&KM=?xQCjHtx~241$~tn{%<L)}gQ?M0&PHk6*1{&p
zZEs<dbRG3HB{;Uob!tZ@=;&~&iFzH2G5DY(34@P2)?)BMhlQe37qbDfr>@0#+&%$&
z6t;z~rG{fn?t28^r0NS!3un`cJ?$sPPSMIWQQ|2rUy$Nk6D+a@>Pc^7=Sa$kGoF)X
z<{T+R8~N0Av@WAr4Ajw;j98B3j4*ndQN?m;duE(5SGO=afO;~cSO9&f*5hjZSgj3C
z?zcKEsJ+fOqb*>j=L-CfjQ<IsE@zu4%k+!0Neq$cU{*4qoX_eInM_MJw6RR;L4ArO
zS9_9MFbD<nq#pWi$N|VMK^FAFGmN<p(m<D8wOE_ceZ(A#)-XuwT!ar1Skwjgp+(j?
zr&bh%TqR;-BP+BDMqxR6aK_A%+iuvWA?qP&5Hoyy^ySc_)i{H&8H|JMgl_|+1rkf&
zZc2&fvoD<|wz<EyVLtc<Upm6b;|b^AVZWz_Wh!Hy!z|)ebg71vBWPiPk9K6IhE~nF
z4Z;Gw&mEzRW>+yWA&_EoYM70Ba#~m!F>gJqphj=8oG_bmFA+;K(LHZCVxD{R5#!BG
zk}Kx7D!sX9Bo;?^3r&<>5G2NFX3j>z6w9N=!b(<yrYK{LW?^n<i4{dLEiEr<W+T*B
z6q7JA8xbOCj2H3IU9dmJ5<Z^wht1}oMBf!zm_*NuqC%0LYF_e{^4$wT48jG8?8U`$
zoZ6G&JF{F9y<40n=goRTRnJp+X6D6&ZR+`TmAKf5(p6Hgk)L7;yo}NGjwItvSYxod
zaf10FjwE}j$=F)mc&MPFwT{Qd;;$L4E{$U%?J1368tN)7v+m}zL7A9=TI+F+wqrc?
zGRSK_T3zs3bJdZ`R)Lr;MH$^$!q^zucbhuX1;LLaB{)G`GeQ=)1Y8HkgX_T*a09po
z+z7hCO`r#S1>6O02KRtoum#)#9tHEjZZID_0~Uanz+&(NtWhX|G7QId@FTDkyakql
zU(oHc!p^P8!1TF<?d7rR%GlhBv0C8-gqQv37Xwy;m^9ByKgL2H3;w-eE!Y7b0FQ(9
z;M-sWcpYp6?}E*s0baujp&b)wg+w9|j?VHp^w%MNJ~49cx!qUr!|-0eBtF(rN99??
zTxDg<)#nbQebsOFZ3-Q(u`zK<R2;Rp0wbm{e~mDITX<R}sA)E(7+V&J`hByTDrl&w
zHB9jw84<B#pS3NM_~IwH#*aa=FHGVI7fN>DGKnYJHm)JvyL=X0T?0Og)PM|5qCvFt
ztF~3u0<q^CxQ1)h&~A}r+=vFXB?Q{bYD*?nv|CsL-9@_%$1#bz+LuXX&~#kGF-8lX
zqQ|J4$lYO)I?-mJAJNvW+Wa|MqS{wgdvwmm3xxQ|KW%9m+EO0L-#y*2L@_={aU4qy
z6i?`s{U;wv|Lvvi4bbZ2c~+xfKz8s6>rcG#H;=F4I_DDqb^8XMu)plhJ0rUP-QHZD
o(3%I#tH0tG%;%m(->iS;%)d6-`Lp%L-h3teibtpJ+{gv_4^q=dZvX%Q

-- 
2.22.0