ozone: rename and hide some thumbnails settings
This commit is contained in:
parent
222b7e7be0
commit
f06d955996
|
@ -2954,6 +2954,10 @@ MSG_HASH(
|
||||||
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS,
|
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS,
|
||||||
"Left Thumbnails"
|
"Left Thumbnails"
|
||||||
)
|
)
|
||||||
|
MSG_HASH(
|
||||||
|
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
|
||||||
|
"Second Thumbnail"
|
||||||
|
)
|
||||||
MSG_HASH(
|
MSG_HASH(
|
||||||
MENU_ENUM_LABEL_VALUE_XMB_VERTICAL_THUMBNAILS,
|
MENU_ENUM_LABEL_VALUE_XMB_VERTICAL_THUMBNAILS,
|
||||||
"Thumbnails Vertical Disposition"
|
"Thumbnails Vertical Disposition"
|
||||||
|
@ -5695,6 +5699,10 @@ MSG_HASH(
|
||||||
MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS,
|
MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS,
|
||||||
"Type of thumbnail to display at the left."
|
"Type of thumbnail to display at the left."
|
||||||
)
|
)
|
||||||
|
MSG_HASH(
|
||||||
|
MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE,
|
||||||
|
"Replace the content metadata panel by another thumbnail."
|
||||||
|
)
|
||||||
MSG_HASH(
|
MSG_HASH(
|
||||||
MENU_ENUM_SUBLABEL_XMB_VERTICAL_THUMBNAILS,
|
MENU_ENUM_SUBLABEL_XMB_VERTICAL_THUMBNAILS,
|
||||||
"Display the left thumbnail under the right one, on the right side of the screen."
|
"Display the left thumbnail under the right one, on the right side of the screen."
|
||||||
|
|
|
@ -310,6 +310,7 @@ default_sublabel_macro(action_bind_sublabel_mouse_enable, MENU_
|
||||||
default_sublabel_macro(action_bind_sublabel_pointer_enable, MENU_ENUM_SUBLABEL_POINTER_ENABLE)
|
default_sublabel_macro(action_bind_sublabel_pointer_enable, MENU_ENUM_SUBLABEL_POINTER_ENABLE)
|
||||||
default_sublabel_macro(action_bind_sublabel_thumbnails, MENU_ENUM_SUBLABEL_THUMBNAILS)
|
default_sublabel_macro(action_bind_sublabel_thumbnails, MENU_ENUM_SUBLABEL_THUMBNAILS)
|
||||||
default_sublabel_macro(action_bind_sublabel_left_thumbnails, MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS)
|
default_sublabel_macro(action_bind_sublabel_left_thumbnails, MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS)
|
||||||
|
default_sublabel_macro(action_bind_sublabel_left_thumbnails_ozone, MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE)
|
||||||
default_sublabel_macro(action_bind_sublabel_timedate_enable, MENU_ENUM_SUBLABEL_TIMEDATE_ENABLE)
|
default_sublabel_macro(action_bind_sublabel_timedate_enable, MENU_ENUM_SUBLABEL_TIMEDATE_ENABLE)
|
||||||
default_sublabel_macro(action_bind_sublabel_timedate_style, MENU_ENUM_SUBLABEL_TIMEDATE_STYLE)
|
default_sublabel_macro(action_bind_sublabel_timedate_style, MENU_ENUM_SUBLABEL_TIMEDATE_STYLE)
|
||||||
default_sublabel_macro(action_bind_sublabel_battery_level_enable, MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE)
|
default_sublabel_macro(action_bind_sublabel_battery_level_enable, MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE)
|
||||||
|
@ -1006,6 +1007,8 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
|
||||||
|
|
||||||
if (cbs->enum_idx != MSG_UNKNOWN)
|
if (cbs->enum_idx != MSG_UNKNOWN)
|
||||||
{
|
{
|
||||||
|
settings_t *settings; /* config_get_ptr is called only when needed */
|
||||||
|
|
||||||
switch (cbs->enum_idx)
|
switch (cbs->enum_idx)
|
||||||
{
|
{
|
||||||
case MENU_ENUM_LABEL_ADD_TO_MIXER:
|
case MENU_ENUM_LABEL_ADD_TO_MIXER:
|
||||||
|
@ -1591,7 +1594,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
|
||||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_thumbnails);
|
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_thumbnails);
|
||||||
break;
|
break;
|
||||||
case MENU_ENUM_LABEL_LEFT_THUMBNAILS:
|
case MENU_ENUM_LABEL_LEFT_THUMBNAILS:
|
||||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_left_thumbnails);
|
settings = config_get_ptr();
|
||||||
|
if (string_is_equal(settings->arrays.menu_driver, "ozone"))
|
||||||
|
{
|
||||||
|
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_left_thumbnails_ozone);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_left_thumbnails);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case MENU_ENUM_LABEL_MOUSE_ENABLE:
|
case MENU_ENUM_LABEL_MOUSE_ENABLE:
|
||||||
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_mouse_enable);
|
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_mouse_enable);
|
||||||
|
|
|
@ -9196,11 +9196,15 @@ static bool setting_append_list(
|
||||||
|
|
||||||
if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
|
if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
|
||||||
{
|
{
|
||||||
|
bool is_ozone = string_is_equal(settings->arrays.menu_driver, "ozone");
|
||||||
|
enum msg_hash_enums label = is_ozone ?
|
||||||
|
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE : MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS;
|
||||||
|
|
||||||
CONFIG_UINT(
|
CONFIG_UINT(
|
||||||
list, list_info,
|
list, list_info,
|
||||||
&settings->uints.menu_left_thumbnails,
|
&settings->uints.menu_left_thumbnails,
|
||||||
MENU_ENUM_LABEL_LEFT_THUMBNAILS,
|
MENU_ENUM_LABEL_LEFT_THUMBNAILS,
|
||||||
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS,
|
label,
|
||||||
menu_left_thumbnails_default,
|
menu_left_thumbnails_default,
|
||||||
&group_info,
|
&group_info,
|
||||||
&subgroup_info,
|
&subgroup_info,
|
||||||
|
@ -9212,20 +9216,21 @@ static bool setting_append_list(
|
||||||
&setting_get_string_representation_uint_menu_left_thumbnails;
|
&setting_get_string_representation_uint_menu_left_thumbnails;
|
||||||
menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
|
menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
|
||||||
|
|
||||||
CONFIG_BOOL(
|
if (!is_ozone)
|
||||||
list, list_info,
|
CONFIG_BOOL(
|
||||||
&settings->bools.menu_xmb_vertical_thumbnails,
|
list, list_info,
|
||||||
MENU_ENUM_LABEL_XMB_VERTICAL_THUMBNAILS,
|
&settings->bools.menu_xmb_vertical_thumbnails,
|
||||||
MENU_ENUM_LABEL_VALUE_XMB_VERTICAL_THUMBNAILS,
|
MENU_ENUM_LABEL_XMB_VERTICAL_THUMBNAILS,
|
||||||
xmb_vertical_thumbnails,
|
MENU_ENUM_LABEL_VALUE_XMB_VERTICAL_THUMBNAILS,
|
||||||
MENU_ENUM_LABEL_VALUE_OFF,
|
xmb_vertical_thumbnails,
|
||||||
MENU_ENUM_LABEL_VALUE_ON,
|
MENU_ENUM_LABEL_VALUE_OFF,
|
||||||
&group_info,
|
MENU_ENUM_LABEL_VALUE_ON,
|
||||||
&subgroup_info,
|
&group_info,
|
||||||
parent_group,
|
&subgroup_info,
|
||||||
general_write_handler,
|
parent_group,
|
||||||
general_read_handler,
|
general_write_handler,
|
||||||
SD_FLAG_NONE);
|
general_read_handler,
|
||||||
|
SD_FLAG_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
CONFIG_BOOL(
|
CONFIG_BOOL(
|
||||||
|
|
|
@ -898,6 +898,7 @@ enum msg_hash_enums
|
||||||
MENU_LABEL(XMB_RIBBON_ENABLE),
|
MENU_LABEL(XMB_RIBBON_ENABLE),
|
||||||
MENU_LABEL(THUMBNAILS),
|
MENU_LABEL(THUMBNAILS),
|
||||||
MENU_LABEL(LEFT_THUMBNAILS),
|
MENU_LABEL(LEFT_THUMBNAILS),
|
||||||
|
MENU_LABEL(LEFT_THUMBNAILS_OZONE),
|
||||||
MENU_LABEL(XMB_VERTICAL_THUMBNAILS),
|
MENU_LABEL(XMB_VERTICAL_THUMBNAILS),
|
||||||
MENU_LABEL(MENU_RGUI_THUMBNAIL_DOWNSCALER),
|
MENU_LABEL(MENU_RGUI_THUMBNAIL_DOWNSCALER),
|
||||||
MENU_LABEL(TIMEDATE_ENABLE),
|
MENU_LABEL(TIMEDATE_ENABLE),
|
||||||
|
|
Loading…
Reference in New Issue