use gimp_image_get_name().

2002-05-13  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpmenu.c: use gimp_image_get_name().

	* plug-ins/common/deinterlace.c: don't use 'O' as mnemonic, it's
	already taken by the _OK button.
This commit is contained in:
Sven Neumann 2002-05-13 13:21:55 +00:00 committed by Sven Neumann
parent 2e8fdca5aa
commit d8c4461c20
6 changed files with 65 additions and 56 deletions

View File

@ -1,3 +1,10 @@
2002-05-13 Sven Neumann <sven@gimp.org>
* libgimp/gimpmenu.c: use gimp_image_get_name().
* plug-ins/common/deinterlace.c: don't use 'O' as mnemonic, it's
already taken by the _OK button.
2002-05-13 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpwidgets.c: documentation fix.

View File

@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
#ifdef __GNUC__
@ -29,6 +31,7 @@
#include "gimp.h"
#include "gimpui.h"
#include "libgimp-intl.h"
#define MENU_THUMBNAIL_WIDTH 24
#define MENU_THUMBNAIL_HEIGHT 24
@ -120,8 +123,7 @@ gimp_image_menu_new (GimpConstraintFunc constraint,
{
GtkWidget *menu;
GtkWidget *menuitem;
gchar *filename;
gchar *basename;
gchar *name;
gchar *label;
gint32 *images;
gint nimages;
@ -135,13 +137,11 @@ gimp_image_menu_new (GimpConstraintFunc constraint,
for (i = 0, k = 0; i < nimages; i++)
if (!constraint || (* constraint) (images[i], -1, data))
{
filename = gimp_image_get_filename (images[i]);
basename = g_path_get_basename (filename);
g_free (filename);
name = gimp_image_get_name (images[i]);
label = g_strdup_printf ("%s-%d", basename, images[i]);
label = g_strdup_printf ("%s-%d", name, images[i]);
g_free (basename);
g_free (name);
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (G_OBJECT (menuitem), "activate",
@ -160,7 +160,7 @@ gimp_image_menu_new (GimpConstraintFunc constraint,
if (k == 0)
{
menuitem = gtk_menu_item_new_with_label ("none");
menuitem = gtk_menu_item_new_with_label (_("None"));
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@ -186,7 +186,6 @@ gimp_layer_menu_new (GimpConstraintFunc constraint,
GtkWidget *menu;
GtkWidget *menuitem;
gchar *name;
gchar *basename;
gchar *image_label;
gchar *label;
gint32 *images;
@ -206,14 +205,12 @@ gimp_layer_menu_new (GimpConstraintFunc constraint,
for (i = 0, k = 0; i < nimages; i++)
if (!constraint || (* constraint) (images[i], -1, data))
{
name = gimp_image_get_filename (images[i]);
basename = g_path_get_basename (name);
name = gimp_image_get_name (images[i]);
image_label = g_strdup_printf ("%s-%d", name, images[i]);
g_free (name);
image_label = g_strdup_printf ("%s-%d", basename, images[i]);
g_free (basename);
layers = gimp_image_get_layers (images[i], &nlayers);
for (j = 0; j < nlayers; j++)
if (!constraint || (* constraint) (images[i], layers[j], data))
@ -241,7 +238,8 @@ gimp_layer_menu_new (GimpConstraintFunc constraint,
gtk_widget_show(vbox);
wcolor_box = gtk_preview_new(GTK_PREVIEW_COLOR);
gtk_preview_set_dither (GTK_PREVIEW (wcolor_box), GDK_RGB_DITHER_MAX);
gtk_preview_set_dither (GTK_PREVIEW (wcolor_box),
GDK_RGB_DITHER_MAX);
fill_preview_with_thumb (wcolor_box,
layers[j],
@ -282,7 +280,7 @@ gimp_layer_menu_new (GimpConstraintFunc constraint,
if (k == 0)
{
menuitem = gtk_menu_item_new_with_label ("none");
menuitem = gtk_menu_item_new_with_label (_("None"));
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@ -303,7 +301,6 @@ gimp_channel_menu_new (GimpConstraintFunc constraint,
GtkWidget *menu;
GtkWidget *menuitem;
gchar *name;
gchar *basename;
gchar *image_label;
gchar *label;
gint32 *images;
@ -323,14 +320,12 @@ gimp_channel_menu_new (GimpConstraintFunc constraint,
for (i = 0, k = 0; i < nimages; i++)
if (!constraint || (* constraint) (images[i], -1, data))
{
name = gimp_image_get_filename (images[i]);
basename = g_path_get_basename (name);
name = gimp_image_get_name (images[i]);
image_label = g_strdup_printf ("%s-%d", name, images[i]);
g_free (name);
image_label = g_strdup_printf ("%s-%d", basename, images[i]);
g_free (basename);
channels = gimp_image_get_channels (images[i], &nchannels);
for (j = 0; j < nchannels; j++)
if (!constraint || (* constraint) (images[i], channels[j], data))
@ -400,7 +395,7 @@ gimp_channel_menu_new (GimpConstraintFunc constraint,
if (k == 0)
{
menuitem = gtk_menu_item_new_with_label ("none");
menuitem = gtk_menu_item_new_with_label (_("None"));
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@ -421,7 +416,6 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint,
GtkWidget *menu;
GtkWidget *menuitem;
gchar *name;
gchar *basename;
gchar *image_label;
gchar *label;
gint32 *images;
@ -444,14 +438,12 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint,
for (i = 0, k = 0; i < nimages; i++)
if (!constraint || (* constraint) (images[i], -1, data))
{
name = gimp_image_get_filename (images[i]);
basename = g_path_get_basename (name);
name = gimp_image_get_name (images[i]);
image_label = g_strdup_printf ("%s-%d", name, images[i]);
g_free (name);
image_label = g_strdup_printf ("%s-%d", basename, images[i]);
g_free (basename);
layers = gimp_image_get_layers (images[i], &nlayers);
for (j = 0; j < nlayers; j++)
@ -585,7 +577,7 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint,
if (k == 0)
{
menuitem = gtk_menu_item_new_with_label ("none");
menuitem = gtk_menu_item_new_with_label (_("None"));
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);

View File

@ -288,7 +288,7 @@ deinterlace_dialog (void)
&DeinterlaceValue,
GINT_TO_POINTER (DeinterlaceValue),
_("Keep _Odd Fields"),
_("Keep O_dd Fields"),
GINT_TO_POINTER (ODD_FIELDS), NULL,
_("Keep _Even Fields"),

View File

@ -1,10 +1,16 @@
2002-05-13 Sven Neumann <sven@gimp.org>
* POTFILES.in: added libgimp/gimpmenu.c.
* de.po: updated german translation.
2002-05-06 Pablo Saratxaga <pablo@mandrakesoft.com>
* vi.po: Added Vietnamese file
* vi.po: Added Vietnamese file.
2002-04-30 Duarte Loreto <happyguy_pt@hotmail.com>
* pt.po: Converted Portuguese translation to UTF-8.
* pt.po: Converted Portuguese translation to UTF-8.
2002-04-15 Christophe Merlet <redfox@eikonex.org>

View File

@ -2,6 +2,7 @@
# marked to allow runtime translation of messages
libgimp/gimpexport.c
libgimp/gimpmenu.c
libgimp/gimpunit.c
libgimpwidgets/gimpcolorbutton.c
libgimpwidgets/gimpfileselection.c

View File

@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: GIMP 1.1.24\n"
"POT-Creation-Date: 2002-03-28 14:51+0100\n"
"PO-Revision-Date: 2002-02-28 11:20+0100\n"
"Project-Id-Version: GIMP 1.3.6\n"
"POT-Creation-Date: 2002-05-13 15:12+0200\n"
"PO-Revision-Date: 2002-05-13 15:15+0200\n"
"Last-Translator: Sven Neumann <sven@gimp.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@ -24,9 +24,8 @@ msgid "Merge Visible Layers"
msgstr "Sichtbare Ebenen vereinen"
#: libgimp/gimpexport.c:179
#, fuzzy
msgid "can't handle layer offsets, size or opacity"
msgstr "kennt keine Ebenen"
msgstr "kennt keine Ebeneneigenschaften wie Versatz, Grösse und Transparenz"
#: libgimp/gimpexport.c:188 libgimp/gimpexport.c:197
msgid "can only handle layers as animation frames"
@ -115,6 +114,8 @@ msgid ""
"You are about to save %s as %s.\n"
"This will not save the visible layers."
msgstr ""
"Sie sichern %s als %s.\n"
"Die sichtbaren Ebenen werden dabei nicht gesichert."
#.
#. * Plug-ins must have called gtk_init () before calling gimp_export ().
@ -146,11 +147,16 @@ msgstr "Dieser Vorgang wird das Originalbild nicht verändern."
#: libgimp/gimpexport.c:571
msgid "a layer mask"
msgstr ""
msgstr "eine Ebenenmaske"
#: libgimp/gimpexport.c:573
msgid "a channel (saved selection)"
msgstr ""
msgstr "einen Kanal (gesicherte Selektion)"
#: libgimp/gimpmenu.c:163 libgimp/gimpmenu.c:283 libgimp/gimpmenu.c:398
#: libgimp/gimpmenu.c:580
msgid "None"
msgstr "Keine"
#: libgimp/gimpunit.c:56
msgid "percent"
@ -212,19 +218,19 @@ msgstr "_Rücksetzen"
msgid "Visible"
msgstr "Sichtbar"
#: libgimpwidgets/gimpstock.c:155
#: libgimpwidgets/gimpstock.c:159
msgid "Transform"
msgstr "Transformation"
#: libgimpwidgets/gimpstock.c:158
#: libgimpwidgets/gimpstock.c:162
msgid "Rotate"
msgstr "Rotieren"
#: libgimpwidgets/gimpstock.c:159
#: libgimpwidgets/gimpstock.c:163
msgid "Scale"
msgstr "Skalieren"
#: libgimpwidgets/gimpstock.c:160
#: libgimpwidgets/gimpstock.c:164
msgid "Shear"
msgstr "Scheren"
@ -244,7 +250,7 @@ msgstr "Einheit"
msgid "Factor"
msgstr "Faktor"
#: libgimpwidgets/gimpwidgets.c:842
#: libgimpwidgets/gimpwidgets.c:845
msgid ""
"If the \"Time\" button is not pressed, use this value for random number "
"generator seed - this allows you to repeat a given \"random\" operation"
@ -253,11 +259,11 @@ msgstr ""
"Zufallsgenerator - dies ermgöglicht es \"zufällige\" Funktionen zu "
"wiederholen"
#: libgimpwidgets/gimpwidgets.c:847
#: libgimpwidgets/gimpwidgets.c:850
msgid "Time"
msgstr "Zeit"
#: libgimpwidgets/gimpwidgets.c:856
#: libgimpwidgets/gimpwidgets.c:859
msgid ""
"Seed random number generator from the current time - this guarantees a "
"reasonable randomization"
@ -265,17 +271,14 @@ msgstr ""
"Speise Zufallsgenerator mit der aktuellen Zeit - dies garantiert eine "
"vernünftige Wahrscheinlichkeit"
#: libgimpwidgets/gimpwidgets.c:1170
#: libgimpwidgets/gimpwidgets.c:1173
msgid "Bytes"
msgstr "Byte"
#: libgimpwidgets/gimpwidgets.c:1171
#: libgimpwidgets/gimpwidgets.c:1174
msgid "KiloBytes"
msgstr "KiloByte"
#: libgimpwidgets/gimpwidgets.c:1172
#: libgimpwidgets/gimpwidgets.c:1175
msgid "MegaBytes"
msgstr "MegaByte"
#~ msgid "Paste"
#~ msgstr "Einfügen"