Commit 780b93d9 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

themes/Default/images/stock-button-stroke.png

2002-02-27  Michael Natterer  <mitch@gimp.org>

	* themes/Default/images/stock-button-stroke.png
	* themes/Default/images/stock-button-to-path.png
	* themes/Default/images/stock-button-to-selection.png: removed.

	* themes/Default/images/stock-button-path-stroke.png
	* themes/Default/images/stock-button-selection-stroke.png
	* themes/Default/images/stock-button-selection-to-path.png: new ones.

	* themes/Default/Makefile.am
	* themes/Default/images/Makefile.am
	* libgimpwidgets/gimpstock.[ch]: changed accordingly.

	* themes/Default/images/stock-button-selection-add.png
	* themes/Default/images/stock-button-selection-intersect.png
	* themes/Default/images/stock-button-selection-replace.png
	* themes/Default/images/stock-button-selection-subtract.png: cropped.

	* themes/Default/images/tools/stock-tool-button-brightness-contrast.png:
	a nicer one from Ville Pätsi.

	* app/gui/menus.c
	* app/widgets/gimpvectorslistview.c: use the new stock items.

	* app/gui/dialogs-commands.c: create the new paths dialog, not the
	old one in dialogs_lc_cmd_callback().

	* app/gui/vectors-commands.c: some more s/Vectors/Path/ in
	user-visible strings.

	* app/app_procs.c: some test code for the filename -> uri migration.
parent 2d0c8b20
2002-02-27 Michael Natterer <mitch@gimp.org>
* themes/Default/images/stock-button-stroke.png
* themes/Default/images/stock-button-to-path.png
* themes/Default/images/stock-button-to-selection.png: removed.
* themes/Default/images/stock-button-path-stroke.png
* themes/Default/images/stock-button-selection-stroke.png
* themes/Default/images/stock-button-selection-to-path.png: new ones.
* themes/Default/Makefile.am
* themes/Default/images/Makefile.am
* libgimpwidgets/gimpstock.[ch]: changed accordingly.
* themes/Default/images/stock-button-selection-add.png
* themes/Default/images/stock-button-selection-intersect.png
* themes/Default/images/stock-button-selection-replace.png
* themes/Default/images/stock-button-selection-subtract.png: cropped.
* themes/Default/images/tools/stock-tool-button-brightness-contrast.png:
a nicer one from Ville Ptsi.
* app/gui/menus.c
* app/widgets/gimpvectorslistview.c: use the new stock items.
* app/gui/dialogs-commands.c: create the new paths dialog, not the
old one in dialogs_lc_cmd_callback().
* app/gui/vectors-commands.c: some more s/Vectors/Path/ in
user-visible strings.
* app/app_procs.c: some test code for the filename -> uri migration.
2002-02-27 Michael Natterer <mitch@gimp.org>
 
* app/core/Makefile.am
......
......@@ -298,7 +298,7 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,
{
"gimp:layer-list",
"gimp:channel-list",
"gimp:path-list",
"gimp:vectors-list",
"gimp:indexed-palette"
};
gint i;
......
......@@ -435,7 +435,7 @@ vectors_new_vectors_query (GimpImage *gimage,
/* The dialog */
options->query_box =
gimp_dialog_new (_("New Vectors Options"), "new_vectors_options",
gimp_dialog_new (_("New Path Options"), "new_path_options",
gimp_standard_help_func,
"dialogs/vectors/new_vectors.html",
GTK_WIN_POS_MOUSE,
......@@ -550,9 +550,9 @@ vectors_edit_vectors_query (GimpVectors *vectors)
/* The dialog */
options->query_box =
gimp_dialog_new (_("Edit Vectors Attributes"), "edit_vectors_attributes",
gimp_dialog_new (_("Edit Path Attributes"), "edit_path_attributes",
gimp_standard_help_func,
"dialogs/vectors/edit_vectors_attributes.html",
"dialogs/paths/edit_path_attributes.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
......@@ -200,6 +200,26 @@ app_init (gint gimp_argc,
absolute_filename = g_strdup (gimp_argv[i]);
}
/* test */
{
GError *error = NULL;
gchar *uri;
uri = g_filename_to_uri (absolute_filename, NULL, &error);
if (uri)
{
g_print ("filename as uri: %s\n", uri);
g_free (uri);
}
else
{
g_printerr ("conversion filename -> uri failed: %s\n",
error->message);
g_error_free (error);
}
}
file_open_with_display (the_gimp, absolute_filename);
g_free (absolute_filename);
......
......@@ -298,7 +298,7 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,
{
"gimp:layer-list",
"gimp:channel-list",
"gimp:path-list",
"gimp:vectors-list",
"gimp:indexed-palette"
};
gint i;
......
......@@ -438,7 +438,7 @@ static GimpItemFactoryEntry image_entries[] =
"edit/fill.html", NULL },
{ { N_("/Edit/Stroke"), NULL,
edit_stroke_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_SELECTION_STROKE },
NULL,
"edit/stroke.html", NULL },
......@@ -1218,12 +1218,12 @@ static GimpItemFactoryEntry vectors_entries[] =
{ { N_("/Selection to Path"), "<control>P",
vectors_sel_to_vectors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TO_PATH },
"<StockItem>", GIMP_STOCK_SELECTION_TO_PATH },
NULL,
"filters/sel2path.html", NULL },
{ { N_("/Stroke Path"), "<control>T",
vectors_stroke_vectors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_PATH_STROKE },
NULL,
"stroke_path.html", NULL },
......@@ -1289,17 +1289,17 @@ static GimpItemFactoryEntry paths_entries[] =
"duplicate_path.html", NULL },
{ { N_("/Path to Selection"), "<control>S",
paths_dialog_path_to_sel_callback, 0,
"<StockItem>", GIMP_STOCK_TO_SELECTION },
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"path_to_selection.html", NULL },
{ { N_("/Selection to Path"), "<control>P",
paths_dialog_sel_to_path_callback, 0,
"<StockItem>", GIMP_STOCK_TO_PATH },
"<StockItem>", GIMP_STOCK_SELECTION_TO_PATH },
NULL,
"filters/sel2path.html", NULL },
{ { N_("/Stroke Path"), "<control>T",
paths_dialog_stroke_path_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_PATH_STROKE },
NULL,
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
......
......@@ -435,7 +435,7 @@ vectors_new_vectors_query (GimpImage *gimage,
/* The dialog */
options->query_box =
gimp_dialog_new (_("New Vectors Options"), "new_vectors_options",
gimp_dialog_new (_("New Path Options"), "new_path_options",
gimp_standard_help_func,
"dialogs/vectors/new_vectors.html",
GTK_WIN_POS_MOUSE,
......@@ -550,9 +550,9 @@ vectors_edit_vectors_query (GimpVectors *vectors)
/* The dialog */
options->query_box =
gimp_dialog_new (_("Edit Vectors Attributes"), "edit_vectors_attributes",
gimp_dialog_new (_("Edit Path Attributes"), "edit_path_attributes",
gimp_standard_help_func,
"dialogs/vectors/edit_vectors_attributes.html",
"dialogs/paths/edit_path_attributes.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
......
......@@ -438,7 +438,7 @@ static GimpItemFactoryEntry image_entries[] =
"edit/fill.html", NULL },
{ { N_("/Edit/Stroke"), NULL,
edit_stroke_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_SELECTION_STROKE },
NULL,
"edit/stroke.html", NULL },
......@@ -1218,12 +1218,12 @@ static GimpItemFactoryEntry vectors_entries[] =
{ { N_("/Selection to Path"), "<control>P",
vectors_sel_to_vectors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TO_PATH },
"<StockItem>", GIMP_STOCK_SELECTION_TO_PATH },
NULL,
"filters/sel2path.html", NULL },
{ { N_("/Stroke Path"), "<control>T",
vectors_stroke_vectors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_PATH_STROKE },
NULL,
"stroke_path.html", NULL },
......@@ -1289,17 +1289,17 @@ static GimpItemFactoryEntry paths_entries[] =
"duplicate_path.html", NULL },
{ { N_("/Path to Selection"), "<control>S",
paths_dialog_path_to_sel_callback, 0,
"<StockItem>", GIMP_STOCK_TO_SELECTION },
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"path_to_selection.html", NULL },
{ { N_("/Selection to Path"), "<control>P",
paths_dialog_sel_to_path_callback, 0,
"<StockItem>", GIMP_STOCK_TO_PATH },
"<StockItem>", GIMP_STOCK_SELECTION_TO_PATH },
NULL,
"filters/sel2path.html", NULL },
{ { N_("/Stroke Path"), "<control>T",
paths_dialog_stroke_path_callback, 0,
"<StockItem>", GIMP_STOCK_STROKE },
"<StockItem>", GIMP_STOCK_PATH_STROKE },
NULL,
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
......
......@@ -140,7 +140,7 @@ gimp_vectors_list_view_init (GimpVectorsListView *view)
view->stroke_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_STROKE,
GIMP_STOCK_PATH_STROKE,
_("Stroke Path"), NULL,
G_CALLBACK (gimp_vectors_list_view_stroke_clicked),
NULL,
......
......@@ -140,7 +140,7 @@ gimp_vectors_list_view_init (GimpVectorsListView *view)
view->stroke_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_STROKE,
GIMP_STOCK_PATH_STROKE,
_("Stroke Path"), NULL,
G_CALLBACK (gimp_vectors_list_view_stroke_clicked),
NULL,
......
......@@ -93,9 +93,6 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_PASTE_AS_NEW, N_("Paste as New"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_RESET, N_("_Reset"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_STROKE, N_("_Stroke"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TO_PATH, N_("Selection To Path"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TO_SELECTION, N_("To Sleection"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp-libgimp" },
......@@ -111,6 +108,10 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_SELECTION_STROKE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_SELECTION_TO_PATH, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_PATH_STROKE, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp-libgimp" },
......@@ -167,9 +168,6 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_PASTE_AS_NEW, stock_button_paste_as_new },
{ GIMP_STOCK_PASTE_INTO, stock_button_paste_into },
{ GIMP_STOCK_RESET, stock_button_refresh },
{ GIMP_STOCK_STROKE, stock_button_stroke },
{ GIMP_STOCK_TO_PATH, stock_button_to_path },
{ GIMP_STOCK_TO_SELECTION, stock_button_to_selection },
{ GIMP_STOCK_VISIBLE, stock_button_eye },
{ GIMP_STOCK_HCHAIN, stock_button_hchain },
......@@ -181,6 +179,10 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_SELECTION_ADD, stock_button_selection_add },
{ GIMP_STOCK_SELECTION_SUBTRACT, stock_button_selection_subtract },
{ GIMP_STOCK_SELECTION_INTERSECT, stock_button_selection_intersect },
{ GIMP_STOCK_SELECTION_STROKE, stock_button_selection_stroke },
{ GIMP_STOCK_SELECTION_TO_PATH, stock_button_selection_to_path },
{ GIMP_STOCK_PATH_STROKE, stock_button_path_stroke },
{ GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_button_airbrush },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_button_bezier_select },
......
......@@ -36,9 +36,6 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_STROKE "gimp-stroke"
#define GIMP_STOCK_TO_PATH "gimp-to-path"
#define GIMP_STOCK_TO_SELECTION "gimp-to-selection"
#define GIMP_STOCK_VISIBLE "gimp-visible"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
......@@ -54,6 +51,10 @@ G_BEGIN_DECLS
#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add"
#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract"
#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect"
#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke"
#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path"
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
#define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush"
#define GIMP_STOCK_TOOL_BEZIER_SELECT "gimp-tool-bezier-select"
......
......@@ -27,12 +27,6 @@ STOCK_VARIABLES = @STRIP_BEGIN@ \
$(srcdir)/images/stock-button-paste-into.png \
stock_button_refresh \
$(srcdir)/images/stock-button-refresh.png \
stock_button_stroke \
$(srcdir)/images/stock-button-stroke.png \
stock_button_to_path \
$(srcdir)/images/stock-button-to-path.png \
stock_button_to_selection \
$(srcdir)/images/stock-button-to-selection.png \
stock_button_selection_replace \
$(srcdir)/images/stock-button-selection-replace.png \
stock_button_selection_add \
......@@ -41,6 +35,12 @@ STOCK_VARIABLES = @STRIP_BEGIN@ \
$(srcdir)/images/stock-button-selection-subtract.png \
stock_button_selection_intersect \
$(srcdir)/images/stock-button-selection-intersect.png \
stock_button_selection_stroke \
$(srcdir)/images/stock-button-selection-stroke.png \
stock_button_selection_to_path \
$(srcdir)/images/stock-button-selection-to-path.png \
stock_button_path_stroke \
$(srcdir)/images/stock-button-path-stroke.png \
\
stock_button_hchain \
$(srcdir)/images/stock-button-hchain.png \
......
......@@ -28,13 +28,13 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-paste.png \
stock-button-paste-as-new.png \
stock-button-paste-into.png \
stock-button-stroke.png \
stock-button-to-path.png \
stock-button-to-selection.png \
stock-button-selection-replace.png \
stock-button-selection-add.png \
stock-button-selection-subtract.png \
stock-button-selection-intersect.png \
stock-button-selection-stroke.png \
stock-button-selection-to-path.png \
stock-button-path-stroke.png \
stock-button-hchain.png \
stock-button-hchain-broken.png \
stock-button-vchain.png \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment