From 40fa5fe03509303d013f15411c5a6d5bb115c07c Mon Sep 17 00:00:00 2001 From: yt3trees Date: Fri, 12 Aug 2022 22:16:50 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A4=87=E6=95=B0=E9=81=B8=E6=8A=9E=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msbuild-gui-installer.vdproj | 6 ++-- msbuild-gui/MainWindow.xaml | 6 ++-- msbuild-gui/MainWindow.xaml.cs | 29 +++++++++++++++---- msbuild-gui/msbuild-gui.csproj | 4 +-- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/msbuild-gui-installer/msbuild-gui-installer.vdproj b/msbuild-gui-installer/msbuild-gui-installer.vdproj index 8f652c6..ce907f1 100644 --- a/msbuild-gui-installer/msbuild-gui-installer.vdproj +++ b/msbuild-gui-installer/msbuild-gui-installer.vdproj @@ -246,15 +246,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MsBuild-Gui" - "ProductCode" = "8:{7990D27C-5549-435F-A418-4BF971E40604}" - "PackageCode" = "8:{6BEAF04A-54F2-443D-911F-85775EEAB763}" + "ProductCode" = "8:{3D1157FB-35CF-485D-A542-150C3B87B638}" + "PackageCode" = "8:{51F28A31-8F2A-46FC-918A-9EE9E234321E}" "UpgradeCode" = "8:{7D70ECDB-383F-40E2-B1A8-D750CFA02BE0}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.1" + "ProductVersion" = "8:1.0.2" "Manufacturer" = "8:yt3trees" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/msbuild-gui/MainWindow.xaml b/msbuild-gui/MainWindow.xaml index 9eade92..b6d822c 100644 --- a/msbuild-gui/MainWindow.xaml +++ b/msbuild-gui/MainWindow.xaml @@ -96,7 +96,8 @@ MouseDoubleClick="SourceList_MouseDoubleClick" KeyDown="SourceList_KeyDown" ScrollViewer.HorizontalScrollBarVisibility="Auto" - TabIndex="7" /> + TabIndex="7" + SelectionMode="Extended" /> + TabIndex="10" + SelectionMode="Extended" /> diff --git a/msbuild-gui/MainWindow.xaml.cs b/msbuild-gui/MainWindow.xaml.cs index 794af60..ffd14d5 100644 --- a/msbuild-gui/MainWindow.xaml.cs +++ b/msbuild-gui/MainWindow.xaml.cs @@ -188,10 +188,18 @@ private void MenuItem_Click(object sender, RoutedEventArgs e) /// private void AddButton_Click(object sender, RoutedEventArgs e) { - string? sourceFolder = SourceList.SelectedItem as string; - if (sourceFolder != null) + string[]? sourceFolder = new string[0]; + int i = 0; + + foreach(var item in SourceList.SelectedItems) + { + Array.Resize(ref sourceFolder, i + 1); + sourceFolder[i] = item.ToString(); + i++; + } + foreach(var item in sourceFolder) { - TargetList.Items.Add(sourceFolder); + TargetList.Items.Add(item); } } /// @@ -199,8 +207,19 @@ private void AddButton_Click(object sender, RoutedEventArgs e) /// private void RemoveButton_Click(object sender, RoutedEventArgs e) { - string? targetFolder = TargetList.SelectedItem as string; - TargetList.Items.Remove(targetFolder); + string[]? targetFolder = new string[0]; + int i = 0; + + foreach(var item in TargetList.SelectedItems) + { + Array.Resize(ref targetFolder, i + 1); + targetFolder[i] = item.ToString(); + i++; + } + foreach (var item in targetFolder) + { + TargetList.Items.Remove(item); + } } private void ProjCombo_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) diff --git a/msbuild-gui/msbuild-gui.csproj b/msbuild-gui/msbuild-gui.csproj index 4251a1f..6dc4938 100644 --- a/msbuild-gui/msbuild-gui.csproj +++ b/msbuild-gui/msbuild-gui.csproj @@ -6,9 +6,9 @@ msbuild_gui enable true - 1.0.1.0 + 1.0.2.0 yt3trees - 1.0.1.0 + 1.0.2.0 MsBuild-Gui.png image\MsBuild-Gui.ico app.manifest