dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #11869: use a custom AppMenu for macOS

Browse source
This commit is contained in:
Gabriele 2025-09-26 13:43:47 +02:00 committed by Lukas Oberhuber
parent 23a9758a7b
commit 7f8298467b
4 changed files with 129 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/actions/dialogs-actions.c
View file

@ -307,13 +307,8 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
static const GimpStringActionEntry dialogs_toplevel_actions[] =
{
{ "dialogs-preferences", GIMP_ICON_PREFERENCES_SYSTEM,
#if defined(PLATFORM_OSX)
NC_("dialogs-action", "_Settings..."),
NC_("dialogs-action", "_Settings..."),
#else
NC_("dialogs-action", "_Preferences"),
NC_("dialogs-action", "_Preferences"),
#endif
{ NULL },
NC_("dialogs-action", "Open the preferences dialog"),
"gimp-preferences-dialog",
@ -360,8 +355,6 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
{ "dialogs-about", GIMP_ICON_HELP_ABOUT,
#if defined(G_OS_WIN32)
NC_("dialogs-action", "About GIMP"),
#elif defined(PLATFORM_OSX)
NC_("dialogs-action", "About"),
#else /* UNIX: use GNOME HIG */
NC_("dialogs-action", "_About"),
#endif

9
app/display/gimpimagewindow.c
View file

@ -464,12 +464,10 @@ gimp_image_window_constructed (GObject *object)
}
}
#ifndef GDK_WINDOWING_QUARTZ
/* Docs says that macOS always returns FALSE but we actually want to create
* our custom macOS menu.
*/
#ifdef GDK_WINDOWING_QUARTZ
menus_quartz_app_menu (private->gimp);
#else
use_app_menu = gtk_application_prefers_app_menu (GTK_APPLICATION (private->gimp->app));
#endif /* !GDK_WINDOWING_QUARTZ */
if (use_app_menu)
{
@ -482,6 +480,7 @@ gimp_image_window_constructed (GObject *object)
gtk_application_set_app_menu (GTK_APPLICATION (private->gimp->app),
G_MENU_MODEL (app_menu_model));
}
#endif
/* Create the hbox that contains docks and images */
private->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

122
app/menus/menus.c
View file

@ -20,6 +20,10 @@
#include <gegl.h>
#include <gtk/gtk.h>
#ifdef PLATFORM_OSX
#include <AppKit/AppKit.h>
#endif
#include "libgimpbase/gimpbase.h"
#include "menus-types.h"
@ -52,7 +56,11 @@
/* private variables */
static gboolean menurc_deleted = FALSE;
static gboolean menurc_deleted = FALSE;
#ifdef PLATFORM_OSX
static Gimp *unique_gimp = NULL;
#endif
/* public functions */
@ -542,3 +550,115 @@ menus_get_image_manager_singleton (Gimp *gimp)
return image_ui_manager;
}
#ifdef PLATFORM_OSX
@interface GimpappMenuHandler : NSObject
@end
@implementation GimpappMenuHandler
+ (void) gimpShowAbout:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "dialogs", "dialogs-about");
}
+ (void) gimpShowWelcomeDialog:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "dialogs", "dialogs-welcome");
}
+ (void) gimpShowPreferences:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "dialogs", "dialogs-preferences");
}
+ (void) gimpShowInputDevices:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "dialogs", "dialogs-input-devices");
}
+ (void) gimpShowKeyboardShortcuts:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "dialogs", "dialogs-keyboard-shortcuts");
}
+ (void) gimpQuit:(id) sender
{
GimpUIManager *ui_manager = menus_get_image_manager_singleton (unique_gimp);
gimp_ui_manager_activate_action (ui_manager, "file", "file-quit");
}
@end
void
menus_quartz_app_menu (Gimp *gimp)
{
NSMenu *main_menu;
NSMenuItem *app_menu_item;
NSMenu *app_menu;
NSInteger last_index;
NSMenuItem *item;
g_return_if_fail (GIMP_IS_GIMP (gimp));
unique_gimp = gimp;
main_menu = [NSApp mainMenu];
app_menu_item = [main_menu itemAtIndex:0];
app_menu = [app_menu_item submenu];
/* On macOS, some standard menu items (e.g. "Hide", "Hide Others", "Show All", "Quit")
* are automatically provided by the system rather than created by our application.
* For the items we need to customize, we override their default behavior with our own
* implementations. In addition, we extend the menu with extra entries specific to
* our application’s functionality. */
[app_menu setTitle:@"GIMP"];
/* About */
item = [app_menu itemAtIndex:0];
[item setTarget:[GimpappMenuHandler class]];
[item setAction:@selector (gimpShowAbout:)];
/* Welcome Dialog */
item = [[NSMenuItem alloc] initWithTitle:@"Welcome Dialog"
action:@selector (gimpShowWelcomeDialog:)
keyEquivalent:@""];
[item setTarget:[GimpappMenuHandler class]];
[app_menu insertItem:item atIndex:1];
/* Settings */
item = [app_menu itemAtIndex:3];
[item setTarget:[GimpappMenuHandler class]];
[item setAction:@selector (gimpShowPreferences:)];
/* Input Devices */
item = [[NSMenuItem alloc] initWithTitle:@"Input Devices"
action:@selector (gimpShowInputDevices:)
keyEquivalent:@""];
[item setTarget:[GimpappMenuHandler class]];
[app_menu insertItem:item atIndex:4];
/* Keyboard Shortcuts */
item = [[NSMenuItem alloc] initWithTitle:@"Keyboard Shortcuts"
action:@selector (gimpShowKeyboardShortcuts:)
keyEquivalent:@""];
[item setTarget:[GimpappMenuHandler class]];
[app_menu insertItem:item atIndex:5];
/* Quit */
last_index = [app_menu numberOfItems] - 1;
item = [app_menu itemAtIndex:last_index];
[item setTarget:[GimpappMenuHandler class]];
[item setAction:@selector (gimpQuit:)];
}
#endif

4
app/menus/menus.h
View file

@ -31,3 +31,7 @@ void menus_remove (Gimp *gimp);
GimpMenuFactory * menus_get_global_menu_factory (Gimp *gimp);
GimpUIManager * menus_get_image_manager_singleton (Gimp *gimp);
#ifdef PLATFORM_OSX
void menus_quartz_app_menu (Gimp *gimp);
#endif