diff --git a/XeRelease_Gtkmm4/.vscode/settings.json b/XeRelease_Gtkmm4/.vscode/settings.json index 28debd9..c76ee22 100644 --- a/XeRelease_Gtkmm4/.vscode/settings.json +++ b/XeRelease_Gtkmm4/.vscode/settings.json @@ -80,5 +80,6 @@ "typeinfo": "cpp", "valarray": "cpp", "variant": "cpp" - } + }, + "mesonbuild.configureOnOpen": false } \ No newline at end of file diff --git a/XeRelease_Gtkmm4/src/MyPrefs.hh b/XeRelease_Gtkmm4/src/MyPrefs.hh index 4b29a64..3b11b7b 100644 --- a/XeRelease_Gtkmm4/src/MyPrefs.hh +++ b/XeRelease_Gtkmm4/src/MyPrefs.hh @@ -3,7 +3,7 @@ #include #include #include "../json_nlohmann/json.hpp" -#include "os_detector.hh" +#include "config.hh" using json = nlohmann::json; diff --git a/XeRelease_Gtkmm4/src/MyWin.cc b/XeRelease_Gtkmm4/src/MyWin.cc index 5b152d7..a0992b8 100644 --- a/XeRelease_Gtkmm4/src/MyWin.cc +++ b/XeRelease_Gtkmm4/src/MyWin.cc @@ -4,6 +4,7 @@ #include "fly.xpm" #include "xeapi.hh" #include "xerelease.hh" +#include "config.hh" #include enum Releases @@ -122,9 +123,9 @@ MyWin::MyWin() } // Apply css class for widgets - Gtk::CssProvider::add_provider_for_display(btn_box.get_display(), provider, + Gtk::CssProvider::add_provider_for_display(btn_box.get_display(), provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - Gtk::CssProvider::add_provider_for_display(prefs->get_display(), provider, + Gtk::CssProvider::add_provider_for_display(prefs->get_display(), provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); // auto style1 = btn_box.get_style_context(); // style1->add_provider(provider, 1); @@ -190,10 +191,13 @@ void MyWin::background1() sized.reset(); // Update config - if(!start){ + if (!start) + { prefs->background_id = 1; prefs->save_config_now(); - }else{ + } + else + { start = false; } } @@ -211,10 +215,13 @@ void MyWin::background2() sized.reset(); // Update config - if(!start){ + if (!start) + { prefs->background_id = 2; prefs->save_config_now(); - }else{ + } + else + { start = false; } } @@ -232,10 +239,13 @@ void MyWin::background3() sized.reset(); // Update config - if(!start){ + if (!start) + { prefs->background_id = 3; prefs->save_config_now(); - }else{ + } + else + { start = false; } } @@ -291,9 +301,14 @@ void MyWin::main_releases() switch (version) // Use Selection to Perform { case Releases::LTS: +#ifdef DISABLE_LONGTERM_BUILD + msg_dialog.Init("The longterm build is diasbled!"); + msg_dialog.show(); +#else longterm(local, config_longterm.c_str(), str); msg_dialog.Init(str); msg_dialog.show(); +#endif break; case Releases::Stable: stable(local, config_stable.c_str(), str); diff --git a/XeRelease_Gtkmm4/src/os_detector.hh b/XeRelease_Gtkmm4/src/config.hh similarity index 79% rename from XeRelease_Gtkmm4/src/os_detector.hh rename to XeRelease_Gtkmm4/src/config.hh index 6bdba56..67b4fd9 100644 --- a/XeRelease_Gtkmm4/src/os_detector.hh +++ b/XeRelease_Gtkmm4/src/config.hh @@ -1,4 +1,6 @@ +// This header file is to get the platform and features enable/disable #pragma once + // Defining the OS enum class OS_Type{ Linux, @@ -17,4 +19,7 @@ static inline OS_Type get_os_type(){ // #define COMPILED_IN_WINDOWS return OS_Type::Windows; #endif -} \ No newline at end of file +} + +// Disable longterm build +#define DISABLE_LONGTERM_BUILD \ No newline at end of file diff --git a/XeRelease_Gtkmm4/src/xerelease.hh b/XeRelease_Gtkmm4/src/xerelease.hh index 1357024..f8ea797 100644 --- a/XeRelease_Gtkmm4/src/xerelease.hh +++ b/XeRelease_Gtkmm4/src/xerelease.hh @@ -2,7 +2,7 @@ #define __XE_RELEASE_ #include "../json_nlohmann/json.hpp" -#include "os_detector.hh" +#include "config.hh" using json = nlohmann::json;