diff --git a/BetterJoyForCemu/MainForm.Designer.cs b/BetterJoyForCemu/MainForm.Designer.cs index e97854f9..8b89287a 100644 --- a/BetterJoyForCemu/MainForm.Designer.cs +++ b/BetterJoyForCemu/MainForm.Designer.cs @@ -42,7 +42,6 @@ private void InitializeComponent() { this.con2 = new System.Windows.Forms.Button(); this.con1 = new System.Windows.Forms.Button(); this.btnTip = new System.Windows.Forms.ToolTip(this.components); - this.foldLbl = new System.Windows.Forms.Label(); this.startInTrayBox = new System.Windows.Forms.CheckBox(); this.btn_open3rdP = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -51,6 +50,7 @@ private void InitializeComponent() { this.settingsApply = new System.Windows.Forms.Button(); this.AutoCalibrate = new System.Windows.Forms.Button(); this.btn_reassign_open = new System.Windows.Forms.Button(); + this.btn_settings = new System.Windows.Forms.Button(); this.contextMenu.SuspendLayout(); this.conCntrls.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -64,7 +64,7 @@ private void InitializeComponent() { this.console.Name = "console"; this.console.ReadOnly = true; this.console.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.console.Size = new System.Drawing.Size(262, 100); + this.console.Size = new System.Drawing.Size(270, 100); this.console.TabIndex = 2; // // notifyIcon @@ -95,7 +95,7 @@ private void InitializeComponent() { // version_lbl // this.version_lbl.AutoSize = true; - this.version_lbl.Location = new System.Drawing.Point(246, 239); + this.version_lbl.Location = new System.Drawing.Point(246, 263); this.version_lbl.Name = "version_lbl"; this.version_lbl.Size = new System.Drawing.Size(28, 13); this.version_lbl.TabIndex = 2; @@ -118,9 +118,10 @@ private void InitializeComponent() { // donationLink // this.donationLink.AutoSize = true; - this.donationLink.Location = new System.Drawing.Point(196, 239); + this.donationLink.Location = new System.Drawing.Point(198, 263); this.donationLink.Name = "donationLink"; - this.donationLink.Size = new System.Drawing.Size(42, 13); + this.donationLink.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.donationLink.Size = new System.Drawing.Size(42, 23); this.donationLink.TabIndex = 5; this.donationLink.TabStop = true; this.donationLink.Text = "Donate"; @@ -136,16 +137,16 @@ private void InitializeComponent() { this.conCntrls.Controls.Add(this.con3); this.conCntrls.Controls.Add(this.con2); this.conCntrls.Controls.Add(this.con1); - this.conCntrls.Location = new System.Drawing.Point(12, 12); + this.conCntrls.Location = new System.Drawing.Point(12, 9); this.conCntrls.Name = "conCntrls"; - this.conCntrls.Size = new System.Drawing.Size(262, 100); + this.conCntrls.Size = new System.Drawing.Size(270, 100); this.conCntrls.TabIndex = 0; this.conCntrls.TabStop = false; this.conCntrls.Text = "Connected Controllers"; // // loc4 // - this.loc4.Location = new System.Drawing.Point(198, 80); + this.loc4.Location = new System.Drawing.Point(200, 80); this.loc4.Name = "loc4"; this.loc4.Size = new System.Drawing.Size(58, 20); this.loc4.TabIndex = 7; @@ -154,7 +155,7 @@ private void InitializeComponent() { // // loc3 // - this.loc3.Location = new System.Drawing.Point(134, 80); + this.loc3.Location = new System.Drawing.Point(136, 80); this.loc3.Name = "loc3"; this.loc3.Size = new System.Drawing.Size(58, 20); this.loc3.TabIndex = 6; @@ -163,7 +164,7 @@ private void InitializeComponent() { // // loc2 // - this.loc2.Location = new System.Drawing.Point(70, 80); + this.loc2.Location = new System.Drawing.Point(72, 80); this.loc2.Name = "loc2"; this.loc2.Size = new System.Drawing.Size(58, 20); this.loc2.TabIndex = 5; @@ -184,7 +185,7 @@ private void InitializeComponent() { this.con4.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross; this.con4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.con4.Enabled = false; - this.con4.Location = new System.Drawing.Point(198, 20); + this.con4.Location = new System.Drawing.Point(200, 20); this.con4.Name = "con4"; this.con4.Size = new System.Drawing.Size(58, 59); this.con4.TabIndex = 3; @@ -196,7 +197,7 @@ private void InitializeComponent() { this.con3.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross; this.con3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.con3.Enabled = false; - this.con3.Location = new System.Drawing.Point(134, 20); + this.con3.Location = new System.Drawing.Point(136, 20); this.con3.Name = "con3"; this.con3.Size = new System.Drawing.Size(58, 59); this.con3.TabIndex = 2; @@ -208,7 +209,7 @@ private void InitializeComponent() { this.con2.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross; this.con2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.con2.Enabled = false; - this.con2.Location = new System.Drawing.Point(70, 20); + this.con2.Location = new System.Drawing.Point(72, 20); this.con2.Name = "con2"; this.con2.Size = new System.Drawing.Size(58, 59); this.con2.TabIndex = 1; @@ -228,22 +229,10 @@ private void InitializeComponent() { this.btnTip.SetToolTip(this.con1, "Click on Joycons to join/split them"); this.con1.UseVisualStyleBackColor = true; // - // foldLbl - // - this.foldLbl.Location = new System.Drawing.Point(274, 20); - this.foldLbl.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.foldLbl.Name = "foldLbl"; - this.foldLbl.Size = new System.Drawing.Size(13, 231); - this.foldLbl.TabIndex = 12; - this.foldLbl.Text = ">"; - this.foldLbl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.btnTip.SetToolTip(this.foldLbl, "Config"); - this.foldLbl.Click += new System.EventHandler(this.foldLbl_Click); - // // startInTrayBox // this.startInTrayBox.AutoSize = true; - this.startInTrayBox.Location = new System.Drawing.Point(107, 238); + this.startInTrayBox.Location = new System.Drawing.Point(109, 238); this.startInTrayBox.Name = "startInTrayBox"; this.startInTrayBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.startInTrayBox.Size = new System.Drawing.Size(83, 17); @@ -294,7 +283,7 @@ private void InitializeComponent() { // this.rightPanel.Controls.Add(this.settingsApply); this.rightPanel.Controls.Add(this.groupBox1); - this.rightPanel.Location = new System.Drawing.Point(289, 1); + this.rightPanel.Location = new System.Drawing.Point(289, 0); this.rightPanel.Margin = new System.Windows.Forms.Padding(2, 2, 12, 2); this.rightPanel.Name = "rightPanel"; this.rightPanel.Size = new System.Drawing.Size(312, 273); @@ -316,7 +305,7 @@ private void InitializeComponent() { // // AutoCalibrate // - this.AutoCalibrate.Location = new System.Drawing.Point(203, 112); + this.AutoCalibrate.Location = new System.Drawing.Point(212, 112); this.AutoCalibrate.Name = "AutoCalibrate"; this.AutoCalibrate.Size = new System.Drawing.Size(71, 20); this.AutoCalibrate.TabIndex = 8; @@ -334,15 +323,26 @@ private void InitializeComponent() { this.btn_reassign_open.UseVisualStyleBackColor = true; this.btn_reassign_open.Click += new System.EventHandler(this.btn_reassign_open_Click); // + // btn_settings + // + this.btn_settings.Location = new System.Drawing.Point(198, 234); + this.btn_settings.Margin = new System.Windows.Forms.Padding(3, 3, 12, 3); + this.btn_settings.Name = "btn_settings"; + this.btn_settings.Size = new System.Drawing.Size(84, 22); + this.btn_settings.TabIndex = 14; + this.btn_settings.Text = "Open Settings"; + this.btn_settings.UseVisualStyleBackColor = true; + this.btn_settings.Click += new System.EventHandler(this.btn_settings_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(615, 308); + this.ClientSize = new System.Drawing.Size(633, 308); + this.Controls.Add(this.btn_settings); this.Controls.Add(this.btn_reassign_open); - this.Controls.Add(this.foldLbl); this.Controls.Add(this.rightPanel); this.Controls.Add(this.AutoCalibrate); this.Controls.Add(this.btn_open3rdP); @@ -394,8 +394,8 @@ private void InitializeComponent() { private System.Windows.Forms.TableLayoutPanel settingsTable; private System.Windows.Forms.Panel rightPanel; private System.Windows.Forms.Button settingsApply; - private System.Windows.Forms.Label foldLbl; private System.Windows.Forms.Button AutoCalibrate; private System.Windows.Forms.Button btn_reassign_open; + private System.Windows.Forms.Button btn_settings; } } diff --git a/BetterJoyForCemu/MainForm.cs b/BetterJoyForCemu/MainForm.cs index 1bbc7b15..fe768f7b 100644 --- a/BetterJoyForCemu/MainForm.cs +++ b/BetterJoyForCemu/MainForm.cs @@ -277,9 +277,9 @@ void ReenableViGEm(Joycon v) { } } - private void foldLbl_Click(object sender, EventArgs e) { + private void btn_settings_Click(object sender, EventArgs e) { rightPanel.Visible = !rightPanel.Visible; - foldLbl.Text = rightPanel.Visible ? "<" : ">"; + btn_settings.Text = rightPanel.Visible ? "Close Settings" : "Open Settings"; } private void cbBox_Changed(object sender, EventArgs e) {