Adding upstream version 2.10.36.upstream/2.10.36

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 743 insertions, 0 deletions

diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
new file mode 100644
index 0000000..70f2dc4
--- /dev/null
+++ b/app/tools/gimptextoptions.c
@@ -0,0 +1,743 @@
+/* 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 <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "config/gimpconfig-utils.h"
+
+#include "core/gimp.h"
+#include "core/gimpdatafactory.h"
+#include "core/gimptoolinfo.h"
+#include "core/gimpviewable.h"
+
+#include "text/gimptext.h"
+
+#include "widgets/gimpcolorpanel.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimppropwidgets.h"
+#include "widgets/gimptextbuffer.h"
+#include "widgets/gimptexteditor.h"
+#include "widgets/gimpviewablebox.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptextoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+enum
+{
+  PROP_0,
+  PROP_FONT_SIZE,
+  PROP_UNIT,
+  PROP_ANTIALIAS,
+  PROP_HINT_STYLE,
+  PROP_LANGUAGE,
+  PROP_BASE_DIR,
+  PROP_JUSTIFICATION,
+  PROP_INDENTATION,
+  PROP_LINE_SPACING,
+  PROP_LETTER_SPACING,
+  PROP_BOX_MODE,
+
+  PROP_USE_EDITOR,
+
+  PROP_FONT_VIEW_TYPE,
+  PROP_FONT_VIEW_SIZE
+};
+
+
+static void  gimp_text_options_config_iface_init (GimpConfigInterface *config_iface);
+
+static void  gimp_text_options_finalize           (GObject         *object);
+static void  gimp_text_options_set_property       (GObject         *object,
+                                                   guint            property_id,
+                                                   const GValue    *value,
+                                                   GParamSpec      *pspec);
+static void  gimp_text_options_get_property       (GObject         *object,
+                                                   guint            property_id,
+                                                   GValue          *value,
+                                                   GParamSpec      *pspec);
+
+static void  gimp_text_options_reset              (GimpConfig      *config);
+
+static void  gimp_text_options_notify_font        (GimpContext     *context,
+                                                   GParamSpec      *pspec,
+                                                   GimpText        *text);
+static void  gimp_text_options_notify_text_font   (GimpText        *text,
+                                                   GParamSpec      *pspec,
+                                                   GimpContext     *context);
+static void  gimp_text_options_notify_color       (GimpContext     *context,
+                                                   GParamSpec      *pspec,
+                                                   GimpText        *text);
+static void  gimp_text_options_notify_text_color  (GimpText        *text,
+                                                   GParamSpec      *pspec,
+                                                   GimpContext     *context);
+
+
+G_DEFINE_TYPE_WITH_CODE (GimpTextOptions, gimp_text_options,
+                         GIMP_TYPE_TOOL_OPTIONS,
+                         G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
+                                                gimp_text_options_config_iface_init))
+
+#define parent_class gimp_text_options_parent_class
+
+static GimpConfigInterface *parent_config_iface = NULL;
+
+
+static void
+gimp_text_options_class_init (GimpTextOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize     = gimp_text_options_finalize;
+  object_class->set_property = gimp_text_options_set_property;
+  object_class->get_property = gimp_text_options_get_property;
+
+  GIMP_CONFIG_PROP_UNIT (object_class, PROP_UNIT,
+                         "font-size-unit",
+                         _("Unit"),
+                         _("Font size unit"),
+                         TRUE, FALSE, GIMP_UNIT_PIXEL,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_FONT_SIZE,
+                           "font-size",
+                           _("Font size"),
+                           _("Font size"),
+                           0.0, 8192.0, 62.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
+                            "antialias",
+                            _("Antialiasing"),
+                            NULL,
+                            TRUE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_HINT_STYLE,
+                         "hint-style",
+                         _("Hinting"),
+                         _("Hinting alters the font outline to "
+                           "produce a crisp bitmap at small "
+                           "sizes"),
+                         GIMP_TYPE_TEXT_HINT_STYLE,
+                         GIMP_TEXT_HINT_STYLE_MEDIUM,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_STRING (object_class, PROP_LANGUAGE,
+                           "language",
+                           _("Language"),
+                           _("The text language may have an effect "
+                             "on the way the text is rendered."),
+                           (const gchar *) gtk_get_default_language (),
+                           GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BASE_DIR,
+                         "base-direction",
+                         NULL, NULL,
+                         GIMP_TYPE_TEXT_DIRECTION,
+                         GIMP_TEXT_DIRECTION_LTR,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_JUSTIFICATION,
+                         "justify",
+                         _("Justify"),
+                         _("Text alignment"),
+                         GIMP_TYPE_TEXT_JUSTIFICATION,
+                         GIMP_TEXT_JUSTIFY_LEFT,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_INDENTATION,
+                           "indent",
+                           _("Indentation"),
+                           _("Indentation of the first line"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LINE_SPACING,
+                           "line-spacing",
+                           _("Line spacing"),
+                           _("Adjust line spacing"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_LETTER_SPACING,
+                           "letter-spacing",
+                           _("Letter spacing"),
+                           _("Adjust letter spacing"),
+                           -8192.0, 8192.0, 0.0,
+                           GIMP_PARAM_STATIC_STRINGS |
+                           GIMP_CONFIG_PARAM_DEFAULTS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_BOX_MODE,
+                         "box-mode",
+                         _("Box"),
+                         _("Whether text flows into rectangular shape or "
+                           "moves into a new line when you press Enter"),
+                         GIMP_TYPE_TEXT_BOX_MODE,
+                         GIMP_TEXT_BOX_DYNAMIC,
+                         GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_USE_EDITOR,
+                            "use-editor",
+                            _("Use editor"),
+                            _("Use an external editor window for text entry"),
+                            FALSE,
+                            GIMP_PARAM_STATIC_STRINGS);
+
+  GIMP_CONFIG_PROP_ENUM (object_class, PROP_FONT_VIEW_TYPE,
+                         "font-view-type",
+                         NULL, NULL,
+                         GIMP_TYPE_VIEW_TYPE,
+                         GIMP_VIEW_TYPE_LIST,
+                         GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_PROP_INT (object_class, PROP_FONT_VIEW_SIZE,
+                        "font-view-size",
+                        NULL, NULL,
+                        GIMP_VIEW_SIZE_TINY,
+                        GIMP_VIEWABLE_MAX_BUTTON_SIZE,
+                        GIMP_VIEW_SIZE_SMALL,
+                        GIMP_PARAM_STATIC_STRINGS);
+}
+
+static void
+gimp_text_options_config_iface_init (GimpConfigInterface *config_iface)
+{
+  parent_config_iface = g_type_interface_peek_parent (config_iface);
+
+  config_iface->reset = gimp_text_options_reset;
+}
+
+static void
+gimp_text_options_init (GimpTextOptions *options)
+{
+  options->size_entry = NULL;
+}
+
+static void
+gimp_text_options_finalize (GObject *object)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  g_clear_pointer (&options->language, g_free);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_text_options_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FONT_SIZE:
+      g_value_set_double (value, options->font_size);
+      break;
+    case PROP_UNIT:
+      g_value_set_int (value, options->unit);
+      break;
+    case PROP_ANTIALIAS:
+      g_value_set_boolean (value, options->antialias);
+      break;
+    case PROP_HINT_STYLE:
+      g_value_set_enum (value, options->hint_style);
+      break;
+    case PROP_LANGUAGE:
+      g_value_set_string (value, options->language);
+      break;
+    case PROP_BASE_DIR:
+      g_value_set_enum (value, options->base_dir);
+      break;
+    case PROP_JUSTIFICATION:
+      g_value_set_enum (value, options->justify);
+      break;
+    case PROP_INDENTATION:
+      g_value_set_double (value, options->indent);
+      break;
+    case PROP_LINE_SPACING:
+      g_value_set_double (value, options->line_spacing);
+      break;
+    case PROP_LETTER_SPACING:
+      g_value_set_double (value, options->letter_spacing);
+      break;
+    case PROP_BOX_MODE:
+      g_value_set_enum (value, options->box_mode);
+      break;
+
+    case PROP_USE_EDITOR:
+      g_value_set_boolean (value, options->use_editor);
+      break;
+
+    case PROP_FONT_VIEW_TYPE:
+      g_value_set_enum (value, options->font_view_type);
+      break;
+    case PROP_FONT_VIEW_SIZE:
+      g_value_set_int (value, options->font_view_size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_options_set_property (GObject      *object,
+                                guint         property_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  GimpTextOptions *options = GIMP_TEXT_OPTIONS (object);
+
+  switch (property_id)
+    {
+    case PROP_FONT_SIZE:
+      options->font_size = g_value_get_double (value);
+      break;
+    case PROP_UNIT:
+      options->unit = g_value_get_int (value);
+      break;
+    case PROP_ANTIALIAS:
+      options->antialias = g_value_get_boolean (value);
+      break;
+    case PROP_HINT_STYLE:
+      options->hint_style = g_value_get_enum (value);
+      break;
+    case PROP_BASE_DIR:
+      options->base_dir = g_value_get_enum (value);
+      break;
+    case PROP_LANGUAGE:
+      g_free (options->language);
+      options->language = g_value_dup_string (value);
+      break;
+    case PROP_JUSTIFICATION:
+      options->justify = g_value_get_enum (value);
+      break;
+    case PROP_INDENTATION:
+      options->indent = g_value_get_double (value);
+      break;
+    case PROP_LINE_SPACING:
+      options->line_spacing = g_value_get_double (value);
+      break;
+    case PROP_LETTER_SPACING:
+      options->letter_spacing = g_value_get_double (value);
+      break;
+    case PROP_BOX_MODE:
+      options->box_mode = g_value_get_enum (value);
+      break;
+
+    case PROP_USE_EDITOR:
+      options->use_editor = g_value_get_boolean (value);
+      break;
+
+    case PROP_FONT_VIEW_TYPE:
+      options->font_view_type = g_value_get_enum (value);
+      break;
+    case PROP_FONT_VIEW_SIZE:
+      options->font_view_size = g_value_get_int (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gimp_text_options_reset (GimpConfig *config)
+{
+  GObject *object = G_OBJECT (config);
+
+  /*  implement reset() ourselves because the default impl would
+   *  reset *all* properties, including all rectangle properties
+   *  of the text box
+   */
+
+  /* context */
+  gimp_config_reset_property (object, "font");
+  gimp_config_reset_property (object, "foreground");
+
+  /* text options */
+  gimp_config_reset_property (object, "font-size");
+  gimp_config_reset_property (object, "font-size-unit");
+  gimp_config_reset_property (object, "antialias");
+  gimp_config_reset_property (object, "hint-style");
+  gimp_config_reset_property (object, "language");
+  gimp_config_reset_property (object, "base-direction");
+  gimp_config_reset_property (object, "justify");
+  gimp_config_reset_property (object, "indent");
+  gimp_config_reset_property (object, "line-spacing");
+  gimp_config_reset_property (object, "letter-spacing");
+  gimp_config_reset_property (object, "box-mode");
+  gimp_config_reset_property (object, "use-editor");
+}
+
+static void
+gimp_text_options_notify_font (GimpContext *context,
+                               GParamSpec  *pspec,
+                               GimpText    *text)
+{
+  g_signal_handlers_block_by_func (text,
+                                   gimp_text_options_notify_text_font,
+                                   context);
+
+  g_object_set (text, "font", gimp_context_get_font_name (context), NULL);
+
+  g_signal_handlers_unblock_by_func (text,
+                                     gimp_text_options_notify_text_font,
+                                     context);
+}
+
+static void
+gimp_text_options_notify_text_font (GimpText    *text,
+                                    GParamSpec  *pspec,
+                                    GimpContext *context)
+{
+  g_signal_handlers_block_by_func (context,
+                                   gimp_text_options_notify_font, text);
+
+  gimp_context_set_font_name (context, text->font);
+
+  g_signal_handlers_unblock_by_func (context,
+                                     gimp_text_options_notify_font, text);
+}
+
+static void
+gimp_text_options_notify_color (GimpContext *context,
+                                GParamSpec  *pspec,
+                                GimpText    *text)
+{
+  GimpRGB  color;
+
+  gimp_context_get_foreground (context, &color);
+
+  g_signal_handlers_block_by_func (text,
+                                   gimp_text_options_notify_text_color,
+                                   context);
+
+  g_object_set (text, "color", &color, NULL);
+
+  g_signal_handlers_unblock_by_func (text,
+                                     gimp_text_options_notify_text_color,
+                                     context);
+}
+
+static void
+gimp_text_options_notify_text_color (GimpText    *text,
+                                     GParamSpec  *pspec,
+                                     GimpContext *context)
+{
+  g_signal_handlers_block_by_func (context,
+                                   gimp_text_options_notify_color, text);
+
+  gimp_context_set_foreground (context, &text->color);
+
+  g_signal_handlers_unblock_by_func (context,
+                                     gimp_text_options_notify_color, text);
+}
+
+/*  This function could live in gimptexttool.c also.
+ *  But it takes some bloat out of that file...
+ */
+void
+gimp_text_options_connect_text (GimpTextOptions *options,
+                                GimpText        *text)
+{
+  GimpContext *context;
+  GimpRGB      color;
+
+  g_return_if_fail (GIMP_IS_TEXT_OPTIONS (options));
+  g_return_if_fail (GIMP_IS_TEXT (text));
+
+  context = GIMP_CONTEXT (options);
+
+  gimp_context_get_foreground (context, &color);
+
+  gimp_config_sync (G_OBJECT (options), G_OBJECT (text), 0);
+
+  g_object_set (text,
+                "color", &color,
+                "font",  gimp_context_get_font_name (context),
+                NULL);
+
+  gimp_config_connect (G_OBJECT (options), G_OBJECT (text), NULL);
+
+  g_signal_connect_object (options, "notify::font",
+                           G_CALLBACK (gimp_text_options_notify_font),
+                           text, 0);
+  g_signal_connect_object (text, "notify::font",
+                           G_CALLBACK (gimp_text_options_notify_text_font),
+                           options, 0);
+
+  g_signal_connect_object (options, "notify::foreground",
+                           G_CALLBACK (gimp_text_options_notify_color),
+                           text, 0);
+  g_signal_connect_object (text, "notify::color",
+                           G_CALLBACK (gimp_text_options_notify_text_color),
+                           options, 0);
+}
+
+GtkWidget *
+gimp_text_options_gui (GimpToolOptions *tool_options)
+{
+  GObject         *config    = G_OBJECT (tool_options);
+  GimpTextOptions *options   = GIMP_TEXT_OPTIONS (tool_options);
+  GtkWidget       *main_vbox = gimp_tool_options_gui (tool_options);
+  GimpAsyncSet    *async_set;
+  GtkWidget       *options_vbox;
+  GtkWidget       *table;
+  GtkWidget       *vbox;
+  GtkWidget       *hbox;
+  GtkWidget       *button;
+  GtkWidget       *entry;
+  GtkWidget       *box;
+  GtkWidget       *spinbutton;
+  GtkWidget       *combo;
+  GtkSizeGroup    *size_group;
+  gint             row = 0;
+
+  async_set =
+    gimp_data_factory_get_async_set (tool_options->tool_info->gimp->font_factory);
+
+  box = gimp_busy_box_new (_("Loading fonts (this may take a while...)"));
+  gtk_container_set_border_width (GTK_CONTAINER (box), 8);
+  gtk_box_pack_start (GTK_BOX (main_vbox), box, FALSE, FALSE, 0);
+
+  g_object_bind_property (async_set, "empty",
+                          box,       "visible",
+                          G_BINDING_SYNC_CREATE |
+                          G_BINDING_INVERT_BOOLEAN);
+
+  options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL,
+                              gtk_box_get_spacing (GTK_BOX (main_vbox)));
+  gtk_box_pack_start (GTK_BOX (main_vbox), options_vbox, FALSE, FALSE, 0);
+  gtk_widget_show (options_vbox);
+
+  g_object_bind_property (async_set,    "empty",
+                          options_vbox, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  hbox = gimp_prop_font_box_new (NULL, GIMP_CONTEXT (tool_options),
+                                 _("Font"), 2,
+                                 "font-view-type", "font-view-size");
+  gtk_box_pack_start (GTK_BOX (options_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  table = gtk_table_new (1, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  entry = gimp_prop_size_entry_new (config,
+                                    "font-size", FALSE, "font-size-unit", "%p",
+                                    GIMP_SIZE_ENTRY_UPDATE_SIZE, 72.0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Size:"), 0.0, 0.5,
+                             entry, 2, FALSE);
+
+  options->size_entry = entry;
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
+
+  button = gimp_prop_check_button_new (config, "use-editor", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  button = gimp_prop_check_button_new (config, "antialias", NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+
+  table = gtk_table_new (6, 3, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (options_vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  row = 0;
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  button = gimp_prop_enum_combo_box_new (config, "hint-style", -1, -1);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Hinting:"), 0.0, 0.5,
+                             button, 1, TRUE);
+  gtk_size_group_add_widget (size_group, button);
+
+  button = gimp_prop_color_button_new (config, "foreground", _("Text Color"),
+                                       40, 24, GIMP_COLOR_AREA_FLAT);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
+                                GIMP_CONTEXT (options));
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Color:"), 0.0, 0.5,
+                             button, 1, TRUE);
+  gtk_size_group_add_widget (size_group, button);
+
+  box = gimp_prop_enum_icon_box_new (config, "justify", "format-justify", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Justify:"), 0.0, 0.5,
+                             box, 2, TRUE);
+  gtk_size_group_add_widget (size_group, box);
+  g_object_unref (size_group);
+
+  spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_INDENT_MORE,
+                          spinbutton, 1, TRUE);
+
+  spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LINE,
+                          spinbutton, 1, TRUE);
+
+  spinbutton = gimp_prop_spin_button_new (config,
+                                          "letter-spacing", 1.0, 10.0, 1);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
+  gimp_table_attach_icon (GTK_TABLE (table), row++,
+                          GIMP_ICON_FORMAT_TEXT_SPACING_LETTER,
+                          spinbutton, 1, TRUE);
+
+  combo = gimp_prop_enum_combo_box_new (config, "box-mode", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                             _("Box:"), 0.0, 0.5,
+                             combo, 1, TRUE);
+
+  /*  Only add the language entry if the iso-codes package is available.  */
+
+#ifdef HAVE_ISO_CODES
+  {
+    GtkWidget *label;
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+    gtk_box_pack_start (GTK_BOX (options_vbox), vbox, FALSE, FALSE, 0);
+    gtk_widget_show (vbox);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    label = gtk_label_new (_("Language:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    entry = gimp_prop_language_entry_new (config, "language");
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+    gtk_widget_show (entry);
+  }
+#endif
+
+  return main_vbox;
+}
+
+static void
+gimp_text_options_editor_dir_changed (GimpTextEditor  *editor,
+                                      GimpTextOptions *options)
+{
+  g_object_set (options,
+                "base-direction", editor->base_dir,
+                NULL);
+}
+
+static void
+gimp_text_options_editor_notify_dir (GimpTextOptions *options,
+                                     GParamSpec      *pspec,
+                                     GimpTextEditor  *editor)
+{
+  GimpTextDirection  dir;
+
+  g_object_get (options,
+                "base-direction", &dir,
+                NULL);
+
+  gimp_text_editor_set_direction (editor, dir);
+}
+
+static void
+gimp_text_options_editor_notify_font (GimpTextOptions *options,
+                                      GParamSpec      *pspec,
+                                      GimpTextEditor  *editor)
+{
+  const gchar *font_name;
+
+  font_name = gimp_context_get_font_name (GIMP_CONTEXT (options));
+
+  gimp_text_editor_set_font_name (editor, font_name);
+}
+
+GtkWidget *
+gimp_text_options_editor_new (GtkWindow       *parent,
+                              Gimp            *gimp,
+                              GimpTextOptions *options,
+                              GimpMenuFactory *menu_factory,
+                              const gchar     *title,
+                              GimpText        *text,
+                              GimpTextBuffer  *text_buffer,
+                              gdouble          xres,
+                              gdouble          yres)
+{
+  GtkWidget   *editor;
+  const gchar *font_name;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_OPTIONS (options), NULL);
+  g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT (text), NULL);
+  g_return_val_if_fail (GIMP_IS_TEXT_BUFFER (text_buffer), NULL);
+
+  editor = gimp_text_editor_new (title, parent, gimp, menu_factory,
+                                 text, text_buffer, xres, yres);
+
+  font_name = gimp_context_get_font_name (GIMP_CONTEXT (options));
+
+  gimp_text_editor_set_direction (GIMP_TEXT_EDITOR (editor),
+                                  options->base_dir);
+  gimp_text_editor_set_font_name (GIMP_TEXT_EDITOR (editor),
+                                  font_name);
+
+  g_signal_connect_object (editor, "dir-changed",
+                           G_CALLBACK (gimp_text_options_editor_dir_changed),
+                           options, 0);
+  g_signal_connect_object (options, "notify::base-direction",
+                           G_CALLBACK (gimp_text_options_editor_notify_dir),
+                           editor, 0);
+  g_signal_connect_object (options, "notify::font",
+                           G_CALLBACK (gimp_text_options_editor_notify_font),
+                           editor, 0);
+
+  return editor;
+}