Added support and configuration for the image collection "covers".

Slightly modernized and simplified the code.
mamedev · Mar 18, 2016 · 25bc100 · 25bc100
1 parent 95aa75c
commit 25bc100
Show file tree

Hide file tree

Showing 52 changed files with 209 additions and 192 deletions.
diff --git a/src/emu/ui/auditmenu.cpp b/src/emu/ui/auditmenu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/auditmenu.cpp

diff --git a/src/emu/ui/auditmenu.h b/src/emu/ui/auditmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/auditmenu.h

diff --git a/src/emu/ui/barcode.cpp b/src/emu/ui/barcode.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Fabio Priuli
 /***************************************************************************
 
-    ui/barcode.c
+    ui/barcode.cpp
 
     "Barcode Reader" control
 

diff --git a/src/emu/ui/cheatopt.cpp b/src/emu/ui/cheatopt.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods
 /*********************************************************************
 
-    ui/cheatopt.c
+    ui/cheatopt.cpp
 
     Internal menu for the cheat interface.
 

diff --git a/src/emu/ui/cmddata.h b/src/emu/ui/cmddata.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/cmddata.h
@@ -143,10 +143,8 @@ static rgb_t color_table[] =
 	BUTTON_COLOR_SILVER  // 8 Player Lever
 };
 
-// for color glyph
 #define COLOR_BUTTONS   ARRAY_LENGTH(color_table)
 
-// Follow Varialbe Defined Arraies for Game Command Tag
 struct fix_command_t
 {
 	unsigned char   glyph_char;

diff --git a/src/emu/ui/cmdrender.h b/src/emu/ui/cmdrender.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/cmdrender.h

diff --git a/src/emu/ui/ctrlmenu.cpp b/src/emu/ui/ctrlmenu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/ctrlmenu.cpp

diff --git a/src/emu/ui/ctrlmenu.h b/src/emu/ui/ctrlmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/ctrlmenu.h

diff --git a/src/emu/ui/custmenu.cpp b/src/emu/ui/custmenu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/custmenu.cpp

diff --git a/src/emu/ui/custmenu.h b/src/emu/ui/custmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/custmenu.h

diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/custui.cpp

diff --git a/src/emu/ui/custui.h b/src/emu/ui/custui.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/custui.h

diff --git a/src/emu/ui/datfile.cpp b/src/emu/ui/datfile.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/datfile.cpp

diff --git a/src/emu/ui/datfile.h b/src/emu/ui/datfile.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/datfile.h

diff --git a/src/emu/ui/datmenu.cpp b/src/emu/ui/datmenu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/datmenu.cpp
@@ -36,6 +36,8 @@ ui_menu_dats_view::ui_menu_dats_view(running_machine &machine, render_container
 		}
 	}
 	m_driver = (driver == nullptr) ? &machine.system() : driver;
+	m_actual = 0;
+	m_issoft = false;
 
 	init_items();
 }
@@ -52,8 +54,8 @@ ui_menu_dats_view::ui_menu_dats_view(running_machine &machine, render_container
 	m_parent = swinfo->parentname;
 	m_driver = (driver == nullptr) ? &machine.system() : driver;
 	m_swinfo = swinfo;
-
-	issoft = true;
+	m_actual = 0;
+	m_issoft = true;
 
 	if (machine.datfile().has_software(m_list, m_short, m_parent))
 		m_items_list.emplace_back(_("Software History"), UI_HISTORY_LOAD, machine.datfile().rev_history());
@@ -78,15 +80,15 @@ void ui_menu_dats_view::handle()
 	const ui_menu_event *m_event = process(MENU_FLAG_UI_DATS);
 	if (m_event != nullptr)
 	{
-		if (m_event->iptkey == IPT_UI_LEFT && actual > 0)
+		if (m_event->iptkey == IPT_UI_LEFT && m_actual > 0)
 		{
-			actual--;
+			m_actual--;
 			reset(UI_MENU_RESET_SELECT_FIRST);
 		}
 
-		if (m_event->iptkey == IPT_UI_RIGHT && actual < m_items_list.size() - 1)
+		if (m_event->iptkey == IPT_UI_RIGHT && m_actual < m_items_list.size() - 1)
 		{
-			actual++;
+			m_actual++;
 			reset(UI_MENU_RESET_SELECT_FIRST);
 		}
 	}
@@ -99,7 +101,7 @@ void ui_menu_dats_view::handle()
 void ui_menu_dats_view::populate()
 {
 	machine().pause();
-	(issoft == true) ? get_data_sw() : get_data();
+	(m_issoft == true) ? get_data_sw() : get_data();
 
 	item_append(MENU_SEPARATOR_ITEM, nullptr, (MENU_FLAG_UI_DATS | MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), nullptr);
 	customtop = 2.0f * machine().ui().get_line_height() + 4.0f * UI_BOX_TB_BORDER;
@@ -116,7 +118,7 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom
 	ui_manager &mui = machine().ui();
 	float maxwidth = origx2 - origx1;
 	float width;
-	std::string driver = (issoft == true) ? m_swinfo->longname : m_driver->description;
+	std::string driver = (m_issoft == true) ? m_swinfo->longname : m_driver->description;
 
 	mui.draw_text_full(container, driver.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE,
 		DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr);
@@ -168,8 +170,8 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom
 	for (auto & elem : m_items_list)
 	{
 		x1 += space;
-		rgb_t fcolor = (actual == x) ? rgb_t(0xff, 0xff, 0xff, 0x00) : UI_TEXT_COLOR;
-		rgb_t bcolor = (actual == x) ? rgb_t(0xff, 0xff, 0xff, 0xff) : UI_TEXT_BG_COLOR;
+		rgb_t fcolor = (m_actual == x) ? rgb_t(0xff, 0xff, 0xff, 0x00) : UI_TEXT_COLOR;
+		rgb_t bcolor = (m_actual == x) ? rgb_t(0xff, 0xff, 0xff, 0xff) : UI_TEXT_BG_COLOR;
 		mui.draw_text_full(container, elem.label.c_str(), x1, y1, 1.0f, JUSTIFY_LEFT, WRAP_NEVER,
 			DRAW_NONE, fcolor, bcolor, &width, nullptr);
 		if (bcolor != UI_TEXT_BG_COLOR)
@@ -184,7 +186,7 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom
 
 	// bottom
 	std::string revision;
-	revision.assign(_("Revision: ")).append(m_items_list[actual].revision);
+	revision.assign(_("Revision: ")).append(m_items_list[m_actual].revision);
 	mui.draw_text_full(container, revision.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE,
 									DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr);
 	width += 2 * UI_BOX_LR_BORDER;
@@ -219,7 +221,7 @@ void ui_menu_dats_view::get_data()
 	std::vector<int> xend;
 	std::string buffer;
 	std::vector<std::string> m_item;
-	if (m_items_list[actual].option == UI_COMMAND_LOAD)
+	if (m_items_list[m_actual].option == UI_COMMAND_LOAD)
 	{
 		machine().datfile().command_sub_menu(m_driver, m_item);
 		if (!m_item.empty())
@@ -236,7 +238,7 @@ void ui_menu_dats_view::get_data()
 		}
 	}
 	else
-		machine().datfile().load_data_info(m_driver, buffer, m_items_list[actual].option);
+		machine().datfile().load_data_info(m_driver, buffer, m_items_list[m_actual].option);
 
 	int totallines = machine().ui().wrap_text(container, buffer.c_str(), 0.0f, 0.0f, 1.0f - (4.0f * UI_BOX_LR_BORDER), xstart, xend);
 	for (int x = 0; x < totallines; ++x)
@@ -252,7 +254,7 @@ void ui_menu_dats_view::get_data_sw()
 	std::vector<int> xend;
 	std::string buffer;
 	std::vector<std::string> m_item;
-	if (m_items_list[actual].option == 0)
+	if (m_items_list[m_actual].option == 0)
 		buffer = m_swinfo->usage;
 	else
 	{

diff --git a/src/emu/ui/datmenu.h b/src/emu/ui/datmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/datmenu.h
@@ -31,14 +31,14 @@ class ui_menu_dats_view : public ui_menu
 	virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override;
 
 private:
-	int actual;
+	int m_actual;
 	const game_driver  *m_driver;
 	ui_software_info *m_swinfo;
 	std::string m_list, m_short, m_long, m_parent;
 	void get_data();
 	void get_data_sw();
 	void init_items();
-	bool issoft;
+	bool m_issoft;
 	struct list_items
 	{
 		list_items(std::string l, int i, std::string rev) { label = l; option = i; revision = rev; }

diff --git a/src/emu/ui/defimg.h b/src/emu/ui/defimg.h
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
+
 static const UINT32 no_avail_bmp[] =
 {
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00231f20, 0x00000000, 0x00000000, 0x00000000, 0x01231f20, 0x04231f20, 0x11231f20, 0x2e231f20, 0x62231f20, 0x8e231f20, 0xb4231f20, 0xd4231f20, 0xe5231f20, 0xf2231f20, 0xfd231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xff231f20, 0xfd231f20, 0xf2231f20, 0xe5231f20, 0xd4231f20, 0xb4231f20, 0x8e231f20, 0x62231f20, 0x2e231f20, 0x11231f20, 0x04231f20, 0x01231f20, 0x00000000, 0x00000000, 0x00000000, 0x00231f20, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,

diff --git a/src/emu/ui/devopt.cpp b/src/emu/ui/devopt.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Nathan Woods
 /*********************************************************************
 
-    ui/devopt.c
+    ui/devopt.cpp
 
     Internal menu for the device configuration.
 

diff --git a/src/emu/ui/dirmenu.cpp b/src/emu/ui/dirmenu.cpp
@@ -55,6 +55,7 @@ static const folders_entry s_folders[] =
 	{ __("Logos"),               OPTION_LOGOS_PATH,         ADDING },
 	{ __("Scores"),              OPTION_SCORES_PATH,        ADDING },
 	{ __("Versus"),              OPTION_VERSUS_PATH,        ADDING },
+	{ __("Covers"),              OPTION_COVER_PATH,         ADDING }
 };
 
 

diff --git a/src/emu/ui/dirmenu.h b/src/emu/ui/dirmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/dirmenu.h

diff --git a/src/emu/ui/dsplmenu.cpp b/src/emu/ui/dsplmenu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /*********************************************************************
 
     ui/dsplmenu.cpp

diff --git a/src/emu/ui/dsplmenu.h b/src/emu/ui/dsplmenu.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/dsplmenu.h

diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Nathan Woods
 /*********************************************************************
 
-    ui/filemngr.c
+    ui/filemngr.cpp
 
     MESS's clunky built-in file manager
 

diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Nathan Woods
 /***************************************************************************
 
-    ui/filesel.c
+    ui/filesel.cpp
 
     MESS's clunky built-in file manager
 

diff --git a/src/emu/ui/icorender.h b/src/emu/ui/icorender.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890;Victor Laskin
+// copyright-holders:Maurizio Petrarota, Victor Laskin
 /***************************************************************************
 
     ui/icorender.h

diff --git a/src/emu/ui/info.cpp b/src/emu/ui/info.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods
 /***************************************************************************
 
-    ui/info.c
+    ui/info.cpp
 
     System and image info screens
 

diff --git a/src/emu/ui/info_pty.cpp b/src/emu/ui/info_pty.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:F.Ulivi
 /***************************************************************************
 
-    ui/info_pty.c
+    ui/info_pty.cpp
 
     Information screen on pseudo terminals
 

diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
 /***************************************************************************
 
     ui/inifile.cpp
@@ -18,8 +18,8 @@
 //-------------------------------------------------
 //  GLOBAL VARIABLES
 //-------------------------------------------------
-UINT16 inifile_manager::current_category = 0;
-UINT16 inifile_manager::current_file = 0;
+UINT16 inifile_manager::c_cat = 0;
+UINT16 inifile_manager::c_file = 0;
 
 //-------------------------------------------------
 //  ctor
@@ -48,10 +48,6 @@ void inifile_manager::directory_scan()
 		int length = strlen(dir->name);
 		std::string filename(dir->name);
 
-		// skip ui_favorite file
-		if (!core_stricmp("ui_favorite.ini", filename.c_str()))
-			continue;
-
 		// check .ini file ending
 		if ((length > 4) && dir->name[length - 4] == '.' && tolower((UINT8)dir->name[length - 3]) == 'i' &&
 			tolower((UINT8)dir->name[length - 2]) == 'n' && tolower((UINT8)dir->name[length - 1]) == 'i')
@@ -103,8 +99,8 @@ void inifile_manager::load_ini_category(std::vector<int> &temp_filter)
 		return;
 
 	bool search_clones = false;
-	std::string filename(ini_index[current_file].name);
-	long offset = ini_index[current_file].category[current_category].offset;
+	std::string filename(ini_index[c_file].first);
+	long offset = ini_index[c_file].second[c_cat].second;
 
 	if (!core_stricmp(filename.c_str(), "category.ini") || !core_stricmp(filename.c_str(), "alltime.ini"))
 		search_clones = true;