diff --git a/GetADoc/App.config b/GetADoc/App.config
index b013c9cfead936c3ed5183e110822e75af3f348b..1d5d4bf4a5b625c61ad95a3e394b48e114c573fd 100644
--- a/GetADoc/App.config
+++ b/GetADoc/App.config
@@ -22,6 +22,12 @@
False
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GetADoc/MainWindow.xaml b/GetADoc/MainWindow.xaml
index 00586e1adf8e4ea31753e24efddb17a33ef62705..dc97c26a4670e4569673beee734f8e84b8c8a8f5 100644
--- a/GetADoc/MainWindow.xaml
+++ b/GetADoc/MainWindow.xaml
@@ -36,5 +36,8 @@
+
+
+
diff --git a/GetADoc/MainWindow.xaml.cs b/GetADoc/MainWindow.xaml.cs
index b75d8ff8ed2293615f9c4abf63e779bdaa8e13fb..18523498c458908491a40a8eddf7545283325494 100644
--- a/GetADoc/MainWindow.xaml.cs
+++ b/GetADoc/MainWindow.xaml.cs
@@ -30,17 +30,53 @@ namespace GetADoc
InitializeComponent();
//デフォルトに前回の設定を表示
- FolderPathBox.Text = Properties.Settings.Default.box1Setting;
ScreenCheckbox.IsChecked = Properties.Settings.Default.checkbox1Setting;
IconCheckbox.IsChecked = Properties.Settings.Default.checkbox2Setting;
SepaDocCheckbox.IsChecked = Properties.Settings.Default.checkbox3Setting;
+ //Pathの初期設定（引数指定で起動していれば引数のpath、指定していなければ前回の値）
+ string[] argPathBox = Environment.GetCommandLineArgs();
+ if (argPathBox.Length == 2)
+ {
+ FolderPathBox.Text = argPathBox[1];//第一引数を入力
+ }
+ else
+ {
+ FolderPathBox.Text = Properties.Settings.Default.box1Setting;//前回の値を入力
+ }
+
+ //保存PathはデフォルトOFF
+ MyPathCheckbox.IsChecked = false;
+
//ドラッグ&ドロップイベントの追加
allBox.AddHandler(TextBox.DragOverEvent, new DragEventHandler(textBox_PreviewDragOver), true);
allBox.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);
}
+
+ //保存Pathのチェックボックスをクリックする（ONにする）と登録したPahtをTextBoxに表示
+ private void MyPathClick(object sender, RoutedEventArgs e)
+ {
+ //ONにしたとき
+ if(MyPathCheckbox.IsChecked == true)
+ {
+ FolderPathBox.Text = Properties.Settings.Default.savePathSetting;
+
+ if (FolderPathBox.Text == "")
+ {
+ SavePathLabel.Visibility = Visibility.Visible;
+ }
+ }
+
+ //OFFにしたとき
+ if (MyPathCheckbox.IsChecked == false)
+ {
+ SavePathLabel.Visibility = Visibility.Hidden;
+ FolderPathBox.Text = Properties.Settings.Default.box1Setting;
+ }
+
+ }
//フォルダ指定のためにファイルをドラッグ
private void textBox_PreviewDragOver(object sender, System.Windows.DragEventArgs e)
@@ -143,7 +179,7 @@ namespace GetADoc
|| Directory.Exists(System.IO.Path.Combine(filePath, "Sub_First")) || Directory.Exists(System.IO.Path.Combine(filePath, "Sub_Second")))
{
MessageBoxResult OverwriteADoc = CustomMsgBox.Show(mainWindow, "これから生成するファイルと同名のファイルが既に存在します" +
- "\n既存のファイルを上書きしますか？",
+ "\n既存のファイルを上書きしますか？" + "\n(Imageフォルダ内のファイルは維持されます)",
"指定したフォルダに既存のファイルが存在します",
MessageBoxButton.YesNo, MessageBoxImage.None);
if (OverwriteADoc == MessageBoxResult.Yes)
@@ -160,7 +196,12 @@ namespace GetADoc
//バッチファイルの実行
RunBatch.runBatch(IconFlag, SCREENFlag, SepaFlag, fileName, filePath);
-
+
+ //保存Pathのラベルが表示されていれば、表示を隠す
+ if (SavePathLabel.Visibility == Visibility.Visible)
+ {
+ SavePathLabel.Visibility = Visibility.Hidden;
+ }
//処理の完了を知らせるラベルを表示
CompletedLabel.Visibility = Visibility.Visible;
@@ -169,6 +210,15 @@ namespace GetADoc
Properties.Settings.Default.checkbox1Setting = ((bool)ScreenCheckbox.IsChecked);
Properties.Settings.Default.checkbox2Setting = ((bool)IconCheckbox.IsChecked);
Properties.Settings.Default.checkbox3Setting = ((bool)SepaDocCheckbox.IsChecked);
+
+ //保存PahtがTrueなら、そのときTextBoxに記載されているPathを保存
+ if (MyPathCheckbox.IsChecked == true)
+ {
+ Properties.Settings.Default.savePathSetting = FolderPathBox.Text;
+ SavedLabel.Visibility = Visibility.Visible;
+ }
+
+
Properties.Settings.Default.Save();
}
@@ -176,6 +226,7 @@ namespace GetADoc
private void DeleteCompLabel(object sender, RoutedEventArgs e)
{
CompletedLabel.Visibility = Visibility.Hidden;
+ SavedLabel.Visibility = Visibility.Hidden;
}
}
}
diff --git a/GetADoc/Properties/AssemblyInfo.cs b/GetADoc/Properties/AssemblyInfo.cs
index 47fb4ea92ac37e086a66250dfa7655a0ff515a70..aa4107a745dfe7dc4a8ad0b5fe1226eac5c0b759 100644
--- a/GetADoc/Properties/AssemblyInfo.cs
+++ b/GetADoc/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GetADoc/Properties/Settings.Designer.cs b/GetADoc/Properties/Settings.Designer.cs
index 135f6652eef5baf669f13d26c99f087a85d5cd0a..e788d0d1119cb321e80136856fba2fcb7e63a36e 100644
--- a/GetADoc/Properties/Settings.Designer.cs
+++ b/GetADoc/Properties/Settings.Designer.cs
@@ -70,5 +70,29 @@ namespace GetADoc.Properties {
this["checkbox3Setting"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string savePathSetting {
+ get {
+ return ((string)(this["savePathSetting"]));
+ }
+ set {
+ this["savePathSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string argPathSetting {
+ get {
+ return ((string)(this["argPathSetting"]));
+ }
+ set {
+ this["argPathSetting"] = value;
+ }
+ }
}
}
diff --git a/GetADoc/Properties/Settings.settings b/GetADoc/Properties/Settings.settings
index e33e4a1240a196ab4595d054d552906d4c0abcf3..8b57dd869b263580f0fc121f81bb25a1fb994932 100644
--- a/GetADoc/Properties/Settings.settings
+++ b/GetADoc/Properties/Settings.settings
@@ -14,5 +14,11 @@
False
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Release/GetADocGUI.exe b/Release/GetADocGUI.exe
index f98658dd0922d5196c0e6648d859e5a003299c3a..f7bee538ee13d3aa07972a67fd5a65c3c54b63c2 100644
Binary files a/Release/GetADocGUI.exe and b/Release/GetADocGUI.exe differ
diff --git a/Release/GetADocGUI.exe.config b/Release/GetADocGUI.exe.config
index b013c9cfead936c3ed5183e110822e75af3f348b..1d5d4bf4a5b625c61ad95a3e394b48e114c573fd 100644
--- a/Release/GetADocGUI.exe.config
+++ b/Release/GetADocGUI.exe.config
@@ -22,6 +22,12 @@
False
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Release/GetADocGUI.pdb b/Release/GetADocGUI.pdb
index 6a7ed3f382cfb356dd0000b4a1dc439766abe132..13c39125382fa35d889e87f6f778bcb5feb51c1c 100644
Binary files a/Release/GetADocGUI.pdb and b/Release/GetADocGUI.pdb differ