(Ozone) Add 'Load Disc/Dump Disc' entries to Ozone

(Ozone) Add texture for disc
(Disc) Add sublabels for Load Disc/Dump Disc
This commit is contained in:
twinaphex 2019-08-23 18:35:04 +02:00
parent 26e8cb7ff0
commit f6d2768181
23 changed files with 107 additions and 0 deletions

View File

@ -4070,3 +4070,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -5088,3 +5088,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3846,3 +3846,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3975,3 +3975,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -8052,3 +8052,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3734,3 +3734,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -8204,3 +8204,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -8992,3 +8992,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3955,3 +3955,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -9367,3 +9367,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -9199,3 +9199,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3728,3 +3728,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -4519,3 +4519,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -9279,3 +9279,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3800,3 +3800,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3998,3 +3998,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -9004,3 +9004,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -9503,3 +9503,7 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_DIRECTORY,
"Show or hide 'Directory Settings' on the Settings screen."
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -3890,3 +3890,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
"Yiddish"
)
MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_DISC,
"Load a physical media disc. You should first select the core (Load Core) you intend to use with the disc.")
MSG_HASH(MENU_ENUM_SUBLABEL_DUMP_DISC,
"Dump the physical media disc to internal storage. It will be saved as an image file.")

View File

@ -257,6 +257,8 @@ default_sublabel_macro(action_bind_sublabel_start_core, MENU_
default_sublabel_macro(action_bind_sublabel_core_list, MENU_ENUM_SUBLABEL_CORE_LIST)
default_sublabel_macro(action_bind_sublabel_download_core, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE)
default_sublabel_macro(action_bind_sublabel_sideload_core_list, MENU_ENUM_SUBLABEL_SIDELOAD_CORE_LIST)
default_sublabel_macro(action_bind_sublabel_load_disc, MENU_ENUM_SUBLABEL_LOAD_DISC)
default_sublabel_macro(action_bind_sublabel_dump_disc, MENU_ENUM_SUBLABEL_DUMP_DISC)
default_sublabel_macro(action_bind_sublabel_content_list, MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST)
default_sublabel_macro(action_bind_sublabel_content_special, MENU_ENUM_SUBLABEL_LOAD_CONTENT_SPECIAL)
default_sublabel_macro(action_bind_sublabel_network_information, MENU_ENUM_SUBLABEL_NETWORK_INFORMATION)
@ -1564,6 +1566,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_MENU_SHOW_LOAD_CORE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_load_core);
break;
case MENU_ENUM_LABEL_LOAD_DISC:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_load_disc);
break;
case MENU_ENUM_LABEL_DUMP_DISC:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dump_disc);
break;
case MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_load_content);
break;

View File

@ -876,6 +876,18 @@ static int ozone_list_push(void *data, void *userdata,
menu_subsystem_populate(subsystem, info);
}
if (settings->bools.menu_show_load_disc)
{
entry.enum_idx = MENU_ENUM_LABEL_LOAD_DISC;
menu_displaylist_setting(&entry);
}
if (settings->bools.menu_show_dump_disc)
{
entry.enum_idx = MENU_ENUM_LABEL_DUMP_DISC;
menu_displaylist_setting(&entry);
}
entry.enum_idx = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
menu_displaylist_setting(&entry);
#ifdef HAVE_QT

View File

@ -33,6 +33,10 @@ menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
{
switch (enum_idx)
{
case MENU_ENUM_LABEL_LOAD_DISC:
case MENU_ENUM_LABEL_DUMP_DISC:
case MENU_ENUM_LABEL_DISC_INFORMATION:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DISC];
case MENU_ENUM_LABEL_CORE_OPTIONS:
case MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS];
@ -311,6 +315,10 @@ menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
switch(type)
{
case MENU_SET_CDROM_INFO:
case MENU_SET_CDROM_LIST:
case MENU_SET_LOAD_CDROM_LIST:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DISC];
case FILE_TYPE_DIRECTORY:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FOLDER];
case FILE_TYPE_PLAIN:
@ -602,6 +610,8 @@ switch (id)
return "on.png";
case OZONE_ENTRIES_ICONS_TEXTURE_SWITCH_OFF:
return "off.png";
case OZONE_ENTRIES_ICONS_TEXTURE_DISC:
return "disc.png";
case OZONE_ENTRIES_ICONS_TEXTURE_ADD:
return "add.png";
#ifdef HAVE_NETWORKING

View File

@ -144,6 +144,7 @@ enum
OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_20,
OZONE_ENTRIES_ICONS_TEXTURE_POINTER,
OZONE_ENTRIES_ICONS_TEXTURE_ADD,
OZONE_ENTRIES_ICONS_TEXTURE_DISC,
OZONE_ENTRIES_ICONS_TEXTURE_KEY,
OZONE_ENTRIES_ICONS_TEXTURE_KEY_HOVER,
OZONE_ENTRIES_ICONS_TEXTURE_DIALOG_SLICE,