Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/23/11 21:31:48 (14 years ago)
Author:
ascheibe
Message:

#1233

  • added UAC self elevation for start/stop of windows service
  • added slave states and simplified ui commands
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r6225 r6257  
    7979      <SubType>Form</SubType>
    8080    </Compile>
    81     <Compile Include="MainWindow.Designer.cs">
     81    <Compile Include="MainWindow.designer.cs">
    8282      <DependentUpon>MainWindow.cs</DependentUpon>
    8383    </Compile>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.Designer.cs

    r6225 r6257  
    2929      this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
    3030      this.contextMenuNotifyIcon = new System.Windows.Forms.ContextMenuStrip(this.components);
     31      this.homepageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     32      this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
    3133      this.showToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3234      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    33       this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
    34       this.homepageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3535      this.mainTabControl = new System.Windows.Forms.TabControl();
    3636      this.tabSlaveView = new System.Windows.Forms.TabPage();
    … …  
    6969      this.contextMenuNotifyIcon.Size = new System.Drawing.Size(210, 98);
    7070      //
    71       // showToolStripMenuItem
    72       //
    73       this.showToolStripMenuItem.Name = "showToolStripMenuItem";
    74       this.showToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
    75       this.showToolStripMenuItem.Text = "Show";
    76       this.showToolStripMenuItem.Click += new System.EventHandler(this.showToolStripMenuItem_Click);
    77       //
    78       // closeToolStripMenuItem
    79       //
    80       this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
    81       this.closeToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
    82       this.closeToolStripMenuItem.Text = "Close";
    83       this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
    84       //
    85       // toolStripSeparator
    86       //
    87       this.toolStripSeparator.Name = "toolStripSeparator";
    88       this.toolStripSeparator.Size = new System.Drawing.Size(206, 6);
    89       //
    9071      // homepageToolStripMenuItem
    9172      //
    … …  
    9576      this.homepageToolStripMenuItem.Text = "Visit dev.heuristiclab.com";
    9677      this.homepageToolStripMenuItem.Click += new System.EventHandler(this.homepageToolStripMenuItem_Click);
     78      //
     79      // toolStripSeparator
     80      //
     81      this.toolStripSeparator.Name = "toolStripSeparator";
     82      this.toolStripSeparator.Size = new System.Drawing.Size(206, 6);
     83      //
     84      // showToolStripMenuItem
     85      //
     86      this.showToolStripMenuItem.Name = "showToolStripMenuItem";
     87      this.showToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
     88      this.showToolStripMenuItem.Text = "Show";
     89      this.showToolStripMenuItem.Click += new System.EventHandler(this.showToolStripMenuItem_Click);
     90      //
     91      // closeToolStripMenuItem
     92      //
     93      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
     94      this.closeToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
     95      this.closeToolStripMenuItem.Text = "Close";
     96      this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
    9797      //
    9898      // mainTabControl
    … …  
    107107      this.mainTabControl.Name = "mainTabControl";
    108108      this.mainTabControl.SelectedIndex = 0;
    109       this.mainTabControl.Size = new System.Drawing.Size(581, 303);
     109      this.mainTabControl.Size = new System.Drawing.Size(581, 369);
    110110      this.mainTabControl.TabIndex = 1;
    111111      //
    … …  
    116116      this.tabSlaveView.Name = "tabSlaveView";
    117117      this.tabSlaveView.Padding = new System.Windows.Forms.Padding(3);
    118       this.tabSlaveView.Size = new System.Drawing.Size(573, 277);
     118      this.tabSlaveView.Size = new System.Drawing.Size(573, 343);
    119119      this.tabSlaveView.TabIndex = 0;
    120120      this.tabSlaveView.Text = "Overview";
    … …  
    131131      this.slaveView.Name = "slaveView";
    132132      this.slaveView.ReadOnly = false;
    133       this.slaveView.Size = new System.Drawing.Size(561, 265);
     133      this.slaveView.Size = new System.Drawing.Size(561, 331);
    134134      this.slaveView.TabIndex = 0;
    135135      //
    … …  
    185185      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    186186      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    187       this.ClientSize = new System.Drawing.Size(605, 327);
     187      this.ClientSize = new System.Drawing.Size(605, 393);
    188188      this.Controls.Add(this.mainTabControl);
    189189      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

    r6225 r6257  
    4949    }
    5050
    51     private void RestoreFromTray() {
     51    public void RestoreFromTray() {
    5252      Show();
    5353      WindowState = FormWindowState.Normal;

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

    r6116 r6257  
    1212    /// </summary>
    1313    [STAThread]
    14     static void Main() {
    15       KillOtherInstances();
     14    static void Main(string[] args) {
     15      if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {
     16        KillOtherInstances();
     17      }
    1618
    1719      Application.EnableVisualStyles();
    1820      Application.SetCompatibleTextRenderingDefault(false);
    1921      MainWindow mw = new MainWindow();
    20       mw.MinimizeToTray();
     22      if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {
     23        mw.MinimizeToTray();
     24      } else if (args.Length > 0 && args[0] == "showui") {
     25        mw.RestoreFromTray();
     26      }
     27     
     28
    2129      mw.Content = new SlaveItem();
    2230
Note: See TracChangeset for help on using the changeset viewer.