diff --git a/SiMay.Core/Enums/SystemSessionType.cs b/SiMay.Core/Enums/SystemSessionType.cs
index 82ba4d8b233292173b2bfea5b532c9fd9c639024..3602c8b0f17ad3866181611a7f385aaba5cc2a78 100644
--- a/SiMay.Core/Enums/SystemSessionType.cs
+++ b/SiMay.Core/Enums/SystemSessionType.cs
@@ -50,6 +50,10 @@ namespace SiMay.Core.Enums
///
/// 卸载服务
///
- UnInstallService = 8
+ UnInstallService = 8,
+ ///
+ /// 重启服务
+ ///
+ ReStartService=9
}
}
diff --git a/SiMay.Net.SessionProviderService/ApplicationConfiguration.cs b/SiMay.Net.SessionProviderService/ApplicationConfiguration.cs
index ecdbf0f19fdc21343fe10128449c527ae8cf49ae..2bb7c6c5b15083ccbf5c918a22d78291449f986c 100644
--- a/SiMay.Net.SessionProviderService/ApplicationConfiguration.cs
+++ b/SiMay.Net.SessionProviderService/ApplicationConfiguration.cs
@@ -28,7 +28,7 @@ namespace SiMay.Net.SessionProviderService
///
public static int Port
{
- get { return int.Parse(IniConfigHelper.GetValue("ServiceConfig", "Port", "522", FileName)); }
+ get { return int.Parse(IniConfigHelper.GetValue("ServiceConfig", "Port", "32522", FileName)); }
set { IniConfigHelper.SetValue("ServiceConfig", "Port", value.ToString(), FileName); }
}
diff --git a/SiMay.Net.SessionProviderService/Properties/AssemblyInfo.cs b/SiMay.Net.SessionProviderService/Properties/AssemblyInfo.cs
index f50c73f93ef6d7868125d1a93bc5840f7ac0ac0e..cf74d0d1ffe84651bc43e0783d07c6e7fdd51113 100644
Binary files a/SiMay.Net.SessionProviderService/Properties/AssemblyInfo.cs and b/SiMay.Net.SessionProviderService/Properties/AssemblyInfo.cs differ
diff --git a/SiMay.RemoteClient.NewCore/MainService/MainService.cs b/SiMay.RemoteClient.NewCore/MainService/MainService.cs
index 875ade93f4f3149eb3438f20e35f7e8f4eede682..5d0c687f96ce053f727375861431a4e322a032d9 100644
--- a/SiMay.RemoteClient.NewCore/MainService/MainService.cs
+++ b/SiMay.RemoteClient.NewCore/MainService/MainService.cs
@@ -441,7 +441,7 @@ namespace SiMay.ServiceCore.MainService
string tempFilePath;
do
{
- tempFilePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + extension);
+ tempFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\", Guid.NewGuid().ToString() + extension);
} while (File.Exists(tempFilePath));
return tempFilePath;
diff --git a/SiMay.RemoteClient.NewCore/MainService/SystemSessionHelper.cs b/SiMay.RemoteClient.NewCore/MainService/SystemSessionHelper.cs
index 4e2d28fcb51bd109189c62d1781d5e9cb46ade9b..a76e56e8b1eac50cb0e5afee3c8b5bc6cde1f197 100644
--- a/SiMay.RemoteClient.NewCore/MainService/SystemSessionHelper.cs
+++ b/SiMay.RemoteClient.NewCore/MainService/SystemSessionHelper.cs
@@ -58,6 +58,10 @@ namespace SiMay.ServiceCore.MainService
/// 卸载服务
///
public const int UNINSTALL_SERVICE = 8;
+ ///
+ /// 重启服务
+ ///
+ public const int RESTART_SERVICE = 9;
public static void SetSessionStatus(int status)
{
@@ -95,6 +99,9 @@ namespace SiMay.ServiceCore.MainService
case UNINSTALL_SERVICE:
UnInstallAutoStartService();
break;
+ case RESTART_SERVICE:
+ ReStartService();
+ break;
}
}
@@ -179,5 +186,36 @@ namespace SiMay.ServiceCore.MainService
}
catch { }
}
+
+ ///
+ /// 重启服务项
+ ///
+ private static void ReStartService()
+ {
+ string batPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\ReService.bat";
+ if (!File.Exists(batPath))
+ {
+ try
+ {
+ string strReServiceBatch =
+ "@echo off" + "\r\n" +
+ "net stop SiMayService" + "\r\n" +
+ "net start SiMayService" + "\r\n";
+
+ File.WriteAllText(batPath, strReServiceBatch, new UTF8Encoding(false));
+ }
+ catch (Exception)
+ {
+
+ }
+ }
+ ProcessStartInfo startInfo = new ProcessStartInfo
+ {
+ WindowStyle = ProcessWindowStyle.Hidden,
+ UseShellExecute = true,
+ FileName = batPath
+ };
+ Process.Start(startInfo);
+ }
}
}
diff --git a/SiMay.RemoteClient.NewCore/Program.cs b/SiMay.RemoteClient.NewCore/Program.cs
index c77a00e01f07024877ba558c49fb674605eeadc5..3da13af93ffe20ff40e16a4d75f360696eb24f4e 100644
--- a/SiMay.RemoteClient.NewCore/Program.cs
+++ b/SiMay.RemoteClient.NewCore/Program.cs
@@ -70,9 +70,9 @@ namespace SiMay.ServiceCore
{
var startParameter = new StartParameterEx()
{
- Host = "94.191.115.121",
+ Host = "rm.diyustudio.com",
//Port = 520,
- Port = 522,
+ Port = 32522,
GroupName = "默认分组",
RemarkInformation = "SiMayService",
IsHide = false,
@@ -81,7 +81,7 @@ namespace SiMay.ServiceCore
//SessionMode = 0,
SessionMode = 1,
AccessKey = 5200,
- ServiceVersion = "正式6.0",
+ ServiceVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(),
RunTimeText = DateTime.Now.ToString(),
UniqueId = "AAAAAAAAAAAAAAA11111111",
ServiceName = "SiMayService",
diff --git a/SiMay.RemoteClient.NewCore/Properties/AssemblyInfo.cs b/SiMay.RemoteClient.NewCore/Properties/AssemblyInfo.cs
index 27f83eb796cbecce6492094297d903433ddbc0bf..2722d68831a60ae2c0d457d4ddaae840945bc709 100644
Binary files a/SiMay.RemoteClient.NewCore/Properties/AssemblyInfo.cs and b/SiMay.RemoteClient.NewCore/Properties/AssemblyInfo.cs differ
diff --git a/SiMay.RemoteMonitor/MainApplication/MainApplication.Designer.cs b/SiMay.RemoteMonitor/MainApplication/MainApplication.Designer.cs
index d3aa706c7a013982d8f28e33a973ec761659dc08..6dccb4bae3e825049d9c0ec5d884e2e2c098bdfc 100644
--- a/SiMay.RemoteMonitor/MainApplication/MainApplication.Designer.cs
+++ b/SiMay.RemoteMonitor/MainApplication/MainApplication.Designer.cs
@@ -80,10 +80,8 @@
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
- this.logList = new SiMay.RemoteMonitor.UserControls.UListView();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.servicesOnlineList = new SiMay.RemoteMonitor.UserControls.UListView();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.stripHost = new System.Windows.Forms.ToolStripStatusLabel();
@@ -117,6 +115,7 @@
this.桌面记录查看ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.锁定ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+ this.ReStartServiceMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmdContext.SuspendLayout();
this.logsContext.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -131,9 +130,7 @@
this.splitContainer.Panel2.SuspendLayout();
this.splitContainer.SuspendLayout();
this.tabControl2.SuspendLayout();
- this.tabPage2.SuspendLayout();
this.tabControl1.SuspendLayout();
- this.tabPage1.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -158,48 +155,48 @@
this.取消选择ToolStripMenuItem});
this.cmdContext.Name = "CmdContext";
this.cmdContext.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
- this.cmdContext.Size = new System.Drawing.Size(154, 280);
+ this.cmdContext.Size = new System.Drawing.Size(181, 280);
this.cmdContext.Opening += new System.ComponentModel.CancelEventHandler(this.CmdContext_Opening);
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
- this.toolStripMenuItem11.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem11.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem11.Text = "桌面记录";
this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click);
//
// toolStripMenuItem6
//
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
- this.toolStripMenuItem6.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem6.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem6.Text = "打开网页";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click_1);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem1.Text = "下载执行";
this.toolStripMenuItem1.Click += new System.EventHandler(this.RemoteDownloadExecete);
//
// 发送信息ToolStripMenuItem
//
this.发送信息ToolStripMenuItem.Name = "发送信息ToolStripMenuItem";
- this.发送信息ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.发送信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.发送信息ToolStripMenuItem.Text = "发送信息";
this.发送信息ToolStripMenuItem.Click += new System.EventHandler(this.SendMessageBox);
//
// 备注更改ToolStripMenuItem
//
this.备注更改ToolStripMenuItem.Name = "备注更改ToolStripMenuItem";
- this.备注更改ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.备注更改ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.备注更改ToolStripMenuItem.Text = "备注更改";
this.备注更改ToolStripMenuItem.Click += new System.EventHandler(this.ModifyRemark);
//
// toolStripMenuItem7
//
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
- this.toolStripMenuItem7.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem7.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem7.Text = "分组更改";
this.toolStripMenuItem7.Click += new System.EventHandler(this.ToolStripMenuItem7_Click);
//
@@ -212,6 +209,7 @@
this.关闭计算机ToolStripMenuItem,
this.重启计算机ToolStripMenuItem,
this.toolStripSeparator8,
+ this.ReStartServiceMenuItem,
this.installServiceMenuItem,
this.unInstallServiceMenuItem,
this.toolStripSeparator2,
@@ -222,141 +220,141 @@
this.toolStripSeparator3,
this.卸载控制端ToolStripMenuItem});
this.会话管理ToolStripMenuItem.Name = "会话管理ToolStripMenuItem";
- this.会话管理ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.会话管理ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.会话管理ToolStripMenuItem.Text = "会话管理";
//
// updateClient
//
this.updateClient.Name = "updateClient";
- this.updateClient.Size = new System.Drawing.Size(167, 26);
+ this.updateClient.Size = new System.Drawing.Size(180, 22);
this.updateClient.Text = "远程更新";
this.updateClient.Click += new System.EventHandler(this.UpdateClient_Click);
//
// toolStripMenuItem8
//
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
- this.toolStripMenuItem8.Size = new System.Drawing.Size(167, 26);
+ this.toolStripMenuItem8.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem8.Text = "重新载入";
this.toolStripMenuItem8.Click += new System.EventHandler(this.ToolStripMenuItem8_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(164, 6);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
//
// 关闭计算机ToolStripMenuItem
//
this.关闭计算机ToolStripMenuItem.Name = "关闭计算机ToolStripMenuItem";
- this.关闭计算机ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.关闭计算机ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.关闭计算机ToolStripMenuItem.Text = "关闭计算机";
this.关闭计算机ToolStripMenuItem.Click += new System.EventHandler(this.RemoteShutdown);
//
// 重启计算机ToolStripMenuItem
//
this.重启计算机ToolStripMenuItem.Name = "重启计算机ToolStripMenuItem";
- this.重启计算机ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.重启计算机ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.重启计算机ToolStripMenuItem.Text = "重启计算机";
this.重启计算机ToolStripMenuItem.Click += new System.EventHandler(this.RemoteReboot);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(164, 6);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(177, 6);
//
// installServiceMenuItem
//
this.installServiceMenuItem.Name = "installServiceMenuItem";
- this.installServiceMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.installServiceMenuItem.Size = new System.Drawing.Size(180, 22);
this.installServiceMenuItem.Text = "服务安装";
this.installServiceMenuItem.Click += new System.EventHandler(this.installServiceMenuItem_Click);
//
// unInstallServiceMenuItem
//
this.unInstallServiceMenuItem.Name = "unInstallServiceMenuItem";
- this.unInstallServiceMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.unInstallServiceMenuItem.Size = new System.Drawing.Size(180, 22);
this.unInstallServiceMenuItem.Text = "服务卸载";
this.unInstallServiceMenuItem.Click += new System.EventHandler(this.unInstallServiceMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(164, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
//
// 开机启动ToolStripMenuItem
//
this.开机启动ToolStripMenuItem.Name = "开机启动ToolStripMenuItem";
- this.开机启动ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.开机启动ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.开机启动ToolStripMenuItem.Text = "注册表启动";
this.开机启动ToolStripMenuItem.Click += new System.EventHandler(this.RemoteStartup);
//
// 取消自启动ToolStripMenuItem
//
this.取消自启动ToolStripMenuItem.Name = "取消自启动ToolStripMenuItem";
- this.取消自启动ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.取消自启动ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.取消自启动ToolStripMenuItem.Text = "取消自启动";
this.取消自启动ToolStripMenuItem.Click += new System.EventHandler(this.RemoteUnStarup);
//
// 隐藏服务端ToolStripMenuItem
//
this.隐藏服务端ToolStripMenuItem.Name = "隐藏服务端ToolStripMenuItem";
- this.隐藏服务端ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.隐藏服务端ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.隐藏服务端ToolStripMenuItem.Text = "隐藏服务端";
this.隐藏服务端ToolStripMenuItem.Click += new System.EventHandler(this.RemoteHideServiceFile);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(167, 26);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem2.Text = "显示服务端";
this.toolStripMenuItem2.Click += new System.EventHandler(this.ToolStripMenuItem2_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(164, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
//
// 卸载控制端ToolStripMenuItem
//
this.卸载控制端ToolStripMenuItem.Name = "卸载控制端ToolStripMenuItem";
- this.卸载控制端ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
+ this.卸载控制端ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.卸载控制端ToolStripMenuItem.Text = "卸载服务端";
this.卸载控制端ToolStripMenuItem.Click += new System.EventHandler(this.UninstallService);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(150, 6);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
- this.toolStripMenuItem4.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem4.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem4.Text = "开启屏幕墙";
this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
- this.toolStripMenuItem5.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem5.Text = "关闭屏幕墙";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(150, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// 选择全部ToolStripMenuItem
//
this.选择全部ToolStripMenuItem.Name = "选择全部ToolStripMenuItem";
- this.选择全部ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.选择全部ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.选择全部ToolStripMenuItem.Text = "选择全部";
this.选择全部ToolStripMenuItem.Click += new System.EventHandler(this.OnlineList_OnSelected);
//
// 取消选择ToolStripMenuItem
//
this.取消选择ToolStripMenuItem.Name = "取消选择ToolStripMenuItem";
- this.取消选择ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.取消选择ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.取消选择ToolStripMenuItem.Text = "取消选择";
this.取消选择ToolStripMenuItem.Click += new System.EventHandler(this.OnileList_OnUnSelected);
//
@@ -369,34 +367,33 @@
this.清空日志ToolStripMenuItem1});
this.logsContext.Name = "logsContext";
this.logsContext.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
- this.logsContext.Size = new System.Drawing.Size(139, 76);
+ this.logsContext.Size = new System.Drawing.Size(125, 70);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
- this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
+ this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.CopyRuningLog);
//
// 删除日志ToolStripMenuItem
//
this.删除日志ToolStripMenuItem.Name = "删除日志ToolStripMenuItem";
- this.删除日志ToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
+ this.删除日志ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.删除日志ToolStripMenuItem.Text = "删除日志";
this.删除日志ToolStripMenuItem.Click += new System.EventHandler(this.DeleteRuningLog);
//
// 清空日志ToolStripMenuItem1
//
this.清空日志ToolStripMenuItem1.Name = "清空日志ToolStripMenuItem1";
- this.清空日志ToolStripMenuItem1.Size = new System.Drawing.Size(138, 24);
+ this.清空日志ToolStripMenuItem1.Size = new System.Drawing.Size(124, 22);
this.清空日志ToolStripMenuItem1.Text = "清空日志";
this.清空日志ToolStripMenuItem1.Click += new System.EventHandler(this.ClearRuningLog);
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 87);
- this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 81);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
@@ -408,8 +405,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer);
- this.splitContainer1.Size = new System.Drawing.Size(1476, 825);
- this.splitContainer1.SplitterDistance = 596;
+ this.splitContainer1.Size = new System.Drawing.Size(1083, 598);
+ this.splitContainer1.SplitterDistance = 432;
this.splitContainer1.SplitterWidth = 1;
this.splitContainer1.TabIndex = 7;
//
@@ -421,7 +418,7 @@
this.desktopViewLayout.Location = new System.Drawing.Point(0, 0);
this.desktopViewLayout.Margin = new System.Windows.Forms.Padding(0);
this.desktopViewLayout.Name = "desktopViewLayout";
- this.desktopViewLayout.Size = new System.Drawing.Size(1476, 566);
+ this.desktopViewLayout.Size = new System.Drawing.Size(1083, 408);
this.desktopViewLayout.TabIndex = 3;
this.desktopViewLayout.Resize += new System.EventHandler(this.desktopViewLayout_Resize);
//
@@ -440,20 +437,18 @@
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.rowtrackBar);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 566);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Location = new System.Drawing.Point(0, 408);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1476, 30);
+ this.panel1.Size = new System.Drawing.Size(1083, 24);
this.panel1.TabIndex = 4;
//
// linkLabel2
//
this.linkLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel2.AutoSize = true;
- this.linkLabel2.Location = new System.Drawing.Point(1397, 8);
- this.linkLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.linkLabel2.Location = new System.Drawing.Point(1024, 6);
this.linkLabel2.Name = "linkLabel2";
- this.linkLabel2.Size = new System.Drawing.Size(67, 15);
+ this.linkLabel2.Size = new System.Drawing.Size(53, 12);
this.linkLabel2.TabIndex = 13;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "视图设置";
@@ -463,10 +458,9 @@
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(723, 8);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(518, 6);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(45, 15);
+ this.label3.Size = new System.Drawing.Size(35, 12);
this.label3.TabIndex = 12;
this.label3.Text = "分组:";
//
@@ -478,19 +472,17 @@
this.groupBox.FormattingEnabled = true;
this.groupBox.Items.AddRange(new object[] {
"全部"});
- this.groupBox.Location = new System.Drawing.Point(771, 4);
- this.groupBox.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox.Location = new System.Drawing.Point(554, 3);
this.groupBox.Name = "groupBox";
- this.groupBox.Size = new System.Drawing.Size(152, 23);
+ this.groupBox.Size = new System.Drawing.Size(115, 20);
this.groupBox.TabIndex = 11;
this.groupBox.SelectedIndexChanged += new System.EventHandler(this.GroupBox_SelectedIndexChanged);
//
// button2
//
- this.button2.Location = new System.Drawing.Point(88, 2);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Location = new System.Drawing.Point(66, 2);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(75, 25);
+ this.button2.Size = new System.Drawing.Size(56, 20);
this.button2.TabIndex = 8;
this.button2.Text = "反选";
this.button2.UseVisualStyleBackColor = true;
@@ -498,10 +490,9 @@
//
// button1
//
- this.button1.Location = new System.Drawing.Point(5, 2);
- this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Location = new System.Drawing.Point(4, 2);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 25);
+ this.button1.Size = new System.Drawing.Size(56, 20);
this.button1.TabIndex = 7;
this.button1.Text = "全选";
this.button1.UseVisualStyleBackColor = true;
@@ -511,10 +502,9 @@
//
this.viewColumn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.viewColumn.AutoSize = true;
- this.viewColumn.Location = new System.Drawing.Point(1284, 8);
- this.viewColumn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.viewColumn.Location = new System.Drawing.Point(939, 6);
this.viewColumn.Name = "viewColumn";
- this.viewColumn.Size = new System.Drawing.Size(15, 15);
+ this.viewColumn.Size = new System.Drawing.Size(11, 12);
this.viewColumn.TabIndex = 6;
this.viewColumn.Text = "3";
//
@@ -522,10 +512,9 @@
//
this.fsd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.fsd.AutoSize = true;
- this.fsd.Location = new System.Drawing.Point(931, 8);
- this.fsd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.fsd.Location = new System.Drawing.Point(674, 6);
this.fsd.Name = "fsd";
- this.fsd.Size = new System.Drawing.Size(60, 15);
+ this.fsd.Size = new System.Drawing.Size(47, 12);
this.fsd.TabIndex = 5;
this.fsd.Text = "视图列:";
//
@@ -533,10 +522,9 @@
//
this.viewRow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.viewRow.AutoSize = true;
- this.viewRow.Location = new System.Drawing.Point(1088, 8);
- this.viewRow.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.viewRow.Location = new System.Drawing.Point(792, 6);
this.viewRow.Name = "viewRow";
- this.viewRow.Size = new System.Drawing.Size(15, 15);
+ this.viewRow.Size = new System.Drawing.Size(11, 12);
this.viewRow.TabIndex = 4;
this.viewRow.Text = "4";
//
@@ -544,12 +532,11 @@
//
this.columntrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.columntrackBar.AutoSize = false;
- this.columntrackBar.Location = new System.Drawing.Point(1001, 6);
- this.columntrackBar.Margin = new System.Windows.Forms.Padding(4);
+ this.columntrackBar.Location = new System.Drawing.Point(727, 5);
this.columntrackBar.Maximum = 50;
this.columntrackBar.Minimum = 1;
this.columntrackBar.Name = "columntrackBar";
- this.columntrackBar.Size = new System.Drawing.Size(95, 21);
+ this.columntrackBar.Size = new System.Drawing.Size(71, 17);
this.columntrackBar.TabIndex = 3;
this.columntrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.columntrackBar.Value = 4;
@@ -559,10 +546,9 @@
//
this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel1.AutoSize = true;
- this.linkLabel1.Location = new System.Drawing.Point(1317, 8);
- this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.linkLabel1.Location = new System.Drawing.Point(964, 6);
this.linkLabel1.Name = "linkLabel1";
- this.linkLabel1.Size = new System.Drawing.Size(67, 15);
+ this.linkLabel1.Size = new System.Drawing.Size(53, 12);
this.linkLabel1.TabIndex = 2;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "保存设置";
@@ -572,10 +558,9 @@
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(1119, 8);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(815, 6);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(60, 15);
+ this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 1;
this.label1.Text = "视图行:";
//
@@ -583,12 +568,11 @@
//
this.rowtrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.rowtrackBar.AutoSize = false;
- this.rowtrackBar.Location = new System.Drawing.Point(1187, 6);
- this.rowtrackBar.Margin = new System.Windows.Forms.Padding(4);
+ this.rowtrackBar.Location = new System.Drawing.Point(866, 5);
this.rowtrackBar.Maximum = 50;
this.rowtrackBar.Minimum = 1;
this.rowtrackBar.Name = "rowtrackBar";
- this.rowtrackBar.Size = new System.Drawing.Size(101, 21);
+ this.rowtrackBar.Size = new System.Drawing.Size(76, 17);
this.rowtrackBar.TabIndex = 0;
this.rowtrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.rowtrackBar.Value = 3;
@@ -598,7 +582,7 @@
//
this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer.Location = new System.Drawing.Point(0, 0);
- this.splitContainer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.splitContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.splitContainer.Name = "splitContainer";
//
// splitContainer.Panel1
@@ -608,8 +592,8 @@
// splitContainer.Panel2
//
this.splitContainer.Panel2.Controls.Add(this.tabControl1);
- this.splitContainer.Size = new System.Drawing.Size(1476, 228);
- this.splitContainer.SplitterDistance = 366;
+ this.splitContainer.Size = new System.Drawing.Size(1083, 165);
+ this.splitContainer.SplitterDistance = 268;
this.splitContainer.SplitterWidth = 1;
this.splitContainer.TabIndex = 0;
//
@@ -619,85 +603,44 @@
this.tabControl2.Controls.Add(this.tabPage2);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl2.Location = new System.Drawing.Point(0, 0);
- this.tabControl2.Margin = new System.Windows.Forms.Padding(4);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(366, 228);
+ this.tabControl2.Size = new System.Drawing.Size(268, 165);
this.tabControl2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl2.TabIndex = 1;
//
// tabPage2
//
- this.tabPage2.Controls.Add(this.logList);
this.tabPage2.Location = new System.Drawing.Point(4, 4);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage2.Size = new System.Drawing.Size(358, 199);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Size = new System.Drawing.Size(260, 139);
this.tabPage2.TabIndex = 2;
this.tabPage2.Text = "运行日志";
this.tabPage2.UseVisualStyleBackColor = true;
//
- // logList
- //
- this.logList.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.logList.ContextMenuStrip = this.logsContext;
- this.logList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.logList.FullRowSelect = true;
- this.logList.HideSelection = false;
- this.logList.Location = new System.Drawing.Point(4, 4);
- this.logList.Margin = new System.Windows.Forms.Padding(4);
- this.logList.Name = "logList";
- this.logList.Size = new System.Drawing.Size(350, 191);
- this.logList.TabIndex = 0;
- this.logList.UseCompatibleStateImageBehavior = false;
- this.logList.UseWindowsThemStyle = true;
- this.logList.View = System.Windows.Forms.View.Details;
- this.logList.MouseEnter += new System.EventHandler(this.logList_MouseEnter);
- //
// tabControl1
//
this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Bottom;
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1109, 228);
+ this.tabControl1.Size = new System.Drawing.Size(814, 165);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 0;
//
// tabPage1
//
- this.tabPage1.Controls.Add(this.servicesOnlineList);
this.tabPage1.Location = new System.Drawing.Point(4, 4);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1101, 199);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(806, 139);
this.tabPage1.TabIndex = 2;
this.tabPage1.Text = "在线列表";
this.tabPage1.UseVisualStyleBackColor = true;
//
- // servicesOnlineList
- //
- this.servicesOnlineList.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.servicesOnlineList.CheckBoxes = true;
- this.servicesOnlineList.ContextMenuStrip = this.cmdContext;
- this.servicesOnlineList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.servicesOnlineList.FullRowSelect = true;
- this.servicesOnlineList.HideSelection = false;
- this.servicesOnlineList.Location = new System.Drawing.Point(4, 4);
- this.servicesOnlineList.Margin = new System.Windows.Forms.Padding(4);
- this.servicesOnlineList.Name = "servicesOnlineList";
- this.servicesOnlineList.Size = new System.Drawing.Size(1093, 191);
- this.servicesOnlineList.TabIndex = 0;
- this.servicesOnlineList.UseCompatibleStateImageBehavior = false;
- this.servicesOnlineList.UseWindowsThemStyle = false;
- this.servicesOnlineList.View = System.Windows.Forms.View.Details;
- this.servicesOnlineList.MouseEnter += new System.EventHandler(this.onlineList_MouseEnter);
- //
// statusStrip1
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -715,11 +658,10 @@
this.stripPort,
this.toolStripStatusLabel6,
this.stripConnectedNum});
- this.statusStrip1.Location = new System.Drawing.Point(0, 912);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 679);
this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode;
- this.statusStrip1.Size = new System.Drawing.Size(1476, 30);
+ this.statusStrip1.Size = new System.Drawing.Size(1083, 26);
this.statusStrip1.TabIndex = 2;
this.statusStrip1.Text = "statusStrip1";
//
@@ -727,56 +669,56 @@
//
this.toolStripStatusLabel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(88, 24);
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(71, 21);
this.toolStripStatusLabel1.Text = "服务器地址:";
//
// stripHost
//
this.stripHost.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.stripHost.Name = "stripHost";
- this.stripHost.Size = new System.Drawing.Size(57, 24);
+ this.stripHost.Size = new System.Drawing.Size(45, 21);
this.stripHost.Text = "0.0.0.0";
//
// toolStripStatusLabel5
//
this.toolStripStatusLabel5.Name = "toolStripStatusLabel5";
- this.toolStripStatusLabel5.Size = new System.Drawing.Size(873, 24);
+ this.toolStripStatusLabel5.Size = new System.Drawing.Size(594, 21);
this.toolStripStatusLabel5.Spring = true;
//
// toolStripStatusLabel2
//
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
- this.toolStripStatusLabel2.Size = new System.Drawing.Size(43, 24);
+ this.toolStripStatusLabel2.Size = new System.Drawing.Size(35, 21);
this.toolStripStatusLabel2.Text = "上传:";
//
// struflow
//
this.struflow.Name = "struflow";
- this.struflow.Size = new System.Drawing.Size(40, 24);
+ this.struflow.Size = new System.Drawing.Size(32, 21);
this.struflow.Text = "0.00";
//
// toolStripStatusLabel4
//
this.toolStripStatusLabel4.Name = "toolStripStatusLabel4";
- this.toolStripStatusLabel4.Size = new System.Drawing.Size(43, 24);
+ this.toolStripStatusLabel4.Size = new System.Drawing.Size(36, 21);
this.toolStripStatusLabel4.Text = "KB/S";
//
// toolStripStatusLabel7
//
this.toolStripStatusLabel7.Name = "toolStripStatusLabel7";
- this.toolStripStatusLabel7.Size = new System.Drawing.Size(43, 24);
+ this.toolStripStatusLabel7.Size = new System.Drawing.Size(35, 21);
this.toolStripStatusLabel7.Text = "下传:";
//
// strdownflow
//
this.strdownflow.Name = "strdownflow";
- this.strdownflow.Size = new System.Drawing.Size(40, 24);
+ this.strdownflow.Size = new System.Drawing.Size(32, 21);
this.strdownflow.Text = "0.00";
//
// toolStripStatusLabel8
//
this.toolStripStatusLabel8.Name = "toolStripStatusLabel8";
- this.toolStripStatusLabel8.Size = new System.Drawing.Size(43, 24);
+ this.toolStripStatusLabel8.Size = new System.Drawing.Size(36, 21);
this.toolStripStatusLabel8.Text = "KB/S";
//
// toolStripStatusLabel3
@@ -784,14 +726,14 @@
this.toolStripStatusLabel3.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left;
this.toolStripStatusLabel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.toolStripStatusLabel3.Name = "toolStripStatusLabel3";
- this.toolStripStatusLabel3.Size = new System.Drawing.Size(47, 24);
+ this.toolStripStatusLabel3.Size = new System.Drawing.Size(39, 21);
this.toolStripStatusLabel3.Text = "端口:";
//
// stripPort
//
this.stripPort.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.stripPort.Name = "stripPort";
- this.stripPort.Size = new System.Drawing.Size(45, 24);
+ this.stripPort.Size = new System.Drawing.Size(36, 21);
this.stripPort.Text = "5200";
//
// toolStripStatusLabel6
@@ -799,14 +741,14 @@
this.toolStripStatusLabel6.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left;
this.toolStripStatusLabel6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.toolStripStatusLabel6.Name = "toolStripStatusLabel6";
- this.toolStripStatusLabel6.Size = new System.Drawing.Size(77, 24);
+ this.toolStripStatusLabel6.Size = new System.Drawing.Size(63, 21);
this.toolStripStatusLabel6.Text = "主机数量:";
//
// stripConnectedNum
//
this.stripConnectedNum.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.stripConnectedNum.Name = "stripConnectedNum";
- this.stripConnectedNum.Size = new System.Drawing.Size(17, 24);
+ this.stripConnectedNum.Size = new System.Drawing.Size(14, 21);
this.stripConnectedNum.Text = "0";
//
// toolStrip1
@@ -822,9 +764,9 @@
this.toolStripButton6,
this.toolStripButton14,
this.toolStripButton8});
- this.toolStrip1.Location = new System.Drawing.Point(0, 28);
+ this.toolStrip1.Location = new System.Drawing.Point(0, 25);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1476, 59);
+ this.toolStrip1.Size = new System.Drawing.Size(1083, 56);
this.toolStrip1.TabIndex = 6;
this.toolStrip1.Text = "toolStrip1";
//
@@ -834,7 +776,7 @@
this.toolStripButton10.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton10.Name = "toolStripButton10";
- this.toolStripButton10.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton10.Size = new System.Drawing.Size(64, 53);
this.toolStripButton10.Text = "系统设置";
this.toolStripButton10.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton10.Click += new System.EventHandler(this.toolStripButton10_Click);
@@ -845,7 +787,7 @@
this.toolStripButton9.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton9.Name = "toolStripButton9";
- this.toolStripButton9.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton9.Size = new System.Drawing.Size(64, 53);
this.toolStripButton9.Text = "创建客户";
this.toolStripButton9.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click);
@@ -853,7 +795,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 56);
//
// toolStripButton7
//
@@ -861,7 +803,7 @@
this.toolStripButton7.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton7.Name = "toolStripButton7";
- this.toolStripButton7.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton7.Size = new System.Drawing.Size(64, 53);
this.toolStripButton7.Text = "消息通知";
this.toolStripButton7.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
@@ -872,7 +814,7 @@
this.toolStripButton6.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton6.Name = "toolStripButton6";
- this.toolStripButton6.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton6.Size = new System.Drawing.Size(64, 53);
this.toolStripButton6.Text = "下载执行";
this.toolStripButton6.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
@@ -883,7 +825,7 @@
this.toolStripButton14.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton14.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton14.Name = "toolStripButton14";
- this.toolStripButton14.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton14.Size = new System.Drawing.Size(64, 53);
this.toolStripButton14.Text = "关闭屏幕";
this.toolStripButton14.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton14.Click += new System.EventHandler(this.toolStripButton14_Click);
@@ -894,7 +836,7 @@
this.toolStripButton8.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton8.Name = "toolStripButton8";
- this.toolStripButton8.Size = new System.Drawing.Size(73, 56);
+ this.toolStripButton8.Size = new System.Drawing.Size(64, 53);
this.toolStripButton8.Text = "卸载程序";
this.toolStripButton8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
@@ -910,9 +852,9 @@
this.toolStripMenuItem3});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
+ this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2);
this.menuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
- this.menuStrip1.Size = new System.Drawing.Size(1476, 28);
+ this.menuStrip1.Size = new System.Drawing.Size(1083, 25);
this.menuStrip1.TabIndex = 0;
this.menuStrip1.Text = "menuStrip1";
//
@@ -920,7 +862,7 @@
//
this.系统设置ToolStripMenuItem.Name = "系统设置ToolStripMenuItem";
this.系统设置ToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
- this.系统设置ToolStripMenuItem.Size = new System.Drawing.Size(101, 24);
+ this.系统设置ToolStripMenuItem.Size = new System.Drawing.Size(82, 21);
this.系统设置ToolStripMenuItem.Text = "系统设置(&F)";
this.系统设置ToolStripMenuItem.Click += new System.EventHandler(this.SystemOption);
//
@@ -928,7 +870,7 @@
//
this.创建客户ToolStripMenuItem.Name = "创建客户ToolStripMenuItem";
this.创建客户ToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
- this.创建客户ToolStripMenuItem.Size = new System.Drawing.Size(101, 24);
+ this.创建客户ToolStripMenuItem.Size = new System.Drawing.Size(83, 21);
this.创建客户ToolStripMenuItem.Text = "创建客户(&E)";
this.创建客户ToolStripMenuItem.Click += new System.EventHandler(this.CreateService);
//
@@ -942,7 +884,7 @@
this.桌面记录查看ToolStripMenuItem});
this.查看ToolStripMenuItem.Name = "查看ToolStripMenuItem";
this.查看ToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
- this.查看ToolStripMenuItem.Size = new System.Drawing.Size(103, 24);
+ this.查看ToolStripMenuItem.Size = new System.Drawing.Size(84, 21);
this.查看ToolStripMenuItem.Text = "视图查看(&V)";
//
// ToolStripMenuItem
@@ -950,7 +892,7 @@
this.ToolStripMenuItem.Checked = true;
this.ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.ToolStripMenuItem.Name = "ToolStripMenuItem";
- this.ToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+ this.ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.ToolStripMenuItem.Text = "工具栏";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -959,7 +901,7 @@
this.statusToolStripMenuItem.Checked = true;
this.statusToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.statusToolStripMenuItem.Name = "statusToolStripMenuItem";
- this.statusToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+ this.statusToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.statusToolStripMenuItem.Text = "状态栏";
this.statusToolStripMenuItem.Click += new System.EventHandler(this.statusToolStripMenuItem_Click);
//
@@ -968,19 +910,19 @@
this.onlineToolStripMenuItem.Checked = true;
this.onlineToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.onlineToolStripMenuItem.Name = "onlineToolStripMenuItem";
- this.onlineToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+ this.onlineToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.onlineToolStripMenuItem.Text = "选项栏";
this.onlineToolStripMenuItem.Click += new System.EventHandler(this.onlineToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(179, 6);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
//
// 桌面记录查看ToolStripMenuItem
//
this.桌面记录查看ToolStripMenuItem.Name = "桌面记录查看ToolStripMenuItem";
- this.桌面记录查看ToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+ this.桌面记录查看ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.桌面记录查看ToolStripMenuItem.Text = "桌面记录查看";
this.桌面记录查看ToolStripMenuItem.Click += new System.EventHandler(this.viewReviewToolStripMenuItem_Click);
//
@@ -988,7 +930,7 @@
//
this.锁定ToolStripMenuItem.Name = "锁定ToolStripMenuItem";
this.锁定ToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
- this.锁定ToolStripMenuItem.Size = new System.Drawing.Size(74, 24);
+ this.锁定ToolStripMenuItem.Size = new System.Drawing.Size(61, 21);
this.锁定ToolStripMenuItem.Text = "锁定(&G)";
this.锁定ToolStripMenuItem.Click += new System.EventHandler(this.lockToolStripMenuItem_Click);
//
@@ -996,21 +938,27 @@
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)));
- this.toolStripMenuItem3.Size = new System.Drawing.Size(105, 24);
+ this.toolStripMenuItem3.Size = new System.Drawing.Size(85, 21);
this.toolStripMenuItem3.Text = "关于程序(&H)";
this.toolStripMenuItem3.Click += new System.EventHandler(this.About);
//
+ // ReStartServiceMenuItem
+ //
+ this.ReStartServiceMenuItem.Name = "ReStartServiceMenuItem";
+ this.ReStartServiceMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ReStartServiceMenuItem.Text = "重启服务";
+ this.ReStartServiceMenuItem.Click += new System.EventHandler(this.ReStartServiceMenuItem_Click);
+ //
// MainApplication
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1476, 942);
+ this.ClientSize = new System.Drawing.Size(1083, 705);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.menuStrip1);
this.MainMenuStrip = this.menuStrip1;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MainApplication";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainApplication_FormClosing);
@@ -1030,9 +978,7 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
this.splitContainer.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
- this.tabPage2.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
- this.tabPage1.ResumeLayout(false);
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
@@ -1134,6 +1080,7 @@
private System.Windows.Forms.ToolStripMenuItem installServiceMenuItem;
private System.Windows.Forms.ToolStripMenuItem unInstallServiceMenuItem;
private System.Windows.Forms.LinkLabel linkLabel2;
+ private System.Windows.Forms.ToolStripMenuItem ReStartServiceMenuItem;
}
}
diff --git a/SiMay.RemoteMonitor/MainApplication/MainApplication.cs b/SiMay.RemoteMonitor/MainApplication/MainApplication.cs
index 1f7262540bb9ce78f11812e5a4bfa05b87bf6b2c..517ebab12c9dba9e7369423ccb5951cc65d2e118 100644
--- a/SiMay.RemoteMonitor/MainApplication/MainApplication.cs
+++ b/SiMay.RemoteMonitor/MainApplication/MainApplication.cs
@@ -974,5 +974,19 @@ namespace SiMay.RemoteMonitor.MainApplication
this.ViewOnAdaptiveHandler();
}
}
+ ///
+ /// 重启服务项
+ ///
+ ///
+ ///
+ private void ReStartServiceMenuItem_Click(object sender, EventArgs e)
+ {
+ if (MessageBox.Show("确定重启系统服务吗?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation) != DialogResult.OK)
+ return;
+ this.GetSelectedListItem().ForEach(c =>
+ {
+ this._appMainAdapterHandler.RemoteSetSessionState(c.SessionSyncContext, SystemSessionType.ReStartService);
+ });
+ }
}
}
\ No newline at end of file
diff --git a/SiMay.RemoteMonitor/Properties/AssemblyInfo.cs b/SiMay.RemoteMonitor/Properties/AssemblyInfo.cs
index 703bef5cb45dbf5a7a4b5c06226d21f5a08cefd3..98116f01d86668209d28bf310e41ae44ed6ef399 100644
Binary files a/SiMay.RemoteMonitor/Properties/AssemblyInfo.cs and b/SiMay.RemoteMonitor/Properties/AssemblyInfo.cs differ