(UI/QT) Dehardcode settings

This commit is contained in:
twinaphex 2019-04-14 23:07:34 +02:00
parent 534cfb60cf
commit 756e49d2af
3 changed files with 51 additions and 33 deletions

View File

@ -7504,6 +7504,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_video_record_quality;
menu_settings_list_current_add_range(list, list_info, RECORD_CONFIG_TYPE_RECORDING_CUSTOM, RECORD_CONFIG_TYPE_RECORDING_GIF, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_PATH(
list, list_info,
@ -7622,6 +7623,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint_special;
menu_settings_list_current_add_range(list, list_info, 1, 8, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_DIR(
list, list_info,
@ -8461,6 +8463,7 @@ static bool setting_append_list(
&setting_get_string_representation_uint_rgui_internal_upscale_level;
menu_settings_list_current_add_range(list, list_info, 0, RGUI_UPSCALE_LAST-1, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
}
#if !defined(GEKKO)
@ -8496,6 +8499,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_rgui_aspect_ratio_lock;
menu_settings_list_current_add_range(list, list_info, 0, RGUI_ASPECT_RATIO_LOCK_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_UINT(
list, list_info,
@ -8512,6 +8516,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_rgui_menu_color_theme;
menu_settings_list_current_add_range(list, list_info, 0, RGUI_THEME_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_PATH(
list, list_info,
@ -8598,6 +8603,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_menu_ticker_type;
menu_settings_list_current_add_range(list, list_info, 0, TICKER_TYPE_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_RADIO_BUTTONS;
CONFIG_FLOAT(
list, list_info,
@ -8791,6 +8797,7 @@ static bool setting_append_list(
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_FONT_SELECTOR;
CONFIG_UINT(
list, list_info,
@ -8852,6 +8859,7 @@ static bool setting_append_list(
&setting_get_string_representation_uint_xmb_layout;
menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_UINT(
list, list_info,
@ -8868,6 +8876,7 @@ static bool setting_append_list(
&setting_get_string_representation_uint_xmb_icon_theme;
menu_settings_list_current_add_range(list, list_info, 0, XMB_ICON_THEME_LAST - 1, 1, true, true);
menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_BOOL(
list, list_info,
@ -8902,6 +8911,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_xmb_shader_pipeline;
menu_settings_list_current_add_range(list, list_info, 0, XMB_SHADER_PIPELINE_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
}
#endif
@ -8920,6 +8930,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_xmb_menu_color_theme;
menu_settings_list_current_add_range(list, list_info, 0, XMB_THEME_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
}
#endif
if (string_is_equal(settings->arrays.menu_driver, "ozone"))
@ -9139,6 +9150,7 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT | SD_FLAG_LAKKA_ADVANCED);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_PASSWORD_LINE_EDIT;
}
#endif
@ -9306,6 +9318,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_materialui_menu_color_theme;
menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_THEME_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_FLOAT(
list, list_info,
@ -9336,6 +9349,8 @@ static bool setting_append_list(
general_read_handler);
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true);
(*list)[list_info->index - 1].ui_type
= ST_UI_TYPE_FLOAT_SLIDER_AND_SPINBOX;
}
#endif
@ -9357,6 +9372,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_ozone_menu_color_theme;
menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_BOOL(
list, list_info,
@ -9512,6 +9528,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_rgui_thumbnail_scaler;
menu_settings_list_current_add_range(list, list_info, 0, RGUI_THUMB_SCALE_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_RADIO_BUTTONS;
CONFIG_UINT(
list, list_info,
@ -9556,6 +9573,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_menu_timedate_style;
menu_settings_list_current_add_range(list, list_info, 0, 7, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_BOOL(
list, list_info,

View File

@ -23,18 +23,18 @@ RecordingPage::RecordingPage(QObject *parent) :
QWidget *RecordingPage::widget()
{
QWidget * widget = new QWidget;
QVBoxLayout *layout = new QVBoxLayout;
QWidget * widget = new QWidget;
QVBoxLayout *layout = new QVBoxLayout;
SettingsGroup *recordingGroup = new SettingsGroup("Recording");
SettingsGroup *streamingGroup = new SettingsGroup("Streaming");
QHBoxLayout *hl = new QHBoxLayout;
QHBoxLayout *hl = new QHBoxLayout;
recordingGroup->addUIntComboBox(MENU_ENUM_LABEL_VIDEO_RECORD_QUALITY);
recordingGroup->addFileSelector(MENU_ENUM_LABEL_RECORD_CONFIG);
recordingGroup->addUIntComboBox(MENU_ENUM_LABEL_VIDEO_RECORD_THREADS);
recordingGroup->addDirectorySelector(MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY);
recordingGroup->addCheckBox(MENU_ENUM_LABEL_VIDEO_POST_FILTER_RECORD);
recordingGroup->addCheckBox(MENU_ENUM_LABEL_VIDEO_GPU_RECORD);
recordingGroup->add(MENU_ENUM_LABEL_VIDEO_RECORD_QUALITY);
recordingGroup->add(MENU_ENUM_LABEL_RECORD_CONFIG);
recordingGroup->add(MENU_ENUM_LABEL_VIDEO_RECORD_THREADS);
recordingGroup->add(MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY);
recordingGroup->add(MENU_ENUM_LABEL_VIDEO_POST_FILTER_RECORD);
recordingGroup->add(MENU_ENUM_LABEL_VIDEO_GPU_RECORD);
hl->addWidget(new UIntRadioButtons(MENU_ENUM_LABEL_STREAMING_MODE));
hl->addWidget(new UIntRadioButtons(MENU_ENUM_LABEL_VIDEO_STREAM_QUALITY));

View File

@ -115,7 +115,7 @@ QWidget *ViewsPage::widget()
mainMenu->add(MENU_ENUM_LABEL_MENU_SHOW_SHUTDOWN);
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS);
tabs->addPasswordLineEdit(MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD);
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD);
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES);
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY);
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES);
@ -126,7 +126,7 @@ QWidget *ViewsPage::widget()
tabs->add(MENU_ENUM_LABEL_CONTENT_SHOW_PLAYLISTS);
status->add(MENU_ENUM_LABEL_TIMEDATE_ENABLE);
status->addUIntComboBox(MENU_ENUM_LABEL_TIMEDATE_STYLE);
status->add(MENU_ENUM_LABEL_TIMEDATE_STYLE);
status->add(MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE);
status->add(MENU_ENUM_LABEL_CORE_ENABLE);
@ -197,39 +197,39 @@ QWidget *AppearancePage::widget()
FormLayout *layout = new FormLayout;
rarch_setting_t *thumbnails = menu_setting_find_enum(MENU_ENUM_LABEL_THUMBNAILS);
layout->addFileSelector(MENU_ENUM_LABEL_MENU_WALLPAPER);
layout->add(MENU_ENUM_LABEL_MENU_WALLPAPER);
layout->add(MENU_ENUM_LABEL_DYNAMIC_WALLPAPER);
layout->addFloatSliderAndSpinBox(MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY);
layout->addFloatSliderAndSpinBox(MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY);
layout->add(MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY);
layout->add(MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY);
layout->add(MENU_ENUM_LABEL_MENU_HORIZONTAL_ANIMATION);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_BACKGROUND_FILLER_THICKNESS_ENABLE);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_BORDER_FILLER_ENABLE);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_BORDER_FILLER_THICKNESS_ENABLE);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_FULL_WIDTH_LAYOUT);
layout->add(MENU_ENUM_LABEL_MENU_LINEAR_FILTER);
layout->addUIntComboBox(MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL);
layout->addUIntComboBox(MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK);
layout->addUIntComboBox(MENU_ENUM_LABEL_RGUI_MENU_COLOR_THEME);
layout->addFileSelector(MENU_ENUM_LABEL_RGUI_MENU_THEME_PRESET);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK);
layout->add(MENU_ENUM_LABEL_RGUI_MENU_COLOR_THEME);
layout->add(MENU_ENUM_LABEL_RGUI_MENU_THEME_PRESET);
layout->add(MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE);
layout->addUIntSpinBox(MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE);
layout->addUIntSpinBox(MENU_ENUM_LABEL_XMB_ALPHA_FACTOR);
layout->addUIntSpinBox(MENU_ENUM_LABEL_XMB_SCALE_FACTOR);
layout->addFontSelector(MENU_ENUM_LABEL_XMB_FONT);
layout->add(MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE);
layout->add(MENU_ENUM_LABEL_XMB_ALPHA_FACTOR);
layout->add(MENU_ENUM_LABEL_XMB_SCALE_FACTOR);
layout->add(MENU_ENUM_LABEL_XMB_FONT);
layout->addUIntColorButton("Menu Font Color: ",
MENU_ENUM_LABEL_MENU_FONT_COLOR_RED,
MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN,
MENU_ENUM_LABEL_MENU_FONT_COLOR_BLUE);
layout->addUIntComboBox(MENU_ENUM_LABEL_XMB_LAYOUT);
layout->addUIntComboBox(MENU_ENUM_LABEL_XMB_THEME);
layout->add(MENU_ENUM_LABEL_XMB_LAYOUT);
layout->add(MENU_ENUM_LABEL_XMB_THEME);
layout->add(MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE);
layout->addUIntComboBox(MENU_ENUM_LABEL_XMB_RIBBON_ENABLE);
layout->addUIntComboBox(MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME);
layout->addUIntComboBox(MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME);
layout->add(MENU_ENUM_LABEL_XMB_RIBBON_ENABLE);
layout->add(MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME);
layout->add(MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME);
layout->add(MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE);
layout->addUIntComboBox(MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME);
layout->addFloatSliderAndSpinBox(MENU_ENUM_LABEL_MATERIALUI_MENU_HEADER_OPACITY);
layout->addFloatSliderAndSpinBox(MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY);
layout->add(MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME);
layout->add(MENU_ENUM_LABEL_MATERIALUI_MENU_HEADER_OPACITY);
layout->add(MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY);
layout->add(MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME);
if (thumbnails)
@ -246,9 +246,9 @@ QWidget *AppearancePage::widget()
}
layout->add(MENU_ENUM_LABEL_XMB_VERTICAL_THUMBNAILS);
layout->addUIntRadioButtons(MENU_ENUM_LABEL_MENU_RGUI_THUMBNAIL_DOWNSCALER);
layout->addUIntRadioButtons(MENU_ENUM_LABEL_MENU_TICKER_TYPE);
layout->addFloatSpinBox(MENU_ENUM_LABEL_MENU_TICKER_SPEED);
layout->add(MENU_ENUM_LABEL_MENU_RGUI_THUMBNAIL_DOWNSCALER);
layout->add(MENU_ENUM_LABEL_MENU_TICKER_TYPE);
layout->add(MENU_ENUM_LABEL_MENU_TICKER_SPEED);
widget->setLayout(layout);