差分表示用のボタンを追加(無意味化もしれないが)

whistyun · Jul 20, 2018 · 8923bc4 · 8923bc4
1 parent 578ac25
commit 8923bc4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/MultiRept/Gui/ResultWindow.xaml b/MultiRept/Gui/ResultWindow.xaml
@@ -18,6 +18,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto"/>
             <ColumnDefinition Width="185*"/>
+            <ColumnDefinition Width="auto"/>
         </Grid.ColumnDefinitions>
 
         <Label
@@ -28,6 +29,7 @@
 
         <Label x:Name="FolderLabel" 
             Grid.Row="0" Grid.Column="1"
+            Grid.ColumnSpan="2"
             Content="Label"
             HorizontalAlignment="Stretch" VerticalAlignment="Top"
         />
@@ -44,9 +46,14 @@
             HorizontalAlignment="Stretch" VerticalAlignment="Top"
         />
 
+        <Button 
+            Grid.Row="1" Grid.Column="2"
+            Content="差分表示" Click="Button_Click"
+        />
+
         <DataGrid x:Name="dataGrid"
                 Grid.Row="2" Grid.Column="0"
-                Grid.ColumnSpan="2"
+                Grid.ColumnSpan="3"
                 AutoGenerateColumns="False"
                 ScrollViewer.CanContentScroll="True" 
                 IsReadOnly ="True"

diff --git a/MultiRept/Gui/ResultWindow.xaml.cs b/MultiRept/Gui/ResultWindow.xaml.cs
@@ -43,16 +43,32 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
 		private void Row_DoubleClick(object sender, MouseButtonEventArgs e)
 		{
 			DataGridRow row = sender as DataGridRow;
-			ResultData data = row.Item as ResultData;
+			ShowDiff(row.Item as ResultData);
+		}
+
+		private void Button_Click(object sender, RoutedEventArgs e)
+		{
+			var row = dataGrid.SelectedItem as ResultData;
+			if (row != null)
+			{
+				ShowDiff(row);
+			}
 
-			if (detailDic.ContainsKey(data.FilePath))
+		}
+
+		private void ShowDiff(ResultData data)
+		{
+			if (data != null)
 			{
-				//存在する場合は、Diff用のウィンドウを開く
-				var fileSet = detailDic[data.FilePath];
+				if (detailDic.ContainsKey(data.FilePath))
+				{
+					//存在する場合は、Diff用のウィンドウを開く
+					var fileSet = detailDic[data.FilePath];
 
-				var window = new DupleViewWindow();
-				window.Load(data.FilePath, fileSet.Item1, fileSet.Item2);
-				window.Show();
+					var window = new DupleViewWindow();
+					window.Load(data.FilePath, fileSet.Item1, fileSet.Item2);
+					window.Show();
+				}
 			}
 		}