Merge pull request #223 from walkero-gr/fix-morphos-menus

Fixed MorphOS menus

Author: walkero-gr

CHANGELOG.md

@@ -1,11 +1,18 @@
 ## iGame VERSION_TAG - [RELEASE_DATE]
+### Changed
+- Simplified the version string and added the release date in the screen title
+
+### Fixed
+- Fixed the menus in MorphOS that were broken for some time now
+
+## iGame 2.4.1 - [2023-07-19]
 ### Added
 - Now the Genre list is populated from the igame.data files and the genre file, if it exists, although it is not necessary. The genre filtering is working with these new values
-- Added a new cycle box that lets the user to filter the results based on the chipset. This requires in settings the "Prefer igame.data files" to be enabled
+- Added a new cycle box that lets the user filter the results based on the chipset. This requires in settings the "Prefer igame.data files" to be enabled
 
 ### Changed
-- When realtime filtering is enabled at least 3 characters are required so as to be initiated. Less than 3 characters are ignored, unless the filtering by pressing the enter button is enabled.
-- Removed the filtering options from the Genre list and moved to its own select box above entries list
+- When real-time filtering is enabled at least 3 characters are required so as to be initiated. Less than 3 characters are ignored, unless the filtering by pressing the enter button is enabled.
+- Removed the filtering options from the Genre list and moved them to their own select box above the entries list
 - Now, even if the list entries list is populated a new repository scan will update the Chipset and Genre information based on the data found in igame.data files.
 - If the "Prefer igame.data files" is not enabled those files are not used during the scan of repositories
 

Makefile.docker

@@ -132,7 +132,7 @@ src/funcs_$(CPU).o: src/funcs.c src/iGame_strings.h src/strfuncs.h \
 	src/chipsetList.h
 
 src/iGameGUI_$(CPU).o: src/iGameGUI.c src/iGameGUI.h src/iGame_strings.h \
-	src/fsfuncs.h src/iGameExtern.h
+	src/fsfuncs.h src/iGameExtern.h src/version.h
 
 src/iGameMain_$(CPU).o: src/iGameMain.c src/iGameExtern.h
 

src/iGameExtern.h

@@ -54,14 +54,14 @@
 // #define SCREENASPECT_HOTKEY 's'
 // #define SCALEMODEMASK(u,d,p,s) (((u)?GGSMF_SCALEUP:0)|((d)?GGSMF_SCALEDOWN:0)|((p)?GGSMF_KEEPASPECT_PICTURE:0)|((s)?GGSMF_KEEPASPECT_SCREEN:0))
 
-// #define MENU_SCANREPOS_HOTKEY "R"
-// #define MENU_ADDNONWHDLOADGAME_HOTKEY "A"
+#define MENU_SCANREPOS_HOTKEY "R"
+#define MENU_ADDNONWHDLOADGAME_HOTKEY "A"
 #define MENU_OPENLIST_HOTKEY "O"
 #define MENU_SAVELIST_HOTKEY "S"
-// #define MENU_ABOUT_HOTKEY "?"
-// #define MENU_QUIT_HOTKEY "Q"
-// #define MENU_PROPERTIES_HOTKEY "P"
-// #define MENU_DELETE_HOTKEY "D"
+#define MENU_ABOUT_HOTKEY "?"
+#define MENU_QUIT_HOTKEY "Q"
+#define MENU_PROPERTIES_HOTKEY "P"
+#define MENU_DELETE_HOTKEY "D"
 
 #define MAX_SLAVE_TITLE_SIZE 128
 #define MAX_GENRE_NAME_SIZE 32

src/iGameGUI.c

@@ -76,19 +76,22 @@
 extern igame_settings *current_settings;
 extern blockGuiGfx;
 
+#ifndef __MORPHOS__
 static void translateMenu(struct NewMenu *);
 static void flagMenuItem(struct NewMenu *, APTR, UWORD);
 
 #define TICK (CHECKIT|MENUTOGGLE)
 #define DIS  NM_ITEMDISABLED
 #define STR_ID(x) ( (STRPTR)(x) )
+#endif // ndef __MORPHOS__
 
 #if defined(__amigaos4__)
 #define AllocVecShared(size, flags)  AllocVecTags((size), AVT_Type, MEMF_SHARED, AVT_Lock, FALSE, ((flags)&MEMF_CLEAR) ? AVT_ClearWithValue : TAG_IGNORE, 0, TAG_DONE)
 #else
 #define AllocVecShared(size, flags)  AllocVec((size), (flags))
 #endif
 
+#ifndef __MORPHOS__
 static struct NewMenu MenuMainWin[] =
 {
 	{ NM_TITLE, STR_ID(MSG_MNlabel2Actions)							, 0 ,0 ,0			,(APTR)MENU_ACTIONS },
@@ -112,6 +115,7 @@ static struct NewMenu MenuMainWin[] =
 
 	{ NM_END,NULL,0,0,0,NULL }
 };
+#endif // ndef __MORPHOS__
 
 static struct Listentry
 {
@@ -242,21 +246,31 @@ struct ObjApp *CreateApp(void)
 	struct ObjApp *object;
 	APTR strip;
 	static char about_text[512];
-	static char version_string[16];
+	static char version_string[30];
 
+#ifndef __MORPHOS__
 	translateMenu(MenuMainWin);
+#endif // ndef __MORPHOS__
 
 	snprintf(version_string, sizeof(version_string),
-		"%s v%d.%d.%d",
+		"%s %d.%d.%d (%s)",
 		GetMBString(MSG_WI_MainWindow),
-		MAJOR_VERS, MINOR_VERS, PATCH_VERS
+		MAJOR_VERS, MINOR_VERS, PATCH_VERS, STR(RELEASE_DATE)
 	);
 
 	snprintf(about_text, sizeof(about_text),
-		"%s (%s)\n%s %s\n\nCopyright 2005-%d\n%s"
-		, version_string, STR(RELEASE_DATE), GetMBString(MSG_compiledForAboutWin), STR(CPU_VERS), COPY_END_YEAR, GetMBString(MSG_TX_About)
+		"%s\n%s %s\n\nCopyright 2005-%d\n%s",
+		version_string, GetMBString(MSG_compiledForAboutWin), STR(CPU_VERS), COPY_END_YEAR, GetMBString(MSG_TX_About)
 	);
 
+#ifdef __MORPHOS__
+	APTR	MNlabel2Actions, MNlabelScan, MNMainAddnonWHDLoadgame, MNMainMenuShowHidehiddenentries;
+	APTR	MNMainBarLabel0, MNMainAbout;
+	APTR	MNMainBarLabel1, MNMainQuit, MNlabel2Game, MNMainProperties, MNMainOpenCurrentDir;
+	APTR	MNlabel2Tools, MNMainiGameSettings;
+	APTR	MNlabel2GameRepositories, MNMainBarLabel2, MNMainMUISettings;
+#endif // ndef __MORPHOS__
+
 	APTR	MNMainOpenList, MNMainSaveList, MNMainSaveListAs;
 	// APTR	MNMainMenuDuplicate;
 	// APTR	MNMainDelete;
@@ -281,6 +295,14 @@ struct ObjApp *CreateApp(void)
 	APTR	GR_SettingsButtons, Space_SettingsButtons1, Space_SettingsButtons2;
 
 // TODO: Change all the hooks to use SDI_Hook.h and MakeStaticHook()
+#ifdef __MORPHOS__
+	static const struct Hook MenuScanHook = { { NULL,NULL }, HookEntry, (HOOKFUNC)scan_repositories, NULL };
+	static const struct Hook MenuShowHideHiddenHook = { { NULL,NULL }, HookEntry, (HOOKFUNC)list_show_hidden, NULL };
+	static const struct Hook MenuPropertiesHook = { { NULL,NULL }, HookEntry, (HOOKFUNC)slaveProperties, NULL };
+	static const struct Hook MenuAddNonWhdloadHook = { { NULL,NULL }, HookEntry, (HOOKFUNC)add_non_whdload, NULL };
+	static const struct Hook OpenCurrentDirHook = { { NULL,NULL }, HookEntry, (HOOKFUNC)open_current_dir, NULL };
+#endif
+
 #if defined(__amigaos4__)
 	static const struct Hook MenuOpenListHook = { { NULL,NULL }, (HOOKFUNC)open_list, NULL, NULL };
 #else
@@ -640,6 +662,22 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 		Child, object->TX_Status,
 		End;
 
+#ifdef __MORPHOS__
+	MNlabelScan = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNlabelScan),
+		MUIA_Menuitem_Shortcut, MENU_SCANREPOS_HOTKEY,
+		End;
+
+	MNMainAddnonWHDLoadgame = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainAddnonWHDLoadgame),
+		MUIA_Menuitem_Shortcut, MENU_ADDNONWHDLOADGAME_HOTKEY,
+		End;
+
+	MNMainMenuShowHidehiddenentries = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainMenuShowHidehiddenentries),
+		End;
+#endif
+
 	MNMainOpenList = MenuitemObject,
 		MUIA_Menuitem_Title, GetMBString(MSG_MNMainOpenList),
 		MUIA_Menuitem_Shortcut, MENU_OPENLIST_HOTKEY,
@@ -654,6 +692,47 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 		MUIA_Menuitem_Title, GetMBString(MSG_MNMainSaveListAs),
 		End;
 
+#ifdef __MORPHOS__
+	MNMainBarLabel0 = MUI_MakeObject(MUIO_Menuitem, NM_BARLABEL, 0, 0, 0);
+
+	MNMainAbout = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainAbout),
+		MUIA_Menuitem_Shortcut, MENU_ABOUT_HOTKEY,
+		End;
+
+	MNMainBarLabel1 = MUI_MakeObject(MUIO_Menuitem, NM_BARLABEL, 0, 0, 0);
+
+	MNMainQuit = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainQuit),
+		MUIA_Menuitem_Shortcut, MENU_QUIT_HOTKEY,
+		End;
+
+	MNlabel2Actions = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNlabel2Actions),
+		MUIA_Family_Child, MNlabelScan,
+		MUIA_Family_Child, MNMainAddnonWHDLoadgame,
+		MUIA_Family_Child, MNMainMenuShowHidehiddenentries,
+		/* MUIA_Family_Child, MNMainBarLabel5, */
+		/* MUIA_Family_Child, MNMainOpenList, */
+		/* MUIA_Family_Child, MNMainSaveList, */
+		/* MUIA_Family_Child, MNMainSaveListAs, */
+		MUIA_Family_Child, MNMainBarLabel0,
+		MUIA_Family_Child, MNMainAbout,
+		MUIA_Family_Child, MNMainBarLabel1,
+		MUIA_Family_Child, MNMainQuit,
+		End;
+
+	MNMainProperties = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainProperties),
+		MUIA_Menuitem_Shortcut, MENU_PROPERTIES_HOTKEY,
+		End;
+
+	MNMainOpenCurrentDir = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainOpenCurrentDir),
+		//MUIA_Menuitem_Shortcut, GetMBString(MSG_MNMainOpenCurrentDirChar),
+		End;
+#endif
+
 	// MNMainMenuDuplicate = MenuitemObject,
 	// 	MUIA_Menuitem_Title, GetMBString(MSG_MNMainMenuDuplicate),
 	// 	End;
@@ -663,15 +742,54 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 	// 	MUIA_Menuitem_Shortcut, MENU_DELETE_HOTKEY,
 	// 	End;
 
+#ifndef __MORPHOS__
 	if (get_wb_version() < 44)
 	{
 		flagMenuItem(MenuMainWin, (APTR)MENU_GAMEFOLDER, DIS);
 	}
+#else
+	MNlabel2Game = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNlabel2Game),
+		MUIA_Family_Child, MNMainProperties,
+		End;
+
+	MNMainiGameSettings = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainiGameSettings),
+		End;
+
+	MNlabel2GameRepositories = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNlabel2GameRepositories),
+		End;
+
+	MNMainBarLabel2 = MUI_MakeObject(MUIO_Menuitem, NM_BARLABEL, 0, 0, 0);
+
+	MNMainMUISettings = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNMainMUISettings),
+		End;
+
+	MNlabel2Tools = MenuitemObject,
+		MUIA_Menuitem_Title, GetMBString(MSG_MNlabel2Tools),
+		MUIA_Family_Child, MNMainiGameSettings,
+		MUIA_Family_Child, MNlabel2GameRepositories,
+		MUIA_Family_Child, MNMainBarLabel2,
+		MUIA_Family_Child, MNMainMUISettings,
+		End;
+
+	object->MN_MainMenu = MenustripObject,
+		MUIA_Family_Child, MNlabel2Actions,
+		MUIA_Family_Child, MNlabel2Game,
+		MUIA_Family_Child, MNlabel2Tools,
+		End;
+#endif
 
 	object->WI_MainWindow = WindowObject,
 		MUIA_Window_ScreenTitle, version_string,
 		MUIA_Window_Title, GetMBString(MSG_WI_MainWindow),
+#ifndef __MORPHOS__
 		MUIA_Window_Menustrip, strip = MUI_MakeObject(MUIO_MenustripNM, MenuMainWin, 0),
+#else
+		MUIA_Window_Menustrip, object->MN_MainMenu,
+#endif
 		MUIA_Window_ID, MAKE_ID('0', 'I', 'G', 'A'),
 		MUIA_Window_AppWindow, TRUE,
 		WindowContents, GROUP_ROOT,
@@ -1693,6 +1811,78 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 		0
 	);
 
+#ifdef __MORPHOS__
+	DoMethod(MNlabelScan,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_CallHook, &MenuScanHook
+	);
+
+	DoMethod(MNMainAddnonWHDLoadgame,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_CallHook, &MenuAddNonWhdloadHook
+	);
+
+	DoMethod(MNMainMenuShowHidehiddenentries,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_CallHook, &MenuShowHideHiddenHook
+	);
+	DoMethod(MNMainAbout,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->WI_About,
+		3,
+		MUIM_Set, MUIA_Window_Open, TRUE
+	);
+
+	DoMethod(MNMainQuit,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_Application_ReturnID, MUIV_Application_ReturnID_Quit
+	);
+
+	DoMethod(MNMainProperties,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_CallHook, &MenuPropertiesHook
+	);
+
+	//OPEN CURRENT DIR
+	DoMethod(MNMainOpenCurrentDir,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_CallHook, &OpenCurrentDirHook
+	);
+
+	DoMethod(MNMainiGameSettings,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->WI_Settings,
+		3,
+		MUIM_Set, MUIA_Window_Open, TRUE
+	);
+
+	DoMethod(MNlabel2GameRepositories,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->WI_GameRepositories,
+		3,
+		MUIM_Set, MUIA_Window_Open, TRUE
+	);
+
+	DoMethod(MNMainMUISettings,
+		MUIM_Notify, MUIA_Menuitem_Trigger, MUIV_EveryTime,
+		object->App,
+		2,
+		MUIM_Application_OpenConfigWindow, 0
+	);
+#endif
+
 	return object;
 }
 

src/version.h

@@ -39,5 +39,5 @@
 #define COPY_END_YEAR 2023
 
 #ifndef VERSION
-#define VERSION "$VER: iGame v" STR(MAJOR_VERS) "." STR(MINOR_VERS) "." STR(PATCH_VERS) " for " STR(CPU_VERS) " (" STR(RELEASE_DATE) ")"
+#define VERSION "$VER: iGame " STR(MAJOR_VERS) "." STR(MINOR_VERS) "." STR(PATCH_VERS) " (" STR(RELEASE_DATE) ")"
 #endif