diff options
author | 2016-02-04 14:56:46 +0100 | |
---|---|---|
committer | 2016-02-04 15:14:26 +0100 | |
commit | 213283e43064d04bc5ba671e23177eb7ebe8d0a2 (patch) | |
tree | c113b6ef22c6c4adbb140d89a57eca70d38f5002 /src/emu | |
parent | 701df7fe9ea4775b25c9d7263592cb3d442e2793 (diff) |
some MEWUI to UI renames (nw)
Diffstat (limited to 'src/emu')
36 files changed, 149 insertions, 149 deletions
diff --git a/src/emu/drivers/empty.cpp b/src/emu/drivers/empty.cpp index 97c59887e4e..9c48a6c8b26 100644 --- a/src/emu/drivers/empty.cpp +++ b/src/emu/drivers/empty.cpp @@ -29,7 +29,7 @@ public: virtual void machine_start() override { // force the UI to show the game select screen - ui_mewui_select_game::force_game_select(machine(), &machine().render().ui_container()); + ui_menu_select_game::force_game_select(machine(), &machine().render().ui_container()); } UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/emu/ui/auditmenu.cpp b/src/emu/ui/auditmenu.cpp index 631355bfac3..9ebbdf00f40 100644 --- a/src/emu/ui/auditmenu.cpp +++ b/src/emu/ui/auditmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/auditmenu.cpp + ui/auditmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/auditmenu.h b/src/emu/ui/auditmenu.h index 85a9dcba9f6..caad05796a6 100644 --- a/src/emu/ui/auditmenu.h +++ b/src/emu/ui/auditmenu.h @@ -2,16 +2,16 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/auditmenu.h + ui/auditmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_AUDIT_H__ -#define __MEWUI_AUDIT_H__ +#ifndef __UI_AUDIT_H__ +#define __UI_AUDIT_H__ //------------------------------------------------- // class audit menu @@ -34,4 +34,4 @@ private: bool m_first; }; -#endif /* __MEWUI_AUDIT_H__ */ +#endif /* __UI_AUDIT_H__ */ diff --git a/src/emu/ui/cmddata.h b/src/emu/ui/cmddata.h index a588c47465f..5fa2658d2cb 100644 --- a/src/emu/ui/cmddata.h +++ b/src/emu/ui/cmddata.h @@ -2,13 +2,13 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/cmddata.h + ui/cmddata.h *********************************************************************/ #pragma once -#ifndef __MEWUI_CMDDATA_H__ -#define __MEWUI_CMDDATA_H__ +#ifndef __UI_CMDDATA_H__ +#define __UI_CMDDATA_H__ #define BUTTON_COLOR_RED rgb_t(255,64,64) #define BUTTON_COLOR_YELLOW rgb_t(255,238,0) @@ -401,4 +401,4 @@ static fix_strings_t convert_text[] = { 0, 0 } // end of array }; -#endif /* __MEWUI_CMDDATA_H__ */ +#endif /* __UI_CMDDATA_H__ */ diff --git a/src/emu/ui/cmdrender.h b/src/emu/ui/cmdrender.h index 4cf8c7089c6..a1f594a5d8f 100644 --- a/src/emu/ui/cmdrender.h +++ b/src/emu/ui/cmdrender.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/cmdrender.h + ui/cmdrender.h MEWUI rendfont. diff --git a/src/emu/ui/ctrlmenu.cpp b/src/emu/ui/ctrlmenu.cpp index 96a35f052ed..295fb7f85a0 100644 --- a/src/emu/ui/ctrlmenu.cpp +++ b/src/emu/ui/ctrlmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/ctrlmenu.cpp + ui/ctrlmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/ctrlmenu.h b/src/emu/ui/ctrlmenu.h index 0ce43dd2a26..4c1325071d6 100644 --- a/src/emu/ui/ctrlmenu.h +++ b/src/emu/ui/ctrlmenu.h @@ -2,15 +2,15 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/ctrlmenu.h + ui/ctrlmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_CTRLMENU_H__ -#define __MEWUI_CTRLMENU_H__ +#ifndef __UI_CTRLMENU_H__ +#define __UI_CTRLMENU_H__ //------------------------------------------------- // class controller mapping menu @@ -38,4 +38,4 @@ private: int check_status(const char *status, const char *option); }; -#endif /* __MEWUI_CTRLMENU_H__ */ +#endif /* __UI_CTRLMENU_H__ */ diff --git a/src/emu/ui/custmenu.cpp b/src/emu/ui/custmenu.cpp index 6ee8d5094af..3fed1cd1c40 100644 --- a/src/emu/ui/custmenu.cpp +++ b/src/emu/ui/custmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/custmenu.cpp + ui/custmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/custmenu.h b/src/emu/ui/custmenu.h index 8122978b693..d136e911164 100644 --- a/src/emu/ui/custmenu.h +++ b/src/emu/ui/custmenu.h @@ -2,17 +2,17 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/custmenu.h + ui/custmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_CUSTMENU_H__ -#define __MEWUI_CUSTMENU_H__ +#ifndef __UI_CUSTMENU_H__ +#define __UI_CUSTMENU_H__ #include "ui/utils.h" @@ -128,4 +128,4 @@ private: void save_custom_filters(); }; -#endif /* __MEWUI_CUSTMENU_H__ */ +#endif /* __UI_CUSTMENU_H__ */ diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp index ee30658200b..fb247509e59 100644 --- a/src/emu/ui/custui.cpp +++ b/src/emu/ui/custui.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/custui.cpp + ui/custui.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ @@ -141,7 +141,7 @@ void ui_menu_custom_ui::custom_render(void *selectedref, float top, float bottom ui_menu_font_ui::ui_menu_font_ui(running_machine &machine, render_container *container) : ui_menu(machine, container) { emu_options &moptions = machine.options(); -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS std::string name(moptions.ui_font()); list(); @@ -180,7 +180,7 @@ ui_menu_font_ui::ui_menu_font_ui(running_machine &machine, render_container *con } -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS //------------------------------------------------- // fonts enumerator CALLBACK //------------------------------------------------- @@ -227,7 +227,7 @@ ui_menu_font_ui::~ui_menu_font_ui() std::string error_string; emu_options &moptions = machine().options(); -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS std::string name(m_fonts[m_actual]); if (m_fonts[m_actual] != "default") { @@ -273,7 +273,7 @@ void ui_menu_font_ui::handle() } break; -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS case MUI_FNT: if (m_event->iptkey == IPT_UI_LEFT || m_event->iptkey == IPT_UI_RIGHT) @@ -313,7 +313,7 @@ void ui_menu_font_ui::populate() UINT32 arrow_flags; std::string tmptxt; -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS // add fonts option arrow_flags = get_arrow_flags(0, m_fonts.size() - 1, m_actual); std::string name(m_fonts[m_actual]); diff --git a/src/emu/ui/custui.h b/src/emu/ui/custui.h index 46bb92b8197..0c453340c18 100644 --- a/src/emu/ui/custui.h +++ b/src/emu/ui/custui.h @@ -2,18 +2,18 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/custui.h + ui/custui.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_CUSTUI_H__ -#define __MEWUI_CUSTUI_H__ +#ifndef __UI_CUSTUI_H__ +#define __UI_CUSTUI_H__ -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS #define WIN32_LEAN_AND_MEAN #include <windows.h> #endif @@ -64,7 +64,7 @@ private: MUI_ITALIC }; -#ifdef MEWUI_WINDOWS +#ifdef OSD_WINDOWS UINT16 m_actual; std::vector<std::string> m_fonts; bool m_bold, m_italic; @@ -179,4 +179,4 @@ private: rgb_t &m_original; }; -#endif /* __MEWUI_CUSTUI_H__ */ +#endif /* __UI_CUSTUI_H__ */ diff --git a/src/emu/ui/datfile.cpp b/src/emu/ui/datfile.cpp index f0e938fbd4d..5afe83687ac 100644 --- a/src/emu/ui/datfile.cpp +++ b/src/emu/ui/datfile.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/datfile.cpp + ui/datfile.cpp MEWUI DATs manager. diff --git a/src/emu/ui/datfile.h b/src/emu/ui/datfile.h index cb8e5fdcd70..3b7a8423ec2 100644 --- a/src/emu/ui/datfile.h +++ b/src/emu/ui/datfile.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/datfile.h + ui/datfile.h MEWUI DATs manager. @@ -10,8 +10,8 @@ #pragma once -#ifndef __MEWUI_DATFILE_H__ -#define __MEWUI_DATFILE_H__ +#ifndef __UI_DATFILE_H__ +#define __UI_DATFILE_H__ //------------------------------------------------- // Datafile Manager @@ -76,4 +76,4 @@ private: }; -#endif /* __MEWUI_DATFILE_H__ */ +#endif /* __UI_DATFILE_H__ */ diff --git a/src/emu/ui/datmenu.cpp b/src/emu/ui/datmenu.cpp index 91dbcdcd41c..8e66e2ccd5e 100644 --- a/src/emu/ui/datmenu.cpp +++ b/src/emu/ui/datmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/datmenu.cpp + ui/datmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/datmenu.h b/src/emu/ui/datmenu.h index 9df45d57190..652c6492c43 100644 --- a/src/emu/ui/datmenu.h +++ b/src/emu/ui/datmenu.h @@ -2,17 +2,17 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/datmenu.h + ui/datmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_DATMENU_H__ -#define __MEWUI_DATMENU_H__ +#ifndef __UI_DATMENU_H__ +#define __UI_DATMENU_H__ struct ui_software_info; @@ -90,4 +90,4 @@ private: const game_driver *m_driver; }; -#endif /* __MEWUI_DATMENU_H__ */ +#endif /* __UI_DATMENU_H__ */ diff --git a/src/emu/ui/dirmenu.cpp b/src/emu/ui/dirmenu.cpp index 967b8176b06..21a8a177623 100644 --- a/src/emu/ui/dirmenu.cpp +++ b/src/emu/ui/dirmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/dirmenu.cpp + ui/dirmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/dirmenu.h b/src/emu/ui/dirmenu.h index 9d6a8fc6ef4..b513f181540 100644 --- a/src/emu/ui/dirmenu.h +++ b/src/emu/ui/dirmenu.h @@ -2,16 +2,16 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/dirmenu.h + ui/dirmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_DIRMENU_H__ -#define __MEWUI_DIRMENU_H__ +#ifndef __UI_DIRMENU_H__ +#define __UI_DIRMENU_H__ //------------------------------------------------- // class directory menu @@ -125,4 +125,4 @@ private: bool m_change; }; -#endif /* __MEWUI_DIRMENU_H__ */ +#endif /* __UI_DIRMENU_H__ */ diff --git a/src/emu/ui/dsplmenu.cpp b/src/emu/ui/dsplmenu.cpp index 6927043c165..68c218014bd 100644 --- a/src/emu/ui/dsplmenu.cpp +++ b/src/emu/ui/dsplmenu.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/dsplmenu.cpp + ui/dsplmenu.cpp MEWUI video options menu. @@ -15,7 +15,7 @@ #include "ui/selector.h" #include "ui/utils.h" -#if defined(MEWUI_WINDOWS) && !defined(MEWUI_SDL) +#if defined(OSD_WINDOWS) && !defined(OSD_SDL) #include "../osd/windows/winmain.h" #else #include "../osd/modules/lib/osdobj_common.h" @@ -24,7 +24,7 @@ ui_menu_display_options::video_modes ui_menu_display_options::m_video[] = { { "auto", "Auto" }, { "opengl", "OpenGL" }, -#if defined(MEWUI_WINDOWS) && !defined(MEWUI_SDL) +#if defined(OSD_WINDOWS) && !defined(OSD_SDL) { "d3d", "Direct3D" }, { "gdi", "GDI" }, { "ddraw", "DirectDraw" } @@ -37,7 +37,7 @@ ui_menu_display_options::video_modes ui_menu_display_options::m_video[] = { ui_menu_display_options::dspl_option ui_menu_display_options::m_options[] = { { 0, nullptr, nullptr }, { 0, "Video Mode", OSDOPTION_VIDEO }, -#if defined(MEWUI_WINDOWS) && !defined(MEWUI_SDL) +#if defined(OSD_WINDOWS) && !defined(OSD_SDL) { 0, "Hardware Stretch", WINOPTION_HWSTRETCH }, { 0, "Triple Buffering", WINOPTION_TRIPLEBUFFER }, { 0, "HLSL", WINOPTION_HLSL_ENABLE }, @@ -60,7 +60,7 @@ ui_menu_display_options::dspl_option ui_menu_display_options::m_options[] = { ui_menu_display_options::ui_menu_display_options(running_machine &machine, render_container *container) : ui_menu(machine, container) { -#if defined(MEWUI_WINDOWS) && !defined(MEWUI_SDL) +#if defined(OSD_WINDOWS) && !defined(OSD_SDL) windows_options &options = downcast<windows_options &>(machine.options()); #else osd_options &options = downcast<osd_options &>(machine.options()); diff --git a/src/emu/ui/dsplmenu.h b/src/emu/ui/dsplmenu.h index c52e151612b..862ccc11fcd 100644 --- a/src/emu/ui/dsplmenu.h +++ b/src/emu/ui/dsplmenu.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/dsplmenu.h + ui/dsplmenu.h MEWUI video options menu. @@ -10,8 +10,8 @@ #pragma once -#ifndef __MEWUI_DSPLMENU_H__ -#define __MEWUI_DSPLMENU_H__ +#ifndef __UI_DSPLMENU_H__ +#define __UI_DSPLMENU_H__ //------------------------------------------------- // class display options menu @@ -43,4 +43,4 @@ private: static dspl_option m_options[]; }; -#endif /* __MEWUI_DSPLMENU_H__ */ +#endif /* __UI_DSPLMENU_H__ */ diff --git a/src/emu/ui/icorender.h b/src/emu/ui/icorender.h index 915a2b88706..1e5ca286c3a 100644 --- a/src/emu/ui/icorender.h +++ b/src/emu/ui/icorender.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890;Victor Laskin /*************************************************************************** - mewui/icorender.h + ui/icorender.h ICOns file loader. @@ -14,8 +14,8 @@ ***************************************************************************/ #pragma once -#ifndef __MEWUI_ICORENDER_H__ -#define __MEWUI_ICORENDER_H__ +#ifndef __UI_ICORENDER_H__ +#define __UI_ICORENDER_H__ // These next two structs represent how the icon information is stored // in an ICO file. @@ -232,4 +232,4 @@ void render_load_ico(bitmap_argb32 &bitmap, emu_file &file, const char *dirname, global_free_array(buffer); } -#endif /* __MEWUI_ICORENDER_H__ */ +#endif /* __UI_ICORENDER_H__ */ diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp index d261385b5cb..524b1a7b3ad 100644 --- a/src/emu/ui/inifile.cpp +++ b/src/emu/ui/inifile.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/inifile.cpp + ui/inifile.cpp MEWUI INIs file manager. diff --git a/src/emu/ui/inifile.h b/src/emu/ui/inifile.h index f009ec53857..49bf123a3ad 100644 --- a/src/emu/ui/inifile.h +++ b/src/emu/ui/inifile.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/inifile.h + ui/inifile.h MEWUI INIs file manager. @@ -10,8 +10,8 @@ #pragma once -#ifndef __MEWUI_INIFILE_H__ -#define __MEWUI_INIFILE_H__ +#ifndef __UI_INIFILE_H__ +#define __UI_INIFILE_H__ #include "ui/utils.h" @@ -119,4 +119,4 @@ private: running_machine &m_machine; // reference to our machine }; -#endif /* __MEWUI_INIFILE_H__ */ +#endif /* __UI_INIFILE_H__ */ diff --git a/src/emu/ui/moptions.cpp b/src/emu/ui/moptions.cpp index f99699e0a41..83ff444783a 100644 --- a/src/emu/ui/moptions.cpp +++ b/src/emu/ui/moptions.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/moptions.c + ui/moptions.c MEWUI main options manager. diff --git a/src/emu/ui/moptions.h b/src/emu/ui/moptions.h index b31827645fa..b2db7f68059 100644 --- a/src/emu/ui/moptions.h +++ b/src/emu/ui/moptions.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/moptions.h + ui/moptions.h MEWUI main options manager. @@ -10,8 +10,8 @@ #pragma once -#ifndef __MEWUI_OPTS_H__ -#define __MEWUI_OPTS_H__ +#ifndef __UI_OPTS_H__ +#define __UI_OPTS_H__ #include "options.h" @@ -137,4 +137,4 @@ private: static const options_entry s_option_entries[]; }; -#endif /* __MEWUI_OPTS_H__ */ +#endif /* __UI_OPTS_H__ */ diff --git a/src/emu/ui/optsmenu.cpp b/src/emu/ui/optsmenu.cpp index 4902b496304..3cefed3219c 100644 --- a/src/emu/ui/optsmenu.cpp +++ b/src/emu/ui/optsmenu.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/optsmenu.cpp + ui/optsmenu.cpp MEWUI main options menu manager. diff --git a/src/emu/ui/optsmenu.h b/src/emu/ui/optsmenu.h index 5838f5994b5..c1d46a9c80e 100644 --- a/src/emu/ui/optsmenu.h +++ b/src/emu/ui/optsmenu.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/optsmenu.h + ui/optsmenu.h MEWUI main options menu manager. @@ -10,8 +10,8 @@ #pragma once -#ifndef __MEWUI_OPTSMENU_H__ -#define __MEWUI_OPTSMENU_H__ +#ifndef __UI_OPTSMENU_H__ +#define __UI_OPTSMENU_H__ class ui_menu_game_options : public ui_menu { @@ -46,4 +46,4 @@ private: // save options to file void save_game_options(running_machine &machine); -#endif /* __MEWUI_OPTSMENU_H__ */ +#endif /* __UI_OPTSMENU_H__ */ diff --git a/src/emu/ui/selector.cpp b/src/emu/ui/selector.cpp index 5766cc14cb3..06419d93f72 100644 --- a/src/emu/ui/selector.cpp +++ b/src/emu/ui/selector.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/m_selector.cpp + ui/m_selector.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/selector.h b/src/emu/ui/selector.h index e8b68f57ba4..595ca1f578d 100644 --- a/src/emu/ui/selector.h +++ b/src/emu/ui/selector.h @@ -2,16 +2,16 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/selector.h + ui/selector.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_SELECTOR_H__ -#define __MEWUI_SELECTOR_H__ +#ifndef __UI_SELECTOR_H__ +#define __UI_SELECTOR_H__ enum { @@ -48,4 +48,4 @@ private: void find_matches(const char *str); }; -#endif /* __MEWUI_SELECTOR_H__ */ +#endif /* __UI_SELECTOR_H__ */ diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp index ba2b91a93e9..7f1e8b647bf 100644 --- a/src/emu/ui/selgame.cpp +++ b/src/emu/ui/selgame.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/selgame.cpp + ui/selgame.cpp Main MEWUI menu. @@ -105,7 +105,7 @@ bool sort_game_list(const game_driver *x, const game_driver *y) // ctor //------------------------------------------------- -ui_mewui_select_game::ui_mewui_select_game(running_machine &machine, render_container *container, const char *gamename) : ui_menu(machine, container) +ui_menu_select_game::ui_menu_select_game(running_machine &machine, render_container *container, const char *gamename) : ui_menu(machine, container) { std::string error_string, last_filter, sub_filter; emu_options &moptions = machine.options(); @@ -181,7 +181,7 @@ ui_mewui_select_game::ui_mewui_select_game(running_machine &machine, render_cont // dtor //------------------------------------------------- -ui_mewui_select_game::~ui_mewui_select_game() +ui_menu_select_game::~ui_menu_select_game() { std::string error_string, last_driver; const game_driver *driver = nullptr; @@ -217,7 +217,7 @@ ui_mewui_select_game::~ui_mewui_select_game() // handle //------------------------------------------------- -void ui_mewui_select_game::handle() +void ui_menu_select_game::handle() { bool check_filter = false; bool enabled_dats = machine().options().enabled_dats(); @@ -545,7 +545,7 @@ void ui_mewui_select_game::handle() // populate //------------------------------------------------- -void ui_mewui_select_game::populate() +void ui_menu_select_game::populate() { mewui_globals::redraw_icon = true; mewui_globals::switch_image = true; @@ -684,7 +684,7 @@ void ui_mewui_select_game::populate() // build a list of available drivers //------------------------------------------------- -void ui_mewui_select_game::build_available_list() +void ui_menu_select_game::build_available_list() { int m_total = driver_list::total(); std::vector<bool> m_included(m_total, false); @@ -744,7 +744,7 @@ void ui_mewui_select_game::build_available_list() // perform our special rendering //------------------------------------------------- -void ui_mewui_select_game::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2) +void ui_menu_select_game::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2) { const game_driver *driver = nullptr; ui_software_info *swinfo = nullptr; @@ -980,7 +980,7 @@ void ui_mewui_select_game::custom_render(void *selectedref, float top, float bot // and inescapable //------------------------------------------------- -void ui_mewui_select_game::force_game_select(running_machine &machine, render_container *container) +void ui_menu_select_game::force_game_select(running_machine &machine, render_container *container) { // reset the menu stack ui_menu::stack_reset(machine); @@ -989,7 +989,7 @@ void ui_mewui_select_game::force_game_select(running_machine &machine, render_co ui_menu *quit = global_alloc_clear<ui_menu_quit_game>(machine, container); quit->set_special_main_menu(true); ui_menu::stack_push(quit); - ui_menu::stack_push(global_alloc_clear<ui_mewui_select_game>(machine, container, nullptr)); + ui_menu::stack_push(global_alloc_clear<ui_menu_select_game>(machine, container, nullptr)); // force the menus on machine.ui().show_menu(); @@ -1002,7 +1002,7 @@ void ui_mewui_select_game::force_game_select(running_machine &machine, render_co // handle select key event //------------------------------------------------- -void ui_mewui_select_game::inkey_select(const ui_menu_event *m_event) +void ui_menu_select_game::inkey_select(const ui_menu_event *m_event) { const game_driver *driver = (const game_driver *)m_event->itemref; @@ -1061,7 +1061,7 @@ void ui_mewui_select_game::inkey_select(const ui_menu_event *m_event) // handle select key event for favorites menu //------------------------------------------------- -void ui_mewui_select_game::inkey_select_favorite(const ui_menu_event *m_event) +void ui_menu_select_game::inkey_select_favorite(const ui_menu_event *m_event) { ui_software_info *ui_swinfo = (ui_software_info *)m_event->itemref; emu_options &mopt = machine().options(); @@ -1166,7 +1166,7 @@ void ui_mewui_select_game::inkey_select_favorite(const ui_menu_event *m_event) // returns if the search can be activated //------------------------------------------------- -inline bool ui_mewui_select_game::no_active_search() +inline bool ui_menu_select_game::no_active_search() { return (main_filters::actual == FILTER_FAVORITE_GAME); } @@ -1175,7 +1175,7 @@ inline bool ui_mewui_select_game::no_active_search() // handle special key event //------------------------------------------------- -void ui_mewui_select_game::inkey_special(const ui_menu_event *m_event) +void ui_menu_select_game::inkey_special(const ui_menu_event *m_event) { int buflen = strlen(m_search); @@ -1214,7 +1214,7 @@ void ui_mewui_select_game::inkey_special(const ui_menu_event *m_event) // build list //------------------------------------------------- -void ui_mewui_select_game::build_list(std::vector<const game_driver *> &s_drivers, const char *filter_text, int filter, bool bioscheck) +void ui_menu_select_game::build_list(std::vector<const game_driver *> &s_drivers, const char *filter_text, int filter, bool bioscheck) { int cx = 0; bool cloneof = false; @@ -1330,7 +1330,7 @@ void ui_mewui_select_game::build_list(std::vector<const game_driver *> &s_driver // build custom display list //------------------------------------------------- -void ui_mewui_select_game::build_custom() +void ui_menu_select_game::build_custom() { std::vector<const game_driver *> s_drivers; bool bioscheck = false; @@ -1395,7 +1395,7 @@ void ui_mewui_select_game::build_custom() // build category list //------------------------------------------------- -void ui_mewui_select_game::build_category() +void ui_menu_select_game::build_category() { std::vector<int> temp_filter; machine().inifile().load_ini_category(temp_filter); @@ -1411,7 +1411,7 @@ void ui_mewui_select_game::build_category() // build list from cache //------------------------------------------------- -void ui_mewui_select_game::build_from_cache(std::vector<const game_driver *> &s_drivers, int screens, int filter, bool bioscheck) +void ui_menu_select_game::build_from_cache(std::vector<const game_driver *> &s_drivers, int screens, int filter, bool bioscheck) { if (s_drivers.empty()) { @@ -1471,7 +1471,7 @@ void ui_mewui_select_game::build_from_cache(std::vector<const game_driver *> &s_ // populate search list //------------------------------------------------- -void ui_mewui_select_game::populate_search() +void ui_menu_select_game::populate_search() { // allocate memory to track the penalty value std::vector<int> penalty(VISIBLE_GAMES_IN_SEARCH, 9999); @@ -1522,7 +1522,7 @@ void ui_mewui_select_game::populate_search() // generate general info //------------------------------------------------- -void ui_mewui_select_game::general_info(const game_driver *driver, std::string &buffer) +void ui_menu_select_game::general_info(const game_driver *driver, std::string &buffer) { strprintf(buffer, "Romset: %-.100s\n", driver->name); buffer.append("Year: ").append(driver->year).append("\n"); @@ -1598,7 +1598,7 @@ void ui_mewui_select_game::general_info(const game_driver *driver, std::string & buffer.append("Roms Audit Pass: Disabled\nSamples Audit Pass: Disabled\n"); } -void ui_mewui_select_game::inkey_export() +void ui_menu_select_game::inkey_export() { std::string filename("exported"); emu_file infile(machine().options().mewui_path(), OPEN_FLAG_READ); @@ -1654,7 +1654,7 @@ void ui_mewui_select_game::inkey_export() // save drivers infos to file //------------------------------------------------- -void ui_mewui_select_game::save_cache_info() +void ui_menu_select_game::save_cache_info() { // attempt to open the output file emu_file file(machine().options().mewui_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); @@ -1743,7 +1743,7 @@ void ui_mewui_select_game::save_cache_info() // load drivers infos from file //------------------------------------------------- -void ui_mewui_select_game::load_cache_info() +void ui_menu_select_game::load_cache_info() { driver_cache.resize(driver_list::total() + 1); @@ -1817,7 +1817,7 @@ void ui_mewui_select_game::load_cache_info() // load drivers infos from file //------------------------------------------------- -bool ui_mewui_select_game::load_available_machines() +bool ui_menu_select_game::load_available_machines() { // try to load available drivers from file emu_file file(machine().options().mewui_path(), OPEN_FLAG_READ); @@ -1869,7 +1869,7 @@ bool ui_mewui_select_game::load_available_machines() // load custom filters info from file //------------------------------------------------- -void ui_mewui_select_game::load_custom_filters() +void ui_menu_select_game::load_custom_filters() { // attempt to open the output file emu_file file(machine().options().mewui_path(), OPEN_FLAG_READ); @@ -1937,7 +1937,7 @@ void ui_mewui_select_game::load_custom_filters() // draw left box //------------------------------------------------- -float ui_mewui_select_game::draw_left_panel(float x1, float y1, float x2, float y2) +float ui_menu_select_game::draw_left_panel(float x1, float y1, float x2, float y2) { ui_manager &mui = machine().ui(); float line_height = mui.get_line_height(); @@ -2091,7 +2091,7 @@ float ui_mewui_select_game::draw_left_panel(float x1, float y1, float x2, float // draw infos //------------------------------------------------- -void ui_mewui_select_game::infos_render(void *selectedref, float origx1, float origy1, float origx2, float origy2) +void ui_menu_select_game::infos_render(void *selectedref, float origx1, float origy1, float origx2, float origy2) { ui_manager &mui = machine().ui(); float line_height = mui.get_line_height(); @@ -2369,7 +2369,7 @@ void ui_mewui_select_game::infos_render(void *selectedref, float origx1, float o } } -void ui_mewui_select_game::draw_right_panel(void *selectedref, float origx1, float origy1, float origx2, float origy2) +void ui_menu_select_game::draw_right_panel(void *selectedref, float origx1, float origy1, float origx2, float origy2) { ui_manager &mui = machine().ui(); float line_height = mui.get_line_height(); @@ -2413,7 +2413,7 @@ void ui_mewui_select_game::draw_right_panel(void *selectedref, float origx1, flo // perform our special rendering //------------------------------------------------- -void ui_mewui_select_game::arts_render(void *selectedref, float origx1, float origy1, float origx2, float origy2) +void ui_menu_select_game::arts_render(void *selectedref, float origx1, float origy1, float origx2, float origy2) { ui_manager &mui = machine().ui(); float line_height = mui.get_line_height(); diff --git a/src/emu/ui/selgame.h b/src/emu/ui/selgame.h index 175194826ca..b1acdc31e92 100644 --- a/src/emu/ui/selgame.h +++ b/src/emu/ui/selgame.h @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/selgame.h + ui/selgame.h Main MEWUI menu. @@ -10,17 +10,17 @@ #pragma once -#ifndef __MEWUI_MAIN_H__ -#define __MEWUI_MAIN_H__ +#ifndef __UI_MAIN_H__ +#define __UI_MAIN_H__ #include "drivenum.h" #include "ui/menu.h" -class ui_mewui_select_game : public ui_menu +class ui_menu_select_game : public ui_menu { public: - ui_mewui_select_game(running_machine &machine, render_container *container, const char *gamename); - virtual ~ui_mewui_select_game(); + ui_menu_select_game(running_machine &machine, render_container *container, const char *gamename); + virtual ~ui_menu_select_game(); virtual void populate() override; virtual void handle() override; virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -85,4 +85,4 @@ private: }; -#endif /* __MEWUI_MAIN_H__ */ +#endif /* __UI_MAIN_H__ */ diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp index ccc98d5f0a3..a8bedde43b4 100644 --- a/src/emu/ui/selsoft.cpp +++ b/src/emu/ui/selsoft.cpp @@ -2,7 +2,7 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/selsoft.cpp + ui/selsoft.cpp MEWUI softwares menu. diff --git a/src/emu/ui/selsoft.h b/src/emu/ui/selsoft.h index 9691e5ad118..f5a2063cec6 100644 --- a/src/emu/ui/selsoft.h +++ b/src/emu/ui/selsoft.h @@ -2,15 +2,15 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/selsoft.h + ui/selsoft.h MEWUI softwares menu. ***************************************************************************/ #pragma once -#ifndef __MEWUI_SELSOFT_H__ -#define __MEWUI_SELSOFT_H__ +#ifndef __UI_SELSOFT_H__ +#define __UI_SELSOFT_H__ #include "ui/custmenu.h" @@ -109,4 +109,4 @@ private: bool has_multiple_bios(const game_driver *driver, std::vector<s_bios> &biosname); -#endif /* __MEWUI_SELSOFT_H__ */ +#endif /* __UI_SELSOFT_H__ */ diff --git a/src/emu/ui/sndmenu.cpp b/src/emu/ui/sndmenu.cpp index d8dfa05404f..76568509385 100644 --- a/src/emu/ui/sndmenu.cpp +++ b/src/emu/ui/sndmenu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /********************************************************************* - mewui/sndmenu.cpp + ui/sndmenu.cpp - Internal MEWUI user interface. + Internal UI user interface. *********************************************************************/ diff --git a/src/emu/ui/sndmenu.h b/src/emu/ui/sndmenu.h index 19112ad848f..8b13b38ea88 100644 --- a/src/emu/ui/sndmenu.h +++ b/src/emu/ui/sndmenu.h @@ -2,16 +2,16 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/sndmenu.h + ui/sndmenu.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_SNDMENU_H__ -#define __MEWUI_SNDMENU_H__ +#ifndef __UI_SNDMENU_H__ +#define __UI_SNDMENU_H__ //------------------------------------------------- // class sound options menu @@ -39,4 +39,4 @@ private: bool m_samples, m_sound; }; -#endif /* __MEWUI_SNDMENU_H__ */ +#endif /* __UI_SNDMENU_H__ */ diff --git a/src/emu/ui/utils.cpp b/src/emu/ui/utils.cpp index 3dbf3e30e01..e52274e22f1 100644 --- a/src/emu/ui/utils.cpp +++ b/src/emu/ui/utils.cpp @@ -2,9 +2,9 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/utils.cpp + ui/utils.cpp - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ diff --git a/src/emu/ui/utils.h b/src/emu/ui/utils.h index fc3bdf2d32d..3e339ccadce 100644 --- a/src/emu/ui/utils.h +++ b/src/emu/ui/utils.h @@ -2,16 +2,16 @@ // copyright-holders:Dankan1890 /*************************************************************************** - mewui/utils.h + ui/utils.h - Internal MEWUI user interface. + Internal UI user interface. ***************************************************************************/ #pragma once -#ifndef __MEWUI_UTILS_H__ -#define __MEWUI_UTILS_H__ +#ifndef __UI_UTILS_H__ +#define __UI_UTILS_H__ #include "osdepend.h" #include "render.h" @@ -364,4 +364,4 @@ void render_load_jpeg(_T &bitmap, emu_file &file, const char *dirname, const cha global_free_array(jpg_buffer); } -#endif /* __MEWUI_UTILS_H__ */ +#endif /* __UI_UTILS_H__ */ |