Commit 8caca0bf authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

added a prominent comment for translators to make sure they have all 4 po

2003-08-31  Manish Singh  <yosh@gimp.org>

        * configure.in: added a prominent comment for translators to make
        sure they have all 4 po files before adding to ALL_LINGUAS.

        * app/gui/plug-in-menus.c: remove redudant #include of gimpenv.h

        * tools/pdbgen/pdb/plug_in.pdb: gimp_strip_uline menu_path before
        passing it up.

        * app/pdb/plug_in_cmds.c: regenerated.

        * plug-ins/common/mng.c
        * plug-ins/common/psd_save.c
        * plug-ins/common/psp.c: use G_N_ELEMENTS

        * plug-ins/common/screenshot.c: use GDK_WINDOWING_* for #includes
        too. GDK cursor enums are ok to pass to XCreateFontCursor.

        * plug-ins/dbbrowser/dbbrowser_utils.c: minor cleanups, also use
        gtk_cell_renderer_text_set_fixed_height_from_font as an optimization.

        * plug-ins/libgck/gck/gckcolor.c: #undef GDK_DISABLE_DEPRECATED and
        add warning.

        * plug-ins/pygimp/gimpfu.py: remove some redundant import gtk's
parent d93c2f61
2003-08-31 Manish Singh <yosh@gimp.org>
* configure.in: added a prominent comment for translators to make
sure they have all 4 po files before adding to ALL_LINGUAS.
* app/gui/plug-in-menus.c: remove redudant #include of gimpenv.h
* tools/pdbgen/pdb/plug_in.pdb: gimp_strip_uline menu_path before
passing it up.
* app/pdb/plug_in_cmds.c: regenerated.
* plug-ins/common/mng.c
* plug-ins/common/psd_save.c
* plug-ins/common/psp.c: use G_N_ELEMENTS
* plug-ins/common/screenshot.c: use GDK_WINDOWING_* for #includes
too. GDK cursor enums are ok to pass to XCreateFontCursor.
* plug-ins/dbbrowser/dbbrowser_utils.c: minor cleanups, also use
gtk_cell_renderer_text_set_fixed_height_from_font as an optimization.
* plug-ins/libgck/gck/gckcolor.c: #undef GDK_DISABLE_DEPRECATED and
add warning.
* plug-ins/pygimp/gimpfu.py: remove some redundant import gtk's
2003-08-31 Sven Neumann <sven@gimp.org>
* libgimpcolor/gimpcolorspace.c: applied a patch from S. Mukund
......@@ -1839,7 +1866,7 @@
* gimp/app/plug-in/plug-in.c
* gimp/app/widgets/gimpitemfactory.c
* gimp/app/widgets/gimptoolbox.
* gimp/app/widgets/gimptoolbox.c
* gimp/app/gui/plug-in-menus.c: changed accordingly
* gimp/plug-ins/script-fu/script-fu-scripts.c
......@@ -39,7 +39,6 @@
#include "plug-in-commands.h"
#include "plug-in-menus.h"
#include "libgimpbase/gimpenv.h"
#include "gimp-intl.h"
......
......@@ -39,7 +39,6 @@
#include "plug-in-commands.h"
#include "plug-in-menus.h"
#include "libgimpbase/gimpenv.h"
#include "gimp-intl.h"
......
......@@ -44,6 +44,8 @@
#endif
#include "libgimpbase/gimpbase.h"
static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc;
static ProcRecord temp_PDB_name_proc;
......@@ -290,7 +292,7 @@ plugins_query_invoker (Gimp *gimp,
if (search_str && match_strings(&sregex,name))
continue;
menu_strs[i] = g_strdup (proc_def->menu_path);
menu_strs[i] = gimp_strip_uline (proc_def->menu_path);
accel_strs[i] = g_strdup (proc_def->accelerator);
prog_strs[i] = g_strdup (proc_def->prog);
types_strs[i] = g_strdup (proc_def->image_types);
......
......@@ -280,6 +280,9 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The prefix for our gettext translation domains.])
dnl Note to translators: you MUST have .po files in all 4 directories: po,
dnl po-libgimp, po-plug-ins, and po-script-fu before adding you language
dnl code to ALL_LINGUAS
ALL_LINGUAS="ca cs da de el en_GB es fi fr ga gl he hu hr id it ja ko nl no pl pt pt_BR ro ru sk sr sr@Latn sv tr uk vi yi zh_CN zh_TW"
AC_PROG_INTLTOOL
......
......@@ -78,7 +78,7 @@ typedef struct
static void dialog_apply_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser);
static gint procedure_select_callback (GtkTreeSelection *sel,
static void procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser);
static void procedure_activated_callback (GtkTreeView *treeview,
GtkTreePath *path,
......@@ -99,12 +99,13 @@ static const gchar *GParamType2char (GimpPDBArgType t);
GtkWidget *
gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkCellRenderer *renderer;
dbbrowser = g_new0 (dbbrowser_t, 1);
......@@ -178,10 +179,15 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
dbbrowser->tv = gtk_tree_view_new ();
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_text_set_fixed_height_from_font
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
-1, NULL,
gtk_cell_renderer_text_new (),
"text", 0, NULL);
renderer,
"text", 0,
NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
if (apply_callback)
......@@ -265,15 +271,15 @@ procedure_activated_callback (GtkTreeView *treeview,
dialog_apply_callback (NULL, dbbrowser);
}
static gint
static void
procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
g_return_val_if_fail (sel != NULL, FALSE);
g_return_val_if_fail (dbbrowser != NULL, FALSE);
g_return_if_fail (sel != NULL);
g_return_if_fail (dbbrowser != NULL);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
......@@ -283,8 +289,6 @@ procedure_select_callback (GtkTreeSelection *sel,
dialog_select (dbbrowser, func);
g_free (func);
}
return FALSE;
}
/* update the description box (right) */
......
......@@ -78,7 +78,7 @@ typedef struct
static void dialog_apply_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser);
static gint procedure_select_callback (GtkTreeSelection *sel,
static void procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser);
static void procedure_activated_callback (GtkTreeView *treeview,
GtkTreePath *path,
......@@ -99,12 +99,13 @@ static const gchar *GParamType2char (GimpPDBArgType t);
GtkWidget *
gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkCellRenderer *renderer;
dbbrowser = g_new0 (dbbrowser_t, 1);
......@@ -178,10 +179,15 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
dbbrowser->tv = gtk_tree_view_new ();
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_text_set_fixed_height_from_font
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
-1, NULL,
gtk_cell_renderer_text_new (),
"text", 0, NULL);
renderer,
"text", 0,
NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
if (apply_callback)
......@@ -265,15 +271,15 @@ procedure_activated_callback (GtkTreeView *treeview,
dialog_apply_callback (NULL, dbbrowser);
}
static gint
static void
procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
g_return_val_if_fail (sel != NULL, FALSE);
g_return_val_if_fail (dbbrowser != NULL, FALSE);
g_return_if_fail (sel != NULL);
g_return_if_fail (dbbrowser != NULL);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
......@@ -283,8 +289,6 @@ procedure_select_callback (GtkTreeSelection *sel,
dialog_select (dbbrowser, func);
g_free (func);
}
return FALSE;
}
/* update the description box (right) */
......
......@@ -1473,15 +1473,13 @@ query (void)
{GIMP_PDB_INT32, "time", "Write tIME (creation time) chunk"}
};
static gint nsave_args = sizeof (save_args) / sizeof (save_args[0]);
gimp_install_procedure ("file_mng_save",
"Saves images in the MNG file format",
"This plug-in saves images in the Multiple-image Network Graphics (MNG) format which can be used as a replacement for animated GIFs, and more.",
"S. Mukund <muks@mukund.org>",
"S. Mukund <muks@mukund.org>", "November 19, 2002",
"<Save>/MNG", "RGB*,GRAY*,INDEXED*", GIMP_PLUGIN,
nsave_args, 0, save_args, NULL);
G_N_ELEMENTS (save_args), 0, save_args, NULL);
gimp_register_save_handler ("file_mng_save", "mng", "");
}
......
......@@ -170,7 +170,6 @@ query ()
{ GIMP_PDB_INT32, "compression", "Compression type: { NONE (0), LZW (1), PACKBITS (2)" },
{ GIMP_PDB_INT32, "fillorder", "Fill Order: { MSB to LSB (0), LSB to MSB (1)" }
};
static gint nsave_args = sizeof (save_args) / sizeof (save_args[0]);
gimp_install_procedure ("file_psd_save",
"saves files in the Photoshop(tm) PSD file format",
......@@ -181,7 +180,7 @@ query ()
"<Save>/PSD",
"RGB*, GRAY*, INDEXED*",
GIMP_PLUGIN,
nsave_args, 0,
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
gimp_register_save_handler ("file_psd_save", "psd", "");
}
......
......@@ -358,7 +358,6 @@ query (void)
/* { GIMP_PDB_INT32, "compression", "Specify 0 for no compression, " */
/* "1 for RLE, and 2 for LZ77" } */
/* }; */
/* static gint nsave_args = sizeof (save_args) / sizeof (save_args[0]); */
gimp_install_procedure ("file_psp_load",
"loads images from the Paint Shop Pro PSP file format",
......@@ -389,7 +388,7 @@ query (void)
"<Save>/PSP",
"RGB*, GRAY*, INDEXED*",
GIMP_PLUGIN,
nsave_args, 0,
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
*/
......
......@@ -32,13 +32,11 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#ifdef G_OS_WIN32
#include <windows.h>
#else /* ! G_OS_WIN32 */
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#if defined(GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#endif /* ! G_OS_WIN32 */
#elif defined(GDK_WINDOWING_WIN32)
#include <windows.h>
#endif
#include "libgimp/stdplugins-intl.h"
......@@ -258,7 +256,7 @@ select_window (const GdkScreen *screen)
x_win = None;
x_root = RootWindow (x_dpy, x_scr);
x_cursor = XCreateFontCursor (x_dpy, XC_crosshair);
x_cursor = XCreateFontCursor (x_dpy, GDK_CROSSHAIR);
buttons = 0;
status = XGrabPointer (x_dpy, x_root, False,
......
......@@ -78,7 +78,7 @@ typedef struct
static void dialog_apply_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser);
static gint procedure_select_callback (GtkTreeSelection *sel,
static void procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser);
static void procedure_activated_callback (GtkTreeView *treeview,
GtkTreePath *path,
......@@ -99,12 +99,13 @@ static const gchar *GParamType2char (GimpPDBArgType t);
GtkWidget *
gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkCellRenderer *renderer;
dbbrowser = g_new0 (dbbrowser_t, 1);
......@@ -178,10 +179,15 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
dbbrowser->tv = gtk_tree_view_new ();
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_text_set_fixed_height_from_font
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
-1, NULL,
gtk_cell_renderer_text_new (),
"text", 0, NULL);
renderer,
"text", 0,
NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
if (apply_callback)
......@@ -265,15 +271,15 @@ procedure_activated_callback (GtkTreeView *treeview,
dialog_apply_callback (NULL, dbbrowser);
}
static gint
static void
procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
g_return_val_if_fail (sel != NULL, FALSE);
g_return_val_if_fail (dbbrowser != NULL, FALSE);
g_return_if_fail (sel != NULL);
g_return_if_fail (dbbrowser != NULL);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
......@@ -283,8 +289,6 @@ procedure_select_callback (GtkTreeSelection *sel,
dialog_select (dbbrowser, func);
g_free (func);
}
return FALSE;
}
/* update the description box (right) */
......
......@@ -78,7 +78,7 @@ typedef struct
static void dialog_apply_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser);
static gint procedure_select_callback (GtkTreeSelection *sel,
static void procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser);
static void procedure_activated_callback (GtkTreeView *treeview,
GtkTreePath *path,
......@@ -99,12 +99,13 @@ static const gchar *GParamType2char (GimpPDBArgType t);
GtkWidget *
gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkCellRenderer *renderer;
dbbrowser = g_new0 (dbbrowser_t, 1);
......@@ -178,10 +179,15 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
dbbrowser->tv = gtk_tree_view_new ();
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_text_set_fixed_height_from_font
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
-1, NULL,
gtk_cell_renderer_text_new (),
"text", 0, NULL);
renderer,
"text", 0,
NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
if (apply_callback)
......@@ -265,15 +271,15 @@ procedure_activated_callback (GtkTreeView *treeview,
dialog_apply_callback (NULL, dbbrowser);
}
static gint
static void
procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
g_return_val_if_fail (sel != NULL, FALSE);
g_return_val_if_fail (dbbrowser != NULL, FALSE);
g_return_if_fail (sel != NULL);
g_return_if_fail (dbbrowser != NULL);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
......@@ -283,8 +289,6 @@ procedure_select_callback (GtkTreeSelection *sel,
dialog_select (dbbrowser, func);
g_free (func);
}
return FALSE;
}
/* update the description box (right) */
......
......@@ -78,7 +78,7 @@ typedef struct
static void dialog_apply_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser);
static gint procedure_select_callback (GtkTreeSelection *sel,
static void procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser);
static void procedure_activated_callback (GtkTreeView *treeview,
GtkTreePath *path,
......@@ -99,12 +99,13 @@ static const gchar *GParamType2char (GimpPDBArgType t);
GtkWidget *
gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
{
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
dbbrowser_t *dbbrowser;
GtkWidget *hpaned;
GtkWidget *searchhbox;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkCellRenderer *renderer;
dbbrowser = g_new0 (dbbrowser_t, 1);
......@@ -178,10 +179,15 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
dbbrowser->tv = gtk_tree_view_new ();
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_text_set_fixed_height_from_font
(GTK_CELL_RENDERER_TEXT (renderer), 1);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dbbrowser->tv),
-1, NULL,
gtk_cell_renderer_text_new (),
"text", 0, NULL);
renderer,
"text", 0,
NULL);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dbbrowser->tv), FALSE);
if (apply_callback)
......@@ -265,15 +271,15 @@ procedure_activated_callback (GtkTreeView *treeview,
dialog_apply_callback (NULL, dbbrowser);
}
static gint
static void
procedure_select_callback (GtkTreeSelection *sel,
dbbrowser_t *dbbrowser)
{
GtkTreeIter iter;
gchar *func;
g_return_val_if_fail (sel != NULL, FALSE);
g_return_val_if_fail (dbbrowser != NULL, FALSE);
g_return_if_fail (sel != NULL);
g_return_if_fail (dbbrowser != NULL);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
......@@ -283,8 +289,6 @@ procedure_select_callback (GtkTreeSelection *sel,
dialog_select (dbbrowser, func);
g_free (func);
}
return FALSE;
}
/* update the description box (right) */
......
......@@ -30,6 +30,11 @@
#include <stdlib.h>
#include <string.h>
#ifdef __GNUC__
#warning GDK_DISABLE_DEPRECATED
#endif
#undef GDK_DISABLE_DEPRECATED
#include <glib.h>
#include "libgimpcolor/gimpcolor.h"
......
......@@ -244,10 +244,6 @@ def _interact(func_name):
# define a mapping of param types to edit objects ...
class StringEntry(gtk.Entry):
def __init__(self, default=''):
import pygtk
pygtk.require('2.0')
import gtk
gtk.Entry.__init__(self)
self.set_text(str(default))
def get_value(self):
......@@ -266,9 +262,6 @@ def _interact(func_name):
class SliderEntry(gtk.HScale):
# bounds is (upper, lower, step)
def __init__(self, default=0, bounds=(0, 100, 5)):
import pygtk
pygtk.require('2.0')
import gtk
self.adj = gtk.Adjustment(default, bounds[0],
bounds[1], bounds[2],
bounds[2], bounds[2])
......@@ -278,9 +271,6 @@ def _interact(func_name):
class SpinnerEntry(gtk.SpinButton):
# bounds is (upper, lower, step)
def __init__(self, default=0, bounds=(0, 100, 5)):
import pygtk
pygtk.require('2.0')
import gtk
self.adj = gtk.Adjustment(default, bounds[0],
bounds[1], bounds[2],
bounds[2], bounds[2])
......@@ -289,9 +279,6 @@ def _interact(func_name):
return int(self.adj.value)
class ToggleEntry(gtk.ToggleButton):
def __init__(self, default=0):
import pygtk
pygtk.require('2.0')
import gtk
gtk.ToggleButton.__init__(self)
self.label = gtk.Label("No")
self.add(self.label)
......@@ -307,9 +294,6 @@ def _interact(func_name):
return self.get_active()
class RadioEntry(gtk.Frame):
def __init__(self, default=0, items=(("Yes", 1), ("No", 0))):
import pygtk
pygtk.require('2.0')
import gtk
gtk.Frame.__init__(self)
box = gtk.HBox(gtk.FALSE, 5)
self.add(box)
......
......@@ -167,6 +167,7 @@ sub plugins_query {
delete $outargs[0]->{array}->{no_declare};
%invoke = (
headers => [ qw("libgimpbase/gimpbase.h") ],
vars => [ 'PlugInProcDef *proc_def', 'GSList *list = NULL',
'gint i = 0', 'regex_t sregex' ],
code => <<'CODE'
......@@ -228,7 +229,7 @@ sub plugins_query {
if (search_str && match_strings(&sregex,name))
continue;
menu_strs[i] = g_strdup (proc_def->menu_path);
menu_strs[i] = gimp_strip_uline (proc_def->menu_path);
accel_strs[i] = g_strdup (proc_def->accelerator);
prog_strs[i] = g_strdup (proc_def->prog);
types_strs[i] = g_strdup (proc_def->image_types);
......
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