[gimp] app: global_dock_window_factory -> global_dock_factory
- From: Martin Nordholts <martinn src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] app: global_dock_window_factory -> global_dock_factory
- Date: Sun, 20 Dec 2009 13:40:20 +0000 (UTC)
commit 8699511bbdc73a7efe5f08225711b5cbd791684b
Author: Martin Nordholts <martinn src gnome org>
Date: Sun Dec 20 14:41:02 2009 +0100
app: global_dock_window_factory -> global_dock_factory
With GimpDock not being a toplevel any longer, it makes more sense to
name global_dock_factory global_dock_window_factory. Do that.
app/actions/data-commands.c | 2 +-
app/actions/dialogs-commands.c | 2 +-
app/actions/edit-commands.c | 2 +-
app/actions/select-commands.c | 2 +-
app/actions/view-commands.c | 2 +-
app/actions/windows-actions.c | 10 ++++---
app/actions/windows-commands.c | 6 ++--
app/dialogs/dialogs-constructors.c | 8 +++---
app/dialogs/dialogs.c | 41 ++++++++++++++++---------------
app/dialogs/dialogs.h | 2 +-
app/gui/gimpuiconfigurer.c | 6 ++--
app/gui/gui-message.c | 4 +-
app/gui/gui-vtable.c | 2 +-
app/gui/gui.c | 2 +-
app/menus/windows-menu.c | 10 ++++---
app/tests/test-window-management.c | 2 +-
app/widgets/gimpdockable.c | 2 +-
app/widgets/gimpsessioninfo-dockable.c | 2 +-
18 files changed, 56 insertions(+), 51 deletions(-)
---
diff --git a/app/actions/data-commands.c b/app/actions/data-commands.c
index 753b854..ef9bc3b 100644
--- a/app/actions/data-commands.c
+++ b/app/actions/data-commands.c
@@ -302,7 +302,7 @@ data_edit_cmd_callback (GtkAction *action,
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (view));
GtkWidget *dockable;
- dockable = gimp_dialog_factory_dialog_raise (global_dock_factory, screen,
+ dockable = gimp_dialog_factory_dialog_raise (global_dock_window_factory, screen,
value, -1);
gimp_data_editor_set_data (GIMP_DATA_EDITOR (gtk_bin_get_child (GTK_BIN (dockable))),
diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c
index 54512d9..0116905 100644
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@@ -56,7 +56,7 @@ dialogs_create_dockable_cmd_callback (GtkAction *action,
return_if_no_widget (widget, data);
if (value)
- gimp_dialog_factory_dialog_raise (global_dock_factory,
+ gimp_dialog_factory_dialog_raise (global_dock_window_factory,
gtk_widget_get_screen (widget),
value, -1);
}
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index cc0a735..0cb64ee 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -448,7 +448,7 @@ edit_named_paste_cmd_callback (GtkAction *action,
GtkWidget *widget;
return_if_no_widget (widget, data);
- gimp_dialog_factory_dialog_raise (global_dock_factory,
+ gimp_dialog_factory_dialog_raise (global_dock_window_factory,
gtk_widget_get_screen (widget),
"gimp-buffer-list|gimp-buffer-grid", -1);
}
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
index 7073564..95360d0 100644
--- a/app/actions/select-commands.c
+++ b/app/actions/select-commands.c
@@ -319,7 +319,7 @@ select_save_cmd_callback (GtkAction *action,
gimp_selection_save (GIMP_SELECTION (gimp_image_get_mask (image)));
gimp_image_flush (image);
- gimp_dialog_factory_dialog_raise (global_dock_factory,
+ gimp_dialog_factory_dialog_raise (global_dock_window_factory,
gtk_widget_get_screen (widget),
"gimp-channel-list", -1);
}
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index cacdd16..38bf7a8 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -338,7 +338,7 @@ view_navigation_window_cmd_callback (GtkAction *action,
shell = gimp_display_get_shell (display);
- gimp_dialog_factory_dialog_raise (global_dock_factory,
+ gimp_dialog_factory_dialog_raise (global_dock_window_factory,
gtk_widget_get_screen (GTK_WIDGET (shell)),
"gimp-navigation-view", -1);
}
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 98c12eb..990f5ce 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -137,21 +137,23 @@ windows_actions_setup (GimpActionGroup *group)
windows_actions_display_add (group->gimp->displays, display, group);
}
- g_signal_connect_object (global_dock_factory, "dock-window-added",
+ g_signal_connect_object (global_dock_window_factory, "dock-window-added",
G_CALLBACK (windows_actions_dock_window_added),
group, 0);
- g_signal_connect_object (global_dock_factory, "dock-window-removed",
+ g_signal_connect_object (global_dock_window_factory, "dock-window-removed",
G_CALLBACK (windows_actions_dock_window_removed),
group, 0);
- for (list = global_dock_factory->open_dialogs;
+ for (list = global_dock_window_factory->open_dialogs;
list;
list = g_list_next (list))
{
GimpDockWindow *dock_window = list->data;
if (GIMP_IS_DOCK_WINDOW (dock_window))
- windows_actions_dock_window_added (global_dock_factory, dock_window, group);
+ windows_actions_dock_window_added (global_dock_window_factory,
+ dock_window,
+ group);
}
g_signal_connect_object (global_recent_docks, "add",
diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c
index a3347e7..1742721 100644
--- a/app/actions/windows-commands.c
+++ b/app/actions/windows-commands.c
@@ -112,10 +112,10 @@ windows_open_recent_cmd_callback (GtkAction *action,
g_object_ref (info);
gimp_container_remove (global_recent_docks, GIMP_OBJECT (info));
- global_dock_factory->session_infos =
- g_list_append (global_dock_factory->session_infos, info);
+ global_dock_window_factory->session_infos =
+ g_list_append (global_dock_window_factory->session_infos, info);
- gimp_session_info_restore (info, global_dock_factory);
+ gimp_session_info_restore (info, global_dock_window_factory);
gimp_session_info_clear_info (info);
}
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
index 52de897..aa42773 100644
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@@ -220,11 +220,11 @@ dialogs_toolbox_new (GimpDialogFactory *factory,
GimpContext *context,
GimpUIManager *ui_manager)
{
- /* we pass "global_dock_factory", _not_ "global_toolbox_factory" to
- * the toolbox constructor, because the global_toolbox_factory has no
- * dockables registered
+ /* we pass "global_dock_window_factory", _not_
+ * "global_toolbox_factory" to the toolbox constructor, because the
+ * global_toolbox_factory has no dockables registered
*/
- return gimp_toolbox_new (global_dock_factory,
+ return gimp_toolbox_new (global_dock_window_factory,
context,
ui_manager);
}
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 5522065..5bb48cb 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -40,12 +40,12 @@
#include "gimp-intl.h"
-GimpDialogFactory *global_dialog_factory = NULL;
-GimpDialogFactory *global_dock_factory = NULL;
-GimpDialogFactory *global_toolbox_factory = NULL;
-GimpDialogFactory *global_display_factory = NULL;
+GimpDialogFactory *global_dialog_factory = NULL;
+GimpDialogFactory *global_dock_window_factory = NULL;
+GimpDialogFactory *global_toolbox_factory = NULL;
+GimpDialogFactory *global_display_factory = NULL;
-GimpContainer *global_recent_docks = NULL;
+GimpContainer *global_recent_docks = NULL;
#define FOREIGN(id, singleton, remember_size) \
@@ -334,14 +334,14 @@ dialogs_init (Gimp *gimp,
dialogs_toolbox_dock_window_new);
/* Dock */
- global_dock_factory = gimp_dialog_factory_new ("dock",
- gimp_get_user_context (gimp),
- menu_factory,
- dialogs_dock_new,
- TRUE);
- gimp_dialog_factory_set_constructor (global_dock_factory,
+ global_dock_window_factory = gimp_dialog_factory_new ("dock",
+ gimp_get_user_context (gimp),
+ menu_factory,
+ dialogs_dock_new,
+ TRUE);
+ gimp_dialog_factory_set_constructor (global_dock_window_factory,
dialogs_dockable_constructor);
- gimp_dialog_factory_set_dock_window_func (global_dock_factory,
+ gimp_dialog_factory_set_dock_window_func (global_dock_window_factory,
dialogs_dock_window_new);
/* Display */
@@ -367,7 +367,7 @@ dialogs_init (Gimp *gimp,
toplevel_entries[i].remember_if_open);
for (i = 0; i < G_N_ELEMENTS (dock_entries); i++)
- gimp_dialog_factory_register_entry (global_dock_factory,
+ gimp_dialog_factory_register_entry (global_dock_window_factory,
dock_entries[i].identifier,
gettext (dock_entries[i].name),
gettext (dock_entries[i].blurb),
@@ -406,10 +406,11 @@ dialogs_exit (Gimp *gimp)
}
/* destroy the "global_toolbox_factory" _before_ destroying the
- * "global_dock_factory" because the "global_toolbox_factory" owns
- * dockables which were created by the "global_dock_factory". This
- * way they are properly removed from the "global_dock_factory", which
- * would complain about stale entries otherwise.
+ * "global_dock_window_factory" because the
+ * "global_toolbox_factory" owns dockables which were created by
+ * the "global_dock_window_factory". This way they are properly
+ * removed from the "global_dock_window_factory", which would
+ * complain about stale entries otherwise.
*/
if (global_toolbox_factory)
{
@@ -417,10 +418,10 @@ dialogs_exit (Gimp *gimp)
global_toolbox_factory = NULL;
}
- if (global_dock_factory)
+ if (global_dock_window_factory)
{
- g_object_unref (global_dock_factory);
- global_dock_factory = NULL;
+ g_object_unref (global_dock_window_factory);
+ global_dock_window_factory = NULL;
}
if (global_display_factory)
diff --git a/app/dialogs/dialogs.h b/app/dialogs/dialogs.h
index 84b227d..b5c0d61 100644
--- a/app/dialogs/dialogs.h
+++ b/app/dialogs/dialogs.h
@@ -20,7 +20,7 @@
extern GimpDialogFactory *global_dialog_factory;
-extern GimpDialogFactory *global_dock_factory;
+extern GimpDialogFactory *global_dock_window_factory;
extern GimpDialogFactory *global_toolbox_factory;
extern GimpDialogFactory *global_display_factory;
diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c
index c9be53b..319ce7b 100644
--- a/app/gui/gimpuiconfigurer.c
+++ b/app/gui/gimpuiconfigurer.c
@@ -271,7 +271,7 @@ gimp_ui_configurer_move_docks_to_window (GimpUIConfigurer *ui_configurer,
*/
dialog_factory = (GIMP_IS_TOOLBOX (dock) ?
global_toolbox_factory :
- global_dock_factory);
+ global_dock_window_factory);
/* Create a dock window to put the dock in */
dock_window = gimp_dialog_factory_dock_window_new (dialog_factory,
@@ -312,7 +312,7 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer,
NULL,
global_menu_factory,
global_display_factory,
- global_dock_factory);
+ global_dock_window_factory);
/* Move the shell there */
shell = gimp_image_window_get_shell (source_image_window, 1);
@@ -365,7 +365,7 @@ gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer *ui_configurer)
* window
*/
gimp_ui_configurer_move_docks_to_columns (ui_configurer,
- global_dock_factory,
+ global_dock_window_factory,
right_docks);
/* Show the docks in the window */
diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c
index 0763e3e..f92f0fb 100644
--- a/app/gui/gui-message.c
+++ b/app/gui/gui-message.c
@@ -102,7 +102,7 @@ gui_message_error_console (GimpMessageSeverity severity,
{
GimpSessionInfo *info;
- info = gimp_dialog_factory_find_session_info (global_dock_factory,
+ info = gimp_dialog_factory_find_session_info (global_dock_window_factory,
"gimp-error-console");
if (info && GIMP_IS_DOCKABLE (gimp_session_info_get_widget (info)))
@@ -110,7 +110,7 @@ gui_message_error_console (GimpMessageSeverity severity,
}
if (! dockable)
- dockable = gimp_dialog_factory_dialog_raise (global_dock_factory,
+ dockable = gimp_dialog_factory_dialog_raise (global_dock_window_factory,
gdk_screen_get_default (),
"gimp-error-console", -1);
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index 0aded2b..b64a73e 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -352,7 +352,7 @@ gui_display_create (Gimp *gimp,
global_menu_factory,
image_managers->data,
global_display_factory,
- global_dock_factory);
+ global_dock_window_factory);
}
if (gimp_context_get_display (context) == display)
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 7c08ad0..26844bb 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -695,7 +695,7 @@ gui_device_change_notify (Gimp *gimp)
{
GimpSessionInfo *session_info;
- session_info = gimp_dialog_factory_find_session_info (global_dock_factory,
+ session_info = gimp_dialog_factory_find_session_info (global_dock_window_factory,
"gimp-device-status");
if (session_info && gimp_session_info_get_widget (session_info))
diff --git a/app/menus/windows-menu.c b/app/menus/windows-menu.c
index adc0302..eb0be91 100644
--- a/app/menus/windows-menu.c
+++ b/app/menus/windows-menu.c
@@ -104,21 +104,23 @@ windows_menu_setup (GimpUIManager *manager,
windows_menu_display_add (manager->gimp->displays, display, manager);
}
- g_signal_connect_object (global_dock_factory, "dock-window-added",
+ g_signal_connect_object (global_dock_window_factory, "dock-window-added",
G_CALLBACK (windows_menu_dock_window_added),
manager, 0);
- g_signal_connect_object (global_dock_factory, "dock-window-removed",
+ g_signal_connect_object (global_dock_window_factory, "dock-window-removed",
G_CALLBACK (windows_menu_dock_window_removed),
manager, 0);
- for (list = global_dock_factory->open_dialogs;
+ for (list = global_dock_window_factory->open_dialogs;
list;
list = g_list_next (list))
{
GimpDockWindow *dock_window = list->data;
if (GIMP_IS_DOCK_WINDOW (dock_window))
- windows_menu_dock_window_added (global_dock_factory, dock_window, manager);
+ windows_menu_dock_window_added (global_dock_window_factory,
+ dock_window,
+ manager);
}
g_signal_connect_object (global_recent_docks, "add",
diff --git a/app/tests/test-window-management.c b/app/tests/test-window-management.c
index 414a9df..9b9292d 100644
--- a/app/tests/test-window-management.c
+++ b/app/tests/test-window-management.c
@@ -92,7 +92,7 @@ gimp_test_window_roles (GimpTestFixture *fixture,
GimpDockWindow *dock_window = NULL;
GimpDockWindow *toolbox_window = NULL;
- dock = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
+ dock = gimp_dialog_factory_dock_with_window_new (global_dock_window_factory,
gdk_screen_get_default ());
toolbox = gimp_dialog_factory_dock_with_window_new (global_toolbox_factory,
gdk_screen_get_default ());
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index 55c4b42..d39be0d 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -1091,7 +1091,7 @@ gimp_dockable_detach (GimpDockable *dockable)
src_dock = gimp_dockbook_get_dock (dockable->dockbook);
src_dock_window = gimp_dock_window_from_dock (src_dock);
- dock = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
+ dock = gimp_dialog_factory_dock_with_window_new (global_dock_window_factory,
gtk_widget_get_screen (GTK_WIDGET (dockable)));
dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
gtk_window_set_position (GTK_WINDOW (dock_window), GTK_WIN_POS_MOUSE);
diff --git a/app/widgets/gimpsessioninfo-dockable.c b/app/widgets/gimpsessioninfo-dockable.c
index e198631..7c76a6b 100644
--- a/app/widgets/gimpsessioninfo-dockable.c
+++ b/app/widgets/gimpsessioninfo-dockable.c
@@ -282,7 +282,7 @@ gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
info->view_size > GIMP_VIEW_SIZE_GIGANTIC)
info->view_size = -1;
- /* FIXME: Merge global_dock_factory and global_toolbox_factory
+ /* FIXME: Merge global_dock_window_factory and global_toolbox_factory
* somehow so we don't need this hack
*/
dockable = gimp_dialog_factory_dockable_new ((GIMP_IS_TOOLBOX (dock) ?
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]