Split the OptionsMenuButton declarations and data into librpbase header files.

GerbilSoft · GerbilSoft · commit 5340785ace26 · 2026-03-28T11:37:45.000-04:00
This reduces source code duplication, though the data is not exported
from libromdata, so copies are still included in each UI frontend.

I might change it to export symbols from libromdata later.
diff --git a/src/gtk/OptionsMenuButton.cpp b/src/gtk/OptionsMenuButton.cpp
@@ -2,7 +2,7 @@
  * ROM Properties Page shell extension. (GTK+ common)                      *
  * OptionsMenuButton.cpp: Options menu GtkMenuButton container.            *
  *                                                                         *
- * Copyright (c) 2017-2025 by David Korth.                                 *
+ * Copyright (c) 2017-202 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -13,6 +13,7 @@
 #include "RpGtkCpp.hpp"
 
 // librpbase
+#include "librpbase/OptionsMenuButton_data.inc.h"
 using LibRpBase::RomData;
 
 // C++ STL classes
@@ -137,18 +138,6 @@ struct _RpOptionsMenuButton {
 G_DEFINE_TYPE_EXTENDED(RpOptionsMenuButton, rp_options_menu_button,
 	GTK_TYPE_SUPER, static_cast<GTypeFlags>(0), {});
 
-/** Standard actions. **/
-struct option_menu_action_t {
-	const char *desc;
-	int id;
-};
-static const array<option_menu_action_t, 4> stdacts = {{
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to Text..."),	OPTION_EXPORT_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to JSON..."),	OPTION_EXPORT_JSON},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as Text"),		OPTION_COPY_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as JSON"),		OPTION_COPY_JSON},
-}};
-
 static void
 rp_options_menu_button_class_init(RpOptionsMenuButtonClass *klass)
 {
@@ -556,7 +545,7 @@ rp_options_menu_button_reinit_menu(RpOptionsMenuButton *widget,
 
 	GMenu *const menuStdActs = g_menu_new();
 	g_menu_append_section(menuModel, nullptr, G_MENU_MODEL(menuStdActs));
-	for (const option_menu_action_t &p : stdacts) {
+	for (const option_menu_action_t &p : OptionsMenuButton_stdacts) {
 		// Create the action.
 		GSimpleAction *const action = g_simple_action_new(
 			fmt::to_string(p.id).c_str(), nullptr);
@@ -602,7 +591,7 @@ rp_options_menu_button_reinit_menu(RpOptionsMenuButton *widget,
 	GtkWidget *const menuOptions = gtk_menu_new();
 	gtk_widget_set_name(menuOptions, "menuOptions");
 
-	for (const option_menu_action_t &p : stdacts) {
+	for (const option_menu_action_t &p : OptionsMenuButton_stdacts) {
 		GtkWidget *const menuItem = gtk_menu_item_new_with_label(
 			pgettext_expr("RomDataView|Options", p.desc));
 		// NOTE: No name for this GtkWidget.
@@ -706,7 +695,7 @@ rp_options_menu_button_update_op(RpOptionsMenuButton *widget,
 	GList *l = gtk_container_get_children(GTK_CONTAINER(widget->menuOptions));
 
 	// Skip the standard actions and separator.
-	for (size_t i = 0; i < (stdacts.size()+1) && l != nullptr; i++) {
+	for (size_t i = 0; i < (ARRAY_SIZE(OptionsMenuButton_stdacts)+1) && l != nullptr; i++) {
 		l = l->next;
 	}
 
diff --git a/src/gtk/OptionsMenuButton.hpp b/src/gtk/OptionsMenuButton.hpp
@@ -2,13 +2,14 @@
  * ROM Properties Page shell extension. (GTK+ common)                      *
  * OptionsMenuButton.cpp: Options menu GtkMenuButton container.            *
  *                                                                         *
- * Copyright (c) 2017-2025 by David Korth.                                 *
+ * Copyright (c) 2017-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
 #pragma once
 
 #include "gtk-compat.h"
+#include "librpbase/OptionsMenuButton_decl.h"
 
 G_BEGIN_DECLS
 
@@ -24,13 +25,6 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE(RpOptionsMenuButton, rp_options_menu_button, RP, OPTIONS_MENU_BUTTON, _RpOptionsMenuButton_super)
 
-enum StandardOptionID {
-	OPTION_EXPORT_TEXT = -1,
-	OPTION_EXPORT_JSON = -2,
-	OPTION_COPY_TEXT = -3,
-	OPTION_COPY_JSON = -4,
-};
-
 GtkWidget	*rp_options_menu_button_new		(void) G_GNUC_MALLOC;
 
 GtkArrowType	rp_options_menu_button_get_direction	(RpOptionsMenuButton *widget);
diff --git a/src/kde/OptionsMenuButton.cpp b/src/kde/OptionsMenuButton.cpp
@@ -2,32 +2,21 @@
  * ROM Properties Page shell extension. (KDE4/KF5)                         *
  * OptionsMenuButton.cpp: Options menu button QPushButton subclass.        *
  *                                                                         *
- * Copyright (c) 2016-2024 by David Korth.                                 *
+ * Copyright (c) 2016-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
 #include "stdafx.h"
 #include "OptionsMenuButton.hpp"
 
-// libromdata
+// librpbase
+#include "librpbase/OptionsMenuButton_data.inc.h"
 using LibRpBase::RomData;
 
 // C++ STL classes
 using std::array;
 using std::vector;
 
-/** Standard actions. **/
-struct option_menu_action_t {
-	const char *desc;
-	int id;
-};
-static const array<option_menu_action_t, 4> stdacts = {{
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to Text..."),	OPTION_EXPORT_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to JSON..."),	OPTION_EXPORT_JSON},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as Text"),		OPTION_COPY_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as JSON"),		OPTION_COPY_JSON},
-}};
-
 OptionsMenuButton::OptionsMenuButton(QWidget *parent)
 	: super(parent)
 	, menuOptions(nullptr)
@@ -65,7 +54,7 @@ void OptionsMenuButton::reinitMenu(const LibRpBase::RomData *romData)
 	menuOptions->clear();
 
 	// Add the standard actions.
-	for (const option_menu_action_t &p : stdacts) {
+	for (const option_menu_action_t &p : OptionsMenuButton_stdacts) {
 		QAction *const action = menuOptions->addAction(
 			qpgettext_expr("OptionsMenuButton", p.desc));
 #ifdef RP_OMB_USE_LAMBDA_FUNCTIONS
diff --git a/src/kde/OptionsMenuButton.hpp b/src/kde/OptionsMenuButton.hpp
@@ -2,14 +2,15 @@
  * ROM Properties Page shell extension. (KDE4/KF5)                         *
  * OptionsMenuButton.hpp: Options menu button QPushButton subclass.        *
  *                                                                         *
- * Copyright (c) 2016-2025 by David Korth.                                 *
+ * Copyright (c) 2016-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
 #pragma once
 
 // librpbase
 #include "librpbase/RomData.hpp"
+#include "librpbase/OptionsMenuButton_decl.h"
 
 // NOTE: Using QT_VERSION_CHECK causes errors on moc-qt4 due to CMAKE_AUTOMOC.
 // Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
@@ -30,13 +31,6 @@ class QMenu;
 class QSignalMapper;
 #endif /* !RP_OMB_USE_LAMBDA_FUNCTIONS */
 
-enum StandardOptionID {
-	OPTION_EXPORT_TEXT = -1,
-	OPTION_EXPORT_JSON = -2,
-	OPTION_COPY_TEXT = -3,
-	OPTION_COPY_JSON = -4,
-};
-
 class OptionsMenuButton : public QPushButton
 {
 	Q_OBJECT
diff --git a/src/librpbase/CMakeLists.txt b/src/librpbase/CMakeLists.txt
@@ -69,6 +69,8 @@ SET(${PROJECT_NAME}_H
 	TextOut.hpp
 	Achievements.hpp
 	timeconv.h
+	OptionsMenuButton_data.inc.h
+	OptionsMenuButton_decl.h
 	img/RpPng.hpp
 	img/RpPngWriter.hpp
 	img/APNG_dlopen.hpp
diff --git a/src/librpbase/OptionsMenuButton_data.inc.h b/src/librpbase/OptionsMenuButton_data.inc.h
@@ -0,0 +1,34 @@
+/********************************************************************************
+ * ROM Properties Page shell extension. (Win32)                                 *
+ * OptionsMenuButton_data.h: Common data for OptionsMenuButton implementations. *
+ * NOTE: Should only be included by the OptionsMenuButton implementation.       *
+ *                                                                              *
+ * Copyright (c) 2017-2026 by David Korth.                                      *
+ * SPDX-License-Identifier: GPL-2.0-or-later                                    *
+ ********************************************************************************/
+
+#pragma once
+#include "OptionsMenuButton_decl.h"
+
+// libi18n
+#include "libi18n/i18n.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Standard actions **/
+struct option_menu_action_t {
+	const char *desc;
+	int id;
+};
+static const option_menu_action_t OptionsMenuButton_stdacts[] = {
+	{NOP_C_("OptionsMenuButton|StdActs", "Export to Text..."),	OPTION_EXPORT_TEXT},
+	{NOP_C_("OptionsMenuButton|StdActs", "Export to JSON..."),	OPTION_EXPORT_JSON},
+	{NOP_C_("OptionsMenuButton|StdActs", "Copy as Text"),		OPTION_COPY_TEXT},
+	{NOP_C_("OptionsMenuButton|StdActs", "Copy as JSON"),		OPTION_COPY_JSON},
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/librpbase/OptionsMenuButton_decl.h b/src/librpbase/OptionsMenuButton_decl.h
@@ -0,0 +1,25 @@
+/***************************************************************************
+ * ROM Properties Page shell extension. (Win32)                            *
+ * OptionsMenuButton_decl.h: Common declarationss for OptionsMenuButton.   *
+ * NOTE: Should only be included by the OptionsMenuButton header file.     *
+ *                                                                         *
+ * Copyright (c) 2017-2026 by David Korth.                                 *
+ * SPDX-License-Identifier: GPL-2.0-or-later                               *
+ ***************************************************************************/
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum StandardOptionID {
+	OPTION_EXPORT_TEXT = -1,
+	OPTION_EXPORT_JSON = -2,
+	OPTION_COPY_TEXT = -3,
+	OPTION_COPY_JSON = -4,
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/win32/OptionsMenuButton.cpp b/src/win32/OptionsMenuButton.cpp
@@ -2,7 +2,7 @@
  * ROM Properties Page shell extension. (Win32)                            *
  * OptionsMenuButton.cpp: Options menu button WC_BUTTON superclass.        *
  *                                                                         *
- * Copyright (c) 2017-2025 by David Korth.                                 *
+ * Copyright (c) 2017-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -13,6 +13,7 @@
 // Other rom-properties libraries
 #include "librpbase/RomData.hpp"
 #include "librptext/wchar.hpp"
+#include "librpbase/OptionsMenuButton_data.inc.h"
 using LibRpBase::RomData;
 
 // libwin32ui
@@ -25,18 +26,6 @@ using std::vector;
 static ATOM atom_optionsMenuButton;
 static WNDPROC pfnButtonWndProc;
 
-/** Standard actions. **/
-struct option_menu_action_t {
-	const char *desc;
-	int id;
-};
-static const array<option_menu_action_t, 4> stdacts = {{
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to Text..."),	OPTION_EXPORT_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Export to JSON..."),	OPTION_EXPORT_JSON},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as Text"),		OPTION_COPY_TEXT},
-	{NOP_C_("OptionsMenuButton|StdActs", "Copy as JSON"),		OPTION_COPY_JSON},
-}};
-
 class OptionsMenuButtonPrivate
 {
 public:
@@ -131,7 +120,7 @@ void OptionsMenuButtonPrivate::reinitMenu(const RomData *romData)
 	hMenuOptions = CreatePopupMenu();
 
 	// Add the standard actions.
-	for (const option_menu_action_t &p : stdacts) {
+	for (const option_menu_action_t &p : OptionsMenuButton_stdacts) {
 		AppendMenu(hMenuOptions, MF_STRING, IDM_OPTIONS_MENU_BASE + p.id,
 			tpgettext_expr("RomDataView|Options", p.desc));
 	}
diff --git a/src/win32/OptionsMenuButton.hpp b/src/win32/OptionsMenuButton.hpp
@@ -2,7 +2,7 @@
  * ROM Properties Page shell extension. (Win32)                            *
  * OptionsMenuButton.hpp: Options menu button WC_BUTTON superclass.        *
  *                                                                         *
- * Copyright (c) 2017-2023 by David Korth.                                 *
+ * Copyright (c) 2017-2026 by David Korth.                                 *
  * SPDX-License-Identifier: GPL-2.0-or-later                               *
  ***************************************************************************/
 
@@ -12,6 +12,7 @@
 
 // librpbase
 #include "librpbase/RomData.hpp"
+#include "librpbase/OptionsMenuButton_decl.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,13 +28,6 @@ void OptionsMenuButtonUnregister(void);
 #define WM_OMB_UPDATE_OP		(WM_USER + 2)	// wParam == id; lParam == RomData::RomOp*
 #define WM_OMB_POPUP_MENU		(WM_USER + 3)	// returns: id+IDM_OPTIONS_MENU_BASE, or 0 if none.
 
-enum StandardOptionID {
-	OPTION_EXPORT_TEXT = -1,
-	OPTION_EXPORT_JSON = -2,
-	OPTION_COPY_TEXT = -3,
-	OPTION_COPY_JSON = -4,
-};
-
 // "Options" menu item.
 #define IDM_OPTIONS_MENU_BASE		0x8000
 #define IDM_OPTIONS_MENU_EXPORT_TEXT	(IDM_OPTIONS_MENU_BASE + OPTION_EXPORT_TEXT)
