X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=AppliStation%2FPackageUninstallConfirmForm.cs;h=1abc56ef8a01647772c22c549e857f12a1083956;hb=18ca2598ab757e2b59e0e76bbbc398d61884868a;hp=d5a29fb25f7b9c2f6214b149c04d1589389aa4a1;hpb=6f11bada3f4a0d9ff2e8a379bb7487f296f9c063;p=applistation%2FAppliStation.git

diff --git a/AppliStation/PackageUninstallConfirmForm.cs b/AppliStation/PackageUninstallConfirmForm.cs
index d5a29fb..1abc56e 100644
--- a/AppliStation/PackageUninstallConfirmForm.cs
+++ b/AppliStation/PackageUninstallConfirmForm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Drawing;
 using System.Windows.Forms;
@@ -22,7 +22,7 @@ namespace AppliStation
 				label2.Text = string.Format("{0}({1})", uninstallPackage.Name, uninstallPackage.Version);
 				label2.Font = new Font(SystemFonts.DefaultFont.FontFamily, SystemFonts.DefaultFont.Size*1.5f);
 				
-				Icon icon = AppliStation.Util.PackageUtils.GetIconForPackage(uninstallPackage);
+				Icon icon = AppliStation.Util.GUIUtils.GetIconForPackage(uninstallPackage);
 				if (icon != null) {
 					iconLabel.Image = icon.ToBitmap();
 					iconLabel.Size = icon.Size;
@@ -37,17 +37,17 @@ namespace AppliStation
 			//
 			InitializeComponent();
 			
-			// ŠÇ—ŽÒŒ ŒÀ‚Å“®‚¢‚Ä‚¢‚é‚È‚ç‚Îrunas‚ª•K—v‚É‚Í‚È‚ç‚È‚¢‚Ì‚Å•\Ž¦‚µ‚È‚¢
+			// 管理者権限で動いているならばrunasが必要にはならないので表示しない
 			if (NaGet.Utils.IsAdministrators()) {
 				runasCheckBox.Checked = false;
 				runasCheckBox.Visible = false;
 			}
 		}
 		
-		#region runasŠÖ˜A
+		#region runas関連
 		
 		/// <summary>
-		/// runas‚ÅŽÀs‚·‚é‚©”Û‚©
+		/// runasで実行するか否か
 		/// </summary>
 		public bool UseRunas {
 			set {
@@ -61,16 +61,17 @@ namespace AppliStation
 		}
 		
 		/// <summary>
-		/// ‘I‘ð‚³‚ê‚½ƒpƒbƒP[ƒW‚𒲍¸‚µ‚āARunas‚ðŽg‚¤‚ׂ«‚©‚¢‚È‚©‚ð•Ô‚·
+		/// 選択されたパッケージを調査して、Runasを使うべきかいなかを返す
 		/// </summary>
 		public bool GetShouldUseRunas()
 		{
 			if (NaGet.Utils.IsAdministrators()) {
-				// ŠÇ—ŽÒŒ ŒÀ‚Å“®‚¢‚Ä‚¢‚éê‡‚Í•s—v
+				// 管理者権限で動いている場合は不要
 				return false;	
 			}
 			
-			return (uninstallPackage.Type != InstallerType.ARCHIVE);
+			return (uninstallPackage.Type != InstallerType.ARCHIVE)
+				&& (uninstallPackage.Type != InstallerType.ITSELF);
 		}
 		
 		void RunasCheckBoxCheckedChanged(object sender, EventArgs e)
@@ -80,12 +81,7 @@ namespace AppliStation
 		
 		private void updateUseRunas()
 		{
-			if (UseRunas) {
-				System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackagesInstallConfirmForm));
-				okButton.Image = ((System.Drawing.Bitmap)(resources.GetObject("okButton.Image")));
-			} else {
-				okButton.Image = null;
-			}
+			AppliStation.Util.NativeMethods.Button_SetElevationRequiredState(okButton, UseRunas);
 		}
 		
 		#endregion