Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

Options redesign; Rumble intensity; Dark fix; Remove OGL patches

Browse Source
This commit is contained in:
nastys
2021-08-11 18:25:15 +02:00
parent d97f86e833
commit c055ac91d5
11 changed files with 773 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/PD-Loader/templates.h
+8 -8
View File
@@ -30,10 +30,6 @@ char config_template[] =
"No_GPU_Dialog=0\n"
"# Sets the dark colour scheme in the launcher.\n"
"Dark_Launcher=0\n"
"# Ignores some OpenGL-related errors. Don't use both patches at the same time unless you're know what you're doing\n"
"OpenGL_Patch_A=0\n"
"# Ignores some OpenGL-related errors. Don't use both patches at the same time unless you're know what you're doing\n"
"OpenGL_Patch_B=0\n"
"# Command line arguments\n"
"Command_Line=\n"
"# Launches divahook.bat intead of diva.exe.\n"
@@ -315,21 +311,25 @@ char keyconfig_template[] =
"PID = C216\n"
"\n"
"# Rumble (Xinput)\n"
"rumble =true\n"
"rumble = true\n"
"\n"
"# Rumble intensity (Xinput)\n"
"xinput_rumble_intensity_left = 8000\n"
"xinput_rumble_intensity_right = 4000\n"
"\n"
"# Pause when focus is lost\n"
"autopause =true\n"
"autopause = true\n"
"\n"
"# Allow using slider in menus\n"
"# Recommended to enable this and remove MENU_L/R bindings if you have a real slider.\n"
"# Also needed to see slider in input test\n"
"slider_in_menus =false\n"
"slider_in_menus = false\n"
"\n"
"# Use the hardware slider from HORI FT official controller (PS4 version)\n"
"# Requires enabling hardware slider support.\n"
"# Warning: alpha feature, may not work properly\n"
"# Recommended to remove Ds4_L_Stick_* and Ds4_R_Stick_* from button bindings (JVS_LEFT, JVS_RIGHT, MENU_L, MENU_R).\n"
"ps4_official_slider =false\n"
"ps4_official_slider = false\n"
"\n"
"# JVS Buttons:\n"
"JVS_TEST = F1\n"
source-code/source/plugins/Launcher/ConfigOption.h
+38
View File
@@ -338,6 +338,44 @@ public:
};
class OptionMetaSectionLabel : public ConfigOptionBase
{
public:
OptionMetaSectionLabel(LPCWSTR friendlyName)
{
_friendlyName = friendlyName;
}
virtual int AddToPanel(Panel^ panel, unsigned int left, unsigned int top, ToolTip^ tooltip)
{
Label^ lab = gcnew Label();
lab->Text = i18n::GetStringFallback(gcnew String(_friendlyName));
lab->Left = left + 2;
lab->Top = top;
lab->Font = gcnew System::Drawing::Font(lab->Font->Name, 12.0f, System::Drawing::FontStyle::Bold);
lab->AutoSize = true;
Form^ RootForm = panel->FindForm();
float ScaleWidth = 1.0f;
float ScaleHeight = 1.0f;
if (RootForm)
{
Drawing::SizeF CurrentScaleSize = RootForm->CurrentAutoScaleDimensions;
ScaleWidth = CurrentScaleSize.Width / BaseScaleSize;
ScaleHeight = CurrentScaleSize.Height / BaseScaleSize;
}
lab->Scale(ScaleWidth, ScaleHeight);
panel->Controls->Add(lab);
mainControlHandle = lab->Handle;
int ControlHeight = lab->Font->Height / ScaleHeight;
return ControlHeight + ControlSpacing;
}
};
class BooleanOption : public ConfigOptionBase
{
public:
source-code/source/plugins/Launcher/Resources.restext
+15 -6
View File
@@ -46,6 +46,16 @@ NPR1_HINT=NPR1 shader\n\nPress F9 to toggle.
2D_HINT=Disable all 3D passes.\n\nWARNING: The extended data will be deleted unless Prevent Data Deletion is enabled. Don't enable on Intel GPUs, enable "Disable Extended Data" instead.
# options
SECTION_LOADER=Loader
SECTION_COMPATIBILITY=Compatibility
SECTION_PV_SELECTOR=PV Selector
SECTION_ESM=Stages (Songs)
SECTION_UI_ELM=UI Elements
SECTION_PV_PATCHES=PV Patches
SECTION_FRAMERATE=Framerate
SECTION_CONTROLLER_OPTIONS=Controller Options
SECTION_LAUNCHER=Launcher
BUILTIN_PATCHES_NAME=Enable Built-In Patches
BUILTIN_PATCHES_HINT=Enables the built-in patches, including the options below.
CUSTOM_PATCHES_NAME=Enable Custom Patches
@@ -89,7 +99,7 @@ NO_PV_UI_NAME=Disable PV UI
NO_PV_UI_HINT=Remove the photo controls during PV playback.
HIDE_PV_WATERMARK_NAME=Hide PV Watermark
HIDE_PV_WATERMARK_HINT=Hide the watermark that's usually shown in PV viewing mode.
STATUS_ICONS_NAME=Top-Right Corner Icons:
STATUS_ICONS_NAME=Top-Right Network Icons:
STATUS_ICONS_HINT=Set the state of card reader and network status icons.
NO_LYRICS_NAME=Disable Lyrics
NO_LYRICS_HINT=Disable showing lyrics.
@@ -131,17 +141,16 @@ AUTOPAUSE_HINT=Pause when focus is lost.
RUMBLE_NAME=XInput Rumble
RUMBLE_HINT=Enables rumble during chainslides.
XINPUT_RUMBLE_INTENSITY_LEFT_NAME=Left Motor Intensity
XINPUT_RUMBLE_INTENSITY_LEFT_HINT=Default: 8000.
XINPUT_RUMBLE_INTENSITY_RIGHT_NAME=Right Motor Intensity
XINPUT_RUMBLE_INTENSITY_RIGHT_HINT=Default: 4000.
XINPUT_PREFERRED_NAME=XInput Controller Num:
XINPUT_PREFERRED_HINT=Sets the preferred XInput controller.\nIf unavailable, the next connected controller is used.
HARDWARE_SLIDER_NAME=Use Hardware Slider
HARDWARE_SLIDER_HINT=Enable this if using a real arcade slider.\n(set the slider to port COM11)
OPENGL_PATCH_A_NAME=OpenGL Patch A
OPENGL_PATCH_A_HINT=Ignores some OpenGL-related errors. Don't use both patches at the same time unless you're know what you're doing.
OPENGL_PATCH_B_NAME=OpenGL Patch B
OPENGL_PATCH_B_HINT=Ignores some OpenGL-related errors. Don't use both patches at the same time unless you're know what you're doing.
PREVENT_DATA_DELETION_NAME=Prevent Data Deletion
PREVENT_DATA_DELETION_HINT=Prevents the game from deleting files.
COMMAND_LINE_NAME=Command Line:
source-code/source/plugins/Launcher/Resources.zh-Hans.restext
-5
View File
@@ -155,11 +155,6 @@ XINPUT_PREFERRED_HINT=设置 XInput 控制器偏好\n如果此控制器暂时无
HARDWARE_SLIDER_NAME=启用硬件手台
HARDWARE_SLIDER_HINT=如果你准备使用硬件手台，请将其启用\n(请将硬件手台的连接端口设置为 COM11）
OPENGL_PATCH_A_NAME=OpenGL Patch A
OPENGL_PATCH_A_HINT=忽略一些与 OpenGL 相关的错误；除非您知道自己在做什么，否则不要同时启用两个 Patch
OPENGL_PATCH_B_NAME=OpenGL Patch B
OPENGL_PATCH_B_HINT=忽略一些与 OpenGL 相关的错误；除非您知道自己在做什么，否则不要同时启用两个 Patch
PREVENT_DATA_DELETION_NAME=游戏数据保护
PREVENT_DATA_DELETION_HINT=避免游戏自动删除数据
COMMAND_LINE_NAME=启动设定:
source-code/source/plugins/Launcher/framework.h
+43 -48
View File
@@ -198,37 +198,65 @@ ConfigOptionBase* graphicsArray[] = {
};
ConfigOptionBase* optionsArray[] = {
new OptionMetaSectionLabel(L"SECTION_LOADER"),
new BooleanOption(L"builtin_patches", GLOBAL_SECTION, CONFIG_FILE, L"BUILTIN_PATCHES_NAME", L"BUILTIN_PATCHES_HINT", true, false),
new BooleanOption(L"custom_patches", GLOBAL_SECTION, CONFIG_FILE, L"CUSTOM_PATCHES_NAME", L"CUSTOM_PATCHES_HINT", true, false),
new BooleanOption(L"builtin_render", GLOBAL_SECTION, CONFIG_FILE, L"BUILTIN_RENDER_NAME", L"BUILTIN_RENDER_HINT", true, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_COMPATIBILITY"),
new BooleanOption(L"no_movies", PATCHES_SECTION, CONFIG_FILE, L"NO_MOVIES_NAME", L"NO_MOVIES_HINT", false, false),
new BooleanOption(L"cursor", PATCHES_SECTION, CONFIG_FILE, L"CURSOR_NAME", L"CURSOR_HINT", true, false),
new BooleanOption(L"stereo", PATCHES_SECTION, CONFIG_FILE, L"STEREO_NAME", L"STEREO_HINT", true, false),
new BooleanOption(L"prevent_data_deletion", PATCHES_SECTION, CONFIG_FILE, L"PREVENT_DATA_DELETION_NAME", L"PREVENT_DATA_DELETION_HINT", false, false),
new BooleanOption(L"no_opd", PATCHES_SECTION, CONFIG_FILE, L"NO_OPD_NAME", L"NO_OPD_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_FRAMERATE"),
new BooleanOption(L"FPS.Limit.LightMode", GRAPHICS_SECTION, CONFIG_FILE, L"FPS.LIMIT.LIGHTMODE_NAME", L"FPS.LIMIT.LIGHTMODE_HINT", true, false),
new NumericOption(L"FPS.Limit", GRAPHICS_SECTION, CONFIG_FILE, L"FPS.LIMIT_NAME", L"FPS.LIMIT_HINT", 60, -1, INT_MAX),
new NumericOption(L"frm.motion.rate", GRAPHICS_SECTION, CONFIG_FILE, L"FRM.MOTION.RATE_NAME", L"FRM.MOTION.RATE_HINT", 300, 1, INT_MAX),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_CONTROLLER_OPTIONS"),
new BooleanOption(L"rumble", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"RUMBLE_NAME", L"RUMBLE_HINT", true, true),
new NumericOption(L"xinput_rumble_intensity_left", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"XINPUT_RUMBLE_INTENSITY_LEFT_NAME", L"XINPUT_RUMBLE_INTENSITY_LEFT_HINT", 8000, 0, USHRT_MAX),
new NumericOption(L"xinput_rumble_intensity_right", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"XINPUT_RUMBLE_INTENSITY_RIGHT_NAME", L"XINPUT_RUMBLE_INTENSITY_RIGHT_HINT", 4000, 0, USHRT_MAX),
new NumericOption(L"xinput_preferred", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"XINPUT_PREFERRED_NAME", L"XINPUT_PREFERRED_HINT", 0, 0, 3),
new BooleanOption(L"hardware_slider", PATCHES_SECTION, CONFIG_FILE, L"HARDWARE_SLIDER_NAME", L"HARDWARE_SLIDER_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_LAUNCHER"),
new DropdownOption(L"launcher_language",LAUNCHER_SECTION,CONFIG_FILE, L"LAUNCHER_LANGUAGE_NAME",L"LAUNCHER_LANGUAGE_HINT", 0, languages),
new BooleanOption(L"dark_launcher", LAUNCHER_SECTION, CONFIG_FILE, L"DARK_LAUNCHER_NAME", L"DARK_LAUNCHER_HINT", false, false),
//new BooleanOption(L"acrylic_blur", LAUNCHER_SECTION, CONFIG_FILE, L"ACRYLIC_BLUR_NAME", L"ACRYLIC_BLUR_HINT", false, false),
new BooleanOption(L"no_gpu_dialog", LAUNCHER_SECTION, CONFIG_FILE, L"NO_GPU_DIALOG_NAME", L"NO_GPU_DIALOG_HINT", false, false),
new BooleanOption(L"use_divahook_bat", LAUNCHER_SECTION, CONFIG_FILE, L"USE_DIVAHOOK_BAT_NAME", L"USE_DIVAHOOK_BAT_HINT", false, false),
new StringOption(L"command_line", LAUNCHER_SECTION, CONFIG_FILE, L"COMMAND_LINE_NAME", L"COMMAND_LINE_HINT", L"", false),
};
ConfigOptionBase* options2Array[] = {
new OptionMetaSectionLabel(L"SECTION_PV_SELECTOR"),
new DropdownOption(L"quick_start", PATCHES_SECTION, CONFIG_FILE, L"QUICK_START_NAME", L"QUICK_START_HINT", 1, std::vector<LPCWSTR>({ L"Disabled", L"Guest", L"Guest + Normal" })),
new BooleanOption(L"freeplay", PATCHES_SECTION, CONFIG_FILE, L"FREEPLAY_NAME", L"FREEPLAY_HINT", true, false),
new BooleanOption(L"no_scrolling_sfx", PATCHES_SECTION, CONFIG_FILE, L"NO_SCROLLING_SFX_NAME", L"NO_SCROLLING_SFX_HINT", false, false),
new BooleanOption(L"unlock_pseudo", PATCHES_SECTION, CONFIG_FILE, L"UNLOCK_PSEUDO_NAME", L"UNLOCK_PSEUDO_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_ESM"),
new NumericOption(L"Enhanced_Stage_Manager", PATCHES_SECTION, CONFIG_FILE, L"ENHANCED_STAGE_MANAGER_NAME", L"ENHANCED_STAGE_MANAGER_HINT", 0, 0, INT_MAX),
new BooleanOption(L"Enhanced_Stage_Manager_Encore", PATCHES_SECTION, CONFIG_FILE, L"ENHANCED_STAGE_MANAGER_ENCORE_NAME", L"ENHANCED_STAGE_MANAGER_ENCORE_HINT", true, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new DropdownOption(L"force_mouth", PATCHES_SECTION, CONFIG_FILE, L"FORCE_MOUTH_NAME", L"FORCE_MOUTH_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new DropdownOption(L"force_expressions", PATCHES_SECTION, CONFIG_FILE, L"FORCE_EXPRESSIONS_NAME", L"FORCE_EXPRESSIONS_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new DropdownOption(L"force_look", PATCHES_SECTION, CONFIG_FILE, L"FORCE_LOOK_NAME", L"FORCE_LOOK_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new BooleanOption(L"no_hand_scaling", PATCHES_SECTION, CONFIG_FILE, L"NO_HAND_SCALING_NAME", L"NO_HAND_SCALING_HINT", false, false),
new NumericOption(L"default_hand_size", PATCHES_SECTION, CONFIG_FILE, L"DEFAULT_HAND_SIZE_NAME", L"DEFAULT_HAND_SIZE_HINT", -1, -1, INT_MAX),
new BooleanOption(L"sing_missed", PATCHES_SECTION, CONFIG_FILE, L"SING_MISSED_NAME", L"SING_MISSED_HINT", false, false),
new BooleanOption(L"autopause", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"AUTOPAUSE_NAME", L"AUTOPAUSE_HINT", true, true),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new OptionMetaSectionLabel(L"SECTION_UI_ELM"),
new BooleanOption(L"cursor", PATCHES_SECTION, CONFIG_FILE, L"CURSOR_NAME", L"CURSOR_HINT", true, false),
new BooleanOption(L"hide_volume", PATCHES_SECTION, CONFIG_FILE, L"HIDE_VOLUME_NAME", L"HIDE_VOLUME_HINT", false, false),
new BooleanOption(L"no_pv_ui", PATCHES_SECTION, CONFIG_FILE, L"NO_PV_UI_NAME", L"NO_PV_UI_HINT", false, false),
new BooleanOption(L"hide_pv_watermark", PATCHES_SECTION, CONFIG_FILE, L"HIDE_PV_WATERMARK_NAME", L"HIDE_PV_WATERMARK_HINT", false, false),
@@ -241,52 +269,19 @@ ConfigOptionBase* optionsArray[] = {
new BooleanOption(L"no_timer_sprite", PATCHES_SECTION, CONFIG_FILE, L"NO_TIMER_SPRITE_NAME", L"NO_TIMER_SPRITE_HINT", true, false),
new BooleanOption(L"no_message_bar", PATCHES_SECTION, CONFIG_FILE, L"NO_MESSAGE_BAR_NAME", L"NO_MESSAGE_BAR_HINT", false, false),
new BooleanOption(L"no_stage_text", PATCHES_SECTION, CONFIG_FILE, L"NO_STAGE_TEXT_NAME", L"NO_STAGE_TEXT_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"unlock_pseudo", PATCHES_SECTION, CONFIG_FILE, L"UNLOCK_PSEUDO_NAME", L"UNLOCK_PSEUDO_HINT", false, false),
new BooleanOption(L"card", PATCHES_SECTION, CONFIG_FILE, L"CARD_NAME", L"CARD_HINT", false, false),
new BooleanOption(L"no_opd", PATCHES_SECTION, CONFIG_FILE, L"NO_OPD_NAME", L"NO_OPD_HINT", false, false),
new BooleanOption(L"dwgui_scaling", PATCHES_SECTION, CONFIG_FILE, L"DWGUI_SCALING_NAME", L"DWGUI_SCALING_HINT", false, false),
new BooleanOption(L"freeplay", PATCHES_SECTION, CONFIG_FILE, L"FREEPLAY_NAME", L"FREEPLAY_HINT", true, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"FPS.Limit.LightMode", GRAPHICS_SECTION, CONFIG_FILE, L"FPS.LIMIT.LIGHTMODE_NAME", L"FPS.LIMIT.LIGHTMODE_HINT", true, false),
new NumericOption(L"FPS.Limit", GRAPHICS_SECTION, CONFIG_FILE, L"FPS.LIMIT_NAME", L"FPS.LIMIT_HINT", 60, -1, INT_MAX),
new NumericOption(L"frm.motion.rate", GRAPHICS_SECTION, CONFIG_FILE, L"FRM.MOTION.RATE_NAME", L"FRM.MOTION.RATE_HINT", 300, 1, INT_MAX),
new OptionMetaSectionLabel(L"SECTION_PV_PATCHES"),
new DropdownOption(L"force_mouth", PATCHES_SECTION, CONFIG_FILE, L"FORCE_MOUTH_NAME", L"FORCE_MOUTH_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new DropdownOption(L"force_expressions", PATCHES_SECTION, CONFIG_FILE, L"FORCE_EXPRESSIONS_NAME", L"FORCE_EXPRESSIONS_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new DropdownOption(L"force_look", PATCHES_SECTION, CONFIG_FILE, L"FORCE_LOOK_NAME", L"FORCE_LOOK_HINT", 0, std::vector<LPCWSTR>({ L"Default", L"Force PDA", L"Force FT" })),
new BooleanOption(L"no_hand_scaling", PATCHES_SECTION, CONFIG_FILE, L"NO_HAND_SCALING_NAME", L"NO_HAND_SCALING_HINT", false, false),
new NumericOption(L"default_hand_size", PATCHES_SECTION, CONFIG_FILE, L"DEFAULT_HAND_SIZE_NAME", L"DEFAULT_HAND_SIZE_HINT", -1, -1, INT_MAX),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"autopause", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"AUTOPAUSE_NAME", L"AUTOPAUSE_HINT", true, true),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"rumble", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"RUMBLE_NAME", L"RUMBLE_HINT", true, true),
new NumericOption(L"xinput_preferred", KEYCONFIG_SECTION, KEYCONFIG_FILE, L"XINPUT_PREFERRED_NAME", L"XINPUT_PREFERRED_HINT", 0, 0, 3),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"hardware_slider", PATCHES_SECTION, CONFIG_FILE, L"HARDWARE_SLIDER_NAME", L"HARDWARE_SLIDER_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"opengl_patch_a", LAUNCHER_SECTION, CONFIG_FILE, L"OPENGL_PATCH_A_NAME", L"OPENGL_PATCH_A_HINT", false, false),
new BooleanOption(L"opengl_patch_b", LAUNCHER_SECTION, CONFIG_FILE, L"OPENGL_PATCH_B_NAME", L"OPENGL_PATCH_B_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
//new BooleanOption(L"ignore_exe_checksum", PATCHES_SECTION, CONFIG_FILE, L"IGNORE_EXE_CHECKSUM_NAME", L"IGNORE_EXE_CHECKSUM_HINT", false, false),
new BooleanOption(L"prevent_data_deletion", PATCHES_SECTION, CONFIG_FILE, L"PREVENT_DATA_DELETION_NAME", L"PREVENT_DATA_DELETION_HINT", false, false),
new StringOption(L"command_line", LAUNCHER_SECTION, CONFIG_FILE, L"COMMAND_LINE_NAME", L"COMMAND_LINE_HINT", L"", false),
new BooleanOption(L"use_divahook_bat", LAUNCHER_SECTION, CONFIG_FILE, L"USE_DIVAHOOK_BAT_NAME", L"USE_DIVAHOOK_BAT_HINT", false, false),
new OptionMetaSeparator(),
new OptionMetaSpacer(8),
new BooleanOption(L"dark_launcher", LAUNCHER_SECTION, CONFIG_FILE, L"DARK_LAUNCHER_NAME", L"DARK_LAUNCHER_HINT", false, false),
new DropdownOption(L"launcher_language",LAUNCHER_SECTION,CONFIG_FILE, L"LAUNCHER_LANGUAGE_NAME",L"LAUNCHER_LANGUAGE_HINT", 0, languages),
//new BooleanOption(L"acrylic_blur", LAUNCHER_SECTION, CONFIG_FILE, L"ACRYLIC_BLUR_NAME", L"ACRYLIC_BLUR_HINT", false, false),
new BooleanOption(L"no_gpu_dialog", LAUNCHER_SECTION, CONFIG_FILE, L"NO_GPU_DIALOG_NAME", L"NO_GPU_DIALOG_HINT", false, false),
};
ConfigOptionBase* playerdataArray[] = {
source-code/source/plugins/Launcher/ui.h
+49 -70
View File
@@ -123,6 +123,7 @@ namespace Launcher {
this->panel_Patches->SuspendLayout();
this->panel_Patches2->SuspendLayout();
// populate options (patches) from array in framework
// (easier than manually setting everything up)
@@ -133,6 +134,14 @@ namespace Launcher {
optionsY += option->AddToPanel(panel_Patches, 12, optionsY, toolTip1);
}
int options2Y = 3;
for (ConfigOptionBase* option : options2Array)
{
option->hasChanged = OptionsConfigChanged;
options2Y += option->AddToPanel(panel_Patches2, 12, options2Y, toolTip1);
}
Button^ keycfg_button = gcnew Button();
keycfg_button->Left = 12;
keycfg_button->Top = 3;
@@ -152,7 +161,9 @@ namespace Launcher {
panel_Patches->Controls->Add(keycfg_button);
this->panel_Patches->ResumeLayout(false);
this->panel_Patches2->ResumeLayout(false);
this->panel_Patches->PerformLayout();
this->panel_Patches2->PerformLayout();
@@ -433,8 +444,12 @@ namespace Launcher {
this->tabPage_Plugins->ForeColor = colourFg;
this->tabPage_Components->BackColor = colourBg;
this->tabPage_Components->ForeColor = colourFg;
this->tabPage_Modpacks->BackColor = colourBg;
this->tabPage_Modpacks->ForeColor = colourFg;
this->creditsTextBox->BackColor = colourBg;
this->creditsTextBox->ForeColor = colourFg;
this->tabPage_Update->BackColor = colourBg;
this->tabPage_Update->ForeColor = colourFg;
this->tabControl->BackColor = colourBg;
this->tabControl->ForeColor = colourFg;
@@ -558,6 +573,7 @@ private: System::Windows::Forms::Button^ button_ModFiles;
private: System::Windows::Forms::Button^ button_ModRescan;
private: System::Windows::Forms::Button^ button_ModRename;
private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
private: System::Windows::Forms::Panel^ panel_Patches2;
@@ -646,6 +662,7 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
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();
@@ -665,29 +682,26 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
// button_Launch
//
resources->ApplyResources(this->button_Launch, L"button_Launch");
this->button_Launch->BackColor = System::Drawing::Color::White;
this->button_Launch->FlatAppearance->BorderColor = System::Drawing::SystemColors::Control;
resources->ApplyResources(this->button_Launch, L"button_Launch");
this->button_Launch->Name = L"button_Launch";
this->toolTip1->SetToolTip(this->button_Launch, resources->GetString(L"button_Launch.ToolTip"));
this->button_Launch->UseVisualStyleBackColor = false;
this->button_Launch->Click += gcnew System::EventHandler(this, &ui::Button_Launch_Click);
//
// groupBox_ScreenRes
//
resources->ApplyResources(this->groupBox_ScreenRes, L"groupBox_ScreenRes");
this->groupBox_ScreenRes->Controls->Add(this->panel_ScreenRes);
this->groupBox_ScreenRes->FlatStyle = System::Windows::Forms::FlatStyle::Flat;
resources->ApplyResources(this->groupBox_ScreenRes, L"groupBox_ScreenRes");
this->groupBox_ScreenRes->Name = L"groupBox_ScreenRes";
this->groupBox_ScreenRes->TabStop = false;
this->toolTip1->SetToolTip(this->groupBox_ScreenRes, resources->GetString(L"groupBox_ScreenRes.ToolTip"));
//
// panel_ScreenRes
//
resources->ApplyResources(this->panel_ScreenRes, L"panel_ScreenRes");
this->panel_ScreenRes->Controls->Add(this->checkBox_nofsopt);
this->panel_ScreenRes->Name = L"panel_ScreenRes";
this->toolTip1->SetToolTip(this->panel_ScreenRes, resources->GetString(L"panel_ScreenRes.ToolTip"));
//
// checkBox_nofsopt
//
@@ -698,7 +712,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
// tabControl
//
resources->ApplyResources(this->tabControl, L"tabControl");
this->tabControl->Controls->Add(this->tabPage_Resolution);
this->tabControl->Controls->Add(this->tabPage_Patches);
this->tabControl->Controls->Add(this->tabPage_Playerdata);
@@ -707,14 +720,14 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->tabControl->Controls->Add(this->tabPage_Modpacks);
this->tabControl->Controls->Add(this->tabPage_Credits);
this->tabControl->Controls->Add(this->tabPage_Update);
resources->ApplyResources(this->tabControl, L"tabControl");
this->tabControl->Name = L"tabControl";
this->tabControl->SelectedIndex = 0;
this->toolTip1->SetToolTip(this->tabControl, resources->GetString(L"tabControl.ToolTip"));
//
// tabPage_Resolution
//
resources->ApplyResources(this->tabPage_Resolution, L"tabPage_Resolution");
this->tabPage_Resolution->BackColor = System::Drawing::Color::White;
resources->ApplyResources(this->tabPage_Resolution, L"tabPage_Resolution");
this->tabPage_Resolution->Controls->Add(this->groupBox_Lag);
this->tabPage_Resolution->Controls->Add(this->groupBox_Details);
this->tabPage_Resolution->Controls->Add(this->labelGPU);
@@ -723,41 +736,36 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->tabPage_Resolution->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)));
this->tabPage_Resolution->Name = L"tabPage_Resolution";
this->toolTip1->SetToolTip(this->tabPage_Resolution, resources->GetString(L"tabPage_Resolution.ToolTip"));
//
// groupBox_Lag
//
resources->ApplyResources(this->groupBox_Lag, L"groupBox_Lag");
this->groupBox_Lag->Controls->Add(this->trackBar_LagCompensation);
this->groupBox_Lag->FlatStyle = System::Windows::Forms::FlatStyle::Flat;
resources->ApplyResources(this->groupBox_Lag, L"groupBox_Lag");
this->groupBox_Lag->Name = L"groupBox_Lag";
this->groupBox_Lag->TabStop = false;
this->toolTip1->SetToolTip(this->groupBox_Lag, resources->GetString(L"groupBox_Lag.ToolTip"));
//
// trackBar_LagCompensation
//
resources->ApplyResources(this->trackBar_LagCompensation, L"trackBar_LagCompensation");
this->trackBar_LagCompensation->LargeChange = 1;
resources->ApplyResources(this->trackBar_LagCompensation, L"trackBar_LagCompensation");
this->trackBar_LagCompensation->Maximum = 500;
this->trackBar_LagCompensation->Name = L"trackBar_LagCompensation";
this->trackBar_LagCompensation->TickStyle = System::Windows::Forms::TickStyle::None;
this->toolTip1->SetToolTip(this->trackBar_LagCompensation, resources->GetString(L"trackBar_LagCompensation.ToolTip"));
this->trackBar_LagCompensation->ValueChanged += gcnew System::EventHandler(this, &ui::trackBar_LagCompensation_ValueChanged);
//
// groupBox_Details
//
resources->ApplyResources(this->groupBox_Details, L"groupBox_Details");
this->groupBox_Details->Controls->Add(this->panel_Details);
this->groupBox_Details->FlatStyle = System::Windows::Forms::FlatStyle::Flat;
resources->ApplyResources(this->groupBox_Details, L"groupBox_Details");
this->groupBox_Details->Name = L"groupBox_Details";
this->groupBox_Details->TabStop = false;
this->toolTip1->SetToolTip(this->groupBox_Details, resources->GetString(L"groupBox_Details.ToolTip"));
//
// panel_Details
//
resources->ApplyResources(this->panel_Details, L"panel_Details");
this->panel_Details->Name = L"panel_Details";
this->toolTip1->SetToolTip(this->panel_Details, resources->GetString(L"panel_Details.ToolTip"));
//
// labelGPU
//
@@ -765,106 +773,93 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->labelGPU->BackColor = System::Drawing::Color::Transparent;
this->labelGPU->ForeColor = System::Drawing::Color::Black;
this->labelGPU->Name = L"labelGPU";
this->toolTip1->SetToolTip(this->labelGPU, resources->GetString(L"labelGPU.ToolTip"));
//
// groupBox_InternalRes
//
resources->ApplyResources(this->groupBox_InternalRes, L"groupBox_InternalRes");
this->groupBox_InternalRes->Controls->Add(this->panel_IntRes);
this->groupBox_InternalRes->FlatStyle = System::Windows::Forms::FlatStyle::Flat;
resources->ApplyResources(this->groupBox_InternalRes, L"groupBox_InternalRes");
this->groupBox_InternalRes->Name = L"groupBox_InternalRes";
this->groupBox_InternalRes->TabStop = false;
this->toolTip1->SetToolTip(this->groupBox_InternalRes, resources->GetString(L"groupBox_InternalRes.ToolTip"));
//
// panel_IntRes
//
resources->ApplyResources(this->panel_IntRes, L"panel_IntRes");
this->panel_IntRes->Name = L"panel_IntRes";
this->toolTip1->SetToolTip(this->panel_IntRes, resources->GetString(L"panel_IntRes.ToolTip"));
//
// tabPage_Patches
//
resources->ApplyResources(this->tabPage_Patches, L"tabPage_Patches");
this->tabPage_Patches->BackColor = System::Drawing::Color::White;
this->tabPage_Patches->Controls->Add(this->panel_Patches2);
this->tabPage_Patches->Controls->Add(this->panel_Patches);
this->tabPage_Patches->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)));
resources->ApplyResources(this->tabPage_Patches, L"tabPage_Patches");
this->tabPage_Patches->Name = L"tabPage_Patches";
this->toolTip1->SetToolTip(this->tabPage_Patches, resources->GetString(L"tabPage_Patches.ToolTip"));
//
// panel_Patches
//
resources->ApplyResources(this->panel_Patches, L"panel_Patches");
this->panel_Patches->Name = L"panel_Patches";
this->toolTip1->SetToolTip(this->panel_Patches, resources->GetString(L"panel_Patches.ToolTip"));
//
// tabPage_Playerdata
//
resources->ApplyResources(this->tabPage_Playerdata, L"tabPage_Playerdata");
this->tabPage_Playerdata->BackColor = System::Drawing::Color::White;
this->tabPage_Playerdata->Controls->Add(this->panel_Playerdata);
this->tabPage_Playerdata->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)));
resources->ApplyResources(this->tabPage_Playerdata, L"tabPage_Playerdata");
this->tabPage_Playerdata->Name = L"tabPage_Playerdata";
this->toolTip1->SetToolTip(this->tabPage_Playerdata, resources->GetString(L"tabPage_Playerdata.ToolTip"));
//
// panel_Playerdata
//
resources->ApplyResources(this->panel_Playerdata, L"panel_Playerdata");
this->panel_Playerdata->Name = L"panel_Playerdata";
this->toolTip1->SetToolTip(this->panel_Playerdata, resources->GetString(L"panel_Playerdata.ToolTip"));
//
// tabPage_Components
//
resources->ApplyResources(this->tabPage_Components, L"tabPage_Components");
this->tabPage_Components->BackColor = System::Drawing::Color::White;
this->tabPage_Components->Controls->Add(this->linkLabel_Console);
this->tabPage_Components->Controls->Add(this->panel_Components);
this->tabPage_Components->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)));
resources->ApplyResources(this->tabPage_Components, L"tabPage_Components");
this->tabPage_Components->Name = L"tabPage_Components";
this->toolTip1->SetToolTip(this->tabPage_Components, resources->GetString(L"tabPage_Components.ToolTip"));
//
// linkLabel_Console
//
resources->ApplyResources(this->linkLabel_Console, L"linkLabel_Console");
this->linkLabel_Console->Name = L"linkLabel_Console";
this->linkLabel_Console->TabStop = true;
this->toolTip1->SetToolTip(this->linkLabel_Console, resources->GetString(L"linkLabel_Console.ToolTip"));
this->linkLabel_Console->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Console_LinkClicked);
//
// panel_Components
//
resources->ApplyResources(this->panel_Components, L"panel_Components");
this->panel_Components->Name = L"panel_Components";
this->toolTip1->SetToolTip(this->panel_Components, resources->GetString(L"panel_Components.ToolTip"));
//
// tabPage_Plugins
//
resources->ApplyResources(this->tabPage_Plugins, L"tabPage_Plugins");
this->tabPage_Plugins->BackColor = System::Drawing::Color::White;
this->tabPage_Plugins->Controls->Add(this->panel_Custom);
this->tabPage_Plugins->Controls->Add(this->panel_Plugins);
this->tabPage_Plugins->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)));
resources->ApplyResources(this->tabPage_Plugins, L"tabPage_Plugins");
this->tabPage_Plugins->Name = L"tabPage_Plugins";
this->toolTip1->SetToolTip(this->tabPage_Plugins, resources->GetString(L"tabPage_Plugins.ToolTip"));
//
// panel_Custom
//
resources->ApplyResources(this->panel_Custom, L"panel_Custom");
this->panel_Custom->Name = L"panel_Custom";
this->toolTip1->SetToolTip(this->panel_Custom, resources->GetString(L"panel_Custom.ToolTip"));
//
// panel_Plugins
//
resources->ApplyResources(this->panel_Plugins, L"panel_Plugins");
this->panel_Plugins->Name = L"panel_Plugins";
this->toolTip1->SetToolTip(this->panel_Plugins, resources->GetString(L"panel_Plugins.ToolTip"));
//
// tabPage_Modpacks
//
resources->ApplyResources(this->tabPage_Modpacks, L"tabPage_Modpacks");
this->tabPage_Modpacks->Controls->Add(this->button_ModRename);
this->tabPage_Modpacks->Controls->Add(this->button_ModRescan);
this->tabPage_Modpacks->Controls->Add(this->button_ModFiles);
@@ -873,8 +868,8 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->tabPage_Modpacks->Controls->Add(this->button_ModClone);
this->tabPage_Modpacks->Controls->Add(this->button_ModSetActive);
this->tabPage_Modpacks->Controls->Add(this->listBox_Mods);
resources->ApplyResources(this->tabPage_Modpacks, L"tabPage_Modpacks");
this->tabPage_Modpacks->Name = L"tabPage_Modpacks";
this->toolTip1->SetToolTip(this->tabPage_Modpacks, resources->GetString(L"tabPage_Modpacks.ToolTip"));
this->tabPage_Modpacks->UseVisualStyleBackColor = true;
this->tabPage_Modpacks->Enter += gcnew System::EventHandler(this, &ui::tabPage_Modpacks_Enter);
//
@@ -882,7 +877,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_ModRename, L"button_ModRename");
this->button_ModRename->Name = L"button_ModRename";
this->toolTip1->SetToolTip(this->button_ModRename, resources->GetString(L"button_ModRename.ToolTip"));
this->button_ModRename->UseVisualStyleBackColor = true;
this->button_ModRename->Click += gcnew System::EventHandler(this, &ui::button_ModRename_Click);
//
@@ -890,7 +884,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_ModRescan, L"button_ModRescan");
this->button_ModRescan->Name = L"button_ModRescan";
this->toolTip1->SetToolTip(this->button_ModRescan, resources->GetString(L"button_ModRescan.ToolTip"));
this->button_ModRescan->UseVisualStyleBackColor = true;
this->button_ModRescan->Click += gcnew System::EventHandler(this, &ui::button_ModRescan_Click);
//
@@ -898,7 +891,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_ModFiles, L"button_ModFiles");
this->button_ModFiles->Name = L"button_ModFiles";
this->toolTip1->SetToolTip(this->button_ModFiles, resources->GetString(L"button_ModFiles.ToolTip"));
this->button_ModFiles->UseVisualStyleBackColor = true;
this->button_ModFiles->Click += gcnew System::EventHandler(this, &ui::button_ModFiles_Click);
//
@@ -908,14 +900,12 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->checkBox_ModPatches->Checked = true;
this->checkBox_ModPatches->CheckState = System::Windows::Forms::CheckState::Checked;
this->checkBox_ModPatches->Name = L"checkBox_ModPatches";
this->toolTip1->SetToolTip(this->checkBox_ModPatches, resources->GetString(L"checkBox_ModPatches.ToolTip"));
this->checkBox_ModPatches->UseVisualStyleBackColor = true;
//
// button_ModDelete
//
resources->ApplyResources(this->button_ModDelete, L"button_ModDelete");
this->button_ModDelete->Name = L"button_ModDelete";
this->toolTip1->SetToolTip(this->button_ModDelete, resources->GetString(L"button_ModDelete.ToolTip"));
this->button_ModDelete->UseVisualStyleBackColor = true;
this->button_ModDelete->Click += gcnew System::EventHandler(this, &ui::button_ModDelete_Click);
//
@@ -923,7 +913,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_ModClone, L"button_ModClone");
this->button_ModClone->Name = L"button_ModClone";
this->toolTip1->SetToolTip(this->button_ModClone, resources->GetString(L"button_ModClone.ToolTip"));
this->button_ModClone->UseVisualStyleBackColor = true;
this->button_ModClone->Click += gcnew System::EventHandler(this, &ui::button_ModClone_Click);
//
@@ -931,39 +920,34 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_ModSetActive, L"button_ModSetActive");
this->button_ModSetActive->Name = L"button_ModSetActive";
this->toolTip1->SetToolTip(this->button_ModSetActive, resources->GetString(L"button_ModSetActive.ToolTip"));
this->button_ModSetActive->UseVisualStyleBackColor = true;
this->button_ModSetActive->Click += gcnew System::EventHandler(this, &ui::button_ModSetActive_Click);
//
// listBox_Mods
//
resources->ApplyResources(this->listBox_Mods, L"listBox_Mods");
this->listBox_Mods->FormattingEnabled = true;
resources->ApplyResources(this->listBox_Mods, L"listBox_Mods");
this->listBox_Mods->Name = L"listBox_Mods";
this->toolTip1->SetToolTip(this->listBox_Mods, resources->GetString(L"listBox_Mods.ToolTip"));
this->listBox_Mods->SelectedValueChanged += gcnew System::EventHandler(this, &ui::listBox_Mods_SelectedValueChanged);
//
// tabPage_Credits
//
resources->ApplyResources(this->tabPage_Credits, L"tabPage_Credits");
this->tabPage_Credits->Controls->Add(this->creditsTextBox);
resources->ApplyResources(this->tabPage_Credits, L"tabPage_Credits");
this->tabPage_Credits->Name = L"tabPage_Credits";
this->toolTip1->SetToolTip(this->tabPage_Credits, resources->GetString(L"tabPage_Credits.ToolTip"));
this->tabPage_Credits->UseVisualStyleBackColor = true;
//
// creditsTextBox
//
resources->ApplyResources(this->creditsTextBox, L"creditsTextBox");
this->creditsTextBox->BackColor = System::Drawing::Color::White;
this->creditsTextBox->ForeColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(64)), static_cast<System::Int32>(static_cast<System::Byte>(64)),
static_cast<System::Int32>(static_cast<System::Byte>(64)));
resources->ApplyResources(this->creditsTextBox, L"creditsTextBox");
this->creditsTextBox->Name = L"creditsTextBox";
this->creditsTextBox->ReadOnly = true;
this->toolTip1->SetToolTip(this->creditsTextBox, resources->GetString(L"creditsTextBox.ToolTip"));
//
// tabPage_Update
//
resources->ApplyResources(this->tabPage_Update, L"tabPage_Update");
this->tabPage_Update->Controls->Add(this->linkLabel_Repo);
this->tabPage_Update->Controls->Add(this->linkLabel_Help);
this->tabPage_Update->Controls->Add(this->linkLabel_Official_Discord);
@@ -974,8 +958,8 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->tabPage_Update->Controls->Add(this->button_Releases_page);
this->tabPage_Update->Controls->Add(this->label_Update_2);
this->tabPage_Update->Controls->Add(this->label_Update_1);
resources->ApplyResources(this->tabPage_Update, L"tabPage_Update");
this->tabPage_Update->Name = L"tabPage_Update";
this->toolTip1->SetToolTip(this->tabPage_Update, resources->GetString(L"tabPage_Update.ToolTip"));
this->tabPage_Update->UseVisualStyleBackColor = true;
//
// linkLabel_Repo
@@ -983,7 +967,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
resources->ApplyResources(this->linkLabel_Repo, L"linkLabel_Repo");
this->linkLabel_Repo->Name = L"linkLabel_Repo";
this->linkLabel_Repo->TabStop = true;
this->toolTip1->SetToolTip(this->linkLabel_Repo, resources->GetString(L"linkLabel_Repo.ToolTip"));
this->linkLabel_Repo->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Repo_LinkClicked);
//
// linkLabel_Help
@@ -991,7 +974,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
resources->ApplyResources(this->linkLabel_Help, L"linkLabel_Help");
this->linkLabel_Help->Name = L"linkLabel_Help";
this->linkLabel_Help->TabStop = true;
this->toolTip1->SetToolTip(this->linkLabel_Help, resources->GetString(L"linkLabel_Help.ToolTip"));
this->linkLabel_Help->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Help_LinkClicked);
//
// linkLabel_Official_Discord
@@ -999,7 +981,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
resources->ApplyResources(this->linkLabel_Official_Discord, L"linkLabel_Official_Discord");
this->linkLabel_Official_Discord->Name = L"linkLabel_Official_Discord";
this->linkLabel_Official_Discord->TabStop = true;
this->toolTip1->SetToolTip(this->linkLabel_Official_Discord, resources->GetString(L"linkLabel_Official_Discord.ToolTip"));
this->linkLabel_Official_Discord->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Official_Discord_LinkClicked);
//
// linkLabel_Changelog
@@ -1007,14 +988,12 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
resources->ApplyResources(this->linkLabel_Changelog, L"linkLabel_Changelog");
this->linkLabel_Changelog->Name = L"linkLabel_Changelog";
this->linkLabel_Changelog->TabStop = true;
this->toolTip1->SetToolTip(this->linkLabel_Changelog, resources->GetString(L"linkLabel_Changelog.ToolTip"));
this->linkLabel_Changelog->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Changelog_LinkClicked);
//
// button_Clean_installation
//
resources->ApplyResources(this->button_Clean_installation, L"button_Clean_installation");
this->button_Clean_installation->Name = L"button_Clean_installation";
this->toolTip1->SetToolTip(this->button_Clean_installation, resources->GetString(L"button_Clean_installation.ToolTip"));
this->button_Clean_installation->UseVisualStyleBackColor = true;
this->button_Clean_installation->Click += gcnew System::EventHandler(this, &ui::button_Clean_installation_Click);
//
@@ -1022,7 +1001,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_Instructions, L"button_Instructions");
this->button_Instructions->Name = L"button_Instructions";
this->toolTip1->SetToolTip(this->button_Instructions, resources->GetString(L"button_Instructions.ToolTip"));
this->button_Instructions->UseVisualStyleBackColor = true;
this->button_Instructions->Click += gcnew System::EventHandler(this, &ui::button_Instructions_Click);
//
@@ -1030,7 +1008,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_Unstable_builds, L"button_Unstable_builds");
this->button_Unstable_builds->Name = L"button_Unstable_builds";
this->toolTip1->SetToolTip(this->button_Unstable_builds, resources->GetString(L"button_Unstable_builds.ToolTip"));
this->button_Unstable_builds->UseVisualStyleBackColor = true;
this->button_Unstable_builds->Click += gcnew System::EventHandler(this, &ui::button_Unstable_builds_Click);
//
@@ -1038,7 +1015,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->button_Releases_page, L"button_Releases_page");
this->button_Releases_page->Name = L"button_Releases_page";
this->toolTip1->SetToolTip(this->button_Releases_page, resources->GetString(L"button_Releases_page.ToolTip"));
this->button_Releases_page->UseVisualStyleBackColor = true;
this->button_Releases_page->Click += gcnew System::EventHandler(this, &ui::button_Releases_page_Click);
//
@@ -1046,60 +1022,59 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
//
resources->ApplyResources(this->label_Update_2, L"label_Update_2");
this->label_Update_2->Name = L"label_Update_2";
this->toolTip1->SetToolTip(this->label_Update_2, resources->GetString(L"label_Update_2.ToolTip"));
//
// label_Update_1
//
resources->ApplyResources(this->label_Update_1, L"label_Update_1");
this->label_Update_1->Name = L"label_Update_1";
this->toolTip1->SetToolTip(this->label_Update_1, resources->GetString(L"label_Update_1.ToolTip"));
//
// button_Discord
//
resources->ApplyResources(this->button_Discord, L"button_Discord");
this->button_Discord->BackColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(242)), static_cast<System::Int32>(static_cast<System::Byte>(242)),
static_cast<System::Int32>(static_cast<System::Byte>(242)));
this->button_Discord->Cursor = System::Windows::Forms::Cursors::Hand;
this->button_Discord->FlatAppearance->BorderSize = 0;
resources->ApplyResources(this->button_Discord, L"button_Discord");
this->button_Discord->Name = L"button_Discord";
this->toolTip1->SetToolTip(this->button_Discord, resources->GetString(L"button_Discord.ToolTip"));
this->button_Discord->UseVisualStyleBackColor = false;
this->button_Discord->Click += gcnew System::EventHandler(this, &ui::button_Discord_Click);
//
// button_github
//
resources->ApplyResources(this->button_github, L"button_github");
this->button_github->BackColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(242)), static_cast<System::Int32>(static_cast<System::Byte>(242)),
static_cast<System::Int32>(static_cast<System::Byte>(242)));
this->button_github->Cursor = System::Windows::Forms::Cursors::Hand;
this->button_github->FlatAppearance->BorderSize = 0;
resources->ApplyResources(this->button_github, L"button_github");
this->button_github->Name = L"button_github";
this->toolTip1->SetToolTip(this->button_github, resources->GetString(L"button_github.ToolTip"));
this->button_github->UseVisualStyleBackColor = false;
this->button_github->Click += gcnew System::EventHandler(this, &ui::button_github_Click);
//
// button_Apply
//
resources->ApplyResources(this->button_Apply, L"button_Apply");
this->button_Apply->BackColor = System::Drawing::Color::White;
this->button_Apply->FlatAppearance->BorderColor = System::Drawing::SystemColors::Control;
resources->ApplyResources(this->button_Apply, L"button_Apply");
this->button_Apply->Name = L"button_Apply";
this->toolTip1->SetToolTip(this->button_Apply, resources->GetString(L"button_Apply.ToolTip"));
this->button_Apply->UseVisualStyleBackColor = false;
this->button_Apply->Click += gcnew System::EventHandler(this, &ui::button_Apply_Click);
//
// button_Wiki
//
resources->ApplyResources(this->button_Wiki, L"button_Wiki");
this->button_Wiki->BackColor = System::Drawing::Color::FromArgb(static_cast<System::Int32>(static_cast<System::Byte>(242)), static_cast<System::Int32>(static_cast<System::Byte>(242)),
static_cast<System::Int32>(static_cast<System::Byte>(242)));
resources->ApplyResources(this->button_Wiki, L"button_Wiki");
this->button_Wiki->Cursor = System::Windows::Forms::Cursors::Hand;
this->button_Wiki->FlatAppearance->BorderSize = 0;
this->button_Wiki->Name = L"button_Wiki";
this->toolTip1->SetToolTip(this->button_Wiki, resources->GetString(L"button_Wiki.ToolTip"));
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;
@@ -1120,7 +1095,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Console;
this->KeyPreview = true;
this->MaximizeBox = false;
this->Name = L"ui";
this->toolTip1->SetToolTip(this, resources->GetString(L"$this.ToolTip"));
this->TransparencyKey = System::Drawing::Color::Magenta;
this->FormClosing += gcnew System::Windows::Forms::FormClosingEventHandler(this, &ui::Ui_FormClosing);
this->FormClosed += gcnew System::Windows::Forms::FormClosedEventHandler(this, &ui::Ui_FormClosed);
@@ -1198,6 +1172,11 @@ private: System::Void SaveSettings() {
option->SaveOption();
}
for (ConfigOptionBase* option : options2Array)
{
option->SaveOption();
}
for (ConfigOptionBase* option : graphicsArray)
{
option->SaveOption();
source-code/source/plugins/Launcher/ui.resx
+612 -391
View File
File diff suppressed because it is too large Load Diff
source-code/source/plugins/TLAC/FileSystem/ConfigFile.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ namespace TLAC::FileSystem
return found;
}
int ConfigFile::GetIntegerValue(const std::string& key)
int ConfigFile::GetIntegerValue(const std::string& key, int defaultval)
{
auto pair = ConfigMap.find(key);
bool found = pair != ConfigMap.end();
return found ? atoi(pair->second.c_str()) : 0;
return found ? atoi(pair->second.c_str()) : defaultval;
}
bool ConfigFile::GetBooleanValue(const std::string& key)
source-code/source/plugins/TLAC/FileSystem/ConfigFile.h
+1 -1
View File
@@ -14,7 +14,7 @@ namespace TLAC::FileSystem
std::unordered_map<std::string, std::string> ConfigMap;
bool TryGetValue(const std::string &key, std::string **value);
int GetIntegerValue(const std::string& key);
int GetIntegerValue(const std::string& key, int defaultval = 0);
bool GetBooleanValue(const std::string& key);
float GetFloatValue(const std::string& key);
std::string GetStringValue(const std::string& key);
source-code/source/plugins/TLAC/Input/Xinput/Xinput.cpp
+4 -2
View File
@@ -16,6 +16,8 @@ namespace TLAC::Input
config.OpenRead();
xinput_num = config.GetIntegerValue("xinput_preferred");
rumble = config.GetBooleanValue("rumble");
rumble_left = config.GetIntegerValue("xinput_rumble_intensity_left", 8000);
rumble_right = config.GetIntegerValue("xinput_rumble_intensity_right", 4000);
}
Xinput* Xinput::GetInstance()
@@ -256,8 +258,8 @@ namespace TLAC::Input
{
XINPUT_VIBRATION vibration;
ZeroMemory(&vibration, sizeof(XINPUT_VIBRATION));
vibration.wLeftMotorSpeed = 8000; // use any value between 0-65535 here
vibration.wRightMotorSpeed = 4000; // use any value between 0-65535 here
vibration.wLeftMotorSpeed = rumble_left; // use any value between 0-65535 here
vibration.wRightMotorSpeed = rumble_right; // use any value between 0-65535 here
XInputSetState(xc_pref, &vibration);
}
else
source-code/source/plugins/TLAC/Input/Xinput/Xinput.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace TLAC::Input
void SetTapStates(BYTE keycode, float elapsed);
int xinput_num;
int xinput_num, rumble_left, rumble_right;
bool rumble;
};
}