1093462ae9
Get rid of 'global_toolbox_factory' and manage everything dock-related with 'global_dock_factory'. The whole of 'global_toolbox_factory' was a big special-case and getting rid of it makes it easier to extend the session management with e.g. single-window mode dock functionality. To get rid of 'global_toolbox_factory' we, roughly, have to * Replace 'global_toolbox_factory' with 'global_dock_factory' everywhere. We can also get rid of lots of code that did special things for the "toolbox" factory. * Make the use or interaction with the toolbox explicit in some places. For example, a function gimp_dock_window_has_toolbox() has been introduced. * Make GimpSessionInfoDock have an 'identifier' parameter so we can differentiate between the "gimp-dock" and "gimp-toolbox" dock types.
120 lines
3.2 KiB
C
120 lines
3.2 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "actions-types.h"
|
|
|
|
#include "config/gimpdisplayconfig.h"
|
|
#include "config/gimpguiconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpcontainer.h"
|
|
|
|
#include "widgets/gimpdialogfactory.h"
|
|
#include "widgets/gimpsessioninfo.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
#include "display/gimpdisplayshell.h"
|
|
|
|
#include "dialogs/dialogs.h"
|
|
|
|
#include "actions.h"
|
|
#include "windows-commands.h"
|
|
|
|
|
|
void
|
|
windows_show_toolbox_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
windows_show_toolbox ();
|
|
}
|
|
|
|
void
|
|
windows_use_single_window_mode_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
|
|
Gimp *gimp = NULL;
|
|
return_if_no_gimp (gimp, data);
|
|
|
|
if (GIMP_GUI_CONFIG (gimp->config)->single_window_mode == active)
|
|
return;
|
|
|
|
g_object_set (gimp->config,
|
|
"single-window-mode", active,
|
|
NULL);
|
|
}
|
|
|
|
void
|
|
windows_show_display_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display");
|
|
|
|
gimp_display_shell_present (gimp_display_get_shell (display));
|
|
}
|
|
|
|
void
|
|
windows_show_dock_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
GtkWindow *dock_window = g_object_get_data (G_OBJECT (action), "dock-window");
|
|
|
|
gtk_window_present (dock_window);
|
|
}
|
|
|
|
void
|
|
windows_open_recent_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
GimpSessionInfo *info = g_object_get_data (G_OBJECT (action), "info");
|
|
|
|
g_object_ref (info);
|
|
gimp_container_remove (global_recent_docks, GIMP_OBJECT (info));
|
|
|
|
gimp_dialog_factory_add_session_info (global_dock_factory, info);
|
|
|
|
gimp_session_info_restore (info, global_dock_factory);
|
|
gimp_session_info_clear_info (info);
|
|
}
|
|
|
|
void
|
|
windows_show_toolbox (void)
|
|
{
|
|
GtkWidget *toolbox = NULL;
|
|
|
|
if (! dialogs_get_toolbox ())
|
|
{
|
|
toolbox = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
|
|
gdk_screen_get_default (),
|
|
TRUE /*toolbox*/);
|
|
|
|
gtk_widget_show (toolbox);
|
|
}
|
|
else
|
|
{
|
|
toolbox = dialogs_get_toolbox ();
|
|
|
|
if (toolbox)
|
|
gtk_window_present (GTK_WINDOW (toolbox));
|
|
}
|
|
}
|