callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: get rid of including menus/ stuff from widgets/ and other places

Browse Source 
Add GimpMenuFactory can always be found in a GimpDialogManager, use
gimp_dialog_factory_get_menu_factory() where we have a dialog factory
instead of accessing "global_menu_factory" or redundantly passing a
menu factory around where we already pass around a dialog factory.
This commit is contained in:
Michael Natterer
2016-11-23 19:16:36 +01:00
parent b795ae2296
commit a3c65e6d17
11 changed files with 60 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/display/gimpdisplay.c
View File

@ -390,7 +390,6 @@ gimp_display_new (Gimp *gimp,
GimpImage *image, GimpImage *image,
GimpUnit unit, GimpUnit unit,
gdouble scale, gdouble scale,
GimpMenuFactory *menu_factory,
GimpUIManager *popup_manager, GimpUIManager *popup_manager,
GimpDialogFactory *dialog_factory, GimpDialogFactory *dialog_factory,
GdkScreen *screen, GdkScreen *screen,
@ -444,7 +443,6 @@ gimp_display_new (Gimp *gimp,
{ {
window = gimp_image_window_new (gimp, window = gimp_image_window_new (gimp,
private->image, private->image,
menu_factory,
dialog_factory, dialog_factory,
screen, screen,
monitor); monitor);

1
app/display/gimpdisplay.h
View File

@ -53,7 +53,6 @@ GimpDisplay * gimp_display_new (Gimp *gimp,
GimpImage *image, GimpImage *image,
GimpUnit unit, GimpUnit unit,
gdouble scale, gdouble scale,
GimpMenuFactory *menu_factory,
GimpUIManager *popup_manager, GimpUIManager *popup_manager,
GimpDialogFactory *dialog_factory, GimpDialogFactory *dialog_factory,
GdkScreen *screen, GdkScreen *screen,

31
app/display/gimpimagewindow.c
View File

@ -99,7 +99,6 @@ enum
{ {
PROP_0, PROP_0,
PROP_GIMP, PROP_GIMP,
PROP_MENU_FACTORY,
PROP_DIALOG_FACTORY, PROP_DIALOG_FACTORY,
PROP_INITIAL_SCREEN, PROP_INITIAL_SCREEN,
PROP_INITIAL_MONITOR PROP_INITIAL_MONITOR
@ -306,12 +305,6 @@ gimp_image_window_class_init (GimpImageWindowClass *klass)
GIMP_TYPE_GIMP, GIMP_TYPE_GIMP,
GIMP_PARAM_WRITABLE | GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_MENU_FACTORY,
g_param_spec_object ("menu-factory",
NULL, NULL,
GIMP_TYPE_MENU_FACTORY,
GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_DIALOG_FACTORY, g_object_class_install_property (object_class, PROP_DIALOG_FACTORY,
g_param_spec_object ("dialog-factory", g_param_spec_object ("dialog-factory",
@ -372,12 +365,20 @@ gimp_image_window_constructed (GObject *object)
{ {
GimpImageWindow *window = GIMP_IMAGE_WINDOW (object); GimpImageWindow *window = GIMP_IMAGE_WINDOW (object);
GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window); GimpImageWindowPrivate *private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
GimpMenuFactory *menu_factory;
GimpGuiConfig *config; GimpGuiConfig *config;
G_OBJECT_CLASS (parent_class)->constructed (object); G_OBJECT_CLASS (parent_class)->constructed (object);
g_assert (GIMP_IS_GIMP (private->gimp)); g_assert (GIMP_IS_GIMP (private->gimp));
g_assert (GIMP_IS_UI_MANAGER (private->menubar_manager)); g_assert (GIMP_IS_DIALOG_FACTORY (private->dialog_factory));
menu_factory = gimp_dialog_factory_get_menu_factory (private->dialog_factory);
private->menubar_manager = gimp_menu_factory_manager_new (menu_factory,
"<Image>",
window,
FALSE);
g_signal_connect_object (private->dialog_factory, "dock-window-added", g_signal_connect_object (private->dialog_factory, "dock-window-added",
G_CALLBACK (gimp_image_window_update_ui_manager), G_CALLBACK (gimp_image_window_update_ui_manager),
@ -556,16 +557,6 @@ gimp_image_window_set_property (GObject *object,
case PROP_GIMP: case PROP_GIMP:
private->gimp = g_value_get_object (value); private->gimp = g_value_get_object (value);
break; break;
case PROP_MENU_FACTORY:
{
GimpMenuFactory *factory = g_value_get_object (value);
private->menubar_manager = gimp_menu_factory_manager_new (factory,
"<Image>",
window,
FALSE);
}
break;
case PROP_DIALOG_FACTORY: case PROP_DIALOG_FACTORY:
private->dialog_factory = g_value_get_object (value); private->dialog_factory = g_value_get_object (value);
break; break;
@ -606,7 +597,6 @@ gimp_image_window_get_property (GObject *object,
g_value_set_int (value, private->initial_monitor); g_value_set_int (value, private->initial_monitor);
break; break;
case PROP_MENU_FACTORY:
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -1121,7 +1111,6 @@ gimp_image_window_set_aux_info (GimpSessionManaged *session_managed,
GimpImageWindow * GimpImageWindow *
gimp_image_window_new (Gimp *gimp, gimp_image_window_new (Gimp *gimp,
GimpImage *image, GimpImage *image,
GimpMenuFactory *menu_factory,
GimpDialogFactory *dialog_factory, GimpDialogFactory *dialog_factory,
GdkScreen *screen, GdkScreen *screen,
gint monitor) gint monitor)
@ -1131,13 +1120,11 @@ gimp_image_window_new (Gimp *gimp,
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL); g_return_val_if_fail (image == NULL || GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL); g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
window = g_object_new (GIMP_TYPE_IMAGE_WINDOW, window = g_object_new (GIMP_TYPE_IMAGE_WINDOW,
"gimp", gimp, "gimp", gimp,
"menu-factory", menu_factory,
"dialog-factory", dialog_factory, "dialog-factory", dialog_factory,
"initial-screen", screen, "initial-screen", screen,
"initial-monitor", monitor, "initial-monitor", monitor,

1
app/display/gimpimagewindow.h
View File

@ -47,7 +47,6 @@ GType gimp_image_window_get_type (void) G_GNUC_CONST;
GimpImageWindow * gimp_image_window_new (Gimp *gimp, GimpImageWindow * gimp_image_window_new (Gimp *gimp,
GimpImage *image, GimpImage *image,
GimpMenuFactory *menu_factory,
GimpDialogFactory *dialog_factory, GimpDialogFactory *dialog_factory,
GdkScreen *screen, GdkScreen *screen,
gint monitor); gint monitor);

3
app/gui/gimpuiconfigurer.c
View File

@ -43,8 +43,6 @@
#include "display/gimpdisplayshell-appearance.h" #include "display/gimpdisplayshell-appearance.h"
#include "display/gimpimagewindow.h" #include "display/gimpimagewindow.h"
#include "menus/menus.h"
#include "gimpuiconfigurer.h" #include "gimpuiconfigurer.h"
@ -450,7 +448,6 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer,
/* Create a new image window */ /* Create a new image window */
new_image_window = gimp_image_window_new (ui_configurer->p->gimp, new_image_window = gimp_image_window_new (ui_configurer->p->gimp,
NULL, NULL,
global_menu_factory,
gimp_dialog_factory_get_singleton (), gimp_dialog_factory_get_singleton (),
gtk_widget_get_screen (GTK_WIDGET (source_image_window)), gtk_widget_get_screen (GTK_WIDGET (source_image_window)),
gimp_widget_get_monitor (GTK_WIDGET (source_image_window))); gimp_widget_get_monitor (GTK_WIDGET (source_image_window)));

1
app/gui/gui-vtable.c
View File

@ -398,7 +398,6 @@ gui_display_create (Gimp *gimp,
g_return_val_if_fail (image_managers != NULL, NULL); g_return_val_if_fail (image_managers != NULL, NULL);
display = gimp_display_new (gimp, image, unit, scale, display = gimp_display_new (gimp, image, unit, scale,
global_menu_factory,
image_managers->data, image_managers->data,
gimp_dialog_factory_get_singleton (), gimp_dialog_factory_get_singleton (),
GDK_SCREEN (screen), GDK_SCREEN (screen),

6
app/widgets/gimpdock.c
View File

@ -27,8 +27,6 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "menus/menus.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
@ -349,6 +347,7 @@ gimp_dock_dropped_cb (GtkWidget *source,
{ {
GimpDock *dock = GIMP_DOCK (data); GimpDock *dock = GIMP_DOCK (data);
GimpDockable *dockable = gimp_dockbook_drag_source_to_dockable (source); GimpDockable *dockable = gimp_dockbook_drag_source_to_dockable (source);
GimpDialogFactory *factory;
GtkWidget *dockbook = NULL; GtkWidget *dockbook = NULL;
if (!dockable ) if (!dockable )
@ -378,7 +377,8 @@ gimp_dock_dropped_cb (GtkWidget *source,
gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable); gimp_dockbook_remove (gimp_dockable_get_dockbook (dockable), dockable);
/* Create a new dockbook */ /* Create a new dockbook */
dockbook = gimp_dockbook_new (global_menu_factory); factory = gimp_dock_get_dialog_factory (dock);
dockbook = gimp_dockbook_new (gimp_dialog_factory_get_menu_factory (factory));
gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), insert_index); gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), insert_index);
/* Add the dockable to new new dockbook */ /* Add the dockable to new new dockbook */

21
app/widgets/gimpdockable.c
View File

@ -29,8 +29,6 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "menus/menus.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "gimpdialogfactory.h" #include "gimpdialogfactory.h"
@ -845,11 +843,13 @@ gimp_dockable_set_drag_handler (GimpDockable *dockable,
void void
gimp_dockable_detach (GimpDockable *dockable) gimp_dockable_detach (GimpDockable *dockable)
{ {
GimpDockWindow *src_dock_window = NULL; GimpDialogFactory *dialog_factory;
GimpDock *src_dock = NULL; GimpMenuFactory *menu_factory;
GtkWidget *dock = NULL; GimpDockWindow *src_dock_window;
GimpDockWindow *dock_window = NULL; GimpDock *src_dock;
GtkWidget *dockbook = NULL; GtkWidget *dock;
GimpDockWindow *dock_window;
GtkWidget *dockbook;
g_return_if_fail (GIMP_IS_DOCKABLE (dockable)); g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
g_return_if_fail (GIMP_IS_DOCKBOOK (dockable->p->dockbook)); g_return_if_fail (GIMP_IS_DOCKBOOK (dockable->p->dockbook));
@ -857,7 +857,10 @@ gimp_dockable_detach (GimpDockable *dockable)
src_dock = gimp_dockbook_get_dock (dockable->p->dockbook); src_dock = gimp_dockbook_get_dock (dockable->p->dockbook);
src_dock_window = gimp_dock_window_from_dock (src_dock); src_dock_window = gimp_dock_window_from_dock (src_dock);
dock = gimp_dock_with_window_new (gimp_dialog_factory_get_singleton (), dialog_factory = gimp_dock_get_dialog_factory (src_dock);
menu_factory = gimp_dialog_factory_get_menu_factory (dialog_factory);
dock = gimp_dock_with_window_new (dialog_factory,
gtk_widget_get_screen (GTK_WIDGET (dockable)), gtk_widget_get_screen (GTK_WIDGET (dockable)),
gimp_widget_get_monitor (GTK_WIDGET (dockable)), gimp_widget_get_monitor (GTK_WIDGET (dockable)),
FALSE /*toolbox*/); FALSE /*toolbox*/);
@ -866,7 +869,7 @@ gimp_dockable_detach (GimpDockable *dockable)
if (src_dock_window) if (src_dock_window)
gimp_dock_window_setup (dock_window, src_dock_window); gimp_dock_window_setup (dock_window, src_dock_window);
dockbook = gimp_dockbook_new (global_menu_factory); dockbook = gimp_dockbook_new (menu_factory);
gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0); gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0);

8
app/widgets/gimpdockcolumns.c
View File

@ -25,8 +25,6 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "menus/menus.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
@ -118,12 +116,14 @@ gimp_dock_columns_class_init (GimpDockColumnsClass *klass)
GIMP_TYPE_CONTEXT, GIMP_TYPE_CONTEXT,
GIMP_PARAM_WRITABLE | GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_DIALOG_FACTORY, g_object_class_install_property (object_class, PROP_DIALOG_FACTORY,
g_param_spec_object ("dialog-factory", g_param_spec_object ("dialog-factory",
NULL, NULL, NULL, NULL,
GIMP_TYPE_DIALOG_FACTORY, GIMP_TYPE_DIALOG_FACTORY,
GIMP_PARAM_WRITABLE | GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_UI_MANAGER, g_object_class_install_property (object_class, PROP_UI_MANAGER,
g_param_spec_object ("ui-manager", g_param_spec_object ("ui-manager",
NULL, NULL, NULL, NULL,
@ -409,13 +409,15 @@ gimp_dock_columns_prepare_dockbook (GimpDockColumns *dock_columns,
gint dock_index, gint dock_index,
GtkWidget **dockbook_p) GtkWidget **dockbook_p)
{ {
GimpMenuFactory *menu_factory;
GtkWidget *dock; GtkWidget *dock;
GtkWidget *dockbook; GtkWidget *dockbook;
dock = gimp_menu_dock_new (); dock = gimp_menu_dock_new ();
gimp_dock_columns_add_dock (dock_columns, GIMP_DOCK (dock), dock_index); gimp_dock_columns_add_dock (dock_columns, GIMP_DOCK (dock), dock_index);
dockbook = gimp_dockbook_new (global_menu_factory); menu_factory = gimp_dialog_factory_get_menu_factory (dock_columns->p->dialog_factory);
dockbook = gimp_dockbook_new (menu_factory);
gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), -1); gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), -1);
gtk_widget_show (GTK_WIDGET (dock)); gtk_widget_show (GTK_WIDGET (dock));

14
app/widgets/gimpdockwindow.c
View File

@ -31,8 +31,6 @@
#include "dialogs/dialogs.h" /* FIXME, we are in the widget layer */ #include "dialogs/dialogs.h" /* FIXME, we are in the widget layer */
#include "menus/menus.h"
#include "config/gimpguiconfig.h" #include "config/gimpguiconfig.h"
#include "core/gimp.h" #include "core/gimp.h"
@ -290,6 +288,7 @@ gimp_dock_window_constructed (GObject *object)
GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object); GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
GimpGuiConfig *config; GimpGuiConfig *config;
GimpContext *factory_context; GimpContext *factory_context;
GimpMenuFactory *menu_factory;
GtkAccelGroup *accel_group; GtkAccelGroup *accel_group;
Gimp *gimp; Gimp *gimp;
GtkSettings *settings; GtkSettings *settings;
@ -316,11 +315,14 @@ gimp_dock_window_constructed (GObject *object)
/* Setup hints */ /* Setup hints */
gimp_window_set_hint (GTK_WINDOW (dock_window), config->dock_window_hint); gimp_window_set_hint (GTK_WINDOW (dock_window), config->dock_window_hint);
menu_factory =
gimp_dialog_factory_get_menu_factory (dock_window->p->dialog_factory);
/* Make image window related keyboard shortcuts work also when a /* Make image window related keyboard shortcuts work also when a
* dock window is the focused window * dock window is the focused window
*/ */
dock_window->p->ui_manager = dock_window->p->ui_manager =
gimp_menu_factory_manager_new (global_menu_factory, gimp_menu_factory_manager_new (menu_factory,
dock_window->p->ui_manager_name, dock_window->p->ui_manager_name,
dock_window, dock_window,
config->tearoff_menus); config->tearoff_menus);
@ -1138,17 +1140,17 @@ GtkWidget *
gimp_dock_window_new (const gchar *role, gimp_dock_window_new (const gchar *role,
const gchar *ui_manager_name, const gchar *ui_manager_name,
gboolean allow_dockbook_absence, gboolean allow_dockbook_absence,
GimpDialogFactory *factory, GimpDialogFactory *dialog_factory,
GimpContext *context) GimpContext *context)
{ {
g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL); g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
return g_object_new (GIMP_TYPE_DOCK_WINDOW, return g_object_new (GIMP_TYPE_DOCK_WINDOW,
"role", role, "role", role,
"ui-manager-name", ui_manager_name, "ui-manager-name", ui_manager_name,
"allow-dockbook-absence", allow_dockbook_absence, "allow-dockbook-absence", allow_dockbook_absence,
"dialog-factory", factory, "dialog-factory", dialog_factory,
"context", context, "context", context,
NULL); NULL);
} }

9
app/widgets/gimpsessioninfo-book.c
View File

@ -26,8 +26,6 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "menus/menus.h"
#include "gimpdialogfactory.h" #include "gimpdialogfactory.h"
#include "gimpdock.h" #include "gimpdock.h"
#include "gimpdockbook.h" #include "gimpdockbook.h"
@ -242,6 +240,8 @@ GimpDockbook *
gimp_session_info_book_restore (GimpSessionInfoBook *info, gimp_session_info_book_restore (GimpSessionInfoBook *info,
GimpDock *dock) GimpDock *dock)
{ {
GimpDialogFactory *dialog_factory;
GimpMenuFactory *menu_factory;
GtkWidget *dockbook; GtkWidget *dockbook;
GList *pages; GList *pages;
gint n_dockables = 0; gint n_dockables = 0;
@ -249,7 +249,10 @@ gimp_session_info_book_restore (GimpSessionInfoBook *info,
g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (info != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL); g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
dockbook = gimp_dockbook_new (global_menu_factory); dialog_factory = gimp_dock_get_dialog_factory (dock);
menu_factory = gimp_dialog_factory_get_menu_factory (dialog_factory);
dockbook = gimp_dockbook_new (menu_factory);
gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), -1); gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), -1);