OSDN Git Service

AppliStation-GUI,リソースファイルの画像の破損を修正
[applistation/AppliStation.git] / AppliStation / UserPrefForm.cs
index f3234ad..b9c3ba2 100644 (file)
@@ -40,6 +40,8 @@ namespace AppliStation
                        \r
                        NaGet.NaGetLibPref userPref = NaGet.Env.Pref;\r
                        this.ProxyAddress = userPref.ProxyAddress;\r
+                       this.EnableScanInstallerFile = userPref.EnableScanInstallerFile;\r
+                       this.InstallOnBackground = userPref.InstallOnBackground;\r
                }\r
                \r
                #region レポジトリリスト設定関連\r
@@ -69,7 +71,7 @@ namespace AppliStation
                /// </summary>\r
                /// <param name="repo">対象レポジトリ</param>\r
                /// <returns>ListBoxに表示すべき文字列</returns>\r
-               private string repoListCheckedListBoxRenderer(RepositoryInfo repo) {\r
+               private static string repoListCheckedListBoxRenderer(RepositoryInfo repo) {\r
                        return string.Format("{0}[{1}]", repo.Name, repo.Url.Href);\r
                }\r
 \r
@@ -276,11 +278,41 @@ namespace AppliStation
                \r
                #endregion\r
                \r
+               #region インストール設定関連\r
+               \r
+               /// <summary>\r
+               /// インストーラーファイルをウイルススキャンするかを設定あるいは取得する\r
+               /// </summary>\r
+               public bool EnableScanInstallerFile {\r
+                       set {   this.installScanInstallerFileCheckbox.Checked = value;  }\r
+                       get {   return this.installScanInstallerFileCheckbox.Checked;   }\r
+               }\r
+               \r
+               /// <summary>\r
+               /// インストール・アンインストールを優先度を下げて実行するかを設定あるいは取得する\r
+               /// </summary>\r
+               public bool InstallOnBackground {\r
+                       set {   this.installOnBackgroundCheckBox.Checked = value;       }\r
+                       get {   return this.installOnBackgroundCheckBox.Checked;        }\r
+               }\r
+               \r
+               /// <summary>\r
+               /// インストール関連設定を、指定された設定オブジェクトに設定する。\r
+               /// </summary>\r
+               /// <param name="pref">設定オブジェクト</param>\r
+               private void commitInstallSetting(NaGet.NaGetLibPref pref)\r
+               {\r
+                       pref.EnableScanInstallerFile = this.EnableScanInstallerFile;\r
+                       pref.InstallOnBackground = this.InstallOnBackground;\r
+               }\r
+               \r
+               #endregion\r
+               \r
                /// <summary>\r
                /// 指定された設定オブジェクトをファイルとして保存する\r
                /// </summary>\r
                /// <param name="pref">設定ファイル</param>\r
-               private void commitNaGetLibPref(NaGet.NaGetLibPref pref)\r
+               private static void commitNaGetLibPref(NaGet.NaGetLibPref pref)\r
                {\r
                        // ファイルに書き込む\r
                        string path = NaGet.Env.PrefPath;\r
@@ -296,6 +328,7 @@ namespace AppliStation
                        \r
                        commitRepositoryListSetting();\r
                        commitProxySetting(pref);\r
+                       commitInstallSetting(pref);\r
                        \r
                        commitNaGetLibPref(pref);\r
                }\r
@@ -303,5 +336,28 @@ namespace AppliStation
                void CancelButtonClick(object sender, EventArgs e)\r
                {\r
                }\r
+               \r
+               void RepoUrlTextBoxValidating(object sender, System.ComponentModel.CancelEventArgs e)\r
+               {\r
+                       string urlText = repoUrlTextBox.Text;\r
+                       \r
+                       if (string.IsNullOrEmpty(urlText)) {\r
+                               return; // special case.\r
+                       } if (Uri.IsWellFormedUriString(urlText, UriKind.Absolute) == false) {\r
+                               repoUrlTextBoxErrorProvider.SetError(repoUrlLabel, "URLの記述が不正です");\r
+                               e.Cancel = true;\r
+                       } else {\r
+                               Uri uri = new Uri(urlText);\r
+                               if ((uri.Scheme != Uri.UriSchemeFile) &&\r
+                                   (uri.Scheme != Uri.UriSchemeFtp) &&\r
+                                   (uri.Scheme != Uri.UriSchemeHttp) &&\r
+                                   (uri.Scheme != Uri.UriSchemeHttps)){\r
+                                       repoUrlTextBoxErrorProvider.SetError(repoUrlLabel, "URLの記述が不正です");\r
+                                       e.Cancel = true;\r
+                               } else {\r
+                                       repoUrlTextBoxErrorProvider.Clear();\r
+                               }\r
+                       }\r
+               }\r
        }\r
 }\r