Changeset 6456 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views

Timestamp:

06/20/11 16:57:04 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed Admin Views plugin dependencies
• use settings instead of magic numbers and strings

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4

Files:

• Properties/Settings.Designer.cs (modified) (1 diff)
• Properties/Settings.settings (modified) (1 diff)
• SlaveItem.cs (modified) (2 diffs)
• SlaveView.cs (modified) (2 diffs)
• app.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/Properties/Settings.Designer.cs

@@ -35 +35 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("showui")]
+        public string ShowUICmd {
+            get {
+                return ((string)(this["ShowUICmd"]));
+            }
+            set {
+                this["ShowUICmd"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("SlaveCommunicationServiceEndpoint")]
+        public string SlaveCommunicationServiceEndpoint {
+            get {
+                return ((string)(this["SlaveCommunicationServiceEndpoint"]));
+            }
+            set {
+                this["SlaveCommunicationServiceEndpoint"] = value;
+            }
+        }
     }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/Properties/Settings.settings

@@ -6 +6 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ShowUICmd" Type="System.String" Scope="User">
+      <Value Profile="(Default)">showui</Value>
+    </Setting>
+    <Setting Name="SlaveCommunicationServiceEndpoint" Type="System.String" Scope="User">
+      <Value Profile="(Default)">SlaveCommunicationServiceEndpoint</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -23 +23 @@
 using System.ServiceModel;
 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts;
+using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -80 +81 @@
     public void Open() {
       try {
-        pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(this, "SlaveCommunicationServiceEndpoint");
+        pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(this, Settings.Default.SlaveCommunicationServiceEndpoint);
         RegisterEvents();
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties;
 using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
@@ -245 +246 @@
     private void ElevateApplication() {
       // launch itself as administrator
-      ProcessStartInfo proc = new ProcessStartInfo(Application.ExecutablePath, "showui");
+      ProcessStartInfo proc = new ProcessStartInfo(Application.ExecutablePath, Settings.Default.ShowUICmd);
       proc.UseShellExecute = true;
       proc.WorkingDirectory = Environment.CurrentDirectory;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/app.config

@@ -11 +11 @@
                 <value>False</value>
             </setting>
+            <setting name="ShowUICmd" serializeAs="String">
+                <value>showui</value>
+            </setting>
+            <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String">
+                <value>SlaveCommunicationServiceEndpoint</value>
+            </setting>
         </HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings>
     </userSettings>