dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: rename gimpproptable.[ch] to gimppropgui.[ch]

This commit is contained in:
Michael Natterer 2014-05-27 02:11:51 +02:00
parent 5ffa278da5
commit a06d570748
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/tools/gimpgegltool.c
View File

@ -376,15 +376,15 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_box_reorder_child (GTK_BOX (main_vbox), tool->description_label, 1);
/* The options vbox */
o_tool->options_table =
o_tool->options_gui =
gtk_label_new (_("Select an operation from the list above"));
gimp_label_set_attributes (GTK_LABEL (o_tool->options_table),
gimp_label_set_attributes (GTK_LABEL (o_tool->options_gui),
PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
-1);
gtk_misc_set_padding (GTK_MISC (o_tool->options_table), 0, 4);
gtk_misc_set_padding (GTK_MISC (o_tool->options_gui), 0, 4);
gtk_container_add (GTK_CONTAINER (o_tool->options_box),
o_tool->options_table);
gtk_widget_show (o_tool->options_table);
o_tool->options_gui);
gtk_widget_show (o_tool->options_gui);
}
static void

30
app/tools/gimpoperationtool.c
View File

@ -47,7 +47,7 @@
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppickablebutton.h"
#include "widgets/gimpproptable.h"
#include "widgets/gimppropgui.h"
#include "display/gimpdisplay.h"
#include "display/gimptoolgui.h"
@ -283,11 +283,11 @@ gimp_operation_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (tool->aux_input_box);
}
if (tool->options_table)
if (tool->options_gui)
{
gtk_box_pack_start (GTK_BOX (tool->options_box), tool->options_table,
gtk_box_pack_start (GTK_BOX (tool->options_box), tool->options_gui,
FALSE, FALSE, 0);
gtk_widget_show (tool->options_table);
gtk_widget_show (tool->options_gui);
}
if (tool->undo_desc)
@ -612,10 +612,10 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
tool->aux_input_box = NULL;
}
if (tool->options_table)
if (tool->options_gui)
{
gtk_widget_destroy (tool->options_table);
tool->options_table = NULL;
gtk_widget_destroy (tool->options_gui);
tool->options_gui = NULL;
if (im_tool->active_picker)
{
@ -668,18 +668,18 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
if (tool->config)
{
tool->options_table =
gimp_prop_table_new (G_OBJECT (tool->config),
G_TYPE_FROM_INSTANCE (tool->config),
GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool)),
(GimpCreatePickerFunc) gimp_image_map_tool_add_color_picker,
tool);
tool->options_gui =
gimp_prop_gui_new (G_OBJECT (tool->config),
G_TYPE_FROM_INSTANCE (tool->config),
GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool)),
(GimpCreatePickerFunc) gimp_image_map_tool_add_color_picker,
tool);
if (tool->options_box)
{
gtk_box_pack_start (GTK_BOX (tool->options_box), tool->options_table,
gtk_box_pack_start (GTK_BOX (tool->options_box), tool->options_gui,
FALSE, FALSE, 0);
gtk_widget_show (tool->options_table);
gtk_widget_show (tool->options_gui);
}
}

2
app/tools/gimpoperationtool.h
View File

@ -45,7 +45,7 @@ struct _GimpOperationTool
/* dialog */
GtkWidget *options_box;
GtkWidget *options_table;
GtkWidget *options_gui;
GtkWidget *aux_input_box;
GtkWidget *aux_input_button;
};

4
app/widgets/Makefile.am
View File

@ -276,8 +276,8 @@ libappwidgets_a_sources = \
gimpprogressbox.h \
gimpprogressdialog.c \
gimpprogressdialog.h \
gimpproptable.c \
gimpproptable.h \
gimppropgui.c \
gimppropgui.h \
gimppropwidgets.c \
gimppropwidgets.h \
gimpradioaction.c \

16
app/widgets/gimpproptable.c → app/widgets/gimppropgui.c
View File

@ -1,8 +1,8 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* gimppropwidgets.c
* Copyright (C) 2002-2004 Michael Natterer <mitch@gimp.org>
* gimppropgui.c
* Copyright (C) 2002-2014 Michael Natterer <mitch@gimp.org>
* Sven Neumann <sven@gimp.org>
*
* This program is free software: you can redistribute it and/or modify
@ -41,7 +41,7 @@
#include "gimpcolorpanel.h"
#include "gimpspinscale.h"
#include "gimpproptable.h"
#include "gimppropgui.h"
#include "gimppropwidgets.h"
#include "gimp-intl.h"
@ -272,11 +272,11 @@ gimp_prop_widget_new (GObject *config,
}
GtkWidget *
gimp_prop_table_new (GObject *config,
GType owner_type,
GimpContext *context,
GimpCreatePickerFunc create_picker_func,
gpointer picker_creator)
gimp_prop_gui_new (GObject *config,
GType owner_type,
GimpContext *context,
GimpCreatePickerFunc create_picker_func,
gpointer picker_creator)
{
GtkWidget *table;
GParamSpec **param_specs;

12
app/widgets/gimpproptable.h → app/widgets/gimppropgui.h
View File

@ -1,8 +1,8 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* gimpproptable.h
* Copyright (C) 2002-2013 Michael Natterer <mitch@gimp.org>
* gimppropgui.h
* Copyright (C) 2002-2014 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
@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_PROP_TABLE_H__
#define __GIMP_PROP_TABLE_H__
#ifndef __GIMP_PROP_GUI_H__
#define __GIMP_PROP_GUI_H__
/* A view on all of an object's properties */
@ -35,7 +35,7 @@ GtkWidget * gimp_prop_widget_new (GObject *config,
GimpCreatePickerFunc create_picker_func,
gpointer picker_creator,
const gchar **label);
GtkWidget * gimp_prop_table_new (GObject *config,
GtkWidget * gimp_prop_gui_new (GObject *config,
GType owner_type,
GimpContext *context,
GimpCreatePickerFunc create_picker_func,
@ -43,4 +43,4 @@ GtkWidget * gimp_prop_table_new (GObject *config,
#endif /* __GIMP_PROP_TABLE_H__ */
#endif /* __GIMP_PROP_GUI_H__ */

2
po/POTFILES.in
View File

@ -480,7 +480,7 @@ app/widgets/gimppaletteeditor.c
app/widgets/gimppanedbox.c
app/widgets/gimppdbdialog.c
app/widgets/gimpprogressdialog.c
app/widgets/gimpproptable.c
app/widgets/gimppropgui.c
app/widgets/gimppropwidgets.c
app/widgets/gimpselectiondata.c
app/widgets/gimpselectioneditor.c