From 7382723cfd84a3f55678e58bb72b6d5879122ad3 Mon Sep 17 00:00:00 2001 From: EternalModz <86510009+EternalModz@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:05:20 -0700 Subject: [PATCH] Added button code + minor design changes --- .../ChangeLogForm.Designer.cs | 1 - PCK-Studio/MainForm.Designer.cs | 10 +- PCK-Studio/MainForm.cs | 16 + PCK-Studio/MainForm.resx | 278 ++++++------------ PCK-Studio/PckStudio.csproj | 1 + PCK-Studio/Properties/Resources.Designer.cs | 10 + PCK-Studio/Properties/Resources.resx | 3 + PCK-Studio/Resources/toolsAsset.png | Bin 0 -> 613 bytes 8 files changed, 123 insertions(+), 196 deletions(-) create mode 100644 PCK-Studio/Resources/toolsAsset.png diff --git a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs index c156045b..d1af020b 100644 --- a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs @@ -54,7 +54,6 @@ this.Controls.Add(this.ChangelogRichTextBox); this.Font = new System.Drawing.Font("Segoe UI", 8.25F); this.ForeColor = System.Drawing.Color.White; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); this.Name = "ChangeLogForm"; this.Padding = new System.Windows.Forms.Padding(10); diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index 3b0601a0..5598a64c 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -522,7 +522,7 @@ // menuStrip // resources.ApplyResources(this.menuStrip, "menuStrip"); - this.menuStrip.BackColor = System.Drawing.Color.Transparent; + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, @@ -647,8 +647,9 @@ this.openPckManagerToolStripMenuItem, this.convertMusicFilesToolStripMenuItem}); this.miscToolStripMenuItem.ForeColor = System.Drawing.Color.Silver; - resources.ApplyResources(this.miscToolStripMenuItem, "miscToolStripMenuItem"); + this.miscToolStripMenuItem.Image = global::PckStudio.Properties.Resources.toolsAsset; this.miscToolStripMenuItem.Name = "miscToolStripMenuItem"; + resources.ApplyResources(this.miscToolStripMenuItem, "miscToolStripMenuItem"); // // openPckManagerToolStripMenuItem // @@ -875,7 +876,7 @@ this.tabControl.Controls.Add(this.editorTab); resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 1; + this.tabControl.SelectedIndex = 0; this.tabControl.Style = MetroFramework.MetroColorStyle.Silver; this.tabControl.TabStop = false; this.tabControl.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -942,6 +943,7 @@ this.whatsNewBtn.Name = "whatsNewBtn"; this.whatsNewBtn.TextColor = System.Drawing.Color.White; this.whatsNewBtn.UseVisualStyleBackColor = false; + this.whatsNewBtn.Click += new System.EventHandler(this.whatsNewBtn_Click); // // pckCenterBtn // @@ -962,6 +964,7 @@ this.pckCenterBtn.Name = "pckCenterBtn"; this.pckCenterBtn.TextColor = System.Drawing.Color.White; this.pckCenterBtn.UseVisualStyleBackColor = false; + this.pckCenterBtn.Click += new System.EventHandler(this.pckCenterBtn_Click); // // creditsBtn // @@ -982,6 +985,7 @@ this.creditsBtn.Name = "creditsBtn"; this.creditsBtn.TextColor = System.Drawing.Color.White; this.creditsBtn.UseVisualStyleBackColor = false; + this.creditsBtn.Click += new System.EventHandler(this.creditsBtn_Click); // // editorTab // diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index fb8fce68..74b9ede7 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -2578,5 +2578,21 @@ namespace PckStudio if (e.Node is not null) treeViewMain.SelectedNode = e.Node; } + + private void whatsNewBtn_Click(object sender, EventArgs e) + { + new ChangeLogForm().Show(); // Shows what's new + } + + private void pckCenterBtn_Click(object sender, EventArgs e) + { + //new PckCenter().Show(); + // Will add PCK Center later... + } + + private void creditsBtn_Click(object sender, EventArgs e) + { + new ContributorsForm().Show(); // PCK Studio's credits/contributors page launcher + } } } \ No newline at end of file diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index faeed984..b8b872e4 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -806,7 +806,7 @@ NoControl - 115, 93 + 115, 90 4, 3, 4, 3 @@ -1620,28 +1620,6 @@ Quick Change - - - iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DAAACwwBP0AiyAAAA6pJREFUeF7tms9vDVEYhouqpFZVRFpdd+cPkFphQeKPqIUfSVl0Y9OQWNpXE/ak - SEhYkEjZUFZERCxtCaKKWKDe787jpNftmTlzz4x0rvMkb3Lzzfu9c8690zkz0+lLJBKJRCKRqIOVlZUx - 6Yb0WSqL9dyUxolrFhq4Tf6DFMtHaYzY5qBB2y9fFdeIbQ4adDeHvY8lYpsDA3dQDoY2B+XmwLgdlIOh - zUG5OTBuB+VgaHNQbg6M20E5GNoclP8N2l/M+r3eKHc9IWNV6/d6I+x6QqYq1+/1RvH1hEy9cNj7KL6e - wNizME0/+HoWpukHX8/CNP3gK8NeWq13IivVStT+aPUjz6R0S/pmDUXQ5qBcG+zGQbmIr5LNaZK2YmQe - lA5K56V70hvpu9QGdgfl2mA3DsqrsTHaWO9KNvYD0iD2RKIIHS7T0h5pA6XGY3NhTtOU/Mj0h7fSFem4 - ZGfbXdIWbOsWGyNjtTGfkK5KNpcW2PzgC4Y2B+XaYDcOysHQ5gdfMLQ5KNcGu3FQDoY2P/jKMEGr9e7L - SrUStT9a/eDrWZimH3x18Ez6kX3M5af0PPtYPUzTD74qeS0dJnumVclnBu9+6UWrUiGWnQu+KrBHUGek - AaIte6N0X/LxUNqE3fz90jHpnVQJRPvBF8ttaZjINlQfkeyXfSktSA+kV5IdKSPY2lB9WLojRUOkH3yx - XCCuMiwzi46DOD/4YrHDfyuR0SjL7kzfW3AsRPrBVwUniYzGsrLIeIj0g68KFoiMRll2nqgEIv3gi+WX - dITIaJR1iMxoiPSDL5aLxFWGZWbRcRDnB18M9ixxB3EdaJvdrp6WnkhfkH0+JXlvt7Vtu2TP9qIgzg++ - GOaI6kDbRqW8y1y7XB7F3oG2zbZcERDlB18ZHkmXpLOSPVEeIqoN1e2XD7nGty9hzSNB9SHpqHROuiw9 - lkpBlB98ZeinNRf57LAPZYq2XOTbnNnDodUPvmBoK0TWp1lHEIu0FYI/GNr84AuGtkJkXc46glimrRD8 - wdDmB18wtBUia5kvIPi1OPzB0OYHXzC0FSJrY/4Eyr4gEXoStHU+lLpOgp9o9SOTvVBUBluKbEmypcmW - qLxl0Ja4IszjHqKsRvVtUswyOE+UH5nGJbud7ZZZojrQNrsQyvsSii6E5lqu7rDb6d1E5SOjvSl2Xerm - fSG7XF3zaZChbQPSlLQo2YnRZL+k1db85Q1t2ykF/cv+L5akeSls8olEIpFIJP4T+vp+A8lMcFIN42ej - AAAAAElFTkSuQmCC - - 62, 21 @@ -3113,108 +3091,6 @@ Edit All Entries - - openTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - tabControl - - - 0 - - - editorTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - tabControl - - - 1 - - - Fill - - - 0, 5 - - - 0, 0, 0, 0 - - - 1234, 756 - - - 0 - - - tabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 4 - - - buttomBox - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openTab - - - 2 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openTab - - - 3 - - - 4, 38 - - - 4, 3, 4, 3 - - - 21, 35, 23, 6 - - - 1226, 719 - - - 1 - - - openTab - - - MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - tabControl - - - 0 - None @@ -4212,7 +4088,7 @@ 23, 23, 23, 23 - 719, 678 + 719, 673 Zoom @@ -4232,69 +4108,6 @@ 2 - - whatsNewBtn - - - CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton, CBH-WinForm-Theme-Library, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 1 - - - pckCenterBtn - - - CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton, CBH-WinForm-Theme-Library, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 2 - - - creditsBtn - - - CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton, CBH-WinForm-Theme-Library, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 3 - - - Right - - - 740, 35 - - - 4, 3, 4, 3 - - - 463, 678 - - - 22 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openTab - - - 3 - None @@ -4311,7 +4124,7 @@ NoControl - 65, 183 + 65, 180 4, 3, 4, 3 @@ -4356,7 +4169,7 @@ NoControl - 65, 305 + 65, 302 4, 3, 4, 3 @@ -4398,7 +4211,7 @@ BottomCenter - 65, 428 + 65, 425 4, 3, 4, 3 @@ -4427,6 +4240,60 @@ 3 + + Right + + + 740, 35 + + + 4, 3, 4, 3 + + + 463, 673 + + + 22 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openTab + + + 3 + + + 4, 38 + + + 4, 3, 4, 3 + + + 21, 35, 23, 6 + + + 1226, 714 + + + 1 + + + openTab + + + MetroFramework.Controls.MetroTabPage, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + tabControl + + + 0 + True @@ -4544,6 +4411,33 @@ 1 + + Fill + + + 0, 5 + + + 0, 0, 0, 0 + + + 1234, 756 + + + 0 + + + tabControl + + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 4 + 4, 20 diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 22674d0b..3e6447c6 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -605,6 +605,7 @@ + diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs index 6e1e1961..b559698d 100644 --- a/PCK-Studio/Properties/Resources.Designer.cs +++ b/PCK-Studio/Properties/Resources.Designer.cs @@ -1119,6 +1119,16 @@ namespace PckStudio.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap toolsAsset { + get { + object obj = ResourceManager.GetObject("toolsAsset", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx index 30587e24..487c0b87 100644 --- a/PCK-Studio/Properties/Resources.resx +++ b/PCK-Studio/Properties/Resources.resx @@ -406,4 +406,7 @@ ..\Resources\whatsNewAsset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\toolsAsset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PCK-Studio/Resources/toolsAsset.png b/PCK-Studio/Resources/toolsAsset.png new file mode 100644 index 0000000000000000000000000000000000000000..501119f8f59767e775023da1e8ba33824f811ccd GIT binary patch literal 613 zcmV-r0-F7aP)*u$O%UzJAX&O~u~Zwu&p~L>y#7wemE*nd{faGhNO*qt-20yAc~9OO zO{JQj|M3QlF$?e!29nMv^8~U`h9md^6OsF1lA)Aa#r^^$`e7fmRwIXsfy6f0^i29e z5a@;z(8>q-ee0ygz@}xNSuGIw09pmrj(1CX8@wuqr7?R?+ZE);J8tdK7z3LYtpOG> zUxLh~LsdAZ5Je*L{q0?mCq1@I~Be?NE0!%tLSvHp%cQ*Be+#9)f6;%L~vd@=!aecLUZ3;T&v|H}Xhl?mW~R zre3e80;Q%B*H`Iu`VZA7)^}Na2^Zj12MdoOSbSaEt1hx`J*jsme9z$ww068c-!tx3 zkl_{TFIWS|XAD`u-wR*hH*7&B#NKTE+c$6n0i^Zk^viP}00000NkvXXu0mjfmS7oB literal 0 HcmV?d00001