From df1bd116062fd817a241113f5a6be5a80f29e95c Mon Sep 17 00:00:00 2001 From: nastys <@> Date: Thu, 2 Sep 2021 00:31:56 +0200 Subject: [PATCH] [Launcher] Minor layout changes] --- source-code/source/plugins/Launcher/ui.h | 12 +- source-code/source/plugins/Launcher/ui.resx | 1090 ++++++++++++------- 2 files changed, 725 insertions(+), 377 deletions(-) diff --git a/source-code/source/plugins/Launcher/ui.h b/source-code/source/plugins/Launcher/ui.h index 71a1b9d..c84dd04 100644 --- a/source-code/source/plugins/Launcher/ui.h +++ b/source-code/source/plugins/Launcher/ui.h @@ -661,6 +661,7 @@ private: System::Windows::Forms::Panel^ panel_Patches2; this->groupBox_InternalRes = (gcnew System::Windows::Forms::GroupBox()); this->panel_IntRes = (gcnew System::Windows::Forms::Panel()); this->tabPage_Patches = (gcnew System::Windows::Forms::TabPage()); + this->panel_Patches2 = (gcnew System::Windows::Forms::Panel()); this->panel_Patches = (gcnew System::Windows::Forms::Panel()); this->tabPage_Playerdata = (gcnew System::Windows::Forms::TabPage()); this->panel_Playerdata = (gcnew System::Windows::Forms::Panel()); @@ -697,7 +698,6 @@ private: System::Windows::Forms::Panel^ panel_Patches2; this->toolTip1 = (gcnew System::Windows::Forms::ToolTip(this->components)); this->button_Apply = (gcnew System::Windows::Forms::Button()); this->button_Wiki = (gcnew System::Windows::Forms::Button()); - this->panel_Patches2 = (gcnew System::Windows::Forms::Panel()); this->groupBox_ScreenRes->SuspendLayout(); this->panel_ScreenRes->SuspendLayout(); this->tabControl->SuspendLayout(); @@ -832,6 +832,11 @@ private: System::Windows::Forms::Panel^ panel_Patches2; resources->ApplyResources(this->tabPage_Patches, L"tabPage_Patches"); this->tabPage_Patches->Name = L"tabPage_Patches"; // + // panel_Patches2 + // + resources->ApplyResources(this->panel_Patches2, L"panel_Patches2"); + this->panel_Patches2->Name = L"panel_Patches2"; + // // panel_Patches // resources->ApplyResources(this->panel_Patches, L"panel_Patches"); @@ -1105,11 +1110,6 @@ private: System::Windows::Forms::Panel^ panel_Patches2; this->button_Wiki->UseVisualStyleBackColor = false; this->button_Wiki->Click += gcnew System::EventHandler(this, &ui::button_Wiki_Click); // - // panel_Patches2 - // - resources->ApplyResources(this->panel_Patches2, L"panel_Patches2"); - this->panel_Patches2->Name = L"panel_Patches2"; - // // ui // this->AcceptButton = this->button_Launch; diff --git a/source-code/source/plugins/Launcher/ui.resx b/source-code/source/plugins/Launcher/ui.resx index eec5b4d..004959e 100644 --- a/source-code/source/plugins/Launcher/ui.resx +++ b/source-code/source/plugins/Launcher/ui.resx @@ -123,13 +123,13 @@ - 344, 818 + 301, 716 - 6, 6, 6, 6 + 5, 5, 5, 5 - 434, 46 + 380, 40 @@ -157,13 +157,13 @@ True - 28, 154 + 24, 150 4, 4, 4, 4 - 358, 29 + 321, 29 0 @@ -190,13 +190,13 @@ 0 - 10, 38 + 9, 33 - 6, 6, 6, 6 + 5, 5, 5, 5 - 506, 198 + 443, 193 0 @@ -214,16 +214,16 @@ 0 - 10, 12 + 9, 10 - 6, 6, 6, 6 + 5, 5, 5, 5 - 6, 6, 6, 6 + 5, 5, 5, 5 - 526, 240 + 460, 230 10 @@ -246,18 +246,6 @@ Stretch - - 14, 40 - - - 6, 6, 6, 6 - - - 500, 90 - - - 0 - trackBar_LagCompensation @@ -271,16 +259,16 @@ 0 - 10, 606 + 9, 568 - 6, 6, 6, 6 + 5, 5, 5, 5 - 6, 6, 6, 6 + 5, 5, 5, 5 - 526, 138 + 460, 83 21 @@ -300,21 +288,6 @@ 0 - - True - - - 10, 38 - - - 6, 6, 6, 6 - - - 522, 682 - - - 0 - panel_Details @@ -328,16 +301,16 @@ 0 - 548, 12 + 480, 10 - 6, 6, 6, 6 + 5, 5, 5, 5 - 6, 6, 6, 6 + 5, 5, 5, 5 - 544, 732 + 476, 640 11 @@ -361,16 +334,16 @@ True - 10, 426 + 9, 393 4, 0, 4, 0 - 526, 26 + 460, 23 - 526, 26 + 460, 25 21 @@ -390,21 +363,6 @@ 2 - - True - - - 10, 38 - - - 6, 6, 6, 6 - - - 506, 118 - - - 1 - panel_IntRes @@ -418,16 +376,16 @@ 0 - 10, 254 + 9, 242 - 6, 6, 6, 6 + 5, 5, 5, 5 - 6, 6, 6, 6 + 5, 5, 5, 5 - 526, 166 + 460, 145 20 @@ -448,16 +406,16 @@ 3 - 8, 39 + 4, 33 - 6, 6, 6, 6 + 5, 5, 5, 5 - 6, 6, 6, 6 + 5, 5, 5, 5 - 1104, 761 + 972, 670 0 @@ -477,17 +435,635 @@ 0 + + panel_Patches2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Patches + + + 0 + + + panel_Patches + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Patches + + + 1 + + + 4, 33 + + + 5, 5, 5, 5 + + + 972, 670 + + + 1 + + + Options + + + tabPage_Patches + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 1 + + + panel_Playerdata + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Playerdata + + + 0 + + + 4, 33 + + + 5, 5, 5, 5 + + + 972, 670 + + + 3 + + + Player + + + tabPage_Playerdata + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 2 + + + linkLabel_Console + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Components + + + 0 + + + panel_Components + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Components + + + 1 + + + 4, 33 + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 972, 670 + + + 2 + + + Components + + + tabPage_Components + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 3 + + + panel_Custom + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Plugins + + + 0 + + + panel_Plugins + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Plugins + + + 1 + + + 4, 33 + + + 5, 5, 5, 5 + + + 5, 5, 5, 5 + + + 972, 670 + + + 3 + + + Plugins and Patches + + + tabPage_Plugins + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 4 + + + button_ModRename + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 0 + + + button_ModRescan + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 1 + + + button_ModFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 2 + + + checkBox_ModPatches + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 3 + + + button_ModDelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 4 + + + button_ModClone + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 5 + + + button_ModSetActive + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 6 + + + listBox_Mods + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Modpacks + + + 7 + + + 4, 33 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 972, 670 + + + 7 + + + Modpacks + + + tabPage_Modpacks + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 5 + + + creditsTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Credits + + + 0 + + + 4, 33 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 972, 670 + + + 5 + + + Credits + + + tabPage_Credits + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 6 + + + linkLabel_Repo + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 0 + + + linkLabel_Help + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 1 + + + linkLabel_Official_Discord + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 2 + + + linkLabel_Changelog + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 3 + + + button_Clean_installation + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 4 + + + button_Instructions + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 5 + + + button_Unstable_builds + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 6 + + + button_Releases_page + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 7 + + + label_Update_2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 8 + + + label_Update_1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage_Update + + + 9 + + + 4, 33 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 972, 670 + + + 6 + + + UPDATE + + + tabPage_Update + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 7 + + + 0, 0 + + + 5, 5, 5, 5 + + + 980, 707 + + + 10 + + + tabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 11, 35 + + + 5, 0, 5, 0 + + + 438, 80 + + + 0 + + + trackBar_LagCompensation + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox_Lag + + + 0 + + + True + + + 9, 33 + + + 5, 5, 5, 5 + + + 457, 597 + + + 0 + + + panel_Details + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox_Details + + + 0 + + + True + + + 9, 33 + + + 5, 5, 5, 5 + + + 443, 103 + + + 1 + + + panel_IntRes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox_InternalRes + + + 0 + True - 552, 0 + 483, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 552, 756 + 483, 662 10 @@ -511,10 +1087,10 @@ 0, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 552, 756 + 483, 662 9 @@ -531,33 +1107,6 @@ 1 - - 8, 39 - - - 6, 6, 6, 6 - - - 1104, 761 - - - 1 - - - Options - - - tabPage_Patches - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - True @@ -565,10 +1114,10 @@ 0, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 1104, 756 + 966, 662 1 @@ -585,44 +1134,17 @@ 0 - - 8, 39 - - - 6, 6, 6, 6 - - - 1104, 761 - - - 3 - - - Player - - - tabPage_Playerdata - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 2 - True - 1008, 724 + 882, 634 - 6, 0, 6, 0 + 5, 0, 5, 0 - 91, 25 + 85, 25 1 @@ -652,10 +1174,10 @@ 0, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 552, 756 + 483, 662 0 @@ -672,47 +1194,17 @@ 1 - - 8, 39 - - - 6, 6, 6, 6 - - - 6, 6, 6, 6 - - - 1104, 761 - - - 2 - - - Components - - - tabPage_Components - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 3 - True - 552, 0 + 483, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 552, 756 + 483, 662 3 @@ -736,10 +1228,10 @@ 0, 0 - 6, 6, 6, 6 + 5, 5, 5, 5 - 552, 756 + 483, 662 0 @@ -756,47 +1248,17 @@ 1 - - 8, 39 - - - 6, 6, 6, 6 - - - 6, 6, 6, 6 - - - 1104, 761 - - - 3 - - - Plugins and Patches - - - tabPage_Plugins - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 4 - False - 558, 714 + 488, 625 4, 4, 4, 4 - 130, 42 + 114, 37 8 @@ -817,13 +1279,13 @@ 0 - 696, 714 + 609, 625 4, 4, 4, 4 - 130, 42 + 114, 37 7 @@ -847,13 +1309,13 @@ False - 146, 714 + 128, 625 4, 4, 4, 4 - 130, 42 + 114, 37 6 @@ -880,13 +1342,13 @@ False - 860, 716 + 752, 626 4, 4, 4, 4 - 241, 29 + 216, 29 5 @@ -910,13 +1372,13 @@ False - 422, 714 + 369, 625 4, 4, 4, 4 - 130, 42 + 114, 37 4 @@ -940,13 +1402,13 @@ False - 284, 714 + 248, 625 4, 4, 4, 4 - 130, 42 + 114, 37 3 @@ -970,13 +1432,13 @@ False - 10, 714 + 9, 625 4, 4, 4, 4 - 130, 42 + 114, 37 2 @@ -997,16 +1459,16 @@ 6 - 25 + 24 - 10, 10 + 9, 9 4, 4, 4, 4 - 1088, 654 + 952, 556 0 @@ -1023,36 +1485,6 @@ 7 - - 8, 39 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 - - - 1104, 761 - - - 7 - - - Modpacks - - - tabPage_Modpacks - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 5 - 0, 0 @@ -1066,7 +1498,7 @@ Both - 1100, 752 + 963, 658 0 @@ -1201,47 +1633,17 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD 0 - - 8, 39 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 - - - 1104, 761 - - - 5 - - - Credits - - - tabPage_Credits - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 6 - True - 338, 594 + 296, 520 4, 0, 4, 0 - 179, 25 + 161, 25 9 @@ -1265,13 +1667,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD True - 338, 514 + 296, 450 4, 0, 4, 0 - 56, 25 + 52, 25 8 @@ -1295,13 +1697,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD True - 338, 554 + 296, 485 4, 0, 4, 0 - 157, 25 + 142, 25 7 @@ -1325,13 +1727,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD True - 338, 476 + 296, 416 4, 0, 4, 0 - 116, 25 + 108, 25 6 @@ -1352,13 +1754,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD 3 - 590, 414 + 516, 362 4, 4, 4, 4 - 184, 52 + 161, 46 5 @@ -1379,13 +1781,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD 4 - 590, 354 + 516, 310 4, 4, 4, 4 - 184, 52 + 161, 46 4 @@ -1406,13 +1808,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD 5 - 338, 414 + 296, 362 4, 4, 4, 4 - 184, 52 + 161, 46 3 @@ -1433,13 +1835,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD 6 - 338, 354 + 296, 310 4, 4, 4, 4 - 184, 52 + 161, 46 2 @@ -1463,13 +1865,13 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD True - 96, 146 + 84, 128 4, 0, 4, 0 - 948, 50 + 852, 50 1 @@ -1500,13 +1902,13 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c Microsoft Sans Serif, 12pt, style=Bold - 22, 60 + 19, 52 4, 0, 4, 0 - 1044, 37 + 933, 32 0 @@ -1529,60 +1931,6 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c 9 - - 8, 39 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 - - - 1104, 761 - - - 6 - - - UPDATE - - - tabPage_Update - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 7 - - - 0, 0 - - - 6, 6, 6, 6 - - - 1120, 808 - - - 10 - - - tabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Flat @@ -1609,13 +1957,13 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c - 992, 808 + 868, 707 - 6, 6, 6, 6 + 5, 5, 5, 5 - 64, 64 + 56, 56 31 @@ -1674,13 +2022,13 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c - 1056, 808 + 924, 707 - 6, 6, 6, 6 + 5, 5, 5, 5 - 64, 64 + 56, 56 32 @@ -1701,13 +2049,13 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c Flat - 8, 818 + 7, 716 - 6, 6, 6, 6 + 5, 5, 5, 5 - 138, 46 + 121, 40 33 @@ -2050,13 +2398,13 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c Flat - 928, 808 + 812, 707 - 6, 6, 6, 6 + 5, 5, 5, 5 - 64, 64 + 56, 56 34 @@ -2077,7 +2425,7 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c True - 192, 192 + 168, 168 True @@ -2089,7 +2437,7 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c Stretch - 1120, 874 + 980, 765 @@ -3224,7 +3572,7 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c - 6, 6, 6, 6 + 5, 5, 5, 5 CenterScreen