[gimp] app: rename gimpproptable.[ch] to gimppropgui.[ch]
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename gimpproptable.[ch] to gimppropgui.[ch]
- Date: Tue, 27 May 2014 00:17:43 +0000 (UTC)
commit a06d5707488e08cefa963437b7c41e01f517c6e1
Author: Michael Natterer <mitch gimp org>
Date: Tue May 27 02:11:51 2014 +0200
app: rename gimpproptable.[ch] to gimppropgui.[ch]
app/tools/gimpgegltool.c | 10 ++++----
app/tools/gimpoperationtool.c | 30 ++++++++++++------------
app/tools/gimpoperationtool.h | 2 +-
app/widgets/Makefile.am | 4 +-
app/widgets/{gimpproptable.c => gimppropgui.c} | 16 ++++++------
app/widgets/{gimpproptable.h => gimppropgui.h} | 12 ++++----
po/POTFILES.in | 2 +-
7 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index fb131c4..0d409a7 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -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
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index b6aba19..bbe61c0 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -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);
}
}
diff --git a/app/tools/gimpoperationtool.h b/app/tools/gimpoperationtool.h
index 608cd6c..587be8a 100644
--- a/app/tools/gimpoperationtool.h
+++ b/app/tools/gimpoperationtool.h
@@ -45,7 +45,7 @@ struct _GimpOperationTool
/* dialog */
GtkWidget *options_box;
- GtkWidget *options_table;
+ GtkWidget *options_gui;
GtkWidget *aux_input_box;
GtkWidget *aux_input_button;
};
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index 7e45ba2..8856a35 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -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 \
diff --git a/app/widgets/gimpproptable.c b/app/widgets/gimppropgui.c
similarity index 97%
rename from app/widgets/gimpproptable.c
rename to app/widgets/gimppropgui.c
index 1ffffd4..b0a87c2 100644
--- a/app/widgets/gimpproptable.c
+++ b/app/widgets/gimppropgui.c
@@ -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;
diff --git a/app/widgets/gimpproptable.h b/app/widgets/gimppropgui.h
similarity index 88%
rename from app/widgets/gimpproptable.h
rename to app/widgets/gimppropgui.h
index 5f0c25b..e822158 100644
--- a/app/widgets/gimpproptable.h
+++ b/app/widgets/gimppropgui.h
@@ -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__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 55eead9..b858ec5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]