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

app/tools/gimpimagemaptool.[ch] app/tools/gimpcurvestool.c allow to 

2004-10-22  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpimagemaptool.[ch]
	* app/tools/gimpcurvestool.c
	* app/tools/gimplevelstool.c: allow to Shift-click the Load and
	Save buttons to skip the file chooser dialog and reuse the last
	used filename. Fixes bug #75558.
This commit is contained in:
Sven Neumann 2004-10-22 19:44:03 +00:00 committed by Sven Neumann
parent 8907fdcf46
commit 43a4629965
5 changed files with 164 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-10-22 Sven Neumann <sven@gimp.org>
* app/tools/gimpimagemaptool.[ch]
* app/tools/gimpcurvestool.c
* app/tools/gimplevelstool.c: allow to Shift-click the Load and
Save buttons to skip the file chooser dialog and reuse the last
used filename. Fixes bug #75558.
2004-10-22 Michael Natterer <mitch@gimp.org> 2004-10-22 Michael Natterer <mitch@gimp.org>
* app/dialogs/Makefile.am * app/dialogs/Makefile.am

6
app/tools/gimpcurvestool.c
View File

@ -204,7 +204,9 @@ gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
image_map_tool_class->shell_desc = _("Adjust Color Curves"); image_map_tool_class->shell_desc = _("Adjust Color Curves");
image_map_tool_class->settings_name = "curves"; image_map_tool_class->settings_name = "curves";
image_map_tool_class->load_dialog_title = _("Load Curves"); image_map_tool_class->load_dialog_title = _("Load Curves");
image_map_tool_class->load_button_tip = _("Load curves settings from file");
image_map_tool_class->save_dialog_title = _("Save Curves"); image_map_tool_class->save_dialog_title = _("Save Curves");
image_map_tool_class->save_button_tip = _("Save curves settings to file");
image_map_tool_class->map = gimp_curves_tool_map; image_map_tool_class->map = gimp_curves_tool_map;
image_map_tool_class->dialog = gimp_curves_tool_dialog; image_map_tool_class->dialog = gimp_curves_tool_dialog;
@ -604,14 +606,10 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_box_pack_start (GTK_BOX (bbox), image_map_tool->load_button, gtk_box_pack_start (GTK_BOX (bbox), image_map_tool->load_button,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gimp_help_set_help_data (image_map_tool->load_button,
_("Read curves settings from file"), NULL);
gtk_widget_show (image_map_tool->load_button); gtk_widget_show (image_map_tool->load_button);
gtk_box_pack_start (GTK_BOX (bbox), image_map_tool->save_button, gtk_box_pack_start (GTK_BOX (bbox), image_map_tool->save_button,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gimp_help_set_help_data (image_map_tool->save_button,
_("Save curves settings to file"), NULL);
gtk_widget_show (image_map_tool->save_button); gtk_widget_show (image_map_tool->save_button);
/* The radio box for selecting the curve type */ /* The radio box for selecting the curve type */

195
app/tools/gimpimagemaptool.c
View File

@ -42,6 +42,7 @@
#include "widgets/gimppropwidgets.h" #include "widgets/gimppropwidgets.h"
#include "widgets/gimptooldialog.h" #include "widgets/gimptooldialog.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
@ -85,13 +86,20 @@ static void gimp_image_map_tool_response (GtkWidget *widget,
gint response_id, gint response_id,
GimpImageMapTool *image_map_tool); GimpImageMapTool *image_map_tool);
static void gimp_image_map_tool_load_clicked (GtkWidget *widget, static void gimp_image_map_tool_load_clicked (GtkWidget *widget,
GimpImageMapTool *image_map_tool); GimpImageMapTool *tool);
static void gimp_image_map_tool_save_clicked (GtkWidget *widget, static void gimp_image_map_tool_load_ext_clicked (GtkWidget *widget,
GimpImageMapTool *image_map_tool); GdkModifierType state,
static void gimp_image_map_tool_settings_dialog (GimpImageMapTool *image_map_tool, GimpImageMapTool *tool);
const gchar *title, static void gimp_image_map_tool_save_clicked (GtkWidget *widget,
gboolean save); GimpImageMapTool *tool);
static void gimp_image_map_tool_save_ext_clicked (GtkWidget *widget,
GdkModifierType state,
GimpImageMapTool *tool);
static void gimp_image_map_tool_settings_dialog (GimpImageMapTool *image_map_tool,
const gchar *title,
gboolean save);
static void gimp_image_map_tool_notify_preview (GObject *config, static void gimp_image_map_tool_notify_preview (GObject *config,
GParamSpec *pspec, GParamSpec *pspec,
@ -149,7 +157,9 @@ gimp_image_map_tool_class_init (GimpImageMapToolClass *klass)
klass->shell_desc = NULL; klass->shell_desc = NULL;
klass->settings_name = NULL; klass->settings_name = NULL;
klass->load_dialog_title = NULL; klass->load_dialog_title = NULL;
klass->load_button_tip = NULL;
klass->save_dialog_title = NULL; klass->save_dialog_title = NULL;
klass->save_button_tip = NULL;
klass->map = NULL; klass->map = NULL;
klass->dialog = NULL; klass->dialog = NULL;
@ -259,21 +269,61 @@ gimp_image_map_tool_initialize (GimpTool *tool,
if (klass->load_dialog_title) if (klass->load_dialog_title)
{ {
image_map_tool->load_button = image_map_tool->load_button =
gtk_button_new_from_stock (GTK_STOCK_OPEN); g_object_new (GIMP_TYPE_BUTTON,
"label", GTK_STOCK_OPEN,
"use_stock", TRUE,
"use_underline", TRUE,
NULL);
g_signal_connect (image_map_tool->load_button, "clicked", g_signal_connect (image_map_tool->load_button, "clicked",
G_CALLBACK (gimp_image_map_tool_load_clicked), G_CALLBACK (gimp_image_map_tool_load_clicked),
image_map_tool); image_map_tool);
g_signal_connect (image_map_tool->load_button, "extended_clicked",
G_CALLBACK (gimp_image_map_tool_load_ext_clicked),
image_map_tool);
if (klass->load_button_tip)
{
gchar *str = g_strdup_printf ("%s\n"
"%s %s",
klass->load_button_tip,
gimp_get_mod_string (GDK_SHIFT_MASK),
_("Quick Load"));
gimp_help_set_help_data (image_map_tool->load_button, str, NULL);
g_free (str);
}
} }
if (klass->save_dialog_title) if (klass->save_dialog_title)
{ {
image_map_tool->save_button = image_map_tool->save_button =
gtk_button_new_from_stock (GTK_STOCK_SAVE); g_object_new (GIMP_TYPE_BUTTON,
"label", GTK_STOCK_SAVE,
"use_stock", TRUE,
"use_underline", TRUE,
NULL);
g_signal_connect (image_map_tool->save_button, "clicked", g_signal_connect (image_map_tool->save_button, "clicked",
G_CALLBACK (gimp_image_map_tool_save_clicked), G_CALLBACK (gimp_image_map_tool_save_clicked),
image_map_tool); image_map_tool);
g_signal_connect (image_map_tool->save_button, "extended_clicked",
G_CALLBACK (gimp_image_map_tool_save_ext_clicked),
image_map_tool);
if (klass->save_button_tip)
{
gchar *str = g_strdup_printf ("%s\n"
"%s %s",
klass->save_button_tip,
gimp_get_mod_string (GDK_SHIFT_MASK),
_("Quick Save"));
gimp_help_set_help_data (image_map_tool->save_button, str, NULL);
g_free (str);
}
} }
/* Fill in subclass widgets */ /* Fill in subclass widgets */
@ -538,6 +588,40 @@ gimp_image_map_tool_preview (GimpImageMapTool *image_map_tool)
} }
} }
static void
gimp_image_map_tool_load_save (GimpImageMapTool *tool,
const gchar *filename,
gboolean save)
{
FILE *file = fopen (filename, save ? "wt" : "rt");
if (! file)
{
g_message (save ?
_("Could not open '%s' for writing: %s") :
_("Could not open '%s' for reading: %s"),
gimp_filename_to_utf8 (filename),
g_strerror (errno));
return;
}
g_object_set (GIMP_TOOL (tool)->tool_info->tool_options,
"settings", filename,
NULL);
if (save)
{
gimp_image_map_tool_settings_save (tool, file);
}
else if (! gimp_image_map_tool_settings_load (tool, file))
{
g_message ("Error in reading file '%s'.",
gimp_filename_to_utf8 (filename));
}
fclose (file);
}
static void static void
settings_dialog_response (GtkWidget *dialog, settings_dialog_response (GtkWidget *dialog,
gint response_id, gint response_id,
@ -550,38 +634,11 @@ settings_dialog_response (GtkWidget *dialog,
if (response_id == GTK_RESPONSE_OK) if (response_id == GTK_RESPONSE_OK)
{ {
gchar *filename; gchar *filename;
FILE *file;
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
file = fopen (filename, save ? "wt" : "rt"); gimp_image_map_tool_load_save (tool, filename, save);
if (! file)
{
g_message (save ?
_("Could not open '%s' for writing: %s") :
_("Could not open '%s' for reading: %s"),
gimp_filename_to_utf8 (filename),
g_strerror (errno));
g_free (filename);
return;
}
g_object_set (GIMP_TOOL (tool)->tool_info->tool_options,
"settings", filename,
NULL);
if (save)
{
gimp_image_map_tool_settings_save (tool, file);
}
else if (! gimp_image_map_tool_settings_load (tool, file))
{
g_message ("Error in reading file '%s'.",
gimp_filename_to_utf8 (filename));
}
fclose (file);
g_free (filename); g_free (filename);
} }
@ -595,22 +652,70 @@ settings_dialog_response (GtkWidget *dialog,
static void static void
gimp_image_map_tool_load_clicked (GtkWidget *widget, gimp_image_map_tool_load_clicked (GtkWidget *widget,
GimpImageMapTool *image_map_tool) GimpImageMapTool *tool)
{ {
GimpImageMapToolClass *klass = GIMP_IMAGE_MAP_TOOL_GET_CLASS (image_map_tool); GimpImageMapToolClass *klass = GIMP_IMAGE_MAP_TOOL_GET_CLASS (tool);
gimp_image_map_tool_settings_dialog (image_map_tool, gimp_image_map_tool_settings_dialog (tool, klass->load_dialog_title, FALSE);
klass->load_dialog_title, FALSE); }
static void
gimp_image_map_tool_load_ext_clicked (GtkWidget *widget,
GdkModifierType state,
GimpImageMapTool *tool)
{
if (state & GDK_SHIFT_MASK)
{
gchar *filename;
g_object_get (GIMP_TOOL (tool)->tool_info->tool_options,
"settings", &filename,
NULL);
if (filename)
{
gimp_image_map_tool_load_save (tool, filename, FALSE);
g_free (filename);
}
else
{
gimp_image_map_tool_load_clicked (widget, tool);
}
}
} }
static void static void
gimp_image_map_tool_save_clicked (GtkWidget *widget, gimp_image_map_tool_save_clicked (GtkWidget *widget,
GimpImageMapTool *image_map_tool) GimpImageMapTool *tool)
{ {
GimpImageMapToolClass *klass = GIMP_IMAGE_MAP_TOOL_GET_CLASS (image_map_tool); GimpImageMapToolClass *klass = GIMP_IMAGE_MAP_TOOL_GET_CLASS (tool);
gimp_image_map_tool_settings_dialog (image_map_tool, gimp_image_map_tool_settings_dialog (tool, klass->save_dialog_title, TRUE);
klass->save_dialog_title, TRUE); }
static void
gimp_image_map_tool_save_ext_clicked (GtkWidget *widget,
GdkModifierType state,
GimpImageMapTool *tool)
{
if (state & GDK_SHIFT_MASK)
{
gchar *filename;
g_object_get (GIMP_TOOL (tool)->tool_info->tool_options,
"settings", &filename,
NULL);
if (filename)
{
gimp_image_map_tool_load_save (tool, filename, TRUE);
g_free (filename);
}
else
{
gimp_image_map_tool_save_clicked (widget, tool);
}
}
} }
static void static void

2
app/tools/gimpimagemaptool.h
View File

@ -56,7 +56,9 @@ struct _GimpImageMapToolClass
const gchar *shell_desc; const gchar *shell_desc;
const gchar *settings_name; const gchar *settings_name;
const gchar *load_button_tip;
const gchar *load_dialog_title; const gchar *load_dialog_title;
const gchar *save_button_tip;
const gchar *save_dialog_title; const gchar *save_dialog_title;
/* virtual functions */ /* virtual functions */

6
app/tools/gimplevelstool.c
View File

@ -220,7 +220,9 @@ gimp_levels_tool_class_init (GimpLevelsToolClass *klass)
image_map_tool_class->shell_desc = _("Adjust Color Levels"); image_map_tool_class->shell_desc = _("Adjust Color Levels");
image_map_tool_class->settings_name = "levels"; image_map_tool_class->settings_name = "levels";
image_map_tool_class->load_dialog_title = _("Load Levels"); image_map_tool_class->load_dialog_title = _("Load Levels");
image_map_tool_class->load_button_tip = _("Load levels settings from file");
image_map_tool_class->save_dialog_title = _("Save Levels"); image_map_tool_class->save_dialog_title = _("Save Levels");
image_map_tool_class->save_button_tip = _("Save levels settings to file");
image_map_tool_class->map = gimp_levels_tool_map; image_map_tool_class->map = gimp_levels_tool_map;
image_map_tool_class->dialog = gimp_levels_tool_dialog; image_map_tool_class->dialog = gimp_levels_tool_dialog;
@ -650,14 +652,10 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_box_pack_start (GTK_BOX (hbbox), image_map_tool->load_button, gtk_box_pack_start (GTK_BOX (hbbox), image_map_tool->load_button,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gimp_help_set_help_data (image_map_tool->load_button,
_("Read levels settings from file"), NULL);
gtk_widget_show (image_map_tool->load_button); gtk_widget_show (image_map_tool->load_button);
gtk_box_pack_start (GTK_BOX (hbbox), image_map_tool->save_button, gtk_box_pack_start (GTK_BOX (hbbox), image_map_tool->save_button,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gimp_help_set_help_data (image_map_tool->save_button,
_("Save levels settings to file"), NULL);
gtk_widget_show (image_map_tool->save_button); gtk_widget_show (image_map_tool->save_button);
hbbox = gtk_hbox_new (FALSE, 6); hbbox = gtk_hbox_new (FALSE, 6);