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

Timestamp:

06/20/11 16:57:04 (14 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.SlaveTrayIcon

Files:

• HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon.csproj (modified) (1 diff)
• Program.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon.csproj

@@ -44 +44 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/Program.cs

@@ -5 +5 @@
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.SlaveCore.Views;
+using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore.SlaveTrayIcon {
@@ -13 +14 @@
     [STAThread]
     static void Main(string[] args) {
-      if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {
+      if (args.Length < 1 || (args.Length > 0 && args[0] != Settings.Default.ShowUICmd)) {
         KillOtherInstances();
       }
@@ -20 +21 @@
       Application.SetCompatibleTextRenderingDefault(false);
       MainWindow mw = new MainWindow();
-      if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {
+      if (args.Length < 1 || (args.Length > 0 && args[0] != Settings.Default.ShowUICmd)) {
         mw.MinimizeToTray();
-      } else if (args.Length > 0 && args[0] == "showui") {
+      } else if (args.Length > 0 && args[0] == Settings.Default.ShowUICmd) {
         mw.RestoreFromTray();
       }