From: ttp <ttp@users.sourceforge.jp>
Date: Sun, 21 Sep 2008 07:32:12 +0000 (+0000)
Subject: AppliStation-GUI,インストール確認ダイアログで、依存関係上必要なソフトを選択しなかったとき、そのアイテムを赤字で長示するようにした。
X-Git-Tag: v1.1.0~12
X-Git-Url: http://git.sourceforge.jp/view?p=applistation%2FAppliStation.git;a=commitdiff_plain;h=1f7c29f0133478924db58d63279caea4d347cf9e

AppliStation-GUI,インストール確認ダイアログで、依存関係上必要なソフトを選択しなかったとき、そのアイテムを赤字で長示するようにした。

git-svn-id: http://localhost/svn/AppliStation/trunk@980 34ed2c89-c49f-4a4b-abdb-c318350108cf
---

diff --git a/AppliStation/InstallationConfirmForm.cs b/AppliStation/InstallationConfirmForm.cs
index 5422480..55c7f22 100644
--- a/AppliStation/InstallationConfirmForm.cs
+++ b/AppliStation/InstallationConfirmForm.cs
@@ -190,9 +190,12 @@ namespace AppliStation
 		{
 			System.Windows.Forms.ListView.CheckedListViewItemCollection checkeds = instsListView.CheckedItems;
 			
+			runasCheckBox.Checked = GetShouldUseRunas();
+			updateUseRunas();
+						
 			okButton.Enabled = (checkeds != null) && (checkeds.Count > 0);
 			
-			updateDependeciesIsNeeded();
+			checkUnselectedDependencies();
 		}
 				
 		void InstsListViewContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)
@@ -283,18 +286,29 @@ namespace AppliStation
 			}
 		}
 		
-		private void updateDependeciesIsNeeded()
+		/// <summary>
+		/// 依存関係を確認してGUIに反映させる。
+		/// 選択されていないが依存関係上必要なソフトを探し出す。
+		/// </summary>
+		/// <returns>選択されていないが依存関係上必要なソフトの個数(何もない場合はゼロ)</returns>
+		private uint checkUnselectedDependencies()
 		{
+			uint retVal = 0;
 			List<Package> pkg = new List<Package>();
 			foreach (Installation inst in DependeciesResolver.CreateRequiresInstallations(CheckedInstallations, pkgListMan)) {
 				pkg.Add(inst.InstalledPackage);
 			}
 			
 			foreach (ListViewItem item in instsListView.Items) {
-				if (pkg.IndexOf(((Installation) item.Tag).InstalledPackage) >= 0) {
-					item.Checked = true;
+				if ((pkg.IndexOf(((Installation) item.Tag).InstalledPackage) >= 0) && !item.Checked) {
+					item.ForeColor = Color.Red;
+					retVal++;
+				} else {
+					item.ForeColor = Color.Empty;
 				}
+			
 			}
+			return retVal;
 		}
 		
 		/// <summary>
@@ -363,6 +377,5 @@ namespace AppliStation
 		}
 		
 		#endregion
-
 	}
 }
diff --git a/AppliStation/InstallationConfirmForm.resx b/AppliStation/InstallationConfirmForm.resx
index a6858d8..201fa42 100644
--- a/AppliStation/InstallationConfirmForm.resx
+++ b/AppliStation/InstallationConfirmForm.resx
@@ -146,28 +146,27 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACu
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
         BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAAQ4BAAEOAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABOAMA
-        AQ4DAAEBAQABIAUAAUABDB4AAwIBAwMSARkBIgIhATEBLQIsAUQBYgJLAbABfgE3AU8B6QGBATcBTQHo
-        AYABOgFJAeQBgQE8AUgB4gGCATwBSwHjAVsCSwGhsAADDgETAVYCSQGWAW0CSwHCAX0BRgFDAdYBggJB
-        AdwBVgEiAZEB+wJFAfEB/wJSAfIB/wIlAe8B/wJHAfIB/wJOAfIB/wGCATwBSwHjrAADAQECAWECTAGt
-        AZ0BYwE5Af8BmwFeATAB/wGbAVwBLAH/AZwBXAEsAf8BQQE5AbsB/wJAAfEB/wLYAfwB/wJvAfUB/wLY
-        AfwB/wJHAfIB/wGBATwBSAHirAABIgIhATEBmAFWASUB+wGfAV4BLQH/AaIBYAEuAf8BpAFhAS8B/wGo
-        AWkBOQH/AUMBPQHCAf8CJQHvAf8CXwH0Af8C+AH+Af8CbwH1Af8CJQHvAf8BgQE8AUgB4qwAATgCNgFa
-        AaUBZwE7Af8BnwFeAS0B/wGqAWUBMQH/Aa0BZwEyAf8BugGIAV4B/wFHAUIBxwH/AkkB8gH/AtsB/AH/
-        Al8B9AH/AtgB/AH/AlIB8gH/AYEBPAFIAeKsAAMUARwBmgFDAS4B8wGpAWQBMQH/Aa8BaAEzAf8BtQFs
-        ATQB/wHSAbMBmwH/AUoBSAHPAf8CPAHxAf8CSQHyAf8CJQHvAf8CQAHxAf8CRQHxAf8BgQE8AUgB4rAA
-        AVsCSwGhAa0BawE6Af8BsAFpATQB/wGlAXEBSAH/AZoCnAH/AVABVQGrAf8BPgE4AbwB/wFCATkBuwH/
-        AUMBOwG8Af8BfwEzAVMB7QF+AUQBSQHaAVMCRwGRsAADCwEPAW8CSQHDAZEBdAFbAf8BOQGFAa8B/wEt
-        AZQB0gH/ASsBlAHTAf8BLAF6Aa0B/wFyAWMBWwH+AVsCSwGhAwEBArwAAwoBDQF8AUMBTQHqATcBoQHi
-        Af8BQAGmAeMB/wE9AaQB4wH/AS0BnAHgAf8BZwFRAWcB9AMaASTAAAE/AjwBaAE6AaMB4gH/AVUBrwHm
-        Af8BcAG8AeoB/wFrAbkB6gH/AUkBqgHlAf8BLwGeAeEB/wFLAkQBgsAAAU0CRQGDAUQBqAHkAf8BagG5
-        AekB/wGdAc8B8QH/AZAByQHvAf8BWwGyAecB/wEzAaAB4QH/AVYCSQGWwAABNwI1AVkBPwGkAeIB/wFf
-        AbQB6AH/AYUBxAHtAf8BeQHAAewB/wFSAa4B5gH/ATIBnwHhAf8BRQJAAXXDAAEBAWwCSwG+AUgBqQHl
-        Af8BUwGvAeYB/wFPAawB5QH/AT8BpQHjAf8BdwJKAc4DBgEIxAADCgENAVgCSQGaAXgCSQHQAXoCSAHU
-        AVsCSwGhAxEBF7gAAUIBTQE+BwABPgMAASgDAAE4AwABDgMAAQEBAAEBBQABcBcAA/8BAAHgBwABwAcA
-        AYAHAAGABwABgAcAAYAHAAHABwABwAEMBgAB4AEcBgAB4AEcBgAB4AEcBgAB4AEcBgAB4AEcBgAB8AE8
-        BgAL
+        AQ4DAAEBAQABIAUAAUABDB4AAwIBAwMSARkBIgIhATEDLAFEAVwCUAGwAXkBPAFRAekBewE9AU8B6AF6
+        AUEBTAHkAXkBQwFNAeIBfAFDAU8B4wFVAk4BobAAAw4BEwFRAkwBlgFlAlABwgF1AU0BSgHWAXkCSAHc
+        AVYBIgGQAfsCRAHxAf8CUQHyAf8CJAHvAf8CRgHyAf8CTQHyAf8BfAFDAU8B46wAAwEBAgFbAlEBrQGd
+        AWIBOAH/AZsBXQEvAf8BmwFbASsB/wGcAVsBKwH/AUABOAG7Af8CPwHxAf8C2AH8Af8CbgH1Af8C2AH8
+        Af8CRgHyAf8BeQFDAU0B4qwAASICIQExAZYBVgElAfsBnwFdASwB/wGiAV8BLQH/AaQBYAEuAf8BqAFo
+        ATgB/wFCATwBwgH/AiQB7wH/Al4B9AH/AvgB/gH/Am4B9QH/AiQB7wH/AXkBQwFNAeKsAAM3AVoBpQFm
+        AToB/wGfAV0BLAH/AaoBZAEwAf8BrQFmATEB/wG6AYgBXQH/AUYBQQHHAf8CSAHyAf8C2wH8Af8CXgH0
+        Af8C2AH8Af8CUQHyAf8BeQFDAU0B4qwAAxQBHAGVAUYBMwHzAakBYwEwAf8BrwFnATIB/wG1AWsBMwH/
+        AdIBswGbAf8BSQFHAc8B/wI7AfEB/wJIAfIB/wIkAe8B/wI/AfEB/wJEAfEB/wF5AUMBTQHisAABVQJO
+        AaEBrQFqATkB/wGwAWgBMwH/AaUBcAFHAf8BmgKcAf8BTwFUAasB/wE9ATcBvAH/AUEBOAG7Af8BQgE6
+        AbwB/wF7ATgBVAHtAXcBSgFPAdoBTgJKAZGwAAMLAQ8BZwJQAcMBkQFzAVoB/wE4AYUBrwH/ASwBlAHS
+        Af8BKgGUAdMB/wErAXkBrQH/AXIBYwFbAf4BVQJOAaEDAQECvAADCgENAXgBRwFQAeoBNgGhAeIB/wE/
+        AaYB4wH/ATwBpAHjAf8BLAGcAeAB/wFmAVIBZgH0AxoBJMAAAT0CPAFoATkBowHiAf8BVAGvAeYB/wFv
+        AbwB6gH/AWoBuQHqAf8BSAGqAeUB/wEuAZ4B4QH/AUgCRgGCwAABSQJHAYMBQwGoAeQB/wFpAbkB6QH/
+        AZ0BzwHxAf8BkAHJAe8B/wFaAbIB5wH/ATIBoAHhAf8BUQJMAZbAAAM2AVkBPgGkAeIB/wFeAbQB6AH/
+        AYUBxAHtAf8BeAHAAewB/wFRAa4B5gH/ATEBnwHhAf8BQwJBAXXDAAEBAWQCUQG+AUcBqQHlAf8BUgGv
+        AeYB/wFOAawB5QH/AT4BpQHjAf8BbgJRAc4DBgEIxAADCgENAVMCTAGaAXACUAHQAXICTwHUAVUCTgGh
+        AxEBF7gAAUIBTQE+BwABPgMAASgDAAE4AwABDgMAAQEBAAEBBQABcBcAA/8BAAHgBwABwAcAAYAHAAGA
+        BwABgAcAAYAHAAHABwABwAEMBgAB4AEcBgAB4AEcBgAB4AEcBgAB4AEcBgAB4AEcBgAB8AE8BgAL
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">