Move the Image Selection Menu from GimpMenuDock to GimpDockWindow. That is, if a dock window contains many docks then they will share the same Image Selection Menu. To do this we need to move around quite a bit of code. Move the "context", "dialog-factory" and "ui-manager" properties from GimpDock to GimpToolbox, GimpMenuDock doesn't need it any longer. Turn the GimpDock getters for these properties into wrappers that go to the GimpDockWindow properties. In some places, most notably GimpToolbox construction, we use the GimpToolbox values of these properties, but most of the time it works fine to just use the GimpDockWindow properties. GimpDock::setup() and set/get_aux_info() have also been moved to GimpDockWindow since the only aux info for docks was for the image selection menu. Also, we don't bother porting gimp_menu_dock_destroy() to GimpDockWindow, but we leave the code around. If this is a problem, it will show.
309 lines
8.4 KiB
C
309 lines
8.4 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpsessioninfo-aux.c
|
|
* Copyright (C) 2001-2007 Michael Natterer <mitch@gimp.org>
|
|
*
|
|
* 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 <string.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpconfig/gimpconfig.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "gimpdock.h"
|
|
#include "gimpdockable.h"
|
|
#include "gimpdockwindow.h"
|
|
#include "gimpsessioninfo-aux.h"
|
|
|
|
|
|
/* public functions */
|
|
|
|
GimpSessionInfoAux *
|
|
gimp_session_info_aux_new (const gchar *name,
|
|
const gchar *value)
|
|
{
|
|
GimpSessionInfoAux *aux;
|
|
|
|
g_return_val_if_fail (name != NULL, NULL);
|
|
g_return_val_if_fail (value != NULL, NULL);
|
|
|
|
aux = g_slice_new0 (GimpSessionInfoAux);
|
|
|
|
aux->name = g_strdup (name);
|
|
aux->value = g_strdup (value);
|
|
|
|
return aux;
|
|
}
|
|
|
|
void
|
|
gimp_session_info_aux_free (GimpSessionInfoAux *aux)
|
|
{
|
|
g_return_if_fail (aux != NULL);
|
|
|
|
g_free (aux->name);
|
|
g_free (aux->value);
|
|
|
|
g_slice_free (GimpSessionInfoAux, aux);
|
|
}
|
|
|
|
GList *
|
|
gimp_session_info_aux_new_from_props (GObject *object,
|
|
...)
|
|
{
|
|
GList *list = NULL;
|
|
const gchar *prop_name;
|
|
va_list args;
|
|
|
|
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
|
|
|
|
va_start (args, object);
|
|
|
|
for (prop_name = va_arg (args, const gchar *);
|
|
prop_name;
|
|
prop_name = va_arg (args, const gchar *))
|
|
{
|
|
GObjectClass *class = G_OBJECT_GET_CLASS (object);
|
|
GParamSpec *pspec = g_object_class_find_property (class, prop_name);
|
|
|
|
if (pspec)
|
|
{
|
|
GString *str = g_string_new (NULL);
|
|
GValue value = { 0, };
|
|
|
|
g_value_init (&value, pspec->value_type);
|
|
g_object_get_property (object, pspec->name, &value);
|
|
|
|
if (! g_param_value_defaults (pspec, &value) &&
|
|
gimp_config_serialize_value (&value, str, TRUE))
|
|
{
|
|
list = g_list_prepend (list,
|
|
gimp_session_info_aux_new (prop_name,
|
|
str->str));
|
|
}
|
|
|
|
g_value_unset (&value);
|
|
g_string_free (str, TRUE);
|
|
}
|
|
else
|
|
{
|
|
g_warning ("%s: no property named '%s' for %s",
|
|
G_STRFUNC,
|
|
prop_name, G_OBJECT_CLASS_NAME (class));
|
|
}
|
|
}
|
|
|
|
va_end (args);
|
|
|
|
return g_list_reverse (list);
|
|
}
|
|
|
|
void
|
|
gimp_session_info_aux_set_props (GObject *object,
|
|
GList *auxs,
|
|
...)
|
|
{
|
|
const gchar *prop_name;
|
|
va_list args;
|
|
|
|
g_return_if_fail (G_IS_OBJECT (object));
|
|
|
|
va_start (args, auxs);
|
|
|
|
for (prop_name = va_arg (args, const gchar *);
|
|
prop_name;
|
|
prop_name = va_arg (args, const gchar *))
|
|
{
|
|
GList *list;
|
|
|
|
for (list = auxs; list; list = g_list_next (list))
|
|
{
|
|
GimpSessionInfoAux *aux = list->data;
|
|
|
|
if (strcmp (aux->name, prop_name) == 0)
|
|
{
|
|
GObjectClass *class = G_OBJECT_GET_CLASS (object);
|
|
GParamSpec *pspec = g_object_class_find_property (class,
|
|
prop_name);
|
|
|
|
if (pspec)
|
|
{
|
|
GValue value = { 0, };
|
|
|
|
g_value_init (&value, pspec->value_type);
|
|
|
|
if (G_VALUE_HOLDS_ENUM (&value))
|
|
{
|
|
GEnumClass *enum_class;
|
|
GEnumValue *enum_value;
|
|
|
|
enum_class = g_type_class_peek (pspec->value_type);
|
|
enum_value = g_enum_get_value_by_nick (enum_class,
|
|
aux->value);
|
|
|
|
if (enum_value)
|
|
{
|
|
g_value_set_enum (&value, enum_value->value);
|
|
g_object_set_property (object, pspec->name, &value);
|
|
}
|
|
else
|
|
{
|
|
g_warning ("%s: unknown enum value in '%s' for %s",
|
|
G_STRFUNC,
|
|
prop_name, G_OBJECT_CLASS_NAME (class));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
GValue str_value = { 0, };
|
|
|
|
g_value_init (&str_value, G_TYPE_STRING);
|
|
g_value_set_static_string (&str_value, aux->value);
|
|
|
|
if (g_value_transform (&str_value, &value))
|
|
g_object_set_property (object, pspec->name, &value);
|
|
else
|
|
g_warning ("%s: cannot convert property '%s' for %s",
|
|
G_STRFUNC,
|
|
prop_name, G_OBJECT_CLASS_NAME (class));
|
|
|
|
g_value_unset (&str_value);
|
|
}
|
|
|
|
g_value_unset (&value);
|
|
}
|
|
else
|
|
{
|
|
g_warning ("%s: no property named '%s' for %s",
|
|
G_STRFUNC,
|
|
prop_name, G_OBJECT_CLASS_NAME (class));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
va_end (args);
|
|
}
|
|
|
|
void
|
|
gimp_session_info_aux_serialize (GimpConfigWriter *writer,
|
|
GList *aux_info)
|
|
{
|
|
GList *list;
|
|
|
|
g_return_if_fail (writer != NULL);
|
|
g_return_if_fail (aux_info != NULL);
|
|
|
|
gimp_config_writer_open (writer, "aux-info");
|
|
|
|
for (list = aux_info; list; list = g_list_next (list))
|
|
{
|
|
GimpSessionInfoAux *aux = list->data;
|
|
|
|
gimp_config_writer_open (writer, aux->name);
|
|
gimp_config_writer_string (writer, aux->value);
|
|
gimp_config_writer_close (writer);
|
|
}
|
|
|
|
gimp_config_writer_close (writer);
|
|
}
|
|
|
|
GTokenType
|
|
gimp_session_info_aux_deserialize (GScanner *scanner,
|
|
GList **aux_list)
|
|
{
|
|
GimpSessionInfoAux *aux_info = NULL;
|
|
GTokenType token = G_TOKEN_LEFT_PAREN;
|
|
|
|
g_return_val_if_fail (scanner != NULL, G_TOKEN_LEFT_PAREN);
|
|
g_return_val_if_fail (aux_list != NULL, G_TOKEN_LEFT_PAREN);
|
|
|
|
while (g_scanner_peek_next_token (scanner) == token)
|
|
{
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
switch (token)
|
|
{
|
|
case G_TOKEN_LEFT_PAREN:
|
|
token = G_TOKEN_IDENTIFIER;
|
|
break;
|
|
|
|
case G_TOKEN_IDENTIFIER:
|
|
{
|
|
aux_info = g_slice_new0 (GimpSessionInfoAux);
|
|
|
|
aux_info->name = g_strdup (scanner->value.v_identifier);
|
|
|
|
token = G_TOKEN_STRING;
|
|
if (g_scanner_peek_next_token (scanner) != token)
|
|
goto error;
|
|
|
|
if (! gimp_scanner_parse_string (scanner, &aux_info->value))
|
|
goto error;
|
|
|
|
*aux_list = g_list_append (*aux_list, aux_info);
|
|
aux_info = NULL;
|
|
}
|
|
token = G_TOKEN_RIGHT_PAREN;
|
|
break;
|
|
|
|
case G_TOKEN_RIGHT_PAREN:
|
|
token = G_TOKEN_LEFT_PAREN;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return token;
|
|
|
|
error:
|
|
if (aux_info)
|
|
gimp_session_info_aux_free (aux_info);
|
|
|
|
return token;
|
|
}
|
|
|
|
void
|
|
gimp_session_info_aux_set_list (GtkWidget *dialog,
|
|
GList *aux_list)
|
|
{
|
|
/* FIXME: make the aux-info stuff generic */
|
|
|
|
if (GIMP_IS_DOCK_WINDOW (dialog))
|
|
gimp_dock_window_set_aux_info (GIMP_DOCK_WINDOW (dialog), aux_list);
|
|
else if (GIMP_IS_DOCKABLE (dialog))
|
|
gimp_dockable_set_aux_info (GIMP_DOCKABLE (dialog), aux_list);
|
|
}
|
|
|
|
GList *
|
|
gimp_session_info_aux_get_list (GtkWidget *dialog)
|
|
{
|
|
/* FIXME: make the aux-info stuff generic */
|
|
|
|
if (GIMP_IS_DOCK_WINDOW (dialog))
|
|
return gimp_dock_window_get_aux_info (GIMP_DOCK_WINDOW (dialog));
|
|
else if (GIMP_IS_DOCKABLE (dialog))
|
|
return gimp_dockable_get_aux_info (GIMP_DOCKABLE (dialog));
|
|
|
|
return NULL;
|
|
}
|