* reverted the previous change to a single click

* calls LoadNotificationIcon()

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@708 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
wj32
2009-02-22 00:22:50 +00:00
parent ee953259ec
commit fb4b5cc8ea
2 changed files with 21 additions and 22 deletions
+17 -17
View File
@@ -113,7 +113,6 @@
this.listNetwork = new ProcessHacker.NetworkList();
this.menuService = new System.Windows.Forms.ContextMenu();
this.goToProcessServiceMenuItem = new System.Windows.Forms.MenuItem();
this.performAdminServiceMenuItem = new System.Windows.Forms.MenuItem();
this.startServiceMenuItem = new System.Windows.Forms.MenuItem();
this.continueServiceMenuItem = new System.Windows.Forms.MenuItem();
this.pauseServiceMenuItem = new System.Windows.Forms.MenuItem();
@@ -141,6 +140,7 @@
this.shutdownTrayMenuItem = new System.Windows.Forms.MenuItem();
this.exitTrayMenuItem = new System.Windows.Forms.MenuItem();
this.vistaMenu = new wyDay.Controls.VistaMenu(this.components);
this.performAdminServiceMenuItem = new System.Windows.Forms.MenuItem();
((System.ComponentModel.ISupportInitialize)(this.statusGeneral)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.statusCPU)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.statusMemory)).BeginInit();
@@ -631,7 +631,7 @@
//
// statusBar
//
this.statusBar.Location = new System.Drawing.Point(0, 348);
this.statusBar.Location = new System.Drawing.Point(0, 369);
this.statusBar.Name = "statusBar";
this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
this.statusGeneral,
@@ -690,7 +690,7 @@
this.tabControlBig.Location = new System.Drawing.Point(0, 0);
this.tabControlBig.Name = "tabControlBig";
this.tabControlBig.SelectedIndex = 0;
this.tabControlBig.Size = new System.Drawing.Size(804, 348);
this.tabControlBig.Size = new System.Drawing.Size(804, 369);
this.tabControlBig.TabIndex = 6;
this.tabControlBig.SelectedIndexChanged += new System.EventHandler(this.tabControlBig_SelectedIndexChanged);
//
@@ -700,7 +700,7 @@
this.tabProcesses.Location = new System.Drawing.Point(4, 22);
this.tabProcesses.Name = "tabProcesses";
this.tabProcesses.Padding = new System.Windows.Forms.Padding(3);
this.tabProcesses.Size = new System.Drawing.Size(796, 322);
this.tabProcesses.Size = new System.Drawing.Size(796, 343);
this.tabProcesses.TabIndex = 0;
this.tabProcesses.Text = "Processes";
this.tabProcesses.UseVisualStyleBackColor = true;
@@ -711,7 +711,7 @@
this.treeProcesses.Location = new System.Drawing.Point(3, 3);
this.treeProcesses.Name = "treeProcesses";
this.treeProcesses.Provider = null;
this.treeProcesses.Size = new System.Drawing.Size(790, 316);
this.treeProcesses.Size = new System.Drawing.Size(790, 337);
this.treeProcesses.TabIndex = 4;
this.treeProcesses.DoubleClick += new System.EventHandler(this.treeProcesses_DoubleClick);
this.treeProcesses.SelectionChanged += new System.EventHandler(this.listProcesses_SelectionChanged);
@@ -723,7 +723,7 @@
this.tabServices.Location = new System.Drawing.Point(4, 22);
this.tabServices.Name = "tabServices";
this.tabServices.Padding = new System.Windows.Forms.Padding(3);
this.tabServices.Size = new System.Drawing.Size(796, 322);
this.tabServices.Size = new System.Drawing.Size(796, 343);
this.tabServices.TabIndex = 1;
this.tabServices.Text = "Services";
this.tabServices.UseVisualStyleBackColor = true;
@@ -735,7 +735,7 @@
this.listServices.Location = new System.Drawing.Point(3, 3);
this.listServices.Name = "listServices";
this.listServices.Provider = null;
this.listServices.Size = new System.Drawing.Size(790, 316);
this.listServices.Size = new System.Drawing.Size(790, 337);
this.listServices.TabIndex = 0;
this.listServices.DoubleClick += new System.EventHandler(this.listServices_DoubleClick);
//
@@ -745,7 +745,7 @@
this.tabNetwork.Location = new System.Drawing.Point(4, 22);
this.tabNetwork.Name = "tabNetwork";
this.tabNetwork.Padding = new System.Windows.Forms.Padding(3);
this.tabNetwork.Size = new System.Drawing.Size(796, 322);
this.tabNetwork.Size = new System.Drawing.Size(796, 343);
this.tabNetwork.TabIndex = 2;
this.tabNetwork.Text = "Network";
this.tabNetwork.UseVisualStyleBackColor = true;
@@ -757,7 +757,7 @@
this.listNetwork.Location = new System.Drawing.Point(3, 3);
this.listNetwork.Name = "listNetwork";
this.listNetwork.Provider = null;
this.listNetwork.Size = new System.Drawing.Size(790, 316);
this.listNetwork.Size = new System.Drawing.Size(790, 337);
this.listNetwork.TabIndex = 0;
//
// menuService
@@ -783,12 +783,6 @@
this.goToProcessServiceMenuItem.Text = "&Go to Process";
this.goToProcessServiceMenuItem.Click += new System.EventHandler(this.goToProcessServiceMenuItem_Click);
//
// performAdminServiceMenuItem
//
this.performAdminServiceMenuItem.Index = 1;
this.performAdminServiceMenuItem.Text = "Perform Administrative Tasks";
this.performAdminServiceMenuItem.Click += new System.EventHandler(this.performAdminServiceMenuItem_Click);
//
// startServiceMenuItem
//
this.vistaMenu.SetImage(this.startServiceMenuItem, global::ProcessHacker.Properties.Resources.control_play_blue);
@@ -853,7 +847,7 @@
this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
this.notifyIcon.Text = "Process Hacker";
this.notifyIcon.Visible = true;
this.notifyIcon.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseClick);
this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
//
// menuIcon
//
@@ -961,11 +955,17 @@
//
this.vistaMenu.ContainerControl = this;
//
// performAdminServiceMenuItem
//
this.performAdminServiceMenuItem.Index = 1;
this.performAdminServiceMenuItem.Text = "Perform Administrative Tasks";
this.performAdminServiceMenuItem.Click += new System.EventHandler(this.performAdminServiceMenuItem_Click);
//
// HackerWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(804, 370);
this.ClientSize = new System.Drawing.Size(804, 391);
this.Controls.Add(this.tabControlBig);
this.Controls.Add(this.statusBar);
this.DoubleBuffered = true;
+4 -5
View File
@@ -343,7 +343,6 @@ namespace ProcessHacker
box.TopMost = this.TopMost;
box.DefaultFileName = "Process Hacker Log.txt";
box.TextBox.SelectionStart = str.Length;
box.ShowDialog();
}
@@ -473,9 +472,9 @@ namespace ProcessHacker
#region Notification Icon & Menu
private void notifyIcon_MouseClick(object sender, MouseEventArgs e)
private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
{
showHideMenuItem_Click(sender, e);
showHideMenuItem_Click(null, null);
}
private void menuIcon_Popup(object sender, EventArgs e)
@@ -2180,8 +2179,8 @@ namespace ProcessHacker
this.LoadUac();
this.LoadFixMenuItems();
this.LoadControls();
this.LoadSettings();
this.LoadNotificationIcon();
this.LoadSettings();
this.LoadSymbols();
this.LoadApplyCommandLineArgs();
@@ -2225,6 +2224,6 @@ namespace ProcessHacker
this.Visible = false;
}
}
}
}
}
}