Skip to content

Commit df588ad

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the quit visibility setting to a single-source def file
The plain half of the quit visibility pair, migrated variant-first: the level-variant twin already owns the label and sublabel, so this row is a reference and the shared configuration row stays with its literal guard state. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 8de3862 commit df588ad

5 files changed

Lines changed: 339 additions & 2 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,6 +1930,7 @@ static struct config_bool_setting *populate_settings_bool(
19301930
#include "settings/settings_def_video_fullscreen.h"
19311931
#define SETTINGS_DEF_CONFIG_PASS
19321932
#include "settings/settings_def_video_sync.h"
1933+
#include "settings/settings_def_quit_visibility.h"
19331934
#include "settings/settings_def_widget_scale_fullscreen.h"
19341935
#ifdef HAVE_MENU
19351936
#include "settings/settings_def_widget_scale.h"
@@ -2616,6 +2617,7 @@ static struct config_float_setting *populate_settings_float(
26162617
#include "settings/settings_def_video_fullscreen.h"
26172618
#define SETTINGS_DEF_CONFIG_PASS
26182619
#include "settings/settings_def_video_sync.h"
2620+
#include "settings/settings_def_quit_visibility.h"
26192621
#include "settings/settings_def_widget_scale_fullscreen.h"
26202622
#ifdef HAVE_MENU
26212623
#include "settings/settings_def_widget_scale.h"
@@ -3259,6 +3261,7 @@ static struct config_uint_setting *populate_settings_uint(
32593261
#include "settings/settings_def_video_fullscreen.h"
32603262
#define SETTINGS_DEF_CONFIG_PASS
32613263
#include "settings/settings_def_video_sync.h"
3264+
#include "settings/settings_def_quit_visibility.h"
32623265
#include "settings/settings_def_widget_scale_fullscreen.h"
32633266
#ifdef HAVE_MENU
32643267
#include "settings/settings_def_widget_scale.h"
@@ -3936,6 +3939,7 @@ static struct config_int_setting *populate_settings_int(
39363939
#include "settings/settings_def_video_fullscreen.h"
39373940
#define SETTINGS_DEF_CONFIG_PASS
39383941
#include "settings/settings_def_video_sync.h"
3942+
#include "settings/settings_def_quit_visibility.h"
39393943
#include "settings/settings_def_widget_scale_fullscreen.h"
39403944
#ifdef HAVE_MENU
39413945
#include "settings/settings_def_widget_scale.h"
@@ -4501,6 +4505,7 @@ static struct config_int_setting *populate_settings_int(
45014505
#include "settings/settings_def_video_fullscreen.h"
45024506
#define SETTINGS_DEF_CONFIG_PASS
45034507
#include "settings/settings_def_video_sync.h"
4508+
#include "settings/settings_def_quit_visibility.h"
45044509
#include "settings/settings_def_widget_scale_fullscreen.h"
45054510
#ifdef HAVE_MENU
45064511
#include "settings/settings_def_widget_scale.h"

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
567567
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
568568
#include "../settings/settings_def_video_fullscreen.h"
569569
#include "../settings/settings_def_video_sync.h"
570+
#include "../settings/settings_def_quit_visibility.h"
570571
#include "../settings/settings_def_widget_scale_fullscreen.h"
571572
#include "../settings/settings_def_widget_scale.h"
572573
#include "../settings/settings_def_cheevos_account.h"
@@ -919,6 +920,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
919920
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
920921
#include "../settings/settings_def_video_fullscreen.h"
921922
#include "../settings/settings_def_video_sync.h"
923+
#include "../settings/settings_def_quit_visibility.h"
922924
#include "../settings/settings_def_widget_scale_fullscreen.h"
923925
#include "../settings/settings_def_widget_scale.h"
924926
#include "../settings/settings_def_cheevos_account.h"

‎intl/msg_hash_us.h‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35132,3 +35132,170 @@ MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3513235132
#undef S_ACTION_LV_H
3513335133
#undef S_ACTION_LV_NS_H
3513435134
#undef SETTINGS_DEF_STRINGS_PASS
35135+
/* GENERATED REGION: quit visibility setting (see settings_def_quit_visibility.h). */
35136+
#define SETTINGS_DEF_STRINGS_PASS
35137+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
35138+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35139+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35140+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
35141+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35142+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
35143+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35144+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35145+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
35146+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35147+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
35148+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35149+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35150+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
35151+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35152+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
35153+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35154+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35155+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
35156+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35157+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35158+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35159+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35160+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
35161+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35162+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
35163+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35164+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35165+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
35166+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35167+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35168+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35169+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35170+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
35171+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35172+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
35173+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35174+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35175+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
35176+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35177+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
35178+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35179+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35180+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
35181+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35182+
#define S_ACTION(T, n, us, sub) \
35183+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35184+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35185+
#define S_ACTION_NS(T, n, us) \
35186+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35187+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35188+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35189+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35190+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
35191+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35192+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35193+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35194+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35195+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35196+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35197+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35198+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35199+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35200+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35201+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35202+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35203+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35204+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35205+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
35206+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35207+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
35208+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35209+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35210+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
35211+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35212+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
35213+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35214+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
35215+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
35216+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35217+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
35218+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35219+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35220+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
35221+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
35222+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35223+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
35224+
#include "../settings/settings_def_quit_visibility.h"
35225+
#undef S_BOOL
35226+
#undef S_BOOL_NS
35227+
#undef S_BOOL_H
35228+
#undef S_BOOL_NS_H
35229+
#undef S_UINT
35230+
#undef S_UINT_NS
35231+
#undef S_UINT_H
35232+
#undef S_UINT_NS_H
35233+
#undef S_INT
35234+
#undef S_INT_NS
35235+
#undef S_INT_H
35236+
#undef S_INT_NS_H
35237+
#undef S_FLOAT
35238+
#undef S_FLOAT_NS
35239+
#undef S_FLOAT_H
35240+
#undef S_FLOAT_NS_H
35241+
#undef S_STRING
35242+
#undef S_STRING_NS
35243+
#undef S_STRING_H
35244+
#undef S_STRING_NS_H
35245+
#undef S_DIR
35246+
#undef S_DIR_NS
35247+
#undef S_DIR_H
35248+
#undef S_DIR_NS_H
35249+
#undef S_STRING_P
35250+
#undef S_STRING_P_NS
35251+
#undef S_STRING_P_H
35252+
#undef S_STRING_P_NS_H
35253+
#undef S_PATH
35254+
#undef S_PATH_NS
35255+
#undef S_PATH_H
35256+
#undef S_PATH_NS_H
35257+
#undef S_PATH_DS
35258+
#undef S_PATH_DS_NS
35259+
#undef S_PATH_DS_H
35260+
#undef S_PATH_DS_NS_H
35261+
#undef S_ACTION
35262+
#undef S_ACTION_NS
35263+
#undef S_ACTION_H
35264+
#undef S_ACTION_NS_H
35265+
#undef S_BOOL_EX
35266+
#undef S_BOOL_EX_NS
35267+
#undef S_BOOL_EX_H
35268+
#undef S_BOOL_EX_NS_H
35269+
#undef S_UINT_EX
35270+
#undef S_UINT_EX_NS
35271+
#undef S_UINT_EX_H
35272+
#undef S_UINT_EX_NS_H
35273+
#undef S_INT_EX
35274+
#undef S_INT_EX_NS
35275+
#undef S_INT_EX_H
35276+
#undef S_INT_EX_NS_H
35277+
#undef S_FLOAT_EX
35278+
#undef S_FLOAT_EX_NS
35279+
#undef S_FLOAT_EX_H
35280+
#undef S_FLOAT_EX_NS_H
35281+
#undef S_ACTION_EX
35282+
#undef S_ACTION_EX_NS
35283+
#undef S_ACTION_EX_H
35284+
#undef S_ACTION_EX_NS_H
35285+
#undef S_BOOL_LV
35286+
#undef S_BOOL_LV_NS
35287+
#undef S_BOOL_LV_H
35288+
#undef S_BOOL_LV_NS_H
35289+
#undef S_FLOAT_LV
35290+
#undef S_FLOAT_LV_NS
35291+
#undef S_FLOAT_LV_H
35292+
#undef S_FLOAT_LV_NS_H
35293+
#undef S_STRING_LV
35294+
#undef S_STRING_LV_NS
35295+
#undef S_STRING_LV_H
35296+
#undef S_STRING_LV_NS_H
35297+
#undef S_ACTION_LV
35298+
#undef S_ACTION_LV_NS
35299+
#undef S_ACTION_LV_H
35300+
#undef S_ACTION_LV_NS_H
35301+
#undef SETTINGS_DEF_STRINGS_PASS

‎menu/menu_setting.c‎

Lines changed: 154 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29963,8 +29963,160 @@ static bool setting_append_list(
2996329963
#elif !defined(IOS)
2996429964
{
2996529965
static const setting_desc_t menu_desc_25[] = {
29966-
SDESC_BOOL_ROW(menu_show_quit_retroarch, MENU_SHOW_QUIT_RETROARCH,
29967-
DEFAULT_MENU_SHOW_QUIT, SD_FLAG_NONE, 0, 0),
29966+
/* GENERATED: rows come from settings_def_quit_visibility.h in order. */
29967+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
29968+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
29969+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
29970+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
29971+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
29972+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
29973+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
29974+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
29975+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
29976+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
29977+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
29978+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
29979+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
29980+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
29981+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
29982+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
29983+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
29984+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
29985+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
29986+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
29987+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
29988+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
29989+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
29990+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
29991+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
29992+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
29993+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
29994+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
29995+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
29996+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
29997+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
29998+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
29999+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
30000+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
30001+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
30002+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
30003+
#define S_ACTION(T, n, us, sub) \
30004+
SDESC_ACTION_ROW(T),
30005+
#define S_ACTION_NS(T, n, us) \
30006+
SDESC_ACTION_ROW(T),
30007+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
30008+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
30009+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
30010+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
30011+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
30012+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
30013+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
30014+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
30015+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
30016+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
30017+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
30018+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
30019+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
30020+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
30021+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
30022+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
30023+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
30024+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
30025+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
30026+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
30027+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
30028+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
30029+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us) \
30030+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
30031+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
30032+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
30033+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us) \
30034+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
30035+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
30036+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
30037+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
30038+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
30039+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
30040+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
30041+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us) \
30042+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
30043+
#include "../settings/settings_def_quit_visibility.h"
30044+
#undef S_BOOL
30045+
#undef S_BOOL_NS
30046+
#undef S_BOOL_H
30047+
#undef S_BOOL_NS_H
30048+
#undef S_UINT
30049+
#undef S_UINT_NS
30050+
#undef S_UINT_H
30051+
#undef S_UINT_NS_H
30052+
#undef S_INT
30053+
#undef S_INT_NS
30054+
#undef S_INT_H
30055+
#undef S_INT_NS_H
30056+
#undef S_FLOAT
30057+
#undef S_FLOAT_NS
30058+
#undef S_FLOAT_H
30059+
#undef S_FLOAT_NS_H
30060+
#undef S_STRING
30061+
#undef S_STRING_NS
30062+
#undef S_STRING_H
30063+
#undef S_STRING_NS_H
30064+
#undef S_DIR
30065+
#undef S_DIR_NS
30066+
#undef S_DIR_H
30067+
#undef S_DIR_NS_H
30068+
#undef S_STRING_P
30069+
#undef S_STRING_P_NS
30070+
#undef S_STRING_P_H
30071+
#undef S_STRING_P_NS_H
30072+
#undef S_PATH
30073+
#undef S_PATH_NS
30074+
#undef S_PATH_H
30075+
#undef S_PATH_NS_H
30076+
#undef S_PATH_DS
30077+
#undef S_PATH_DS_NS
30078+
#undef S_PATH_DS_H
30079+
#undef S_PATH_DS_NS_H
30080+
#undef S_ACTION
30081+
#undef S_ACTION_NS
30082+
#undef S_ACTION_H
30083+
#undef S_ACTION_NS_H
30084+
#undef S_BOOL_EX
30085+
#undef S_BOOL_EX_NS
30086+
#undef S_BOOL_EX_H
30087+
#undef S_BOOL_EX_NS_H
30088+
#undef S_UINT_EX
30089+
#undef S_UINT_EX_NS
30090+
#undef S_UINT_EX_H
30091+
#undef S_UINT_EX_NS_H
30092+
#undef S_INT_EX
30093+
#undef S_INT_EX_NS
30094+
#undef S_INT_EX_H
30095+
#undef S_INT_EX_NS_H
30096+
#undef S_FLOAT_EX
30097+
#undef S_FLOAT_EX_NS
30098+
#undef S_FLOAT_EX_H
30099+
#undef S_FLOAT_EX_NS_H
30100+
#undef S_ACTION_EX
30101+
#undef S_ACTION_EX_NS
30102+
#undef S_ACTION_EX_H
30103+
#undef S_ACTION_EX_NS_H
30104+
#undef S_BOOL_LV
30105+
#undef S_BOOL_LV_NS
30106+
#undef S_BOOL_LV_H
30107+
#undef S_BOOL_LV_NS_H
30108+
#undef S_FLOAT_LV
30109+
#undef S_FLOAT_LV_NS
30110+
#undef S_FLOAT_LV_H
30111+
#undef S_FLOAT_LV_NS_H
30112+
#undef S_STRING_LV
30113+
#undef S_STRING_LV_NS
30114+
#undef S_STRING_LV_H
30115+
#undef S_STRING_LV_NS_H
30116+
#undef S_ACTION_LV
30117+
#undef S_ACTION_LV_NS
30118+
#undef S_ACTION_LV_H
30119+
#undef S_ACTION_LV_NS_H
2996830120
};
2996930121
settings_list_add_desc(list, list_info, settings,
2997030122
menu_desc_25, ARRAY_SIZE(menu_desc_25),

0 commit comments

Comments
 (0)