diff --git a/Master/NucleusCoopTool/Forms/DownloadPrompt.cs b/Master/NucleusCoopTool/Forms/DownloadPrompt.cs index 4821ffae..d60af691 100644 --- a/Master/NucleusCoopTool/Forms/DownloadPrompt.cs +++ b/Master/NucleusCoopTool/Forms/DownloadPrompt.cs @@ -52,7 +52,7 @@ public DownloadPrompt(Handler handler, MainForm mf, string zipFileName) try { InitializeComponent(); - + Handler = handler; mainForm = mf; diff --git a/Master/NucleusCoopTool/Forms/HandlerInfo.cs b/Master/NucleusCoopTool/Forms/HandlerInfo.cs index 0854f6f3..0e41c079 100644 --- a/Master/NucleusCoopTool/Forms/HandlerInfo.cs +++ b/Master/NucleusCoopTool/Forms/HandlerInfo.cs @@ -207,7 +207,6 @@ public void UpdateSize(float scale) if (c.GetType() == typeof(TextBox) ^ c.GetType() == typeof(RichTextBox) ^ c.GetType() == typeof(PictureBox)) { c.Font = new Font(mainForm.customFont, newFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); - } } } diff --git a/Master/NucleusCoopTool/Forms/MainForm.Designer.cs b/Master/NucleusCoopTool/Forms/MainForm.Designer.cs index f94205e5..82b7a8cc 100644 --- a/Master/NucleusCoopTool/Forms/MainForm.Designer.cs +++ b/Master/NucleusCoopTool/Forms/MainForm.Designer.cs @@ -38,20 +38,20 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.btn_faq = new System.Windows.Forms.Button(); + this.btn_reddit = new System.Windows.Forms.Button(); + this.btn_Discord = new System.Windows.Forms.Button(); + this.btn_SplitCalculator = new System.Windows.Forms.Button(); + this.btn_thirdPartytools = new System.Windows.Forms.Button(); this.linkLabel4 = new System.Windows.Forms.LinkLabel(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.btn_dlFromHub = new System.Windows.Forms.Button(); this.btn_noHub = new System.Windows.Forms.Button(); this.btn_downloadAssets = new System.Windows.Forms.Button(); this.btn_settings = new System.Windows.Forms.Button(); this.logo = new System.Windows.Forms.PictureBox(); - this.btn_faq = new System.Windows.Forms.Button(); - this.btn_reddit = new System.Windows.Forms.Button(); - this.btn_Discord = new System.Windows.Forms.Button(); - this.btn_SplitCalculator = new System.Windows.Forms.Button(); - this.btn_thirdPartytools = new System.Windows.Forms.Button(); - this.btn_dlFromHub = new System.Windows.Forms.Button(); this.gameContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.nullToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scriptNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -76,12 +76,8 @@ private void InitializeComponent() this.splash = new System.Windows.Forms.PictureBox(); this.btn_Links = new System.Windows.Forms.Button(); this.glowingLine0 = new System.Windows.Forms.PictureBox(); - this.third_party_tools_container = new System.Windows.Forms.Panel(); - this.txt_version = new System.Windows.Forms.Label(); - this.closeBtn = new System.Windows.Forms.Button(); - this.minimizeBtn = new System.Windows.Forms.Button(); - this.maximizeBtn = new System.Windows.Forms.Button(); this.linksPanel = new BufferedClientAreaPanel(); + this.third_party_tools_container = new System.Windows.Forms.Panel(); this.clientAreaPanel = new BufferedClientAreaPanel(); this.stepPanelPictureBox = new System.Windows.Forms.PictureBox(); this.StepPanel = new BufferedClientAreaPanel(); @@ -94,6 +90,8 @@ private void InitializeComponent() this.btn_scriptAuthorTxt = new System.Windows.Forms.Button(); this.button_UpdateAvailable = new System.Windows.Forms.Button(); this.scriptAuthorTxtSizer = new BufferedClientAreaPanel(); + this.btn_magnifier = new System.Windows.Forms.PictureBox(); + this.HandlerNoteTitle = new System.Windows.Forms.Label(); this.scriptAuthorTxt = new System.Windows.Forms.RichTextBox(); this.cover = new BufferedClientAreaPanel(); this.coverFrame = new BufferedClientAreaPanel(); @@ -108,23 +106,134 @@ private void InitializeComponent() this.btn_Play = new System.Windows.Forms.Button(); this.btn_Next = new System.Windows.Forms.Button(); this.btnAutoSearch = new System.Windows.Forms.Button(); + this.txt_version = new System.Windows.Forms.Label(); + this.closeBtn = new System.Windows.Forms.Button(); + this.minimizeBtn = new System.Windows.Forms.Button(); + this.maximizeBtn = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.logo)).BeginInit(); this.gameContextMenuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splash)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.glowingLine0)).BeginInit(); - this.third_party_tools_container.SuspendLayout(); this.linksPanel.SuspendLayout(); + this.third_party_tools_container.SuspendLayout(); this.clientAreaPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.stepPanelPictureBox)).BeginInit(); this.game_listSizer.SuspendLayout(); this.rightFrame.SuspendLayout(); this.buttonContainer.SuspendLayout(); this.scriptAuthorTxtSizer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.btn_magnifier)).BeginInit(); this.cover.SuspendLayout(); this.txt_GameDescSizer.SuspendLayout(); this.mainButtonFrame.SuspendLayout(); this.SuspendLayout(); // + // btn_faq + // + this.btn_faq.BackColor = System.Drawing.Color.Transparent; + this.btn_faq.BackgroundImage = global::Nucleus.Coop.Properties.Resources.faq; + this.btn_faq.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_faq.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_faq.FlatAppearance.BorderSize = 0; + this.btn_faq.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_faq.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_faq.ForeColor = System.Drawing.Color.White; + this.btn_faq.Location = new System.Drawing.Point(4, 2); + this.btn_faq.Name = "btn_faq"; + this.btn_faq.Size = new System.Drawing.Size(25, 23); + this.btn_faq.TabIndex = 36; + this.btn_faq.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolTip1.SetToolTip(this.btn_faq, "Nucleus Co-op FAQ."); + this.btn_faq.UseVisualStyleBackColor = false; + this.btn_faq.Click += new System.EventHandler(this.link_faq_Click); + this.btn_faq.MouseEnter += new System.EventHandler(this.btn_faq_MouseEnter); + this.btn_faq.MouseLeave += new System.EventHandler(this.btn_faq_MouseLeave); + // + // btn_reddit + // + this.btn_reddit.BackColor = System.Drawing.Color.Transparent; + this.btn_reddit.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_reddit.BackgroundImage"))); + this.btn_reddit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_reddit.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_reddit.FlatAppearance.BorderSize = 0; + this.btn_reddit.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_reddit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_reddit.ForeColor = System.Drawing.Color.White; + this.btn_reddit.Location = new System.Drawing.Point(4, 25); + this.btn_reddit.Name = "btn_reddit"; + this.btn_reddit.Size = new System.Drawing.Size(25, 22); + this.btn_reddit.TabIndex = 40; + this.btn_reddit.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolTip1.SetToolTip(this.btn_reddit, "Official Nucleus Co-op Subreddit."); + this.btn_reddit.UseVisualStyleBackColor = false; + this.btn_reddit.Click += new System.EventHandler(this.button2_Click); + this.btn_reddit.MouseEnter += new System.EventHandler(this.btn_reddit_MouseEnter); + this.btn_reddit.MouseLeave += new System.EventHandler(this.btn_reddit_MouseLeave); + // + // btn_Discord + // + this.btn_Discord.BackColor = System.Drawing.Color.Transparent; + this.btn_Discord.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Discord.BackgroundImage"))); + this.btn_Discord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_Discord.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_Discord.FlatAppearance.BorderSize = 0; + this.btn_Discord.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_Discord.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_Discord.ForeColor = System.Drawing.Color.White; + this.btn_Discord.Location = new System.Drawing.Point(3, 53); + this.btn_Discord.Name = "btn_Discord"; + this.btn_Discord.Size = new System.Drawing.Size(25, 20); + this.btn_Discord.TabIndex = 39; + this.btn_Discord.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolTip1.SetToolTip(this.btn_Discord, "Join the official Nucleus Co-op discord server."); + this.btn_Discord.UseVisualStyleBackColor = false; + this.btn_Discord.Click += new System.EventHandler(this.button1_Click); + this.btn_Discord.MouseEnter += new System.EventHandler(this.btn_Discord_MouseEnter); + this.btn_Discord.MouseLeave += new System.EventHandler(this.btn_Discord_MouseLeave); + // + // btn_SplitCalculator + // + this.btn_SplitCalculator.BackColor = System.Drawing.Color.Transparent; + this.btn_SplitCalculator.BackgroundImage = global::Nucleus.Coop.Properties.Resources.SplitCalculator; + this.btn_SplitCalculator.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_SplitCalculator.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_SplitCalculator.FlatAppearance.BorderSize = 0; + this.btn_SplitCalculator.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_SplitCalculator.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_SplitCalculator.ForeColor = System.Drawing.Color.White; + this.btn_SplitCalculator.Location = new System.Drawing.Point(6, 79); + this.btn_SplitCalculator.Name = "btn_SplitCalculator"; + this.btn_SplitCalculator.Size = new System.Drawing.Size(20, 20); + this.btn_SplitCalculator.TabIndex = 38; + this.btn_SplitCalculator.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolTip1.SetToolTip(this.btn_SplitCalculator, "This program can estimate the system requirements needed\r\nto run a game in split-" + + "screen."); + this.btn_SplitCalculator.UseVisualStyleBackColor = false; + this.btn_SplitCalculator.Click += new System.EventHandler(this.btn_SplitCalculator_Click); + this.btn_SplitCalculator.MouseEnter += new System.EventHandler(this.btn_SplitCalculator_MouseEnter); + this.btn_SplitCalculator.MouseLeave += new System.EventHandler(this.btn_SplitCalculator_MouseLeave); + // + // btn_thirdPartytools + // + this.btn_thirdPartytools.BackColor = System.Drawing.Color.Transparent; + this.btn_thirdPartytools.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_thirdPartytools.BackgroundImage"))); + this.btn_thirdPartytools.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_thirdPartytools.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_thirdPartytools.FlatAppearance.BorderSize = 0; + this.btn_thirdPartytools.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_thirdPartytools.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_thirdPartytools.ForeColor = System.Drawing.Color.White; + this.btn_thirdPartytools.Location = new System.Drawing.Point(6, 105); + this.btn_thirdPartytools.Name = "btn_thirdPartytools"; + this.btn_thirdPartytools.Size = new System.Drawing.Size(20, 20); + this.btn_thirdPartytools.TabIndex = 37; + this.btn_thirdPartytools.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolTip1.SetToolTip(this.btn_thirdPartytools, "Third party tools useful to make non xinput controllers work with Nucleus Co-op."); + this.btn_thirdPartytools.UseVisualStyleBackColor = false; + this.btn_thirdPartytools.Click += new System.EventHandler(this.btn_thirdPartytools_Click); + this.btn_thirdPartytools.MouseEnter += new System.EventHandler(this.btn_thirdPartytools_MouseEnter); + this.btn_thirdPartytools.MouseLeave += new System.EventHandler(this.btn_thirdPartytools_MouseLeave); + // // linkLabel4 // this.linkLabel4.ActiveLinkColor = System.Drawing.Color.Aqua; @@ -192,6 +301,27 @@ private void InitializeComponent() this.linkLabel1.VisitedLinkColor = System.Drawing.Color.Silver; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // + // btn_dlFromHub + // + this.btn_dlFromHub.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btn_dlFromHub.BackColor = System.Drawing.Color.Transparent; + this.btn_dlFromHub.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_dlFromHub.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_dlFromHub.FlatAppearance.BorderSize = 0; + this.btn_dlFromHub.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_dlFromHub.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_dlFromHub.ForeColor = System.Drawing.Color.Transparent; + this.btn_dlFromHub.Location = new System.Drawing.Point(353, 4); + this.btn_dlFromHub.Margin = new System.Windows.Forms.Padding(0); + this.btn_dlFromHub.Name = "btn_dlFromHub"; + this.btn_dlFromHub.Size = new System.Drawing.Size(25, 25); + this.btn_dlFromHub.TabIndex = 42; + this.btn_dlFromHub.Text = " "; + this.toolTip1.SetToolTip(this.btn_dlFromHub, "Download handlers (.nc) directly from the handlers hub, use the extract handler o" + + "ption to install them."); + this.btn_dlFromHub.UseVisualStyleBackColor = false; + this.btn_dlFromHub.Click += new System.EventHandler(this.button1_Click_2); + // // btn_noHub // this.btn_noHub.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -270,133 +400,6 @@ private void InitializeComponent() this.toolTip1.SetToolTip(this.logo, "Nucleus Co-op Github release page."); this.logo.DoubleClick += new System.EventHandler(this.logo_Click); // - // btn_faq - // - this.btn_faq.BackColor = System.Drawing.Color.Transparent; - this.btn_faq.BackgroundImage = global::Nucleus.Coop.Properties.Resources.faq; - this.btn_faq.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_faq.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_faq.FlatAppearance.BorderSize = 0; - this.btn_faq.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_faq.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_faq.ForeColor = System.Drawing.Color.White; - this.btn_faq.Location = new System.Drawing.Point(4, 2); - this.btn_faq.Name = "btn_faq"; - this.btn_faq.Size = new System.Drawing.Size(25, 23); - this.btn_faq.TabIndex = 36; - this.btn_faq.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolTip1.SetToolTip(this.btn_faq, "Nucleus Co-op FAQ."); - this.btn_faq.UseVisualStyleBackColor = false; - this.btn_faq.Click += new System.EventHandler(this.link_faq_Click); - this.btn_faq.MouseEnter += new System.EventHandler(this.btn_faq_MouseEnter); - this.btn_faq.MouseLeave += new System.EventHandler(this.btn_faq_MouseLeave); - // - // btn_reddit - // - this.btn_reddit.BackColor = System.Drawing.Color.Transparent; - this.btn_reddit.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_reddit.BackgroundImage"))); - this.btn_reddit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_reddit.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_reddit.FlatAppearance.BorderSize = 0; - this.btn_reddit.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_reddit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_reddit.ForeColor = System.Drawing.Color.White; - this.btn_reddit.Location = new System.Drawing.Point(4, 25); - this.btn_reddit.Name = "btn_reddit"; - this.btn_reddit.Size = new System.Drawing.Size(25, 22); - this.btn_reddit.TabIndex = 40; - this.btn_reddit.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolTip1.SetToolTip(this.btn_reddit, "Official Nucleus Co-op Subreddit."); - this.btn_reddit.UseVisualStyleBackColor = false; - this.btn_reddit.Click += new System.EventHandler(this.button2_Click); - this.btn_reddit.MouseEnter += new System.EventHandler(this.btn_reddit_MouseEnter); - this.btn_reddit.MouseLeave += new System.EventHandler(this.btn_reddit_MouseLeave); - // - // btn_Discord - // - this.btn_Discord.BackColor = System.Drawing.Color.Transparent; - this.btn_Discord.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Discord.BackgroundImage"))); - this.btn_Discord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_Discord.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_Discord.FlatAppearance.BorderSize = 0; - this.btn_Discord.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_Discord.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Discord.ForeColor = System.Drawing.Color.White; - this.btn_Discord.Location = new System.Drawing.Point(3, 53); - this.btn_Discord.Name = "btn_Discord"; - this.btn_Discord.Size = new System.Drawing.Size(25, 20); - this.btn_Discord.TabIndex = 39; - this.btn_Discord.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolTip1.SetToolTip(this.btn_Discord, "Join the official Nucleus Co-op discord server."); - this.btn_Discord.UseVisualStyleBackColor = false; - this.btn_Discord.Click += new System.EventHandler(this.button1_Click); - this.btn_Discord.MouseEnter += new System.EventHandler(this.btn_Discord_MouseEnter); - this.btn_Discord.MouseLeave += new System.EventHandler(this.btn_Discord_MouseLeave); - // - // btn_SplitCalculator - // - this.btn_SplitCalculator.BackColor = System.Drawing.Color.Transparent; - this.btn_SplitCalculator.BackgroundImage = global::Nucleus.Coop.Properties.Resources.SplitCalculator; - this.btn_SplitCalculator.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_SplitCalculator.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_SplitCalculator.FlatAppearance.BorderSize = 0; - this.btn_SplitCalculator.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_SplitCalculator.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_SplitCalculator.ForeColor = System.Drawing.Color.White; - this.btn_SplitCalculator.Location = new System.Drawing.Point(6, 79); - this.btn_SplitCalculator.Name = "btn_SplitCalculator"; - this.btn_SplitCalculator.Size = new System.Drawing.Size(20, 20); - this.btn_SplitCalculator.TabIndex = 38; - this.btn_SplitCalculator.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolTip1.SetToolTip(this.btn_SplitCalculator, "This program can estimate the system requirements needed\r\nto run a game in split-" + - "screen."); - this.btn_SplitCalculator.UseVisualStyleBackColor = false; - this.btn_SplitCalculator.Click += new System.EventHandler(this.btn_SplitCalculator_Click); - this.btn_SplitCalculator.MouseEnter += new System.EventHandler(this.btn_SplitCalculator_MouseEnter); - this.btn_SplitCalculator.MouseLeave += new System.EventHandler(this.btn_SplitCalculator_MouseLeave); - // - // btn_thirdPartytools - // - this.btn_thirdPartytools.BackColor = System.Drawing.Color.Transparent; - this.btn_thirdPartytools.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_thirdPartytools.BackgroundImage"))); - this.btn_thirdPartytools.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_thirdPartytools.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_thirdPartytools.FlatAppearance.BorderSize = 0; - this.btn_thirdPartytools.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_thirdPartytools.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_thirdPartytools.ForeColor = System.Drawing.Color.White; - this.btn_thirdPartytools.Location = new System.Drawing.Point(6, 105); - this.btn_thirdPartytools.Name = "btn_thirdPartytools"; - this.btn_thirdPartytools.Size = new System.Drawing.Size(20, 20); - this.btn_thirdPartytools.TabIndex = 37; - this.btn_thirdPartytools.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolTip1.SetToolTip(this.btn_thirdPartytools, "Third party tools useful to make non xinput controllers work with Nucleus Co-op."); - this.btn_thirdPartytools.UseVisualStyleBackColor = false; - this.btn_thirdPartytools.Click += new System.EventHandler(this.btn_thirdPartytools_Click); - this.btn_thirdPartytools.MouseEnter += new System.EventHandler(this.btn_thirdPartytools_MouseEnter); - this.btn_thirdPartytools.MouseLeave += new System.EventHandler(this.btn_thirdPartytools_MouseLeave); - // - // btn_dlFromHub - // - this.btn_dlFromHub.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_dlFromHub.BackColor = System.Drawing.Color.Transparent; - this.btn_dlFromHub.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btn_dlFromHub.Cursor = System.Windows.Forms.Cursors.Hand; - this.btn_dlFromHub.FlatAppearance.BorderSize = 0; - this.btn_dlFromHub.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.btn_dlFromHub.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_dlFromHub.ForeColor = System.Drawing.Color.Transparent; - this.btn_dlFromHub.Location = new System.Drawing.Point(353, 4); - this.btn_dlFromHub.Margin = new System.Windows.Forms.Padding(0); - this.btn_dlFromHub.Name = "btn_dlFromHub"; - this.btn_dlFromHub.Size = new System.Drawing.Size(25, 25); - this.btn_dlFromHub.TabIndex = 42; - this.btn_dlFromHub.Text = " "; - this.toolTip1.SetToolTip(this.btn_dlFromHub, "Download handlers (.nc) directly from the handlers hub, use the extract handler o" + - "ption to install them."); - this.btn_dlFromHub.UseVisualStyleBackColor = false; - this.btn_dlFromHub.Click += new System.EventHandler(this.button1_Click_2); - // // gameContextMenuStrip // this.gameContextMenuStrip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; @@ -612,6 +615,21 @@ private void InitializeComponent() this.glowingLine0.TabIndex = 36; this.glowingLine0.TabStop = false; // + // linksPanel + // + this.linksPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.linksPanel.BackColor = System.Drawing.Color.Black; + this.linksPanel.Controls.Add(this.btn_faq); + this.linksPanel.Controls.Add(this.btn_reddit); + this.linksPanel.Controls.Add(this.btn_Discord); + this.linksPanel.Controls.Add(this.btn_SplitCalculator); + this.linksPanel.Controls.Add(this.btn_thirdPartytools); + this.linksPanel.Location = new System.Drawing.Point(896, 32); + this.linksPanel.Name = "linksPanel"; + this.linksPanel.Size = new System.Drawing.Size(33, 127); + this.linksPanel.TabIndex = 0; + this.linksPanel.Visible = false; + // // third_party_tools_container // this.third_party_tools_container.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -629,92 +647,6 @@ private void InitializeComponent() this.third_party_tools_container.TabIndex = 0; this.third_party_tools_container.Visible = false; // - // txt_version - // - this.txt_version.AutoSize = true; - this.txt_version.BackColor = System.Drawing.Color.Transparent; - this.txt_version.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.txt_version.ForeColor = System.Drawing.Color.White; - this.txt_version.Location = new System.Drawing.Point(159, 10); - this.txt_version.Margin = new System.Windows.Forms.Padding(0); - this.txt_version.Name = "txt_version"; - this.txt_version.Size = new System.Drawing.Size(28, 13); - this.txt_version.TabIndex = 35; - this.txt_version.Text = "v2.1"; - this.txt_version.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // closeBtn - // - this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.closeBtn.BackColor = System.Drawing.Color.Transparent; - this.closeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.close_button; - this.closeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.closeBtn.Cursor = System.Windows.Forms.Cursors.Hand; - this.closeBtn.FlatAppearance.BorderSize = 0; - this.closeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.closeBtn.Location = new System.Drawing.Point(1025, 6); - this.closeBtn.Margin = new System.Windows.Forms.Padding(2); - this.closeBtn.Name = "closeBtn"; - this.closeBtn.Size = new System.Drawing.Size(20, 20); - this.closeBtn.TabIndex = 16; - this.closeBtn.UseVisualStyleBackColor = false; - this.closeBtn.MouseEnter += new System.EventHandler(this.closeBtn_MouseEnter); - this.closeBtn.MouseLeave += new System.EventHandler(this.closeBtn_MouseLeave); - // - // minimizeBtn - // - this.minimizeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.minimizeBtn.BackColor = System.Drawing.Color.Transparent; - this.minimizeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.minimize_button; - this.minimizeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.minimizeBtn.Cursor = System.Windows.Forms.Cursors.Hand; - this.minimizeBtn.FlatAppearance.BorderSize = 0; - this.minimizeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.minimizeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.minimizeBtn.Location = new System.Drawing.Point(977, 6); - this.minimizeBtn.Margin = new System.Windows.Forms.Padding(2); - this.minimizeBtn.Name = "minimizeBtn"; - this.minimizeBtn.Size = new System.Drawing.Size(20, 20); - this.minimizeBtn.TabIndex = 16; - this.minimizeBtn.UseVisualStyleBackColor = false; - this.minimizeBtn.MouseEnter += new System.EventHandler(this.minimizeBtn_MouseEnter); - this.minimizeBtn.MouseLeave += new System.EventHandler(this.minimizeBtn_MouseLeave); - // - // maximizeBtn - // - this.maximizeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.maximizeBtn.BackColor = System.Drawing.Color.Transparent; - this.maximizeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.maximize_button; - this.maximizeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.maximizeBtn.Cursor = System.Windows.Forms.Cursors.Hand; - this.maximizeBtn.FlatAppearance.BorderSize = 0; - this.maximizeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.maximizeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.maximizeBtn.Location = new System.Drawing.Point(1001, 6); - this.maximizeBtn.Margin = new System.Windows.Forms.Padding(2); - this.maximizeBtn.Name = "maximizeBtn"; - this.maximizeBtn.Size = new System.Drawing.Size(20, 20); - this.maximizeBtn.TabIndex = 16; - this.maximizeBtn.UseVisualStyleBackColor = false; - this.maximizeBtn.MouseEnter += new System.EventHandler(this.maximizeBtn_MouseEnter); - this.maximizeBtn.MouseLeave += new System.EventHandler(this.maximizeBtn_MouseLeave); - // - // linksPanel - // - this.linksPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.linksPanel.BackColor = System.Drawing.Color.Black; - this.linksPanel.Controls.Add(this.btn_faq); - this.linksPanel.Controls.Add(this.btn_reddit); - this.linksPanel.Controls.Add(this.btn_Discord); - this.linksPanel.Controls.Add(this.btn_SplitCalculator); - this.linksPanel.Controls.Add(this.btn_thirdPartytools); - this.linksPanel.Location = new System.Drawing.Point(896, 32); - this.linksPanel.Name = "linksPanel"; - this.linksPanel.Size = new System.Drawing.Size(33, 127); - this.linksPanel.TabIndex = 0; - this.linksPanel.Visible = false; - // // clientAreaPanel // this.clientAreaPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -757,11 +689,11 @@ private void InitializeComponent() this.StepPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.StepPanel.BackColor = System.Drawing.Color.Transparent; this.StepPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.StepPanel.Cursor = System.Windows.Forms.Cursors.Hand; + this.StepPanel.Cursor = System.Windows.Forms.Cursors.Default; this.StepPanel.Location = new System.Drawing.Point(202, 33); this.StepPanel.Margin = new System.Windows.Forms.Padding(0); this.StepPanel.Name = "StepPanel"; - this.StepPanel.Size = new System.Drawing.Size(644, 533); + this.StepPanel.Size = new System.Drawing.Size(655, 535); this.StepPanel.TabIndex = 0; this.StepPanel.Visible = false; // @@ -773,8 +705,9 @@ private void InitializeComponent() this.game_listSizer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.game_listSizer.Controls.Add(this.list_Games); this.game_listSizer.Location = new System.Drawing.Point(0, 33); + this.game_listSizer.Margin = new System.Windows.Forms.Padding(0); this.game_listSizer.Name = "game_listSizer"; - this.game_listSizer.Size = new System.Drawing.Size(206, 533); + this.game_listSizer.Size = new System.Drawing.Size(202, 534); this.game_listSizer.TabIndex = 35; // // list_Games @@ -794,7 +727,7 @@ private void InitializeComponent() this.list_Games.Name = "list_Games"; this.list_Games.Offset = new System.Drawing.Size(0, 0); this.list_Games.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.list_Games.Size = new System.Drawing.Size(224, 534); + this.list_Games.Size = new System.Drawing.Size(220, 535); this.list_Games.TabIndex = 2; this.list_Games.SelectedChanged += new System.Action(this.list_Games_SelectedChanged); // @@ -808,10 +741,10 @@ private void InitializeComponent() this.rightFrame.Controls.Add(this.scriptAuthorTxtSizer); this.rightFrame.Controls.Add(this.cover); this.rightFrame.Controls.Add(this.txt_GameDescSizer); - this.rightFrame.Location = new System.Drawing.Point(845, 33); + this.rightFrame.Location = new System.Drawing.Point(845, 31); this.rightFrame.Margin = new System.Windows.Forms.Padding(0); this.rightFrame.Name = "rightFrame"; - this.rightFrame.Size = new System.Drawing.Size(205, 533); + this.rightFrame.Size = new System.Drawing.Size(205, 537); this.rightFrame.TabIndex = 34; this.rightFrame.Visible = false; // @@ -824,9 +757,9 @@ private void InitializeComponent() this.buttonContainer.Controls.Add(this.btn_scriptAuthorTxt); this.buttonContainer.Controls.Add(this.button_UpdateAvailable); this.buttonContainer.Cursor = System.Windows.Forms.Cursors.Default; - this.buttonContainer.Location = new System.Drawing.Point(0, 466); + this.buttonContainer.Location = new System.Drawing.Point(0, 470); this.buttonContainer.Name = "buttonContainer"; - this.buttonContainer.Size = new System.Drawing.Size(202, 64); + this.buttonContainer.Size = new System.Drawing.Size(204, 64); this.buttonContainer.TabIndex = 0; // // btn_GameDesc @@ -839,7 +772,7 @@ private void InitializeComponent() this.btn_GameDesc.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.btn_GameDesc.FlatAppearance.BorderSize = 0; this.btn_GameDesc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_GameDesc.Location = new System.Drawing.Point(192, -19); + this.btn_GameDesc.Location = new System.Drawing.Point(193, -19); this.btn_GameDesc.Margin = new System.Windows.Forms.Padding(2); this.btn_GameDesc.Name = "btn_GameDesc"; this.btn_GameDesc.Size = new System.Drawing.Size(166, 13); @@ -858,7 +791,7 @@ private void InitializeComponent() this.btn_gameOptions.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.btn_gameOptions.FlatAppearance.BorderSize = 0; this.btn_gameOptions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_gameOptions.Location = new System.Drawing.Point(17, 3); + this.btn_gameOptions.Location = new System.Drawing.Point(22, 2); this.btn_gameOptions.Margin = new System.Windows.Forms.Padding(2); this.btn_gameOptions.Name = "btn_gameOptions"; this.btn_gameOptions.Size = new System.Drawing.Size(172, 25); @@ -878,7 +811,7 @@ private void InitializeComponent() this.btn_scriptAuthorTxt.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.btn_scriptAuthorTxt.FlatAppearance.BorderSize = 0; this.btn_scriptAuthorTxt.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_scriptAuthorTxt.Location = new System.Drawing.Point(17, -34); + this.btn_scriptAuthorTxt.Location = new System.Drawing.Point(18, -34); this.btn_scriptAuthorTxt.Margin = new System.Windows.Forms.Padding(2); this.btn_scriptAuthorTxt.Name = "btn_scriptAuthorTxt"; this.btn_scriptAuthorTxt.Size = new System.Drawing.Size(166, 11); @@ -898,10 +831,10 @@ private void InitializeComponent() this.button_UpdateAvailable.FlatAppearance.BorderSize = 0; this.button_UpdateAvailable.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button_UpdateAvailable.ForeColor = System.Drawing.Color.Yellow; - this.button_UpdateAvailable.Location = new System.Drawing.Point(17, 32); + this.button_UpdateAvailable.Location = new System.Drawing.Point(22, 30); this.button_UpdateAvailable.Margin = new System.Windows.Forms.Padding(2); this.button_UpdateAvailable.Name = "button_UpdateAvailable"; - this.button_UpdateAvailable.Size = new System.Drawing.Size(172, 25); + this.button_UpdateAvailable.Size = new System.Drawing.Size(173, 25); this.button_UpdateAvailable.TabIndex = 23; this.button_UpdateAvailable.Text = "New Handler Available!"; this.button_UpdateAvailable.UseVisualStyleBackColor = false; @@ -912,17 +845,40 @@ private void InitializeComponent() // this.scriptAuthorTxtSizer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.scriptAuthorTxtSizer.AutoScroll = true; this.scriptAuthorTxtSizer.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.scriptAuthorTxtSizer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.scriptAuthorTxtSizer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.scriptAuthorTxtSizer.Controls.Add(this.btn_magnifier); + this.scriptAuthorTxtSizer.Controls.Add(this.HandlerNoteTitle); this.scriptAuthorTxtSizer.Controls.Add(this.scriptAuthorTxt); - this.scriptAuthorTxtSizer.Location = new System.Drawing.Point(17, 240); + this.scriptAuthorTxtSizer.Location = new System.Drawing.Point(22, 242); this.scriptAuthorTxtSizer.Margin = new System.Windows.Forms.Padding(5); this.scriptAuthorTxtSizer.Name = "scriptAuthorTxtSizer"; - this.scriptAuthorTxtSizer.Size = new System.Drawing.Size(172, 218); + this.scriptAuthorTxtSizer.Size = new System.Drawing.Size(172, 220); this.scriptAuthorTxtSizer.TabIndex = 31; // + // btn_magnifier + // + this.btn_magnifier.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btn_magnifier.Cursor = System.Windows.Forms.Cursors.Hand; + this.btn_magnifier.Location = new System.Drawing.Point(0, 2); + this.btn_magnifier.Name = "btn_magnifier"; + this.btn_magnifier.Size = new System.Drawing.Size(20, 20); + this.btn_magnifier.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.btn_magnifier.TabIndex = 43; + this.btn_magnifier.TabStop = false; + this.btn_magnifier.Click += new System.EventHandler(this.btn_magnifier_Click); + // + // HandlerNoteTitle + // + this.HandlerNoteTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HandlerNoteTitle.Location = new System.Drawing.Point(44, 0); + this.HandlerNoteTitle.Name = "HandlerNoteTitle"; + this.HandlerNoteTitle.Size = new System.Drawing.Size(128, 20); + this.HandlerNoteTitle.TabIndex = 33; + this.HandlerNoteTitle.Text = "Handler Notes"; + this.HandlerNoteTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // scriptAuthorTxt // this.scriptAuthorTxt.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -930,14 +886,15 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.scriptAuthorTxt.BackColor = System.Drawing.Color.Black; this.scriptAuthorTxt.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.scriptAuthorTxt.BulletIndent = 1; this.scriptAuthorTxt.Cursor = System.Windows.Forms.Cursors.IBeam; this.scriptAuthorTxt.ForeColor = System.Drawing.Color.White; - this.scriptAuthorTxt.Location = new System.Drawing.Point(0, 0); + this.scriptAuthorTxt.Location = new System.Drawing.Point(0, 22); this.scriptAuthorTxt.Margin = new System.Windows.Forms.Padding(0); this.scriptAuthorTxt.Name = "scriptAuthorTxt"; this.scriptAuthorTxt.ReadOnly = true; this.scriptAuthorTxt.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical; - this.scriptAuthorTxt.Size = new System.Drawing.Size(187, 218); + this.scriptAuthorTxt.Size = new System.Drawing.Size(187, 199); this.scriptAuthorTxt.TabIndex = 13; this.scriptAuthorTxt.Text = ""; this.scriptAuthorTxt.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.scriptAuthorTxt_LinkClicked); @@ -950,7 +907,7 @@ private void InitializeComponent() this.cover.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.cover.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.cover.Controls.Add(this.coverFrame); - this.cover.Location = new System.Drawing.Point(17, 6); + this.cover.Location = new System.Drawing.Point(22, 5); this.cover.Name = "cover"; this.cover.Size = new System.Drawing.Size(172, 229); this.cover.TabIndex = 27; @@ -982,7 +939,7 @@ private void InitializeComponent() this.txt_GameDescSizer.Location = new System.Drawing.Point(210, 240); this.txt_GameDescSizer.Margin = new System.Windows.Forms.Padding(5); this.txt_GameDescSizer.Name = "txt_GameDescSizer"; - this.txt_GameDescSizer.Size = new System.Drawing.Size(103, 203); + this.txt_GameDescSizer.Size = new System.Drawing.Size(103, 207); this.txt_GameDescSizer.TabIndex = 28; this.txt_GameDescSizer.Visible = false; // @@ -1001,7 +958,7 @@ private void InitializeComponent() this.txt_GameDesc.Name = "txt_GameDesc"; this.txt_GameDesc.ReadOnly = true; this.txt_GameDesc.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txt_GameDesc.Size = new System.Drawing.Size(59, 203); + this.txt_GameDesc.Size = new System.Drawing.Size(59, 207); this.txt_GameDesc.TabIndex = 27; this.txt_GameDesc.Visible = false; // @@ -1021,6 +978,7 @@ private void InitializeComponent() this.mainButtonFrame.Controls.Add(this.btn_Next); this.mainButtonFrame.Controls.Add(this.btnAutoSearch); this.mainButtonFrame.Location = new System.Drawing.Point(0, 0); + this.mainButtonFrame.Margin = new System.Windows.Forms.Padding(0); this.mainButtonFrame.Name = "mainButtonFrame"; this.mainButtonFrame.Size = new System.Drawing.Size(1050, 33); this.mainButtonFrame.TabIndex = 33; @@ -1109,6 +1067,8 @@ private void InitializeComponent() this.btnBack.TabIndex = 9; this.btnBack.UseVisualStyleBackColor = false; this.btnBack.Click += new System.EventHandler(this.arrow_Back_Click); + this.btnBack.MouseEnter += new System.EventHandler(this.btnBack_MouseEnter); + this.btnBack.MouseLeave += new System.EventHandler(this.btnBack_MouseLeave); // // btn_Play // @@ -1148,6 +1108,8 @@ private void InitializeComponent() this.btn_Next.TextAlign = System.Drawing.ContentAlignment.TopRight; this.btn_Next.UseVisualStyleBackColor = false; this.btn_Next.Click += new System.EventHandler(this.btnNext_Click); + this.btn_Next.MouseEnter += new System.EventHandler(this.btn_Next_MouseEnter); + this.btn_Next.MouseLeave += new System.EventHandler(this.btn_Next_MouseLeave); // // btnAutoSearch // @@ -1167,6 +1129,77 @@ private void InitializeComponent() this.btnAutoSearch.UseVisualStyleBackColor = false; this.btnAutoSearch.Click += new System.EventHandler(this.btnAutoSearch_Click); // + // txt_version + // + this.txt_version.AutoSize = true; + this.txt_version.BackColor = System.Drawing.Color.Transparent; + this.txt_version.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.txt_version.ForeColor = System.Drawing.Color.White; + this.txt_version.Location = new System.Drawing.Point(159, 11); + this.txt_version.Margin = new System.Windows.Forms.Padding(0); + this.txt_version.Name = "txt_version"; + this.txt_version.Size = new System.Drawing.Size(28, 13); + this.txt_version.TabIndex = 35; + this.txt_version.Text = "v2.1"; + this.txt_version.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // closeBtn + // + this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.closeBtn.BackColor = System.Drawing.Color.Transparent; + this.closeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.close_button; + this.closeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.closeBtn.Cursor = System.Windows.Forms.Cursors.Hand; + this.closeBtn.FlatAppearance.BorderSize = 0; + this.closeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.closeBtn.Location = new System.Drawing.Point(1025, 6); + this.closeBtn.Margin = new System.Windows.Forms.Padding(2); + this.closeBtn.Name = "closeBtn"; + this.closeBtn.Size = new System.Drawing.Size(20, 20); + this.closeBtn.TabIndex = 16; + this.closeBtn.UseVisualStyleBackColor = false; + this.closeBtn.MouseEnter += new System.EventHandler(this.closeBtn_MouseEnter); + this.closeBtn.MouseLeave += new System.EventHandler(this.closeBtn_MouseLeave); + // + // minimizeBtn + // + this.minimizeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.minimizeBtn.BackColor = System.Drawing.Color.Transparent; + this.minimizeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.minimize_button; + this.minimizeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.minimizeBtn.Cursor = System.Windows.Forms.Cursors.Hand; + this.minimizeBtn.FlatAppearance.BorderSize = 0; + this.minimizeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.minimizeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.minimizeBtn.Location = new System.Drawing.Point(977, 6); + this.minimizeBtn.Margin = new System.Windows.Forms.Padding(2); + this.minimizeBtn.Name = "minimizeBtn"; + this.minimizeBtn.Size = new System.Drawing.Size(20, 20); + this.minimizeBtn.TabIndex = 16; + this.minimizeBtn.UseVisualStyleBackColor = false; + this.minimizeBtn.MouseEnter += new System.EventHandler(this.minimizeBtn_MouseEnter); + this.minimizeBtn.MouseLeave += new System.EventHandler(this.minimizeBtn_MouseLeave); + // + // maximizeBtn + // + this.maximizeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.maximizeBtn.BackColor = System.Drawing.Color.Transparent; + this.maximizeBtn.BackgroundImage = global::Nucleus.Coop.Properties.Resources.maximize_button; + this.maximizeBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.maximizeBtn.Cursor = System.Windows.Forms.Cursors.Hand; + this.maximizeBtn.FlatAppearance.BorderSize = 0; + this.maximizeBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.maximizeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.maximizeBtn.Location = new System.Drawing.Point(1001, 6); + this.maximizeBtn.Margin = new System.Windows.Forms.Padding(2); + this.maximizeBtn.Name = "maximizeBtn"; + this.maximizeBtn.Size = new System.Drawing.Size(20, 20); + this.maximizeBtn.TabIndex = 16; + this.maximizeBtn.UseVisualStyleBackColor = false; + this.maximizeBtn.MouseEnter += new System.EventHandler(this.maximizeBtn_MouseEnter); + this.maximizeBtn.MouseLeave += new System.EventHandler(this.maximizeBtn_MouseLeave); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1175,7 +1208,6 @@ private void InitializeComponent() this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ClientSize = new System.Drawing.Size(1050, 602); this.ControlBox = false; - this.Controls.Add(this.splash); this.Controls.Add(this.btn_Links); this.Controls.Add(this.glowingLine0); this.Controls.Add(this.linksPanel); @@ -1189,6 +1221,7 @@ private void InitializeComponent() this.Controls.Add(this.minimizeBtn); this.Controls.Add(this.logo); this.Controls.Add(this.maximizeBtn); + this.Controls.Add(this.splash); this.Cursor = System.Windows.Forms.Cursors.Default; this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -1205,14 +1238,15 @@ private void InitializeComponent() this.gameContextMenuStrip.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splash)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.glowingLine0)).EndInit(); - this.third_party_tools_container.ResumeLayout(false); this.linksPanel.ResumeLayout(false); + this.third_party_tools_container.ResumeLayout(false); this.clientAreaPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.stepPanelPictureBox)).EndInit(); this.game_listSizer.ResumeLayout(false); this.rightFrame.ResumeLayout(false); this.buttonContainer.ResumeLayout(false); this.scriptAuthorTxtSizer.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.btn_magnifier)).EndInit(); this.cover.ResumeLayout(false); this.txt_GameDescSizer.ResumeLayout(false); this.txt_GameDescSizer.PerformLayout(); @@ -1295,5 +1329,7 @@ private void InitializeComponent() private Button btn_dlFromHub; private BufferedClientAreaPanel linksPanel; private Button btn_Links; + private Label HandlerNoteTitle; + private PictureBox btn_magnifier; } } \ No newline at end of file diff --git a/Master/NucleusCoopTool/Forms/MainForm.cs b/Master/NucleusCoopTool/Forms/MainForm.cs index 4d120969..76298b4a 100644 --- a/Master/NucleusCoopTool/Forms/MainForm.cs +++ b/Master/NucleusCoopTool/Forms/MainForm.cs @@ -103,10 +103,14 @@ public partial class MainForm : BaseForm, IDynamicSized public string[] rgb_MenuStripBackColor; public string[] rgb_MenuStripFontColor; public string[] rgb_TitleBarColor; - public string[] rgb_HandlerNoteBackColor; + public string[] rgb_HandlerNoteTitleFont; public string[] rgb_HandlerNoteFontColor; + public string[] rgb_HandlerNoteTitleFontColor; public string[] rgb_ButtonsBorderColor; public string[] rgb_ThirdPartyToolsLinks; + public string[] rgb_HandlerNoteBackColor; + public string[] rgb_HandlerNoteTitleBackColor; + public Color TitleBarColor; public Color MouseOverBackColor; public Color MenuStripBackColor; @@ -114,6 +118,9 @@ public partial class MainForm : BaseForm, IDynamicSized public Color ButtonsBorderColor; private Color HandlerNoteBackColor; private Color HandlerNoteFontColor; + private Color HandlerNoteTitleBackColor; + private Color HandlerNoteTitleFont; + public FileInfo fontPath; public void CheckNetCon() @@ -281,6 +288,7 @@ public void button_Click(object sender, EventArgs e) private void minimizeButton(object sender, EventArgs e) { this.WindowState = FormWindowState.Minimized; + } private void maximizeButton(object sender, EventArgs e) @@ -292,13 +300,16 @@ private void maximizeButton(object sender, EventArgs e) { if (WindowState == FormWindowState.Maximized) { - Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 0, 0)); + Region = Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 0, 0)); } else { - Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 20, 20)); + Region = Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 20, 20)); } } + + positionsControl.handlerNoteZoom.Visible = false; + btn_magnifier.Image = new Bitmap(themePath + "\\magnifier.png"); ResumeLayout(); } @@ -360,6 +371,8 @@ public MainForm() rgb_TitleBarColor = theme.IniReadValue("Colors", "TitleBar").Split(','); rgb_HandlerNoteBackColor = theme.IniReadValue("Colors", "HandlerNoteBack").Split(','); rgb_HandlerNoteFontColor = theme.IniReadValue("Colors", "HandlerNoteFont").Split(','); + rgb_HandlerNoteTitleFontColor = theme.IniReadValue("Colors", "HandlerNoteTitleFont").Split(','); + rgb_HandlerNoteTitleBackColor = theme.IniReadValue("Colors", "HandlerNoteTitleBackColor").Split(','); rgb_ButtonsBorderColor = theme.IniReadValue("Colors", "ButtonsBorder").Split(','); float fontSize = float.Parse(theme.IniReadValue("Font", "MainFontSize")); @@ -372,10 +385,10 @@ public MainForm() MenuStripFontColor = Color.FromArgb(Convert.ToInt32(rgb_MenuStripFontColor[0]), Convert.ToInt32(rgb_MenuStripFontColor[1]), Convert.ToInt32(rgb_MenuStripFontColor[2])); HandlerNoteBackColor = Color.FromArgb(Convert.ToInt32(rgb_HandlerNoteBackColor[0]), Convert.ToInt32(rgb_HandlerNoteBackColor[1]), Convert.ToInt32(rgb_HandlerNoteBackColor[2])); HandlerNoteFontColor = Color.FromArgb(Convert.ToInt32(rgb_HandlerNoteFontColor[0]), Convert.ToInt32(rgb_HandlerNoteFontColor[1]), Convert.ToInt32(rgb_HandlerNoteFontColor[2])); + HandlerNoteTitleBackColor = Color.FromArgb(Convert.ToInt32(rgb_HandlerNoteTitleBackColor[0]), Convert.ToInt32(rgb_HandlerNoteTitleBackColor[1]), Convert.ToInt32(rgb_HandlerNoteTitleBackColor[2])); + HandlerNoteTitleFont = Color.FromArgb(Convert.ToInt32(rgb_HandlerNoteTitleFontColor[0]), Convert.ToInt32(rgb_HandlerNoteTitleFontColor[1]), Convert.ToInt32(rgb_HandlerNoteTitleFontColor[2])); ButtonsBorderColor = Color.FromArgb(Convert.ToInt32(rgb_ButtonsBorderColor[0]), Convert.ToInt32(rgb_ButtonsBorderColor[1]), Convert.ToInt32(rgb_ButtonsBorderColor[2])); - - InitializeComponent(); SuspendLayout(); @@ -393,6 +406,9 @@ public MainForm() ForeColor = Color.FromArgb(Convert.ToInt32(rgb_font[0]), Convert.ToInt32(rgb_font[1]), Convert.ToInt32(rgb_font[2])); scriptAuthorTxt.BackColor = HandlerNoteBackColor; scriptAuthorTxt.ForeColor = HandlerNoteFontColor; + scriptAuthorTxtSizer.BackColor = HandlerNoteTitleBackColor; + HandlerNoteTitle.ForeColor = HandlerNoteTitleFont; + //Controls Pictures AppButtons = new Bitmap(themePath + "\\button.png"); @@ -430,6 +446,7 @@ public MainForm() btn_dlFromHub.BackgroundImage = new Bitmap(themePath + "\\dlhub_btn.png"); glowingLine0.Image = new Bitmap(themePath + "\\lightbar_top.gif"); StepPanel.BackgroundImage = new Bitmap(themePath + "\\setup_screen.png"); + btn_magnifier.Image = new Bitmap(themePath + "\\magnifier.png"); // btn_Extract.FlatAppearance.MouseOverBackColor = MouseOverBackColor; btnAutoSearch.FlatAppearance.MouseOverBackColor = MouseOverBackColor; @@ -495,7 +512,7 @@ public MainForm() foreach (Control control in ctrls) { - if (control.Name != "btn_Links" && control.Name != "btn_thirdPartytools")//Close "third_party_tools_container" control when an other control in the form is clicked. + if (control.Name != "btn_Links" && control.Name != "btn_thirdPartytools" && control.Name != "HandlerNoteTitle")//Close "third_party_tools_container" control when an other control in the form is clicked. { control.Font = new Font(customFont, fontSize, FontStyle.Regular, GraphicsUnit.Pixel, 0); control.Click += new EventHandler(this.this_Click); @@ -588,7 +605,7 @@ public void UpdateSize(float scale) scriptAuthorTxt.Font = new Font(customFont, newFontSize, FontStyle.Regular, GraphicsUnit.Pixel, 0); txt_GameDesc.Font = new Font(customFont, newFontSize, FontStyle.Regular, GraphicsUnit.Pixel, 0); - + ResumeLayout(); } @@ -968,7 +985,8 @@ private void list_Games_SelectedChanged(object arg1, Control arg2) { currentControl = (GameControl)arg1; currentGameInfo = currentControl.UserGameInfo; - + positionsControl.handlerNoteZoom.Visible = false; + btn_magnifier.Image = new Bitmap(themePath + "\\magnifier.png"); if (currentGameInfo == null) { btn_gameOptions.Visible = false; @@ -1494,7 +1512,10 @@ private void UpdateGameManager(object state) proc.Dispose(); } - File.Delete(regFilePath); + if (!regFilePath.Contains("User Shell Folders")) + { + File.Delete(regFilePath); + } } handler_Ended(); @@ -2428,7 +2449,6 @@ private void button_UpdateAvailable_Click(object sender, EventArgs e) } } - private void btn_Extract_Click(object sender, EventArgs e) { System.Windows.Forms.OpenFileDialog ofd = new System.Windows.Forms.OpenFileDialog @@ -2464,8 +2484,6 @@ private void button1_Click_1(object sender, EventArgs e) CheckNetCon(); } - - private void btn_Links_Click(object sender, EventArgs e) { @@ -2668,7 +2686,6 @@ private void btn_Discord_MouseLeave(object sender, EventArgs e) private void btn_SplitCalculator_MouseEnter(object sender, EventArgs e) { btn_SplitCalculator.BackgroundImage = new Bitmap(themePath + "\\splitcalculator_mousehover.png"); - } private void btn_SplitCalculator_MouseLeave(object sender, EventArgs e) @@ -2687,5 +2704,41 @@ private void btn_thirdPartytools_MouseLeave(object sender, EventArgs e) btn_thirdPartytools.BackgroundImage = new Bitmap(themePath + "\\thirdPartytools.png"); } + private void btn_Next_MouseEnter(object sender, EventArgs e) + { + btn_Next.BackgroundImage = new Bitmap(themePath + "\\arrow_right_mousehover.png"); + } + + private void btn_Next_MouseLeave(object sender, EventArgs e) + { + btn_Next.BackgroundImage = new Bitmap(themePath + "\\arrow_right.png"); + } + + private void btnBack_MouseEnter(object sender, EventArgs e) + { + btnBack.BackgroundImage = new Bitmap(themePath + "\\arrow_left_mousehover.png"); + } + + private void btnBack_MouseLeave(object sender, EventArgs e) + { + btnBack.BackgroundImage = new Bitmap(themePath + "\\arrow_left.png"); + } + + private void btn_magnifier_Click(object sender, EventArgs e) + { + if (!positionsControl.handlerNoteZoom.Visible) + { + positionsControl.handlerNoteZoom.Text = currentGame.Description; + positionsControl.handlerNoteZoom.Location = new Point(positionsControl.Width / 2 - positionsControl.handlerNoteZoom.Width / 2, positionsControl.instruction.Height + 10); + positionsControl.handlerNoteZoom.Region = Region.FromHrgn(CreateRoundRectRgn(0, 0, positionsControl.handlerNoteZoom.Width, positionsControl.handlerNoteZoom.Height, 15, 15)); + positionsControl.handlerNoteZoom.Visible = true; + btn_magnifier.Image = new Bitmap(themePath + "\\magnifier_close.png"); + } + else + { + positionsControl.handlerNoteZoom.Visible = false; + btn_magnifier.Image = new Bitmap(themePath + "\\magnifier.png"); + } + } } } diff --git a/Master/NucleusCoopTool/Forms/MainForm.resx b/Master/NucleusCoopTool/Forms/MainForm.resx index 8c6888db..413f6597 100644 --- a/Master/NucleusCoopTool/Forms/MainForm.resx +++ b/Master/NucleusCoopTool/Forms/MainForm.resx @@ -121,95 +121,6 @@ 17, 17 - - - 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 - YII= - - - - Connection with the game handlers hub couldn't be -established from the app, handlers, covers and screenshots downloader -will be unavailable. Click this button to refresh, if the problem persist, -click the FAQ button or ask for help on the official Nucleus Co-op Discord/SubReddit. - iVBORw0KGgoAAAANSUhEUgAAAJ8AAAB9CAYAAAC8l7FpAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKM+VkTtI @@ -786,6 +697,95 @@ click the FAQ button or ask for help on the official Nucleus Co-op Discord/SubRe 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 + YII= + + + + Connection with the game handlers hub couldn't be +established from the app, handlers, covers and screenshots downloader +will be unavailable. Click this button to refresh, if the problem persist, +click the FAQ button or ask for help on the official Nucleus Co-op Discord/SubReddit. 114, 17 diff --git a/Master/NucleusCoopTool/Forms/Settings.Designer.cs b/Master/NucleusCoopTool/Forms/Settings.Designer.cs index bdcac467..c42b7494 100644 --- a/Master/NucleusCoopTool/Forms/Settings.Designer.cs +++ b/Master/NucleusCoopTool/Forms/Settings.Designer.cs @@ -86,57 +86,75 @@ private void InitializeComponent() this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.settingsCloseHKTxt = new System.Windows.Forms.TextBox(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.numMaxPlyrs = new System.Windows.Forms.NumericUpDown(); - this.numHorDiv = new System.Windows.Forms.NumericUpDown(); - this.numVerDiv = new System.Windows.Forms.NumericUpDown(); - this.label29 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.SplitDiv = new System.Windows.Forms.CheckBox(); - this.label49 = new System.Windows.Forms.Label(); - this.SplitColors = new System.Windows.Forms.ComboBox(); - this.layoutSizer = new System.Windows.Forms.Panel(); - this.label30 = new System.Windows.Forms.Label(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.steamid16 = new System.Windows.Forms.ComboBox(); + this.steamid15 = new System.Windows.Forms.ComboBox(); + this.steamid14 = new System.Windows.Forms.ComboBox(); + this.steamid13 = new System.Windows.Forms.ComboBox(); + this.steamid12 = new System.Windows.Forms.ComboBox(); + this.steamid11 = new System.Windows.Forms.ComboBox(); + this.steamid10 = new System.Windows.Forms.ComboBox(); + this.label48 = new System.Windows.Forms.Label(); + this.steamid9 = new System.Windows.Forms.ComboBox(); + this.steamid8 = new System.Windows.Forms.ComboBox(); + this.steamid7 = new System.Windows.Forms.ComboBox(); + this.steamid6 = new System.Windows.Forms.ComboBox(); + this.steamid5 = new System.Windows.Forms.ComboBox(); + this.steamid4 = new System.Windows.Forms.ComboBox(); + this.steamid3 = new System.Windows.Forms.ComboBox(); + this.steamid2 = new System.Windows.Forms.ComboBox(); + this.label47 = new System.Windows.Forms.Label(); + this.steamid1 = new System.Windows.Forms.ComboBox(); this.label21 = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label(); this.btn_Refresh = new System.Windows.Forms.Button(); - this.controllerSixteenNick = new System.Windows.Forms.TextBox(); + this.controllerSixteenNick = new System.Windows.Forms.ComboBox(); this.label17 = new System.Windows.Forms.Label(); - this.controllerFifteenNick = new System.Windows.Forms.TextBox(); + this.controllerFifteenNick = new System.Windows.Forms.ComboBox(); this.label18 = new System.Windows.Forms.Label(); - this.controllerFourteenNick = new System.Windows.Forms.TextBox(); + this.controllerFourteenNick = new System.Windows.Forms.ComboBox(); this.label19 = new System.Windows.Forms.Label(); - this.controllerThirteenNick = new System.Windows.Forms.TextBox(); + this.controllerThirteenNick = new System.Windows.Forms.ComboBox(); this.label20 = new System.Windows.Forms.Label(); - this.controllerTwelveNick = new System.Windows.Forms.TextBox(); + this.controllerTwelveNick = new System.Windows.Forms.ComboBox(); this.label22 = new System.Windows.Forms.Label(); - this.controllerElevenNick = new System.Windows.Forms.TextBox(); + this.controllerElevenNick = new System.Windows.Forms.ComboBox(); this.label23 = new System.Windows.Forms.Label(); - this.controllerTenNick = new System.Windows.Forms.TextBox(); + this.controllerTenNick = new System.Windows.Forms.ComboBox(); this.label24 = new System.Windows.Forms.Label(); - this.controllerNineNick = new System.Windows.Forms.TextBox(); + this.controllerNineNick = new System.Windows.Forms.ComboBox(); this.label26 = new System.Windows.Forms.Label(); - this.controllerEightNick = new System.Windows.Forms.TextBox(); + this.controllerEightNick = new System.Windows.Forms.ComboBox(); this.label16 = new System.Windows.Forms.Label(); - this.controllerSevenNick = new System.Windows.Forms.TextBox(); + this.controllerSevenNick = new System.Windows.Forms.ComboBox(); this.label15 = new System.Windows.Forms.Label(); - this.controllerSixNick = new System.Windows.Forms.TextBox(); + this.controllerSixNick = new System.Windows.Forms.ComboBox(); this.label11 = new System.Windows.Forms.Label(); - this.controllerFiveNick = new System.Windows.Forms.TextBox(); + this.controllerFiveNick = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); - this.controllerFourNick = new System.Windows.Forms.TextBox(); + this.controllerFourNick = new System.Windows.Forms.ComboBox(); this.label14 = new System.Windows.Forms.Label(); - this.controllerThreeNick = new System.Windows.Forms.TextBox(); + this.controllerThreeNick = new System.Windows.Forms.ComboBox(); this.label12 = new System.Windows.Forms.Label(); - this.controllerTwoNick = new System.Windows.Forms.TextBox(); + this.controllerTwoNick = new System.Windows.Forms.ComboBox(); this.label10 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.controllerOneNick = new System.Windows.Forms.TextBox(); + this.controllerOneNick = new System.Windows.Forms.ComboBox(); this.label7 = new System.Windows.Forms.Label(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.numMaxPlyrs = new System.Windows.Forms.NumericUpDown(); + this.numHorDiv = new System.Windows.Forms.NumericUpDown(); + this.numVerDiv = new System.Windows.Forms.NumericUpDown(); + this.label29 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label31 = new System.Windows.Forms.Label(); + this.SplitDiv = new System.Windows.Forms.CheckBox(); + this.label49 = new System.Windows.Forms.Label(); + this.SplitColors = new System.Windows.Forms.ComboBox(); + this.layoutSizer = new System.Windows.Forms.Panel(); + this.label30 = new System.Windows.Forms.Label(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label39 = new System.Windows.Forms.Label(); this.audioDefaultDevice = new System.Windows.Forms.Label(); @@ -169,11 +187,11 @@ private void InitializeComponent() this.tabPage3.SuspendLayout(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.tabPage5.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numMaxPlyrs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numHorDiv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numVerDiv)).BeginInit(); - this.tabPage5.SuspendLayout(); this.tabPage1.SuspendLayout(); this.audioCustomSettingsBox.SuspendLayout(); this.setting_Label.SuspendLayout(); @@ -184,8 +202,8 @@ private void InitializeComponent() this.tabControl2.Anchor = System.Windows.Forms.AnchorStyles.None; this.tabControl2.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; this.tabControl2.Controls.Add(this.tabPage3); - this.tabControl2.Controls.Add(this.tabPage4); this.tabControl2.Controls.Add(this.tabPage5); + this.tabControl2.Controls.Add(this.tabPage4); this.tabControl2.Controls.Add(this.tabPage1); this.tabControl2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tabControl2.ItemSize = new System.Drawing.Size(52, 23); @@ -755,222 +773,28 @@ private void InitializeComponent() this.settingsCloseHKTxt.TabIndex = 2; this.settingsCloseHKTxt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // tabPage4 - // - this.tabPage4.BackColor = System.Drawing.Color.Transparent; - this.tabPage4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.tabPage4.Controls.Add(this.numMaxPlyrs); - this.tabPage4.Controls.Add(this.numHorDiv); - this.tabPage4.Controls.Add(this.numVerDiv); - this.tabPage4.Controls.Add(this.label29); - this.tabPage4.Controls.Add(this.label27); - this.tabPage4.Controls.Add(this.label28); - this.tabPage4.Controls.Add(this.label31); - this.tabPage4.Controls.Add(this.SplitDiv); - this.tabPage4.Controls.Add(this.label49); - this.tabPage4.Controls.Add(this.SplitColors); - this.tabPage4.Controls.Add(this.layoutSizer); - this.tabPage4.Controls.Add(this.label30); - this.tabPage4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabPage4.Location = new System.Drawing.Point(4, 27); - this.tabPage4.Margin = new System.Windows.Forms.Padding(2); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(2); - this.tabPage4.Size = new System.Drawing.Size(511, 240); - this.tabPage4.TabIndex = 1; - this.tabPage4.Text = "Custom Layout"; - // - // numMaxPlyrs - // - this.numMaxPlyrs.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.numMaxPlyrs.BackColor = System.Drawing.SystemColors.ControlDark; - this.numMaxPlyrs.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.numMaxPlyrs.Enabled = false; - this.numMaxPlyrs.Location = new System.Drawing.Point(6, 106); - this.numMaxPlyrs.Maximum = new decimal(new int[] { - 999, - 0, - 0, - 0}); - this.numMaxPlyrs.Name = "numMaxPlyrs"; - this.numMaxPlyrs.ReadOnly = true; - this.numMaxPlyrs.Size = new System.Drawing.Size(46, 16); - this.numMaxPlyrs.TabIndex = 33; - this.numMaxPlyrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numMaxPlyrs.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // numHorDiv - // - this.numHorDiv.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.numHorDiv.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.numHorDiv.Location = new System.Drawing.Point(6, 65); - this.numHorDiv.Maximum = new decimal(new int[] { - 5, - 0, - 0, - 0}); - this.numHorDiv.Name = "numHorDiv"; - this.numHorDiv.ReadOnly = true; - this.numHorDiv.Size = new System.Drawing.Size(46, 16); - this.numHorDiv.TabIndex = 31; - this.numHorDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numHorDiv.ValueChanged += new System.EventHandler(this.NumHorDiv_ValueChanged); - // - // numVerDiv - // - this.numVerDiv.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.numVerDiv.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.numVerDiv.Location = new System.Drawing.Point(6, 24); - this.numVerDiv.Maximum = new decimal(new int[] { - 5, - 0, - 0, - 0}); - this.numVerDiv.Name = "numVerDiv"; - this.numVerDiv.ReadOnly = true; - this.numVerDiv.Size = new System.Drawing.Size(46, 16); - this.numVerDiv.TabIndex = 32; - this.numVerDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numVerDiv.ValueChanged += new System.EventHandler(this.NumVerDiv_ValueChanged); - // - // label29 - // - this.label29.AutoSize = true; - this.label29.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.label29.Location = new System.Drawing.Point(5, 87); - this.label29.Margin = new System.Windows.Forms.Padding(3); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(64, 13); - this.label29.TabIndex = 30; - this.label29.Text = "Max Players"; - this.label29.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label27 - // - this.label27.AutoSize = true; - this.label27.BackColor = System.Drawing.Color.Transparent; - this.label27.Location = new System.Drawing.Point(5, 46); - this.label27.Margin = new System.Windows.Forms.Padding(3); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(151, 13); - this.label27.TabIndex = 28; - this.label27.Text = "Number of Horizontal Divisions"; - this.label27.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(5, 5); - this.label28.Margin = new System.Windows.Forms.Padding(3); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(139, 13); - this.label28.TabIndex = 29; - this.label28.Text = "Number of Vertical Divisions"; - this.label28.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label31 - // - this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label31.BackColor = System.Drawing.Color.Transparent; - this.label31.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.label31.ForeColor = System.Drawing.Color.Red; - this.label31.Location = new System.Drawing.Point(4, 208); - this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(256, 28); - this.label31.TabIndex = 86; - this.label31.Text = "Splitscreen division may not work for all games."; - this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.label31.UseMnemonic = false; - // - // SplitDiv - // - this.SplitDiv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SplitDiv.AutoSize = true; - this.SplitDiv.Cursor = System.Windows.Forms.Cursors.Default; - this.SplitDiv.Location = new System.Drawing.Point(6, 134); - this.SplitDiv.Margin = new System.Windows.Forms.Padding(2); - this.SplitDiv.Name = "SplitDiv"; - this.SplitDiv.Size = new System.Drawing.Size(116, 17); - this.SplitDiv.TabIndex = 85; - this.SplitDiv.Text = "Splitscreen division"; - this.SplitDiv.UseVisualStyleBackColor = true; - this.SplitDiv.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); - // - // label49 - // - this.label49.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label49.AutoSize = true; - this.label49.BackColor = System.Drawing.Color.Transparent; - this.label49.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label49.Location = new System.Drawing.Point(4, 155); - this.label49.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(103, 15); - this.label49.TabIndex = 84; - this.label49.Text = "Background color"; - this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // SplitColors - // - this.SplitColors.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.SplitColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.SplitColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.SplitColors.FormattingEnabled = true; - this.SplitColors.Items.AddRange(new object[] { - "Black", - "Gray", - "White", - "Dark Blue", - "Blue", - "Purple", - "Pink", - "Red", - "Orange", - "Yellow ", - "Green"}); - this.SplitColors.Location = new System.Drawing.Point(7, 174); - this.SplitColors.Margin = new System.Windows.Forms.Padding(0); - this.SplitColors.MaxDropDownItems = 10; - this.SplitColors.Name = "SplitColors"; - this.SplitColors.Size = new System.Drawing.Size(78, 21); - this.SplitColors.TabIndex = 82; - this.SplitColors.SelectedIndexChanged += new System.EventHandler(this.SplitColors_SelectedIndexChanged); - // - // layoutSizer - // - this.layoutSizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.layoutSizer.BackColor = System.Drawing.Color.Transparent; - this.layoutSizer.Location = new System.Drawing.Point(238, 28); - this.layoutSizer.MaximumSize = new System.Drawing.Size(245, 170); - this.layoutSizer.MinimumSize = new System.Drawing.Size(245, 170); - this.layoutSizer.Name = "layoutSizer"; - this.layoutSizer.Size = new System.Drawing.Size(245, 170); - this.layoutSizer.TabIndex = 36; - this.layoutSizer.Paint += new System.Windows.Forms.PaintEventHandler(this.layoutSizer_Paint); - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(235, 8); - this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(48, 13); - this.label30.TabIndex = 35; - this.label30.Text = "Preview:"; - this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // tabPage5 // this.tabPage5.BackColor = System.Drawing.Color.Transparent; this.tabPage5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.tabPage5.Controls.Add(this.steamid16); + this.tabPage5.Controls.Add(this.steamid15); + this.tabPage5.Controls.Add(this.steamid14); + this.tabPage5.Controls.Add(this.steamid13); + this.tabPage5.Controls.Add(this.steamid12); + this.tabPage5.Controls.Add(this.steamid11); + this.tabPage5.Controls.Add(this.steamid10); + this.tabPage5.Controls.Add(this.label48); + this.tabPage5.Controls.Add(this.steamid9); + this.tabPage5.Controls.Add(this.steamid8); + this.tabPage5.Controls.Add(this.steamid7); + this.tabPage5.Controls.Add(this.steamid6); + this.tabPage5.Controls.Add(this.steamid5); + this.tabPage5.Controls.Add(this.steamid4); + this.tabPage5.Controls.Add(this.steamid3); + this.tabPage5.Controls.Add(this.steamid2); + this.tabPage5.Controls.Add(this.label47); + this.tabPage5.Controls.Add(this.steamid1); this.tabPage5.Controls.Add(this.label21); this.tabPage5.Controls.Add(this.label25); this.tabPage5.Controls.Add(this.btn_Refresh); @@ -1014,7 +838,187 @@ private void InitializeComponent() this.tabPage5.Name = "tabPage5"; this.tabPage5.Size = new System.Drawing.Size(511, 240); this.tabPage5.TabIndex = 2; - this.tabPage5.Text = "Nicknames"; + this.tabPage5.Text = "Players"; + // + // steamid16 + // + this.steamid16.BackColor = System.Drawing.Color.White; + this.steamid16.Location = new System.Drawing.Point(396, 166); + this.steamid16.Margin = new System.Windows.Forms.Padding(2); + this.steamid16.MaxLength = 17; + this.steamid16.Name = "steamid16"; + this.steamid16.Size = new System.Drawing.Size(113, 21); + this.steamid16.TabIndex = 127; + // + // steamid15 + // + this.steamid15.BackColor = System.Drawing.Color.White; + this.steamid15.Location = new System.Drawing.Point(396, 147); + this.steamid15.Margin = new System.Windows.Forms.Padding(2); + this.steamid15.MaxLength = 17; + this.steamid15.Name = "steamid15"; + this.steamid15.Size = new System.Drawing.Size(113, 21); + this.steamid15.TabIndex = 126; + // + // steamid14 + // + this.steamid14.BackColor = System.Drawing.Color.White; + this.steamid14.Location = new System.Drawing.Point(396, 128); + this.steamid14.Margin = new System.Windows.Forms.Padding(2); + this.steamid14.MaxLength = 17; + this.steamid14.Name = "steamid14"; + this.steamid14.Size = new System.Drawing.Size(113, 21); + this.steamid14.TabIndex = 125; + // + // steamid13 + // + this.steamid13.BackColor = System.Drawing.Color.White; + this.steamid13.Location = new System.Drawing.Point(396, 109); + this.steamid13.Margin = new System.Windows.Forms.Padding(2); + this.steamid13.MaxLength = 17; + this.steamid13.Name = "steamid13"; + this.steamid13.Size = new System.Drawing.Size(113, 21); + this.steamid13.TabIndex = 124; + // + // steamid12 + // + this.steamid12.BackColor = System.Drawing.Color.White; + this.steamid12.Location = new System.Drawing.Point(396, 90); + this.steamid12.Margin = new System.Windows.Forms.Padding(2); + this.steamid12.MaxLength = 17; + this.steamid12.Name = "steamid12"; + this.steamid12.Size = new System.Drawing.Size(113, 21); + this.steamid12.TabIndex = 123; + // + // steamid11 + // + this.steamid11.BackColor = System.Drawing.Color.White; + this.steamid11.Location = new System.Drawing.Point(396, 71); + this.steamid11.Margin = new System.Windows.Forms.Padding(2); + this.steamid11.MaxLength = 17; + this.steamid11.Name = "steamid11"; + this.steamid11.Size = new System.Drawing.Size(113, 21); + this.steamid11.TabIndex = 122; + // + // steamid10 + // + this.steamid10.BackColor = System.Drawing.Color.White; + this.steamid10.Location = new System.Drawing.Point(396, 52); + this.steamid10.Margin = new System.Windows.Forms.Padding(2); + this.steamid10.MaxLength = 17; + this.steamid10.Name = "steamid10"; + this.steamid10.Size = new System.Drawing.Size(113, 21); + this.steamid10.TabIndex = 121; + // + // label48 + // + this.label48.AutoSize = true; + this.label48.Location = new System.Drawing.Point(398, 12); + this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label48.Name = "label48"; + this.label48.Size = new System.Drawing.Size(83, 13); + this.label48.TabIndex = 119; + this.label48.Text = "Player Steam ID"; + // + // steamid9 + // + this.steamid9.BackColor = System.Drawing.Color.White; + this.steamid9.Location = new System.Drawing.Point(396, 33); + this.steamid9.Margin = new System.Windows.Forms.Padding(2); + this.steamid9.MaxLength = 17; + this.steamid9.Name = "steamid9"; + this.steamid9.Size = new System.Drawing.Size(113, 21); + this.steamid9.TabIndex = 120; + // + // steamid8 + // + this.steamid8.BackColor = System.Drawing.Color.White; + this.steamid8.Location = new System.Drawing.Point(134, 166); + this.steamid8.Margin = new System.Windows.Forms.Padding(2); + this.steamid8.MaxLength = 17; + this.steamid8.Name = "steamid8"; + this.steamid8.Size = new System.Drawing.Size(113, 21); + this.steamid8.TabIndex = 118; + // + // steamid7 + // + this.steamid7.BackColor = System.Drawing.Color.White; + this.steamid7.Location = new System.Drawing.Point(134, 147); + this.steamid7.Margin = new System.Windows.Forms.Padding(2); + this.steamid7.MaxLength = 17; + this.steamid7.Name = "steamid7"; + this.steamid7.Size = new System.Drawing.Size(113, 21); + this.steamid7.TabIndex = 117; + // + // steamid6 + // + this.steamid6.BackColor = System.Drawing.Color.White; + this.steamid6.Location = new System.Drawing.Point(134, 128); + this.steamid6.Margin = new System.Windows.Forms.Padding(2); + this.steamid6.MaxLength = 17; + this.steamid6.Name = "steamid6"; + this.steamid6.Size = new System.Drawing.Size(113, 21); + this.steamid6.TabIndex = 116; + // + // steamid5 + // + this.steamid5.BackColor = System.Drawing.Color.White; + this.steamid5.Location = new System.Drawing.Point(134, 109); + this.steamid5.Margin = new System.Windows.Forms.Padding(2); + this.steamid5.MaxLength = 17; + this.steamid5.Name = "steamid5"; + this.steamid5.Size = new System.Drawing.Size(113, 21); + this.steamid5.TabIndex = 115; + // + // steamid4 + // + this.steamid4.BackColor = System.Drawing.Color.White; + this.steamid4.Location = new System.Drawing.Point(134, 90); + this.steamid4.Margin = new System.Windows.Forms.Padding(2); + this.steamid4.MaxLength = 17; + this.steamid4.Name = "steamid4"; + this.steamid4.Size = new System.Drawing.Size(113, 21); + this.steamid4.TabIndex = 114; + // + // steamid3 + // + this.steamid3.BackColor = System.Drawing.Color.White; + this.steamid3.Location = new System.Drawing.Point(134, 71); + this.steamid3.Margin = new System.Windows.Forms.Padding(2); + this.steamid3.MaxLength = 17; + this.steamid3.Name = "steamid3"; + this.steamid3.Size = new System.Drawing.Size(113, 21); + this.steamid3.TabIndex = 113; + // + // steamid2 + // + this.steamid2.BackColor = System.Drawing.Color.White; + this.steamid2.Location = new System.Drawing.Point(134, 52); + this.steamid2.Margin = new System.Windows.Forms.Padding(2); + this.steamid2.MaxLength = 17; + this.steamid2.Name = "steamid2"; + this.steamid2.Size = new System.Drawing.Size(113, 21); + this.steamid2.TabIndex = 112; + // + // label47 + // + this.label47.AutoSize = true; + this.label47.Location = new System.Drawing.Point(136, 12); + this.label47.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label47.Name = "label47"; + this.label47.Size = new System.Drawing.Size(83, 13); + this.label47.TabIndex = 110; + this.label47.Text = "Player Steam ID"; + // + // steamid1 + // + this.steamid1.BackColor = System.Drawing.Color.White; + this.steamid1.Location = new System.Drawing.Point(134, 33); + this.steamid1.Margin = new System.Windows.Forms.Padding(2); + this.steamid1.MaxLength = 17; + this.steamid1.Name = "steamid1"; + this.steamid1.Size = new System.Drawing.Size(113, 21); + this.steamid1.TabIndex = 111; // // label21 // @@ -1029,7 +1033,7 @@ private void InitializeComponent() // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(342, 12); + this.label25.Location = new System.Drawing.Point(322, 12); this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(55, 13); @@ -1045,16 +1049,17 @@ private void InitializeComponent() this.btn_Refresh.Size = new System.Drawing.Size(80, 23); this.btn_Refresh.TabIndex = 16; this.btn_Refresh.Text = "Refresh"; + this.btn_Refresh.Visible = false; this.btn_Refresh.Click += new System.EventHandler(this.Btn_Refresh_Click); // // controllerSixteenNick // this.controllerSixteenNick.BackColor = System.Drawing.Color.White; - this.controllerSixteenNick.Location = new System.Drawing.Point(345, 169); + this.controllerSixteenNick.Location = new System.Drawing.Point(320, 166); this.controllerSixteenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerSixteenNick.MaxLength = 9; this.controllerSixteenNick.Name = "controllerSixteenNick"; - this.controllerSixteenNick.Size = new System.Drawing.Size(69, 20); + this.controllerSixteenNick.Size = new System.Drawing.Size(69, 21); this.controllerSixteenNick.TabIndex = 105; // // label17 @@ -1071,11 +1076,11 @@ private void InitializeComponent() // controllerFifteenNick // this.controllerFifteenNick.BackColor = System.Drawing.Color.White; - this.controllerFifteenNick.Location = new System.Drawing.Point(345, 150); + this.controllerFifteenNick.Location = new System.Drawing.Point(320, 147); this.controllerFifteenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerFifteenNick.MaxLength = 9; this.controllerFifteenNick.Name = "controllerFifteenNick"; - this.controllerFifteenNick.Size = new System.Drawing.Size(69, 20); + this.controllerFifteenNick.Size = new System.Drawing.Size(69, 21); this.controllerFifteenNick.TabIndex = 102; // // label18 @@ -1092,11 +1097,11 @@ private void InitializeComponent() // controllerFourteenNick // this.controllerFourteenNick.BackColor = System.Drawing.Color.White; - this.controllerFourteenNick.Location = new System.Drawing.Point(345, 131); + this.controllerFourteenNick.Location = new System.Drawing.Point(320, 128); this.controllerFourteenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerFourteenNick.MaxLength = 9; this.controllerFourteenNick.Name = "controllerFourteenNick"; - this.controllerFourteenNick.Size = new System.Drawing.Size(69, 20); + this.controllerFourteenNick.Size = new System.Drawing.Size(69, 21); this.controllerFourteenNick.TabIndex = 99; // // label19 @@ -1113,11 +1118,11 @@ private void InitializeComponent() // controllerThirteenNick // this.controllerThirteenNick.BackColor = System.Drawing.Color.White; - this.controllerThirteenNick.Location = new System.Drawing.Point(345, 112); + this.controllerThirteenNick.Location = new System.Drawing.Point(320, 109); this.controllerThirteenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerThirteenNick.MaxLength = 9; this.controllerThirteenNick.Name = "controllerThirteenNick"; - this.controllerThirteenNick.Size = new System.Drawing.Size(69, 20); + this.controllerThirteenNick.Size = new System.Drawing.Size(69, 21); this.controllerThirteenNick.TabIndex = 96; // // label20 @@ -1134,11 +1139,11 @@ private void InitializeComponent() // controllerTwelveNick // this.controllerTwelveNick.BackColor = System.Drawing.Color.White; - this.controllerTwelveNick.Location = new System.Drawing.Point(345, 93); + this.controllerTwelveNick.Location = new System.Drawing.Point(320, 90); this.controllerTwelveNick.Margin = new System.Windows.Forms.Padding(2); this.controllerTwelveNick.MaxLength = 9; this.controllerTwelveNick.Name = "controllerTwelveNick"; - this.controllerTwelveNick.Size = new System.Drawing.Size(69, 20); + this.controllerTwelveNick.Size = new System.Drawing.Size(69, 21); this.controllerTwelveNick.TabIndex = 92; // // label22 @@ -1155,11 +1160,11 @@ private void InitializeComponent() // controllerElevenNick // this.controllerElevenNick.BackColor = System.Drawing.Color.White; - this.controllerElevenNick.Location = new System.Drawing.Point(345, 74); + this.controllerElevenNick.Location = new System.Drawing.Point(320, 71); this.controllerElevenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerElevenNick.MaxLength = 9; this.controllerElevenNick.Name = "controllerElevenNick"; - this.controllerElevenNick.Size = new System.Drawing.Size(69, 20); + this.controllerElevenNick.Size = new System.Drawing.Size(69, 21); this.controllerElevenNick.TabIndex = 91; // // label23 @@ -1176,11 +1181,11 @@ private void InitializeComponent() // controllerTenNick // this.controllerTenNick.BackColor = System.Drawing.Color.White; - this.controllerTenNick.Location = new System.Drawing.Point(345, 55); + this.controllerTenNick.Location = new System.Drawing.Point(320, 52); this.controllerTenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerTenNick.MaxLength = 9; this.controllerTenNick.Name = "controllerTenNick"; - this.controllerTenNick.Size = new System.Drawing.Size(69, 20); + this.controllerTenNick.Size = new System.Drawing.Size(69, 21); this.controllerTenNick.TabIndex = 88; // // label24 @@ -1197,11 +1202,11 @@ private void InitializeComponent() // controllerNineNick // this.controllerNineNick.BackColor = System.Drawing.Color.White; - this.controllerNineNick.Location = new System.Drawing.Point(345, 36); + this.controllerNineNick.Location = new System.Drawing.Point(320, 33); this.controllerNineNick.Margin = new System.Windows.Forms.Padding(2); this.controllerNineNick.MaxLength = 9; this.controllerNineNick.Name = "controllerNineNick"; - this.controllerNineNick.Size = new System.Drawing.Size(69, 20); + this.controllerNineNick.Size = new System.Drawing.Size(69, 21); this.controllerNineNick.TabIndex = 87; // // label26 @@ -1218,11 +1223,11 @@ private void InitializeComponent() // controllerEightNick // this.controllerEightNick.BackColor = System.Drawing.Color.White; - this.controllerEightNick.Location = new System.Drawing.Point(90, 166); + this.controllerEightNick.Location = new System.Drawing.Point(58, 166); this.controllerEightNick.Margin = new System.Windows.Forms.Padding(2); this.controllerEightNick.MaxLength = 9; this.controllerEightNick.Name = "controllerEightNick"; - this.controllerEightNick.Size = new System.Drawing.Size(69, 20); + this.controllerEightNick.Size = new System.Drawing.Size(69, 21); this.controllerEightNick.TabIndex = 79; // // label16 @@ -1239,11 +1244,11 @@ private void InitializeComponent() // controllerSevenNick // this.controllerSevenNick.BackColor = System.Drawing.Color.White; - this.controllerSevenNick.Location = new System.Drawing.Point(90, 147); + this.controllerSevenNick.Location = new System.Drawing.Point(58, 147); this.controllerSevenNick.Margin = new System.Windows.Forms.Padding(2); this.controllerSevenNick.MaxLength = 9; this.controllerSevenNick.Name = "controllerSevenNick"; - this.controllerSevenNick.Size = new System.Drawing.Size(69, 20); + this.controllerSevenNick.Size = new System.Drawing.Size(69, 21); this.controllerSevenNick.TabIndex = 76; // // label15 @@ -1260,11 +1265,11 @@ private void InitializeComponent() // controllerSixNick // this.controllerSixNick.BackColor = System.Drawing.Color.White; - this.controllerSixNick.Location = new System.Drawing.Point(90, 128); + this.controllerSixNick.Location = new System.Drawing.Point(58, 128); this.controllerSixNick.Margin = new System.Windows.Forms.Padding(2); this.controllerSixNick.MaxLength = 9; this.controllerSixNick.Name = "controllerSixNick"; - this.controllerSixNick.Size = new System.Drawing.Size(69, 20); + this.controllerSixNick.Size = new System.Drawing.Size(69, 21); this.controllerSixNick.TabIndex = 73; // // label11 @@ -1281,11 +1286,11 @@ private void InitializeComponent() // controllerFiveNick // this.controllerFiveNick.BackColor = System.Drawing.Color.White; - this.controllerFiveNick.Location = new System.Drawing.Point(90, 109); + this.controllerFiveNick.Location = new System.Drawing.Point(58, 109); this.controllerFiveNick.Margin = new System.Windows.Forms.Padding(2); this.controllerFiveNick.MaxLength = 9; this.controllerFiveNick.Name = "controllerFiveNick"; - this.controllerFiveNick.Size = new System.Drawing.Size(69, 20); + this.controllerFiveNick.Size = new System.Drawing.Size(69, 21); this.controllerFiveNick.TabIndex = 70; // // label9 @@ -1312,11 +1317,11 @@ private void InitializeComponent() // controllerFourNick // this.controllerFourNick.BackColor = System.Drawing.Color.White; - this.controllerFourNick.Location = new System.Drawing.Point(90, 90); + this.controllerFourNick.Location = new System.Drawing.Point(58, 90); this.controllerFourNick.Margin = new System.Windows.Forms.Padding(2); this.controllerFourNick.MaxLength = 9; this.controllerFourNick.Name = "controllerFourNick"; - this.controllerFourNick.Size = new System.Drawing.Size(69, 20); + this.controllerFourNick.Size = new System.Drawing.Size(69, 21); this.controllerFourNick.TabIndex = 66; // // label14 @@ -1333,11 +1338,11 @@ private void InitializeComponent() // controllerThreeNick // this.controllerThreeNick.BackColor = System.Drawing.Color.White; - this.controllerThreeNick.Location = new System.Drawing.Point(90, 71); + this.controllerThreeNick.Location = new System.Drawing.Point(58, 71); this.controllerThreeNick.Margin = new System.Windows.Forms.Padding(2); this.controllerThreeNick.MaxLength = 9; this.controllerThreeNick.Name = "controllerThreeNick"; - this.controllerThreeNick.Size = new System.Drawing.Size(69, 20); + this.controllerThreeNick.Size = new System.Drawing.Size(69, 21); this.controllerThreeNick.TabIndex = 65; // // label12 @@ -1354,11 +1359,11 @@ private void InitializeComponent() // controllerTwoNick // this.controllerTwoNick.BackColor = System.Drawing.Color.White; - this.controllerTwoNick.Location = new System.Drawing.Point(90, 52); + this.controllerTwoNick.Location = new System.Drawing.Point(58, 52); this.controllerTwoNick.Margin = new System.Windows.Forms.Padding(2); this.controllerTwoNick.MaxLength = 9; this.controllerTwoNick.Name = "controllerTwoNick"; - this.controllerTwoNick.Size = new System.Drawing.Size(69, 20); + this.controllerTwoNick.Size = new System.Drawing.Size(69, 21); this.controllerTwoNick.TabIndex = 62; // // label10 @@ -1375,7 +1380,7 @@ private void InitializeComponent() // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(87, 12); + this.label8.Location = new System.Drawing.Point(60, 12); this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(55, 13); @@ -1385,11 +1390,11 @@ private void InitializeComponent() // controllerOneNick // this.controllerOneNick.BackColor = System.Drawing.Color.White; - this.controllerOneNick.Location = new System.Drawing.Point(90, 33); + this.controllerOneNick.Location = new System.Drawing.Point(58, 33); this.controllerOneNick.Margin = new System.Windows.Forms.Padding(2); this.controllerOneNick.MaxLength = 9; this.controllerOneNick.Name = "controllerOneNick"; - this.controllerOneNick.Size = new System.Drawing.Size(69, 20); + this.controllerOneNick.Size = new System.Drawing.Size(69, 21); this.controllerOneNick.TabIndex = 61; // // label7 @@ -1403,6 +1408,218 @@ private void InitializeComponent() this.label7.Text = "Player 1 :"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // tabPage4 + // + this.tabPage4.BackColor = System.Drawing.Color.Transparent; + this.tabPage4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.tabPage4.Controls.Add(this.numMaxPlyrs); + this.tabPage4.Controls.Add(this.numHorDiv); + this.tabPage4.Controls.Add(this.numVerDiv); + this.tabPage4.Controls.Add(this.label29); + this.tabPage4.Controls.Add(this.label27); + this.tabPage4.Controls.Add(this.label28); + this.tabPage4.Controls.Add(this.label31); + this.tabPage4.Controls.Add(this.SplitDiv); + this.tabPage4.Controls.Add(this.label49); + this.tabPage4.Controls.Add(this.SplitColors); + this.tabPage4.Controls.Add(this.layoutSizer); + this.tabPage4.Controls.Add(this.label30); + this.tabPage4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabPage4.Location = new System.Drawing.Point(4, 27); + this.tabPage4.Margin = new System.Windows.Forms.Padding(2); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(2); + this.tabPage4.Size = new System.Drawing.Size(511, 240); + this.tabPage4.TabIndex = 1; + this.tabPage4.Text = "Custom Layout"; + // + // numMaxPlyrs + // + this.numMaxPlyrs.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.numMaxPlyrs.BackColor = System.Drawing.SystemColors.ControlDark; + this.numMaxPlyrs.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.numMaxPlyrs.Enabled = false; + this.numMaxPlyrs.Location = new System.Drawing.Point(6, 106); + this.numMaxPlyrs.Maximum = new decimal(new int[] { + 999, + 0, + 0, + 0}); + this.numMaxPlyrs.Name = "numMaxPlyrs"; + this.numMaxPlyrs.ReadOnly = true; + this.numMaxPlyrs.Size = new System.Drawing.Size(46, 16); + this.numMaxPlyrs.TabIndex = 33; + this.numMaxPlyrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.numMaxPlyrs.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numHorDiv + // + this.numHorDiv.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.numHorDiv.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.numHorDiv.Location = new System.Drawing.Point(6, 65); + this.numHorDiv.Maximum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.numHorDiv.Name = "numHorDiv"; + this.numHorDiv.ReadOnly = true; + this.numHorDiv.Size = new System.Drawing.Size(46, 16); + this.numHorDiv.TabIndex = 31; + this.numHorDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.numHorDiv.ValueChanged += new System.EventHandler(this.NumHorDiv_ValueChanged); + // + // numVerDiv + // + this.numVerDiv.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.numVerDiv.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.numVerDiv.Location = new System.Drawing.Point(6, 24); + this.numVerDiv.Maximum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.numVerDiv.Name = "numVerDiv"; + this.numVerDiv.ReadOnly = true; + this.numVerDiv.Size = new System.Drawing.Size(46, 16); + this.numVerDiv.TabIndex = 32; + this.numVerDiv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.numVerDiv.ValueChanged += new System.EventHandler(this.NumVerDiv_ValueChanged); + // + // label29 + // + this.label29.AutoSize = true; + this.label29.ImageAlign = System.Drawing.ContentAlignment.TopCenter; + this.label29.Location = new System.Drawing.Point(5, 87); + this.label29.Margin = new System.Windows.Forms.Padding(3); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(64, 13); + this.label29.TabIndex = 30; + this.label29.Text = "Max Players"; + this.label29.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.BackColor = System.Drawing.Color.Transparent; + this.label27.Location = new System.Drawing.Point(5, 46); + this.label27.Margin = new System.Windows.Forms.Padding(3); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(151, 13); + this.label27.TabIndex = 28; + this.label27.Text = "Number of Horizontal Divisions"; + this.label27.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(5, 5); + this.label28.Margin = new System.Windows.Forms.Padding(3); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(139, 13); + this.label28.TabIndex = 29; + this.label28.Text = "Number of Vertical Divisions"; + this.label28.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label31 + // + this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label31.BackColor = System.Drawing.Color.Transparent; + this.label31.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.label31.ForeColor = System.Drawing.Color.Red; + this.label31.Location = new System.Drawing.Point(4, 208); + this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(256, 28); + this.label31.TabIndex = 86; + this.label31.Text = "Splitscreen division may not work for all games."; + this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.label31.UseMnemonic = false; + // + // SplitDiv + // + this.SplitDiv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.SplitDiv.AutoSize = true; + this.SplitDiv.Cursor = System.Windows.Forms.Cursors.Default; + this.SplitDiv.Location = new System.Drawing.Point(6, 134); + this.SplitDiv.Margin = new System.Windows.Forms.Padding(2); + this.SplitDiv.Name = "SplitDiv"; + this.SplitDiv.Size = new System.Drawing.Size(116, 17); + this.SplitDiv.TabIndex = 85; + this.SplitDiv.Text = "Splitscreen division"; + this.SplitDiv.UseVisualStyleBackColor = true; + this.SplitDiv.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // label49 + // + this.label49.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label49.AutoSize = true; + this.label49.BackColor = System.Drawing.Color.Transparent; + this.label49.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label49.Location = new System.Drawing.Point(4, 155); + this.label49.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label49.Name = "label49"; + this.label49.Size = new System.Drawing.Size(103, 15); + this.label49.TabIndex = 84; + this.label49.Text = "Background color"; + this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // SplitColors + // + this.SplitColors.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.SplitColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.SplitColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.SplitColors.FormattingEnabled = true; + this.SplitColors.Items.AddRange(new object[] { + "Black", + "Gray", + "White", + "Dark Blue", + "Blue", + "Purple", + "Pink", + "Red", + "Orange", + "Yellow ", + "Green"}); + this.SplitColors.Location = new System.Drawing.Point(7, 174); + this.SplitColors.Margin = new System.Windows.Forms.Padding(0); + this.SplitColors.MaxDropDownItems = 10; + this.SplitColors.Name = "SplitColors"; + this.SplitColors.Size = new System.Drawing.Size(78, 21); + this.SplitColors.TabIndex = 82; + this.SplitColors.SelectedIndexChanged += new System.EventHandler(this.SplitColors_SelectedIndexChanged); + // + // layoutSizer + // + this.layoutSizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.layoutSizer.BackColor = System.Drawing.Color.Transparent; + this.layoutSizer.Location = new System.Drawing.Point(238, 28); + this.layoutSizer.MaximumSize = new System.Drawing.Size(245, 170); + this.layoutSizer.MinimumSize = new System.Drawing.Size(245, 170); + this.layoutSizer.Name = "layoutSizer"; + this.layoutSizer.Size = new System.Drawing.Size(245, 170); + this.layoutSizer.TabIndex = 36; + this.layoutSizer.Paint += new System.Windows.Forms.PaintEventHandler(this.layoutSizer_Paint); + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(235, 8); + this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(48, 13); + this.label30.TabIndex = 35; + this.label30.Text = "Preview:"; + this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // tabPage1 // this.tabPage1.BackColor = System.Drawing.Color.Black; @@ -1798,13 +2015,13 @@ private void InitializeComponent() this.panel1.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.tabPage5.ResumeLayout(false); + this.tabPage5.PerformLayout(); this.tabPage4.ResumeLayout(false); this.tabPage4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numMaxPlyrs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numHorDiv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numVerDiv)).EndInit(); - this.tabPage5.ResumeLayout(false); - this.tabPage5.PerformLayout(); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); this.audioCustomSettingsBox.ResumeLayout(false); @@ -1845,39 +2062,39 @@ private void InitializeComponent() private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label29; private System.Windows.Forms.TabPage tabPage5; - private System.Windows.Forms.TextBox controllerSixteenNick; + private System.Windows.Forms.ComboBox controllerSixteenNick; private System.Windows.Forms.Label label17; - private System.Windows.Forms.TextBox controllerFifteenNick; + private System.Windows.Forms.ComboBox controllerFifteenNick; private System.Windows.Forms.Label label18; - private System.Windows.Forms.TextBox controllerFourteenNick; + private System.Windows.Forms.ComboBox controllerFourteenNick; private System.Windows.Forms.Label label19; - private System.Windows.Forms.TextBox controllerThirteenNick; + private System.Windows.Forms.ComboBox controllerThirteenNick; private System.Windows.Forms.Label label20; - private System.Windows.Forms.TextBox controllerTwelveNick; + private System.Windows.Forms.ComboBox controllerTwelveNick; private System.Windows.Forms.Label label22; - private System.Windows.Forms.TextBox controllerElevenNick; + private System.Windows.Forms.ComboBox controllerElevenNick; private System.Windows.Forms.Label label23; - private System.Windows.Forms.TextBox controllerTenNick; + private System.Windows.Forms.ComboBox controllerTenNick; private System.Windows.Forms.Label label24; - private System.Windows.Forms.TextBox controllerNineNick; + private System.Windows.Forms.ComboBox controllerNineNick; private System.Windows.Forms.Label label26; - private System.Windows.Forms.TextBox controllerEightNick; + private System.Windows.Forms.ComboBox controllerEightNick; private System.Windows.Forms.Label label16; - private System.Windows.Forms.TextBox controllerSevenNick; + private System.Windows.Forms.ComboBox controllerSevenNick; private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox controllerSixNick; + private System.Windows.Forms.ComboBox controllerSixNick; private System.Windows.Forms.Label label11; - private System.Windows.Forms.TextBox controllerFiveNick; + private System.Windows.Forms.ComboBox controllerFiveNick; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label13; - private System.Windows.Forms.TextBox controllerFourNick; + private System.Windows.Forms.ComboBox controllerFourNick; private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox controllerThreeNick; + private System.Windows.Forms.ComboBox controllerThreeNick; private System.Windows.Forms.Label label12; - private System.Windows.Forms.TextBox controllerTwoNick; + private System.Windows.Forms.ComboBox controllerTwoNick; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label8; - private System.Windows.Forms.TextBox controllerOneNick; + private System.Windows.Forms.ComboBox controllerOneNick; private System.Windows.Forms.Label label7; private System.Windows.Forms.CheckBox statusCheck; private System.Windows.Forms.ComboBox cmb_Lang; @@ -1932,5 +2149,23 @@ private void InitializeComponent() private CheckBox scaleOptionCbx; private Panel panel1; private Label label35; + private ComboBox steamid8; + private ComboBox steamid7; + private ComboBox steamid6; + private ComboBox steamid5; + private ComboBox steamid4; + private ComboBox steamid3; + private ComboBox steamid2; + private Label label47; + private ComboBox steamid1; + private ComboBox steamid16; + private ComboBox steamid15; + private ComboBox steamid14; + private ComboBox steamid13; + private ComboBox steamid12; + private ComboBox steamid11; + private ComboBox steamid10; + private Label label48; + private ComboBox steamid9; } } \ No newline at end of file diff --git a/Master/NucleusCoopTool/Forms/Settings.cs b/Master/NucleusCoopTool/Forms/Settings.cs index d7bf1fe4..9b717663 100644 --- a/Master/NucleusCoopTool/Forms/Settings.cs +++ b/Master/NucleusCoopTool/Forms/Settings.cs @@ -22,7 +22,10 @@ public partial class Settings : BaseForm, IDynamicSized private MainForm mainForm = null; private PositionsControl positionsControl; - private TextBox[] controllerNicks; + private ComboBox[] controllerNicks; + private List nicksList = new List(); + private List steamIdsList = new List(); + private ComboBox[] steamIds; public int KillProcess_HotkeyID = 1; public int TopMost_HotkeyID = 2; public int StopSession_HotkeyID = 3; @@ -33,6 +36,15 @@ public partial class Settings : BaseForm, IDynamicSized private string epicLang; private string epicLangText; private string prevTheme; + protected override CreateParams CreateParams + { + get + { + CreateParams handleparams = base.CreateParams; + handleparams.ExStyle = 0x02000000; + return handleparams; + } + } private void controlscollect() { @@ -74,9 +86,7 @@ public Settings(MainForm mf, PositionsControl pc) controlscollect(); foreach (Control control in ctrls) { - control.Font = new Font(mf.customFont, fontSize, FontStyle.Regular, GraphicsUnit.Pixel, 0); - - + control.Font = new Font(mf.customFont, fontSize, FontStyle.Regular, GraphicsUnit.Pixel, 0); } ForeColor = Color.FromArgb(Convert.ToInt32(mf.rgb_font[0]), Convert.ToInt32(mf.rgb_font[1]), Convert.ToInt32(mf.rgb_font[2])); // @@ -107,10 +117,10 @@ public Settings(MainForm mf, PositionsControl pc) settingsSaveBtn.FlatAppearance.BorderColor = mf.ButtonsBorderColor; settingsCloseBtn.FlatAppearance.BorderSize = 1; settingsCloseBtn.FlatAppearance.BorderColor = mf.ButtonsBorderColor; - } - controllerNicks = new TextBox[] { controllerOneNick, controllerTwoNick, controllerThreeNick, controllerFourNick, controllerFiveNick, controllerSixNick, controllerSevenNick, controllerEightNick, controllerNineNick, controllerTenNick, controllerElevenNick, controllerTwelveNick, controllerThirteenNick, controllerFourteenNick, controllerFifteenNick, controllerSixteenNick }; + controllerNicks = new ComboBox[] { controllerOneNick, controllerTwoNick, controllerThreeNick, controllerFourNick, controllerFiveNick, controllerSixNick, controllerSevenNick, controllerEightNick, controllerNineNick, controllerTenNick, controllerElevenNick, controllerTwelveNick, controllerThirteenNick, controllerFourteenNick, controllerFifteenNick, controllerSixteenNick }; + steamIds = new ComboBox[] { steamid1, steamid2, steamid3, steamid4, steamid5, steamid6, steamid7, steamid8, steamid9, steamid10, steamid11, steamid12, steamid13, steamid14, steamid15, steamid16}; ResumeLayout(); @@ -370,15 +380,7 @@ public Settings(MainForm mf, PositionsControl pc) DPIManager.Update(this); } - protected override CreateParams CreateParams - { - get - { - CreateParams handleparams = base.CreateParams; - handleparams.ExStyle = 0x02000000; - return handleparams; - } - } + public Settings() { DPIManager.Unregister(this); @@ -480,21 +482,27 @@ protected override void OnShown(EventArgs e) } private void GetPlayersNickName() - { - foreach (TextBox tbox in controllerNicks) + { + + for (int i = 0; i < 16; i++) { - tbox.Clear(); + nicksList.Add(ini.IniReadValue("ControllerMapping", "Player_" + (i + 1)).ToString()); + steamIdsList.Add(ini.IniReadValue("SteamIDs", "Player_" + (i + 1)).ToString()); } - for (int i = 0; i < 16 ; i++) + for (int i = 0; i < 16; i++) { + controllerNicks[i].Items.AddRange(nicksList.ToArray()); + controllerNicks[i].SelectedItem = ini.IniReadValue("ControllerMapping", "Player_" + (i + 1)); + controllerNicks[i].Text = ini.IniReadValue("ControllerMapping", "Player_" + (i + 1)); + } - if (ini.IniReadValue("ControllerMapping", "Player_" + (i+1)) != "") - { - controllerNicks[i].Text = ini.IniReadValue("ControllerMapping", "Player_" + (i + 1)); - } + for (int i = 0; i < 16; i++) + { + steamIds[i].Items.AddRange(steamIdsList.ToArray()); + steamIds[i].SelectedItem = ini.IniReadValue("SteamIDs", "Player_" + (i + 1)); + steamIds[i].Text = ini.IniReadValue("SteamIDs", "Player_" + (i + 1)); } - } private void SettingsSaveBtn_Click(object sender, EventArgs e) @@ -515,8 +523,32 @@ private void SettingsSaveBtn_Click(object sender, EventArgs e) for (int i = 0; i < controllerNicks.Length; i++) { - ini.IniWriteValue("ControllerMapping", "Player_" + (i+1), controllerNicks[i].Text); + ini.IniWriteValue("ControllerMapping", "Player_" + (i + 1), controllerNicks[i].Text); + } + + for (int i = 0; i < steamIds.Length; i++) + { + ini.IniWriteValue("SteamIDs", "Player_" + (i + 1), steamIds[i].Text); + } + + nicksList.Clear(); + steamIdsList.Clear(); + + for (int i = 0; i < 16; i++) + { + nicksList.Add(ini.IniReadValue("ControllerMapping", "Player_" + (i + 1)).ToString()); + steamIdsList.Add(ini.IniReadValue("SteamIDs", "Player_" + (i + 1)).ToString()); + + controllerNicks[i].Items.Clear(); + steamIds[i].Items.Clear(); } + + for (int i = 0; i < 16; i++) + { + controllerNicks[i].Items.AddRange(nicksList.ToArray()); + steamIds[i].Items.AddRange(steamIdsList.ToArray()); + } + if (positionsControl != null) { positionsControl.Refresh(); @@ -581,6 +613,7 @@ private void SettingsSaveBtn_Click(object sender, EventArgs e) if (themeCbx.SelectedItem.ToString() != prevTheme) { ini.IniWriteValue("Theme", "Theme", themeCbx.SelectedItem.ToString()); + Application.Restart(); } } @@ -610,8 +643,7 @@ private int GetMod(string modifier) private void SettingsCloseBtn_Click(object sender, EventArgs e) { - Hide(); - + Hide(); } private void SettingsCloseHKTxt_TextChanged(object sender, EventArgs e) diff --git a/Master/NucleusCoopTool/Nucleus.Coop.csproj b/Master/NucleusCoopTool/Nucleus.Coop.csproj index c22b366d..53fdf998 100644 --- a/Master/NucleusCoopTool/Nucleus.Coop.csproj +++ b/Master/NucleusCoopTool/Nucleus.Coop.csproj @@ -450,18 +450,36 @@ Always - - - - - - + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always + + Always + Always + + Always + Always @@ -474,39 +492,87 @@ Always - - + + Always + + + Always + + + Always + Always + + Always + Always Always + + Always + Always - + + Always + + + Always + Always - - - + + Always + + + Always + + + Always + - PreserveNewest + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always - - - - - Always - + + Always + + + Always + Always @@ -534,15 +600,27 @@ Always + + Always + Always + + Always + Always + + Always + Always + + Always + Always @@ -552,19 +630,39 @@ Always - + + Always + + + Always + Always + + Always + Always Always - - - + + Always + + + Always + + + Always + + + Always + + + Always + diff --git a/Master/NucleusCoopTool/StartChecks.cs b/Master/NucleusCoopTool/StartChecks.cs index 60535631..66587eb9 100644 --- a/Master/NucleusCoopTool/StartChecks.cs +++ b/Master/NucleusCoopTool/StartChecks.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Reflection; +using System.Threading; using System.Windows.Forms; namespace Nucleus.Coop @@ -37,7 +38,7 @@ private static void ExportRegistry(string strKey, string filepath) public static bool IsAlredyRunning() { - + Thread.Sleep(1000);//Put this here for the theme switch option. if (Process.GetProcessesByName("NucleusCoop").Length > 1) { MessageBox.Show("Nucleus Co-op is already running, if you don't see the Nucleus Co-op window it might be running in the background, close the process using task manager.", "Nucleus Co-op is already running", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/Master/NucleusCoopTool/copyoutput/Settings.ini b/Master/NucleusCoopTool/copyoutput/Settings.ini index 1a0958f9..310e9a84 100644 --- a/Master/NucleusCoopTool/copyoutput/Settings.ini +++ b/Master/NucleusCoopTool/copyoutput/Settings.ini @@ -40,4 +40,4 @@ Theme=default [Dev] SplashScreen_On=True MouseClick=True -DisableOfflineIcon=False +DisableOfflineIcon=False \ No newline at end of file diff --git a/Master/NucleusCoopTool/copyoutput/readme.txt b/Master/NucleusCoopTool/copyoutput/readme.txt index f38fa9bc..64da2e0f 100644 --- a/Master/NucleusCoopTool/copyoutput/readme.txt +++ b/Master/NucleusCoopTool/copyoutput/readme.txt @@ -482,7 +482,12 @@ v2.1 - xx - Fixed a Nucleus Co-op silent crash that happened when controllers got disconnected and reconnected multiple times. - Added Game.SetTopMostAtEnd = true; Sets the game windows to top most at the very end. - Added .ini option to hide the Nucleus Co-op offline icon. + - Added handler notes magnifier option. + - Added new supported inputs UI icons, display what input devices a handler supports. + - Added Player Steam IDs fields to the Nucleus Nicknames settings tab (now named Players), you can change the instances Player Steam IDs when a handler uses goldberg or SSE via the UI now. + - Added new Nicknames/Player Steam IDs switcher, you can quickly switch the order of the nicknames and Player Steam IDs you set up. + v2.0 - February 25, 2022 - New overhauled and customizable user interface with support for themes, game covers and screenshots. - Fixed ui scaling issues at more than 100% desktop scale (and all other issues/bugs related to it). diff --git a/Master/NucleusCoopTool/gui/16players.png b/Master/NucleusCoopTool/gui/16players.png new file mode 100644 index 00000000..16c31bd3 Binary files /dev/null and b/Master/NucleusCoopTool/gui/16players.png differ diff --git a/Master/NucleusCoopTool/gui/2horizontal.png b/Master/NucleusCoopTool/gui/2horizontal.png new file mode 100644 index 00000000..f85fc9ea Binary files /dev/null and b/Master/NucleusCoopTool/gui/2horizontal.png differ diff --git a/Master/NucleusCoopTool/gui/2vertical.png b/Master/NucleusCoopTool/gui/2vertical.png new file mode 100644 index 00000000..33862832 Binary files /dev/null and b/Master/NucleusCoopTool/gui/2vertical.png differ diff --git a/Master/NucleusCoopTool/gui/4players.png b/Master/NucleusCoopTool/gui/4players.png new file mode 100644 index 00000000..b52caad9 Binary files /dev/null and b/Master/NucleusCoopTool/gui/4players.png differ diff --git a/Master/NucleusCoopTool/gui/6players.png b/Master/NucleusCoopTool/gui/6players.png new file mode 100644 index 00000000..294ac7f2 Binary files /dev/null and b/Master/NucleusCoopTool/gui/6players.png differ diff --git a/Master/NucleusCoopTool/gui/8players.png b/Master/NucleusCoopTool/gui/8players.png new file mode 100644 index 00000000..8fff389d Binary files /dev/null and b/Master/NucleusCoopTool/gui/8players.png differ diff --git a/Master/NucleusCoopTool/gui/arrow_left.png b/Master/NucleusCoopTool/gui/arrow_left.png new file mode 100644 index 00000000..7a35c120 Binary files /dev/null and b/Master/NucleusCoopTool/gui/arrow_left.png differ diff --git a/Master/NucleusCoopTool/gui/arrow_left_mousehover.png b/Master/NucleusCoopTool/gui/arrow_left_mousehover.png new file mode 100644 index 00000000..7a35c120 Binary files /dev/null and b/Master/NucleusCoopTool/gui/arrow_left_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/arrow_right.png b/Master/NucleusCoopTool/gui/arrow_right.png new file mode 100644 index 00000000..cda78efe Binary files /dev/null and b/Master/NucleusCoopTool/gui/arrow_right.png differ diff --git a/Master/NucleusCoopTool/gui/arrow_right_mousehover.png b/Master/NucleusCoopTool/gui/arrow_right_mousehover.png new file mode 100644 index 00000000..cda78efe Binary files /dev/null and b/Master/NucleusCoopTool/gui/arrow_right_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/background.jpg b/Master/NucleusCoopTool/gui/background.jpg new file mode 100644 index 00000000..985cd45d Binary files /dev/null and b/Master/NucleusCoopTool/gui/background.jpg differ diff --git a/Master/NucleusCoopTool/gui/button.png b/Master/NucleusCoopTool/gui/button.png new file mode 100644 index 00000000..8262b465 Binary files /dev/null and b/Master/NucleusCoopTool/gui/button.png differ diff --git a/Master/NucleusCoopTool/gui/button_click.wav b/Master/NucleusCoopTool/gui/button_click.wav new file mode 100644 index 00000000..f9bcc74e Binary files /dev/null and b/Master/NucleusCoopTool/gui/button_click.wav differ diff --git a/Master/NucleusCoopTool/gui/cover_layer.png b/Master/NucleusCoopTool/gui/cover_layer.png new file mode 100644 index 00000000..2f0000d6 Binary files /dev/null and b/Master/NucleusCoopTool/gui/cover_layer.png differ diff --git a/Master/NucleusCoopTool/gui/customLayout.png b/Master/NucleusCoopTool/gui/customLayout.png new file mode 100644 index 00000000..3530729a Binary files /dev/null and b/Master/NucleusCoopTool/gui/customLayout.png differ diff --git a/Master/NucleusCoopTool/gui/dinput.png b/Master/NucleusCoopTool/gui/dinput.png new file mode 100644 index 00000000..6b1f594d Binary files /dev/null and b/Master/NucleusCoopTool/gui/dinput.png differ diff --git a/Master/NucleusCoopTool/gui/dinput_icon.png b/Master/NucleusCoopTool/gui/dinput_icon.png new file mode 100644 index 00000000..51fb98b4 Binary files /dev/null and b/Master/NucleusCoopTool/gui/dinput_icon.png differ diff --git a/Master/NucleusCoopTool/gui/discord.png b/Master/NucleusCoopTool/gui/discord.png new file mode 100644 index 00000000..cf663040 Binary files /dev/null and b/Master/NucleusCoopTool/gui/discord.png differ diff --git a/Master/NucleusCoopTool/gui/discord_mousehover.png b/Master/NucleusCoopTool/gui/discord_mousehover.png new file mode 100644 index 00000000..cf663040 Binary files /dev/null and b/Master/NucleusCoopTool/gui/discord_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/dlhub_btn.png b/Master/NucleusCoopTool/gui/dlhub_btn.png new file mode 100644 index 00000000..e36e4469 Binary files /dev/null and b/Master/NucleusCoopTool/gui/dlhub_btn.png differ diff --git a/Master/NucleusCoopTool/gui/download_bar.gif b/Master/NucleusCoopTool/gui/download_bar.gif new file mode 100644 index 00000000..68aa417a Binary files /dev/null and b/Master/NucleusCoopTool/gui/download_bar.gif differ diff --git a/Master/NucleusCoopTool/gui/dragging_indicator.png b/Master/NucleusCoopTool/gui/dragging_indicator.png new file mode 100644 index 00000000..32ac472b Binary files /dev/null and b/Master/NucleusCoopTool/gui/dragging_indicator.png differ diff --git a/Master/NucleusCoopTool/gui/faq.png b/Master/NucleusCoopTool/gui/faq.png new file mode 100644 index 00000000..80185515 Binary files /dev/null and b/Master/NucleusCoopTool/gui/faq.png differ diff --git a/Master/NucleusCoopTool/gui/faq_mousehover.png b/Master/NucleusCoopTool/gui/faq_mousehover.png new file mode 100644 index 00000000..80185515 Binary files /dev/null and b/Master/NucleusCoopTool/gui/faq_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/fullscreen.png b/Master/NucleusCoopTool/gui/fullscreen.png new file mode 100644 index 00000000..98e73faa Binary files /dev/null and b/Master/NucleusCoopTool/gui/fullscreen.png differ diff --git a/Master/NucleusCoopTool/gui/game_list.png b/Master/NucleusCoopTool/gui/game_list.png new file mode 100644 index 00000000..728aa557 Binary files /dev/null and b/Master/NucleusCoopTool/gui/game_list.png differ diff --git a/Master/NucleusCoopTool/gui/instruction_closed.png b/Master/NucleusCoopTool/gui/instruction_closed.png new file mode 100644 index 00000000..87399e22 Binary files /dev/null and b/Master/NucleusCoopTool/gui/instruction_closed.png differ diff --git a/Master/NucleusCoopTool/gui/instruction_opened.png b/Master/NucleusCoopTool/gui/instruction_opened.png new file mode 100644 index 00000000..d184f8f0 Binary files /dev/null and b/Master/NucleusCoopTool/gui/instruction_opened.png differ diff --git a/Master/NucleusCoopTool/gui/intro.wav b/Master/NucleusCoopTool/gui/intro.wav new file mode 100644 index 00000000..ac7beaab Binary files /dev/null and b/Master/NucleusCoopTool/gui/intro.wav differ diff --git a/Master/NucleusCoopTool/gui/keyboard.png b/Master/NucleusCoopTool/gui/keyboard.png new file mode 100644 index 00000000..d15f905c Binary files /dev/null and b/Master/NucleusCoopTool/gui/keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/keyboard_icon.png b/Master/NucleusCoopTool/gui/keyboard_icon.png new file mode 100644 index 00000000..07c831d1 Binary files /dev/null and b/Master/NucleusCoopTool/gui/keyboard_icon.png differ diff --git a/Master/NucleusCoopTool/gui/lightbar_top.gif b/Master/NucleusCoopTool/gui/lightbar_top.gif new file mode 100644 index 00000000..70e979c7 Binary files /dev/null and b/Master/NucleusCoopTool/gui/lightbar_top.gif differ diff --git a/Master/NucleusCoopTool/gui/logo.png b/Master/NucleusCoopTool/gui/logo.png new file mode 100644 index 00000000..b4077f65 Binary files /dev/null and b/Master/NucleusCoopTool/gui/logo.png differ diff --git a/Master/NucleusCoopTool/gui/magnifier.png b/Master/NucleusCoopTool/gui/magnifier.png new file mode 100644 index 00000000..eb5398a9 Binary files /dev/null and b/Master/NucleusCoopTool/gui/magnifier.png differ diff --git a/Master/NucleusCoopTool/gui/magnifier_close.png b/Master/NucleusCoopTool/gui/magnifier_close.png new file mode 100644 index 00000000..5cfe70f5 Binary files /dev/null and b/Master/NucleusCoopTool/gui/magnifier_close.png differ diff --git a/Master/NucleusCoopTool/gui/main_buttons_frame.png b/Master/NucleusCoopTool/gui/main_buttons_frame.png new file mode 100644 index 00000000..5f15c428 Binary files /dev/null and b/Master/NucleusCoopTool/gui/main_buttons_frame.png differ diff --git a/Master/NucleusCoopTool/gui/no_cover.png b/Master/NucleusCoopTool/gui/no_cover.png new file mode 100644 index 00000000..89ad01ec Binary files /dev/null and b/Master/NucleusCoopTool/gui/no_cover.png differ diff --git a/Master/NucleusCoopTool/gui/other_backgrounds.jpg b/Master/NucleusCoopTool/gui/other_backgrounds.jpg new file mode 100644 index 00000000..d6fd5e17 Binary files /dev/null and b/Master/NucleusCoopTool/gui/other_backgrounds.jpg differ diff --git a/Master/NucleusCoopTool/gui/players.png b/Master/NucleusCoopTool/gui/players.png new file mode 100644 index 00000000..8396c864 Binary files /dev/null and b/Master/NucleusCoopTool/gui/players.png differ diff --git a/Master/NucleusCoopTool/gui/proto_keyboard.png b/Master/NucleusCoopTool/gui/proto_keyboard.png new file mode 100644 index 00000000..0283f15a Binary files /dev/null and b/Master/NucleusCoopTool/gui/proto_keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/proto_mouse.png b/Master/NucleusCoopTool/gui/proto_mouse.png new file mode 100644 index 00000000..20743fc4 Binary files /dev/null and b/Master/NucleusCoopTool/gui/proto_mouse.png differ diff --git a/Master/NucleusCoopTool/gui/reddit.png b/Master/NucleusCoopTool/gui/reddit.png new file mode 100644 index 00000000..33504125 Binary files /dev/null and b/Master/NucleusCoopTool/gui/reddit.png differ diff --git a/Master/NucleusCoopTool/gui/reddit_mousehover.png b/Master/NucleusCoopTool/gui/reddit_mousehover.png new file mode 100644 index 00000000..33504125 Binary files /dev/null and b/Master/NucleusCoopTool/gui/reddit_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/right_panel.png b/Master/NucleusCoopTool/gui/right_panel.png new file mode 100644 index 00000000..aee00349 Binary files /dev/null and b/Master/NucleusCoopTool/gui/right_panel.png differ diff --git a/Master/NucleusCoopTool/gui/screen.png b/Master/NucleusCoopTool/gui/screen.png new file mode 100644 index 00000000..98382a11 Binary files /dev/null and b/Master/NucleusCoopTool/gui/screen.png differ diff --git a/Master/NucleusCoopTool/gui/setup_screen.png b/Master/NucleusCoopTool/gui/setup_screen.png new file mode 100644 index 00000000..dfd44fdf Binary files /dev/null and b/Master/NucleusCoopTool/gui/setup_screen.png differ diff --git a/Master/NucleusCoopTool/gui/splash.gif b/Master/NucleusCoopTool/gui/splash.gif new file mode 100644 index 00000000..627b56c3 Binary files /dev/null and b/Master/NucleusCoopTool/gui/splash.gif differ diff --git a/Master/NucleusCoopTool/gui/splitcalculator.png b/Master/NucleusCoopTool/gui/splitcalculator.png new file mode 100644 index 00000000..51d83614 Binary files /dev/null and b/Master/NucleusCoopTool/gui/splitcalculator.png differ diff --git a/Master/NucleusCoopTool/gui/splitcalculator_mousehover.png b/Master/NucleusCoopTool/gui/splitcalculator_mousehover.png new file mode 100644 index 00000000..51d83614 Binary files /dev/null and b/Master/NucleusCoopTool/gui/splitcalculator_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme.ini b/Master/NucleusCoopTool/gui/theme.ini new file mode 100644 index 00000000..0617db7b --- /dev/null +++ b/Master/NucleusCoopTool/gui/theme.ini @@ -0,0 +1,33 @@ +[Colors] +TitleBar=0,0,0 +Font=255,255,255 +Selection=36,149,166 +MouseOver=39,162,181 +MenuStripBack=195,195,195 +MenuStripFont=0,0,0 +ButtonsBorder=255,255,255 +SetupScreenFont=255,255,255 +SetupScreenBorder=255,255,255 +SetupScreenPlayerBorder=255,255,255 +HandlerNoteTitleFont=255,255,255 +HandlerNoteTitleBackColor=27,27,27 +HandlerNoteBack=0,0,0 +HandlerNoteFont=255,255,255 +HandlerNoteMagnifierFont = 255,255,255 +[Misc] +DisableCoverBorder=False +DisableNoteBorder=True +ControllerIdentificationOn=True +UseSetupScreenBorder=False +UseLayoutSelectionBorder=False +UseSetupScreenImage=True +UseRoundedCorners=True +UseButtonsBorder=False +[Font] +FontFamily=Franklin Gothic +MainFontSize=10 +SettingsFontSize=10 +AutoSearchFontSize=9 +HandlerDownloaderFontSize=9 +HandlerInfoFontSize=9 +DownloadPromptFontSize=9 \ No newline at end of file diff --git a/Master/NucleusCoopTool/gui/theme/default/arrow_left_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/arrow_left_mousehover.png new file mode 100644 index 00000000..7a35c120 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/arrow_left_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/arrow_right_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/arrow_right_mousehover.png new file mode 100644 index 00000000..cda78efe Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/arrow_right_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/customLayout.png b/Master/NucleusCoopTool/gui/theme/default/customLayout.png index 264628d7..3530729a 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/customLayout.png and b/Master/NucleusCoopTool/gui/theme/default/customLayout.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/dinput.png b/Master/NucleusCoopTool/gui/theme/default/dinput.png index f6b46bfe..6b1f594d 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/dinput.png and b/Master/NucleusCoopTool/gui/theme/default/dinput.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/dinput_icon.png b/Master/NucleusCoopTool/gui/theme/default/dinput_icon.png new file mode 100644 index 00000000..51fb98b4 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/dinput_icon.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/discord_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/discord_mousehover.png new file mode 100644 index 00000000..cf663040 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/discord_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/dragging_indicator.png b/Master/NucleusCoopTool/gui/theme/default/dragging_indicator.png new file mode 100644 index 00000000..32ac472b Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/dragging_indicator.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/faq_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/faq_mousehover.png new file mode 100644 index 00000000..80185515 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/faq_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/fullscreen.png b/Master/NucleusCoopTool/gui/theme/default/fullscreen.png index 054b9f96..98e73faa 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/fullscreen.png and b/Master/NucleusCoopTool/gui/theme/default/fullscreen.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/instruction_closed.png b/Master/NucleusCoopTool/gui/theme/default/instruction_closed.png index 91234f07..87399e22 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/instruction_closed.png and b/Master/NucleusCoopTool/gui/theme/default/instruction_closed.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/instruction_opened.png b/Master/NucleusCoopTool/gui/theme/default/instruction_opened.png index 01c8c75e..d184f8f0 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/instruction_opened.png and b/Master/NucleusCoopTool/gui/theme/default/instruction_opened.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/intro.wav b/Master/NucleusCoopTool/gui/theme/default/intro.wav index c147d15a..ac7beaab 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/intro.wav and b/Master/NucleusCoopTool/gui/theme/default/intro.wav differ diff --git a/Master/NucleusCoopTool/gui/theme/default/keyboard.png b/Master/NucleusCoopTool/gui/theme/default/keyboard.png index 97691588..d15f905c 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/keyboard.png and b/Master/NucleusCoopTool/gui/theme/default/keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/keyboard_icon.png b/Master/NucleusCoopTool/gui/theme/default/keyboard_icon.png new file mode 100644 index 00000000..07c831d1 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/keyboard_icon.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/magnifier.png b/Master/NucleusCoopTool/gui/theme/default/magnifier.png new file mode 100644 index 00000000..eb5398a9 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/magnifier.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/magnifier_close.png b/Master/NucleusCoopTool/gui/theme/default/magnifier_close.png new file mode 100644 index 00000000..5cfe70f5 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/magnifier_close.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/proto_keyboard.png b/Master/NucleusCoopTool/gui/theme/default/proto_keyboard.png index cfe70ef3..0283f15a 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/proto_keyboard.png and b/Master/NucleusCoopTool/gui/theme/default/proto_keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/reddit_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/reddit_mousehover.png new file mode 100644 index 00000000..33504125 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/reddit_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/screen.png b/Master/NucleusCoopTool/gui/theme/default/screen.png index 26e10a12..98382a11 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/screen.png and b/Master/NucleusCoopTool/gui/theme/default/screen.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/splitcalculator_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/splitcalculator_mousehover.png new file mode 100644 index 00000000..51d83614 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/splitcalculator_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/theme.ini b/Master/NucleusCoopTool/gui/theme/default/theme.ini index fa739bc3..a5e55950 100644 --- a/Master/NucleusCoopTool/gui/theme/default/theme.ini +++ b/Master/NucleusCoopTool/gui/theme/default/theme.ini @@ -9,15 +9,18 @@ ButtonsBorder=255,255,255 SetupScreenFont=255,255,255 SetupScreenBorder=255,255,255 SetupScreenPlayerBorder=255,255,255 +HandlerNoteTitleFont=255,255,255 +HandlerNoteTitleBackColor=27,27,27 HandlerNoteBack=0,0,0 HandlerNoteFont=255,255,255 +HandlerNoteMagnifierFont = 255,255,255 [Misc] DisableCoverBorder=False -DisableNoteBorder=False +DisableNoteBorder=True ControllerIdentificationOn=True -UseSetupScreenBorder=False +UseSetupScreenBorder=True UseLayoutSelectionBorder=True -UseSetupScreenImage=True +UseSetupScreenImage=False UseRoundedCorners=True UseButtonsBorder=False [Font] diff --git a/Master/NucleusCoopTool/gui/theme/default/thirdpartytools_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/thirdpartytools_mousehover.png new file mode 100644 index 00000000..9a38a64f Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/thirdpartytools_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/title_close_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/title_close_mousehover.png new file mode 100644 index 00000000..67a88027 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/title_close_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/title_download_assets_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/title_download_assets_mousehover.png new file mode 100644 index 00000000..985f6474 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/title_download_assets_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/title_maximize_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/title_maximize_mousehover.png new file mode 100644 index 00000000..23701eb6 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/title_maximize_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/title_minimize_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/title_minimize_mousehover.png new file mode 100644 index 00000000..7339e64e Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/title_minimize_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/title_settings_mousehover.png b/Master/NucleusCoopTool/gui/theme/default/title_settings_mousehover.png new file mode 100644 index 00000000..93347f65 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/title_settings_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/virtual_keyboard.png b/Master/NucleusCoopTool/gui/theme/default/virtual_keyboard.png index fd49397c..5b19f0c4 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/virtual_keyboard.png and b/Master/NucleusCoopTool/gui/theme/default/virtual_keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/virtual_mouse.png b/Master/NucleusCoopTool/gui/theme/default/virtual_mouse.png index c06a7778..a738498b 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/virtual_mouse.png and b/Master/NucleusCoopTool/gui/theme/default/virtual_mouse.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/xinput.png b/Master/NucleusCoopTool/gui/theme/default/xinput.png index ef25eaf5..63c1c398 100644 Binary files a/Master/NucleusCoopTool/gui/theme/default/xinput.png and b/Master/NucleusCoopTool/gui/theme/default/xinput.png differ diff --git a/Master/NucleusCoopTool/gui/theme/default/xinput_icon.png b/Master/NucleusCoopTool/gui/theme/default/xinput_icon.png new file mode 100644 index 00000000..5f1ed542 Binary files /dev/null and b/Master/NucleusCoopTool/gui/theme/default/xinput_icon.png differ diff --git a/Master/NucleusCoopTool/gui/thirdpartytools.png b/Master/NucleusCoopTool/gui/thirdpartytools.png new file mode 100644 index 00000000..9a38a64f Binary files /dev/null and b/Master/NucleusCoopTool/gui/thirdpartytools.png differ diff --git a/Master/NucleusCoopTool/gui/thirdpartytools_mousehover.png b/Master/NucleusCoopTool/gui/thirdpartytools_mousehover.png new file mode 100644 index 00000000..9a38a64f Binary files /dev/null and b/Master/NucleusCoopTool/gui/thirdpartytools_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/title_close.png b/Master/NucleusCoopTool/gui/title_close.png new file mode 100644 index 00000000..0f4811dd Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_close.png differ diff --git a/Master/NucleusCoopTool/gui/title_close_mousehover.png b/Master/NucleusCoopTool/gui/title_close_mousehover.png new file mode 100644 index 00000000..67a88027 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_close_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/title_download_assets.png b/Master/NucleusCoopTool/gui/title_download_assets.png new file mode 100644 index 00000000..0f970103 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_download_assets.png differ diff --git a/Master/NucleusCoopTool/gui/title_download_assets_mousehover.png b/Master/NucleusCoopTool/gui/title_download_assets_mousehover.png new file mode 100644 index 00000000..985f6474 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_download_assets_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/title_dropdown_closed.png b/Master/NucleusCoopTool/gui/title_dropdown_closed.png new file mode 100644 index 00000000..d6a4723b Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_dropdown_closed.png differ diff --git a/Master/NucleusCoopTool/gui/title_dropdown_opened.png b/Master/NucleusCoopTool/gui/title_dropdown_opened.png new file mode 100644 index 00000000..1f294676 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_dropdown_opened.png differ diff --git a/Master/NucleusCoopTool/gui/title_logo.png b/Master/NucleusCoopTool/gui/title_logo.png new file mode 100644 index 00000000..ed96054d Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_logo.png differ diff --git a/Master/NucleusCoopTool/gui/title_maximize.png b/Master/NucleusCoopTool/gui/title_maximize.png new file mode 100644 index 00000000..b54d731d Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_maximize.png differ diff --git a/Master/NucleusCoopTool/gui/title_maximize_mousehover.png b/Master/NucleusCoopTool/gui/title_maximize_mousehover.png new file mode 100644 index 00000000..23701eb6 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_maximize_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/title_minimize.png b/Master/NucleusCoopTool/gui/title_minimize.png new file mode 100644 index 00000000..e0d18a43 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_minimize.png differ diff --git a/Master/NucleusCoopTool/gui/title_minimize_mousehover.png b/Master/NucleusCoopTool/gui/title_minimize_mousehover.png new file mode 100644 index 00000000..7339e64e Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_minimize_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/title_no_hub.png b/Master/NucleusCoopTool/gui/title_no_hub.png new file mode 100644 index 00000000..030c6d84 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_no_hub.png differ diff --git a/Master/NucleusCoopTool/gui/title_settings.png b/Master/NucleusCoopTool/gui/title_settings.png new file mode 100644 index 00000000..9d408e20 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_settings.png differ diff --git a/Master/NucleusCoopTool/gui/title_settings_mousehover.png b/Master/NucleusCoopTool/gui/title_settings_mousehover.png new file mode 100644 index 00000000..93347f65 Binary files /dev/null and b/Master/NucleusCoopTool/gui/title_settings_mousehover.png differ diff --git a/Master/NucleusCoopTool/gui/virtual_keyboard.png b/Master/NucleusCoopTool/gui/virtual_keyboard.png new file mode 100644 index 00000000..5b19f0c4 Binary files /dev/null and b/Master/NucleusCoopTool/gui/virtual_keyboard.png differ diff --git a/Master/NucleusCoopTool/gui/virtual_mouse.png b/Master/NucleusCoopTool/gui/virtual_mouse.png new file mode 100644 index 00000000..a738498b Binary files /dev/null and b/Master/NucleusCoopTool/gui/virtual_mouse.png differ diff --git a/Master/NucleusCoopTool/gui/xinput.png b/Master/NucleusCoopTool/gui/xinput.png new file mode 100644 index 00000000..63c1c398 Binary files /dev/null and b/Master/NucleusCoopTool/gui/xinput.png differ diff --git a/Master/NucleusCoopTool/gui/xinput_icon.png b/Master/NucleusCoopTool/gui/xinput_icon.png new file mode 100644 index 00000000..5f1ed542 Binary files /dev/null and b/Master/NucleusCoopTool/gui/xinput_icon.png differ diff --git a/Master/NucleusGaming/Coop/Generic/GenericGameHandler.cs b/Master/NucleusGaming/Coop/Generic/GenericGameHandler.cs index 6d0fad99..07c0e4f2 100644 --- a/Master/NucleusGaming/Coop/Generic/GenericGameHandler.cs +++ b/Master/NucleusGaming/Coop/Generic/GenericGameHandler.cs @@ -3320,15 +3320,35 @@ public string Play() foreach (string nameFile in files) { - long steamID = random_steam_id + i; - if (gen.PlayerSteamIDs != null) + long steamID = 0; + + if (ini.IniReadValue("SteamIDs", "Player_" + (i + 1)) != "") + { + Log("Using steam ID from Nucleus settings"); + steamID = Convert.ToInt64(ini.IniReadValue("SteamIDs", "Player_" + (i + 1))); + } + else if(gen.PlayerSteamIDs != null) { if (i < gen.PlayerSteamIDs.Length && !string.IsNullOrEmpty(gen.PlayerSteamIDs[i])) { - Log("Using a manually entered steam ID"); + Log("Usingsteam ID from handler"); steamID = long.Parse(gen.PlayerSteamIDs[i]); } } + else + { + Log("Using default Nucleus steam ID"); + steamID = random_steam_id + i; + } + + //if (gen.PlayerSteamIDs != null) + //{ + // if (i < gen.PlayerSteamIDs.Length && !string.IsNullOrEmpty(gen.PlayerSteamIDs[i])) + // { + // Log("Using a manually entered steam ID"); + // steamID = long.Parse(gen.PlayerSteamIDs[i]); + // } + //} Log("Generating user_steam_id.txt with user steam ID " + (steamID).ToString()); File.Delete(nameFile); @@ -3422,7 +3442,16 @@ public string Play() emu.IniWriteValue("SmartSteamEmu", "AppId", context.SteamID); emu.IniWriteValue("SmartSteamEmu", "SteamIdGeneration", "Manual"); - emu.IniWriteValue("SmartSteamEmu", "ManualSteamId", (random_steam_id + i).ToString()); + + if (ini.IniReadValue("SteamIDs", "Player_" + (i + 1)) != "") + { + emu.IniWriteValue("SmartSteamEmu", "ManualSteamId", ini.IniReadValue("SteamIDs", "Player_" + (i + 1)).ToString());//ToString? + } + else + { + emu.IniWriteValue("SmartSteamEmu", "ManualSteamId", (random_steam_id + i).ToString()); + } + string lang = "english"; if (ini.IniReadValue("Misc", "SteamLang") != "" && ini.IniReadValue("Misc", "SteamLang") != "Automatic") { @@ -5311,7 +5340,7 @@ int WindowEnum(IntPtr _hWnd, int lParam) ProcessData data = p.ProcessData; - Log("(Update) Setting game window to top most"); + Log("Setting game window to top most"); data.HWnd.TopMost = true; } } @@ -9047,15 +9076,28 @@ private void UseGoldberg(string rootFolder, string nucleusRootFolder, string lin } } - long steamID = random_steam_id + i; - if (gen.PlayerSteamIDs != null) + long steamID = 0; + + if (ini.IniReadValue("SteamIDs", "Player_" + (i + 1)) != "") + { + Log("Using steam ID from Nucleus settings "); + steamID = Convert.ToInt64(ini.IniReadValue("SteamIDs", "Player_" + (i + 1)));//ToString? + } + else if (gen.PlayerSteamIDs != null) { if (i < gen.PlayerSteamIDs.Length && !string.IsNullOrEmpty(gen.PlayerSteamIDs[i])) { - Log("Using a manually entered steam ID"); + Log("Usingsteam ID from handler"); steamID = long.Parse(gen.PlayerSteamIDs[i]); } } + else + { + Log("Using default Nucleus steam ID"); + steamID = random_steam_id + i; + } + + Log("Generating user_steam_id.txt with user steam ID " + (steamID).ToString()); //if (File.Exists(Path. Combine(instanceSteamSettingsFolder, "user_steam_id.txt"))) diff --git a/Master/NucleusGaming/Coop/InputManagement/RawInputProcessor.cs b/Master/NucleusGaming/Coop/InputManagement/RawInputProcessor.cs index 5ded5119..67b061dc 100644 --- a/Master/NucleusGaming/Coop/InputManagement/RawInputProcessor.cs +++ b/Master/NucleusGaming/Coop/InputManagement/RawInputProcessor.cs @@ -408,7 +408,7 @@ public void Process(IntPtr hRawInput) } catch (Exception)// ex) { - Console.WriteLine("Iteration has failed"); + Console.WriteLine("Iteration failed"); return; } diff --git a/Master/NucleusGaming/New/PositionsControl.cs b/Master/NucleusGaming/New/PositionsControl.cs index 77c5c951..1ae74cb6 100644 --- a/Master/NucleusGaming/New/PositionsControl.cs +++ b/Master/NucleusGaming/New/PositionsControl.cs @@ -6,6 +6,7 @@ using SharpDX.XInput; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using System.Drawing.Imaging; using System.IO; @@ -75,8 +76,12 @@ public class PositionsControl : UserInputControl, IDynamicSized private System.Threading.Timer gamepadTimer; private System.Threading.Timer gamepadPollTimer; - private PictureBox instruction; + public PictureBox instruction; private PictureBox instructionImg; + private PictureBox inputPic1; + private PictureBox inputPic2; + private PictureBox inputPic3; + private PictureBox inputPic4; private ImageAttributes flashImageAttributes; @@ -91,7 +96,6 @@ public class PositionsControl : UserInputControl, IDynamicSized private Bitmap virtualKeyboardPic; private Bitmap virtualMousePic; private Bitmap screenimg ; - //private Image playerScreenimg; private Bitmap draggingScreenImg; private Bitmap fullscreen; private Bitmap horizontal2; @@ -100,12 +104,24 @@ public class PositionsControl : UserInputControl, IDynamicSized private Bitmap players6; private Bitmap players8; private Bitmap players16; + private Bitmap customLayout; + private Bitmap k_Icon; + private Bitmap xinputGamepad_Icon; + private Bitmap dinputGamepad_Icon; + + private Color otherTextsColor; + private Color handlerNoteZoomFontColor; private Brush[] colors; private SolidBrush myBrush; private Pen PositionPlayerScreenPen; private Pen PositionScreenPen; + + public RichTextBox handlerNoteZoom; + private Label inputsIconsDesc; + + private string customFont; public override string Title => "Position Players"; public PositionsControl() { @@ -115,18 +131,21 @@ public PositionsControl() private void Initialize() { - //TODO: Add device handle zero mouse & keyboard w/ special icon - + string ChoosenTheme = ini.IniReadValue("Theme", "Theme"); IniFile theme = new IniFile(Path.Combine(Directory.GetCurrentDirectory() + "\\gui\\theme\\" + ChoosenTheme, "theme.ini")); string themePath = Path.Combine(Application.StartupPath, @"gui\theme\" + ChoosenTheme); string[] rgb_PositionControlsFontColor = theme.IniReadValue("Colors", "SetupScreenFont").Split(','); string[] rgb_PositionScreenColor = theme.IniReadValue("Colors", "SetupScreenBorder").Split(','); string[] rgb_PositionPlayerScreenColor = theme.IniReadValue("Colors", "SetupScreenPlayerBorder").Split(','); + string[] rgb_handlerNoteZoomFontColor = theme.IniReadValue("Colors", "HandlerNoteMagnifierFont").Split(','); + handlerNoteZoomFontColor = (Color.FromArgb(Convert.ToInt32(rgb_handlerNoteZoomFontColor[0]), Convert.ToInt32(rgb_handlerNoteZoomFontColor[1]), Convert.ToInt32(rgb_handlerNoteZoomFontColor[2]))); + otherTextsColor = (Color.FromArgb(Convert.ToInt32(rgb_PositionControlsFontColor[0]), Convert.ToInt32(rgb_PositionControlsFontColor[1]), Convert.ToInt32(rgb_PositionControlsFontColor[2]))); controllerIdentification = Convert.ToBoolean(theme.IniReadValue("Misc", "ControllerIdentificationOn")); UseSetupScreenBorder = Convert.ToBoolean(theme.IniReadValue("Misc", "UseSetupScreenBorder")); UseLayoutSelectionBorder = Convert.ToBoolean(theme.IniReadValue("Misc", "UseLayoutSelectionBorder")); UseSetupScreenImage = Convert.ToBoolean(theme.IniReadValue("Misc", "UseSetupScreenImage")); + customFont = theme.IniReadValue("Font", "FontFamily"); if (gamepadTimer == null) { @@ -141,18 +160,18 @@ private void Initialize() SuspendLayout(); Anchor = AnchorStyles.Top | AnchorStyles.Bottom| AnchorStyles.Left| AnchorStyles.Right; - playerFont = new Font("Franklin Gothic Medium", 20.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - playerCustomFont = new Font("Franklin Gothic Medium", 16.0f, FontStyle.Bold, GraphicsUnit.Point, 0); - playerTextFont = new Font("Franklin Gothic Medium", 12.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - smallTextFont = new Font("Franklin Gothic Medium", 12.0f, FontStyle.Regular, GraphicsUnit.Point, 0); - extraSmallTextFont = new Font("Franklin Gothic Medium", 10.25f, FontStyle.Regular, GraphicsUnit.Point, 0); + playerFont = new Font(customFont, 20.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + playerCustomFont = new Font(customFont, 16.0f, FontStyle.Bold, GraphicsUnit.Point, 0); + playerTextFont = new Font(customFont, 12.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + smallTextFont = new Font(customFont, 12.0f, FontStyle.Regular, GraphicsUnit.Point, 0); + extraSmallTextFont = new Font(customFont, 10.25f, FontStyle.Regular, GraphicsUnit.Point, 0); PositionScreenPen = new Pen(Color.FromArgb(Convert.ToInt32(rgb_PositionScreenColor[0]), Convert.ToInt32(rgb_PositionScreenColor[1]), Convert.ToInt32(rgb_PositionScreenColor[2]))); PositionPlayerScreenPen = new Pen(Color.FromArgb(Convert.ToInt32(rgb_PositionPlayerScreenColor[0]), Convert.ToInt32(rgb_PositionPlayerScreenColor[1]), Convert.ToInt32(rgb_PositionPlayerScreenColor[2]))); myBrush = new SolidBrush(Color.FromArgb(Convert.ToInt32(rgb_PositionControlsFontColor[0]), Convert.ToInt32(rgb_PositionControlsFontColor[1]), Convert.ToInt32(rgb_PositionControlsFontColor[2]))); BackColor = Color.Transparent; - //BackgroundImage = new Bitmap(themePath + "\\setup_screen.png"); + BackgroundImageLayout = ImageLayout.Stretch; instructionCloseImg = new Bitmap(themePath + "\\instruction_closed.png"); instructionOpenImg = new Bitmap(themePath + "\\instruction_opened.png"); @@ -164,7 +183,6 @@ private void Initialize() virtualKeyboardPic = new Bitmap(themePath + "\\virtual_keyboard.png"); virtualMousePic = new Bitmap(themePath + "\\virtual_mouse.png"); screenimg = new Bitmap(themePath + "\\screen.png"); - //playerScreenimg = Image.FromFile(themePath + "\\player_screen.png"); draggingScreenImg = new Bitmap(themePath + "\\dragging_indicator.png"); fullscreen = new Bitmap(themePath + "\\fullscreen.png"); horizontal2 = new Bitmap(themePath + "\\2horizontal.png"); @@ -174,7 +192,9 @@ private void Initialize() players8 = new Bitmap(themePath + "\\8players.png"); players16 = new Bitmap(themePath + "\\16players.png"); customLayout = new Bitmap(themePath + "\\customLayout.png"); - + k_Icon = new Bitmap(themePath + "\\keyboard_icon.png"); + xinputGamepad_Icon = new Bitmap(themePath + "\\xinput_icon.png"); + dinputGamepad_Icon = new Bitmap(themePath + "\\dinput_icon.png"); instruction = new PictureBox();//using a button cause focus issues instruction.Anchor = AnchorStyles.Top | AnchorStyles.Right; @@ -184,11 +204,53 @@ private void Initialize() instruction.ForeColor = Color.White; instruction.BackgroundImage = instructionCloseImg; instruction.BackgroundImageLayout = ImageLayout.Stretch; + instruction.Cursor = Cursors.Hand; instruction.Click += new EventHandler(this.instruction_Click); - + + this.MouseEnter += inputIcons_MouseEnter; + + inputPic1 = new PictureBox(); + inputPic1.Name = "inputPic1"; + inputPic1.Anchor = AnchorStyles.Top | AnchorStyles.Right; + inputPic1.BackColor = Color.Transparent; + inputPic1.SizeMode = PictureBoxSizeMode.StretchImage; + inputPic1.Cursor = Cursors.Help; + inputPic1.MouseEnter += inputIcons_MouseEnter; + + inputPic2 = new PictureBox(); + inputPic2.Name = "inputPic2"; + inputPic2.Anchor = AnchorStyles.Top | AnchorStyles.Right; + inputPic2.BackColor = Color.Transparent; + inputPic2.SizeMode = PictureBoxSizeMode.StretchImage; + inputPic2.Cursor = Cursors.Help; + inputPic2.MouseEnter += inputIcons_MouseEnter; + + inputPic3 = new PictureBox(); + inputPic3.Name = "inputPic3"; + inputPic3.Anchor = AnchorStyles.Top | AnchorStyles.Right; + inputPic3.BackColor = Color.Transparent; + inputPic3.SizeMode = PictureBoxSizeMode.StretchImage; + inputPic3.Cursor = Cursors.Help; + inputPic3.MouseEnter += inputIcons_MouseEnter; + + inputPic4 = new PictureBox(); + inputPic4.Name = "inputPic4"; + inputPic4.Anchor = AnchorStyles.Top | AnchorStyles.Right; + inputPic4.BackColor = Color.Transparent; + inputPic4.SizeMode = PictureBoxSizeMode.StretchImage; + inputPic4.Cursor = Cursors.Help; + inputPic4.MouseEnter += inputIcons_MouseEnter; + + inputsIconsDesc = new Label(); + inputsIconsDesc.AutoSize = true; + inputsIconsDesc.Visible = false; + inputsIconsDesc.BackColor = Color.Transparent; + inputsIconsDesc.ForeColor = otherTextsColor; + inputsIconsDesc.Anchor = AnchorStyles.Top | AnchorStyles.Right; + instructionImg = new PictureBox() { - Anchor = AnchorStyles.Top | AnchorStyles.Right , + Anchor = AnchorStyles.Top | AnchorStyles.Right, BackColor = Color.Black, Image = Resources.instructions, BackgroundImageLayout = ImageLayout.Stretch, @@ -196,10 +258,19 @@ private void Initialize() //Size\Location see => UpdateScreens() SizeMode = PictureBoxSizeMode.StretchImage, Visible = false - }; - + handlerNoteZoom = new RichTextBox(); + handlerNoteZoom.Visible = false; + handlerNoteZoom.Anchor = AnchorStyles.Top | AnchorStyles.Left| AnchorStyles.Right| AnchorStyles.Bottom; + handlerNoteZoom.BorderStyle = BorderStyle.None; + handlerNoteZoom.BackColor = Color.Black; + handlerNoteZoom.ForeColor = handlerNoteZoomFontColor; + handlerNoteZoom.WordWrap = true; + + handlerNoteZoom.LinkClicked += new LinkClickedEventHandler(handlerNoteZoom_LinkClicked); + handlerNoteZoom.Text = ""; + ResumeLayout(); colors = new Brush[] @@ -209,9 +280,14 @@ private void Initialize() Brushes.OrangeRed, Brushes.Olive, Brushes.DarkRed, Brushes.Lavender }; - this.Controls.Add(instruction); - this.Controls.Add(instructionImg); - //gamepadImg = Resources.gamepad; + Controls.Add(handlerNoteZoom); + Controls.Add(inputPic1); + Controls.Add(inputPic2); + Controls.Add(inputPic3); + Controls.Add(inputPic4); + Controls.Add(instruction); + Controls.Add(inputsIconsDesc); + Controls.Add(instructionImg); //Flash image attributes { @@ -227,15 +303,61 @@ private void Initialize() flashImageAttributes = new ImageAttributes(); flashImageAttributes.SetColorMatrix(colorMatrix); } - + DPIManager.Register(this); DPIManager.Update(this); RemoveFlicker(); } + private void inputIcons_MouseEnter(object sender, EventArgs e) + { + PictureBox inputIcon = sender as PictureBox; + Control parent = sender as Control; + + if (inputIcon == inputPic4 && inputIcon.Image != null || inputIcon == inputPic3 && inputIcon.Image != null) + { + if(inputIcon == inputPic3 && inputPic4.Image == null) + { + inputsIconsDesc.Text = @"Supports 1 keyboard\mouse"; + inputsIconsDesc.Visible = true; + } + else + { + inputsIconsDesc.Text = @"Supports multiple keyboards/mice"; + inputsIconsDesc.Visible = true; + } + } + else if (inputIcon == inputPic2 && inputIcon.Image != null) + { + if (inputIcon.Image.Equals(xinputGamepad_Icon)) + { + inputsIconsDesc.Text = "Supports xinput gamepads (e.g., X360)"; + inputsIconsDesc.Visible = true; + } + else + { + inputsIconsDesc.Text = "Supports dinput gamepads (e.g., Ps3)"; + inputsIconsDesc.Visible = true; + } + } + else if (inputIcon == inputPic1 && inputIcon.Image != null) + { + inputsIconsDesc.Text = "Supports dinput gamepads (e.g., Ps3)"; + inputsIconsDesc.Visible = true; + } + else if (parent == this) + { + inputsIconsDesc.Text = ""; + inputsIconsDesc.Visible = false; + } + } + + private void handlerNoteZoom_LinkClicked(object sender, LinkClickedEventArgs e) + { + Process.Start(e.LinkText); + } private void instruction_Click(object sender, EventArgs e) { - if (instructionImg.Visible) { SuspendLayout(); @@ -243,21 +365,19 @@ private void instruction_Click(object sender, EventArgs e) ResumeLayout(); instructionImg.Visible = false; } - else + else { - SuspendLayout(); + SuspendLayout(); instruction.BackgroundImage = instructionOpenImg; ResumeLayout(); instructionImg.Visible = true; } - } private bool appStart = false; public void UpdateSize(float scale) - { - + { if (IsDisposed) { DPIManager.Unregister(this); @@ -265,17 +385,12 @@ public void UpdateSize(float scale) } SuspendLayout(); - + if (!appStart) { - if (fontScale > 1.0F || fontScale < 2.0F) - { - fontMinus = 0.3f; - } - if (fontScale >= 2.0F) - { - fontMinus = 0.8f; - } + if (fontScale > 1.0F || fontScale < 2.0F){fontMinus = 0.3f;} + + if (fontScale >= 2.0F){fontMinus = 0.8f;} newplayerFontSize = (playerFont.Size - fontMinus); newplayerCustomFontSize = (playerCustomFont.Size - fontMinus); @@ -283,16 +398,35 @@ public void UpdateSize(float scale) newsmallTextFontSize = (smallTextFont.Size - fontMinus); newextraSmallTextFontSize = (extraSmallTextFont.Size - fontMinus); - playerFont = new Font("Franklin Gothic Medium", newplayerFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); - playerCustomFont = new Font("Franklin Gothic Medium", newplayerCustomFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); - playerTextFont = new Font("Franklin Gothic Medium", newplayerTextFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); - smallTextFont = new Font("Franklin Gothic Medium", newsmallTextFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); - extraSmallTextFont = new Font("Franklin Gothic Medium", newextraSmallTextFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); + playerFont = new Font(customFont, newplayerFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); + playerCustomFont = new Font(customFont, newplayerCustomFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); + playerTextFont = new Font(customFont, newplayerTextFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); + smallTextFont = new Font(customFont, 10, FontStyle.Regular, GraphicsUnit.Point, 0); + extraSmallTextFont = new Font(customFont, newextraSmallTextFontSize, FontStyle.Regular, GraphicsUnit.Point, 0); + handlerNoteZoom.Font = new Font(customFont, 14f * scale, FontStyle.Regular, GraphicsUnit.Pixel, 0); + float instructionW = instruction.Width * scale; float instructionH = instruction.Height * scale; + float inputBoxWidth = 28*scale; + float inputBoxHeight = 20*scale; + + inputPic1.Size = new Size((int)inputBoxWidth, (int)inputBoxHeight); + inputPic2.Size = new Size((int)inputBoxWidth, (int)inputBoxHeight); + inputPic3.Size = new Size((int)inputBoxWidth, (int)inputBoxHeight); + inputPic4.Size = new Size((int)inputBoxWidth, (int)inputBoxHeight); + + inputPic1.Location = new Point((instruction.Left - inputPic1.Width) - Convert.ToInt32(30*scale), instruction.Location.Y); + inputPic2.Location = new Point((inputPic1.Left - inputPic1.Width) - Convert.ToInt32(5 * scale), inputPic1.Location.Y); + inputPic3.Location = new Point((inputPic2.Left - inputPic2.Width) - Convert.ToInt32(5 * scale), inputPic2.Location.Y); + inputPic4.Location = new Point((inputPic3.Left - inputPic3.Width) - Convert.ToInt32(5 * scale), inputPic3.Location.Y); + + inputsIconsDesc.Font = new Font(customFont, 10.0f - 2, FontStyle.Regular, GraphicsUnit.Point, 0); + inputsIconsDesc.Location = + new Point((int)(inputPic4.Location.X - inputsIconsDesc.Width) - Convert.ToInt32(35 *scale), inputPic1.Bottom + inputsIconsDesc.Height); instruction.Width = (int)instructionW; instruction.Height = (int)instructionH; instruction.Location = new Point((Width - instruction.Width) - 5, 5); + appStart = true; } @@ -370,7 +504,6 @@ private void GamepadPollTimer_Tick(object state) gamePadPressed = -1; } - } private void PollGamepad(PlayerInfo player) @@ -424,8 +557,9 @@ private void GamepadTimer_Tick(object state) { return; } + try - { + { insideGamepadTick = true; gamePadPressed = -1; @@ -447,7 +581,7 @@ private void GamepadTimer_Tick(object state) if (g.Hook.DInputEnabled || g.Hook.XInputReroute || g.ProtoInput.DinputDeviceHook) { - + IList devices = dinput.GetDevices(DeviceClass.GameControl, DeviceEnumerationFlags.AllDevices); // first search for disconnected gamepads @@ -478,7 +612,7 @@ private void GamepadTimer_Tick(object state) isDisconnected = true; } } - + for (int i = 0; i < devices.Count; i++) { bool already = false; @@ -511,6 +645,7 @@ private void GamepadTimer_Tick(object state) { continue; } + player.GamepadProductGuid = devices[i].ProductGuid; player.GamepadGuid = devices[i].InstanceGuid; player.GamepadName = devices[i].InstanceName; @@ -526,8 +661,9 @@ private void GamepadTimer_Tick(object state) player.IsInputUsed = true; data.Add(player); } - + } + if ((g.Hook.XInputEnabled && !g.Hook.XInputReroute && !g.ProtoInput.DinputDeviceHook) || g.ProtoInput.XinputHook) { @@ -581,7 +717,6 @@ private void GamepadTimer_Tick(object state) p.GamepadMask = newmask; } - already = true; break; } @@ -618,13 +753,15 @@ private void GamepadTimer_Tick(object state) break; } } - + // new gamepad player.IsXInput = true; player.IsInputUsed = true; player.GamepadId = i; + data.Add(player); } + } } @@ -655,6 +792,7 @@ private void AddPlayer(int i, float playerWidth, float playerHeight, float offse { EditBounds = r }; + profile.PlayerData.Add(player); } @@ -777,11 +915,36 @@ public void UpdatePlayers() return; } + GenericGameInfo g = game.Game; List playerData = profile.PlayerData; canProceed = playerData.Count(c => c.ScreenIndex != -1) >= 1; if (playerData.Count == 0) { + if ((g.Hook.XInputEnabled && !g.Hook.XInputReroute && !g.ProtoInput.DinputDeviceHook) || g.ProtoInput.XinputHook) + { + inputPic2.Image = xinputGamepad_Icon; + } + else + { + inputPic2.Image = null; + } + + if ((g.Hook.DInputEnabled || g.Hook.XInputReroute || g.ProtoInput.DinputDeviceHook) && (g.Hook.XInputEnabled || g.ProtoInput.XinputHook)) + { + + inputPic1.Image = dinputGamepad_Icon; + } + else if ((g.Hook.DInputEnabled || g.Hook.XInputReroute || g.ProtoInput.DinputDeviceHook) && (!g.Hook.XInputEnabled || !g.ProtoInput.XinputHook)) + { + inputPic1.Image = null; + inputPic2.Image = dinputGamepad_Icon; + } + else + { + inputPic1.Image = null; + } + if (game.Game.SupportsKeyboard) { // add keyboard data @@ -791,15 +954,27 @@ public void UpdatePlayers() GamepadId = 99, IsInputUsed = true }; - + inputPic3.Image = k_Icon; playerData.Add(kbPlayer); - } - + } + if (game.Game.SupportsMultipleKeyboardsAndMice) //Raw mice/keyboards { playerData.AddRange(RawInputManager.GetDeviceInputInfos()); + inputPic3.Image = k_Icon; + inputPic4.Image = k_Icon; } - + else + { + inputPic4.Image = null; + } + + + if(!game.Game.SupportsMultipleKeyboardsAndMice && !game.Game.SupportsKeyboard) + { + inputPic3.Image = null; + } + if (testDinputPlayers != -1) // make fake data if needed { for (int i = 0; i < testDinputPlayers; i++) @@ -1073,6 +1248,9 @@ protected override void OnMouseDoubleClick(MouseEventArgs e) protected override void OnMouseDown(MouseEventArgs e) { base.OnMouseDown(e); + + Cursor = Cursors.Hand; + List players = profile.PlayerData; if (dragging) @@ -1172,11 +1350,8 @@ protected override void OnMouseDown(MouseEventArgs e) Rectangle r = p.EditBounds; if (r.Contains(e.Location)) { - if (p.ScreenIndex != -1) { - - UserScreen screen = screens[p.ScreenIndex]; int verLines = 2; @@ -1288,7 +1463,6 @@ protected override void OnMouseDown(MouseEventArgs e) Invalidate(); } - } else { @@ -1319,8 +1493,9 @@ protected override void OnMouseMove(MouseEventArgs e) if (dragging) { + List players = profile.PlayerData; - + PlayerInfo player = players[draggingIndex]; if (!player.IsInputUsed) { @@ -1358,6 +1533,7 @@ protected override void OnMouseMove(MouseEventArgs e) } else { + Rectangle s = screens[draggingScreen].UIBounds; float pc = RectangleUtil.PcInside(p, s); if (pc < 0.6f) @@ -1372,7 +1548,7 @@ protected override void OnMouseMove(MouseEventArgs e) Rectangle r = new Rectangle(this.Location.X+5, this.Location.Y+15, this.Width-20,this.Height-60); Invalidate(r,false); - + //Invalidate(); } } @@ -1380,6 +1556,7 @@ protected override void OnMouseMove(MouseEventArgs e) protected override void OnMouseUp(MouseEventArgs e) { base.OnMouseUp(e); + Cursor = Cursors.Default; if (e.Button == MouseButtons.Left) { @@ -1435,14 +1612,8 @@ protected override void OnPaint(PaintEventArgs e) base.OnPaint(e); Graphics g = e.Graphics; - int gamepadCount = 0; -#if DEBUG - //g.FillRectangle(Brushes.Green, playersArea); - //g.FillRectangle(Brushes.CornflowerBlue, screensArea); - //g.FillRectangle(Brushes.CornflowerBlue, new RectangleF(0, 0, Width, Height)); -#endif for (int i = 0; i < screens.Length; i++) { @@ -1464,7 +1635,6 @@ protected override void OnPaint(PaintEventArgs e) g.DrawImage(screenimg, setupScr); } - //g.DrawImage(screenimg, setupScrSwap); switch (s.Type) { case UserScreenType.FullScreen: @@ -1506,27 +1676,29 @@ protected override void OnPaint(PaintEventArgs e) { PlayerInfo info = players[i]; - Rectangle s = info.EditBounds; - g.ResetClip(); + g.Clip = new Region(new RectangleF(s.X, s.Y, s.Width + 1, s.Height + 1)); Rectangle gamepadRect = RectangleUtil.ScaleAndCenter(xinputPic.Size, s); - + string str = (i + 1).ToString(); SizeF size = g.MeasureString(str, playerFont); PointF loc = RectangleUtil.Center(size, s); - if (gamePadPressed == info.GamepadId) + if (gamePadPressed == -1) { - var playerColor = colors[info.GamepadId]; - g.FillPie(playerColor, gamepadRect, 100.0f, -20.0f); - gamePadPressed = -1; + g.ResetClip(); + g.DrawString("Input Devices", playerTextFont, myBrush, new PointF(10, 10)); } else { - g.ResetClip(); + if (gamePadPressed == info.GamepadId) + { + g.ResetClip(); + g.DrawString("Gamepad " + (info.GamepadId + 1) , playerTextFont, colors[info.GamepadId], new PointF(10, 10)); + } } if (info.IsXInput) @@ -1544,8 +1716,15 @@ protected override void OnPaint(PaintEventArgs e) { g.DrawString(str, playerCustomFont, playerColor, loc); } - g.DrawImage(xinputPic, gamepadRect); - + + if (gamePadPressed == info.GamepadId) + { + g.DrawImage(xinputPic, gamepadRect, 0, 0, xinputPic.Width, xinputPic.Height, GraphicsUnit.Pixel, flashImageAttributes); + } + else + { + g.DrawImage(xinputPic, gamepadRect); + } } else if (info.IsKeyboardPlayer && !info.IsRawKeyboard && !info.IsRawMouse) { @@ -1580,13 +1759,11 @@ protected override void OnPaint(PaintEventArgs e) { g.DrawImage(virtualImg, gamepadRect); } - } } else - { - + { loc.Y -= gamepadRect.Height * 0.2f; var playerColor = colors[info.GamepadId]; gamepadCount++; @@ -1600,7 +1777,14 @@ protected override void OnPaint(PaintEventArgs e) g.DrawString(str, playerCustomFont, playerColor, loc); } - g.DrawImage(dinputPic, gamepadRect); + if (gamePadPressed == info.GamepadId) + { + g.DrawImage(dinputPic, gamepadRect, 0, 0, dinputPic.Width, dinputPic.Height, GraphicsUnit.Pixel, flashImageAttributes); + } + else + { + g.DrawImage(dinputPic, gamepadRect); + } } if (info.ScreenIndex != -1) @@ -1622,8 +1806,7 @@ protected override void OnPaint(PaintEventArgs e) g.FillEllipse(Brushes.Transparent, gamepadRect); } } - - g.DrawString("Input Devices", playerTextFont, myBrush, new PointF(10, 10)); + } g.ResetClip();