From 80b6a6decf60dca2b65a611b4b52cd3aaa26251c Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 21 Jan 2023 20:35:56 -0500 Subject: [PATCH] Undo e47b7e6a223a4fbc666e04138f9b93aefe2b1002 I forgot that each program already has a separate settings file. Duh! --- src/pcedit/pc.main.cpp | 20 ++++++++++---------- src/scenedit/scen.main.cpp | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp index 1415a5f3..56fa7501 100644 --- a/src/pcedit/pc.main.cpp +++ b/src/pcedit/pc.main.cpp @@ -145,7 +145,7 @@ sf::FloatRect compute_viewport(const sf::RenderWindow& mainPtr, float ui_scale) void adjust_window (sf::RenderWindow& mainPtr, sf::View& mainView) { - double ui_scale = get_float_pref("UIScaleCharEd", 1.0); + double ui_scale = get_float_pref("UIScale", 1.0); int const width = ui_scale * 590; int const height = ui_scale * 440 @@ -516,12 +516,12 @@ bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) { if(!did_cancel) { std::string scale = dynamic_cast(me["scaleui"]).getSelected(); - if(scale == "1") set_pref("UIScaleCharEd", 1.0); - else if(scale == "1_5") set_pref("UIScaleCharEd", 1.5); - else if(scale == "2") set_pref("UIScaleCharEd", 2.0); - else if(scale == "3") set_pref("UIScaleCharEd", 3.0); - else if(scale == "4") set_pref("UIScaleCharEd", 4.0); - set_pref("PlaySoundsCharEd", dynamic_cast(me["nosound"]).getState() == led_off); + if(scale == "1") set_pref("UIScale", 1.0); + else if(scale == "1_5") set_pref("UIScale", 1.5); + else if(scale == "2") set_pref("UIScale", 2.0); + else if(scale == "3") set_pref("UIScale", 3.0); + else if(scale == "4") set_pref("UIScale", 4.0); + set_pref("PlaySounds", dynamic_cast(me["nosound"]).getState() == led_off); } save_prefs(); return true; @@ -534,7 +534,7 @@ void pick_preferences() { prefsDlog.attachClickHandlers(&prefs_event_filter, {"okay", "cancel"}); cLedGroup& uiScale = dynamic_cast(prefsDlog["scaleui"]); - double ui_scale = get_float_pref("UIScaleCharEd", 1.0); + double ui_scale = get_float_pref("UIScale", 1.0); if (ui_scale>0.95 && ui_scale<1.05) uiScale.setSelected("1"); else if (ui_scale>1.45 && ui_scale<1.55) uiScale.setSelected("1_5"); else if (ui_scale>1.95 && ui_scale<2.05) uiScale.setSelected("2"); @@ -555,11 +555,11 @@ void pick_preferences() { uiScale["other"].hide(); } - dynamic_cast(prefsDlog["nosound"]).setState(get_bool_pref("PlaySoundsCharEd", true) ? led_off : led_red); + dynamic_cast(prefsDlog["nosound"]).setState(get_bool_pref("PlaySounds", true) ? led_off : led_red); prefsDlog.run(); - if(get_float_pref("UIScaleCharEd") != ui_scale) + if(get_float_pref("UIScale") != ui_scale) changed_display_mode = true; } diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index f584736f..bb8f1b4d 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -166,7 +166,7 @@ void adjust_windows (sf::RenderWindow & mainPtr, sf::View & mainView) { // TODO: things might still be broken when upscaled. // translate_mouse_coordinates has been applied in some places but more work might be needed. // In particular, the white area on the right side of the main menu needs fixing. - double ui_scale = get_float_pref("UIScaleScenEd", 1.0); + double ui_scale = get_float_pref("UIScale", 1.0); const int width = ui_scale * 584; const int height = ui_scale * 420 @@ -677,12 +677,12 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) { if(!did_cancel) { std::string scale = dynamic_cast(me["scaleui"]).getSelected(); - if(scale == "1") set_pref("UIScaleScenEd", 1.0); - else if(scale == "1_5") set_pref("UIScaleScenEd", 1.5); - else if(scale == "2") set_pref("UIScaleScenEd", 2.0); - else if(scale == "3") set_pref("UIScaleScenEd", 3.0); - else if(scale == "4") set_pref("UIScaleScenEd", 4.0); - set_pref("PlaySoundsScenEd", dynamic_cast(me["nosound"]).getState() == led_off); + if(scale == "1") set_pref("UIScale", 1.0); + else if(scale == "1_5") set_pref("UIScale", 1.5); + else if(scale == "2") set_pref("UIScale", 2.0); + else if(scale == "3") set_pref("UIScale", 3.0); + else if(scale == "4") set_pref("UIScale", 4.0); + set_pref("PlaySounds", dynamic_cast(me["nosound"]).getState() == led_off); } save_prefs(); return true; @@ -695,7 +695,7 @@ void pick_preferences() { prefsDlog.attachClickHandlers(&prefs_event_filter, {"okay", "cancel"}); cLedGroup& uiScale = dynamic_cast(prefsDlog["scaleui"]); - double ui_scale = get_float_pref("UIScaleScenEd", 1.0); + double ui_scale = get_float_pref("UIScale", 1.0); if (ui_scale>0.95 && ui_scale<1.05) uiScale.setSelected("1"); else if (ui_scale>1.45 && ui_scale<1.55) uiScale.setSelected("1_5"); else if (ui_scale>1.95 && ui_scale<2.05) uiScale.setSelected("2"); @@ -716,11 +716,11 @@ void pick_preferences() { uiScale["other"].hide(); } - dynamic_cast(prefsDlog["nosound"]).setState(get_bool_pref("PlaySoundsScenEd", true) ? led_off : led_red); + dynamic_cast(prefsDlog["nosound"]).setState(get_bool_pref("PlaySounds", true) ? led_off : led_red); prefsDlog.run(); - if(get_float_pref("UIScaleScenEd") != ui_scale) + if(get_float_pref("UIScale") != ui_scale) changed_display_mode = true; }