callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/Makefile.am new file collecting some strings about the app.

Browse Source 
2005-12-28  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am
	* app/about.h: new file collecting some strings about the app.

	* app/main.c
	* app/dialogs/about-dialog.c
	* app/dialogs/user-install-dialog.c: use the defines from about.h.
This commit is contained in:
Sven Neumann
2005-12-28 20:45:52 +00:00
committed by Sven Neumann
parent e397c0ef0a
commit f7e62345ea
8 changed files with 82 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-12-28 Sven Neumann <sven@gimp.org>
* app/Makefile.am
* app/about.h: new file collecting some strings about the app.
* app/main.c
* app/dialogs/about-dialog.c
* app/dialogs/user-install-dialog.c: use the defines from about.h.
2005-12-28 Michael Natterer <mitch@gimp.org> 2005-12-28 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpfiledialog.[ch]: set the new * app/widgets/gimpfiledialog.[ch]: set the new

1
app/Makefile.am
View File

@ -41,6 +41,7 @@ app_sources = \
app_procs.c \ app_procs.c \
app_procs.h \ app_procs.h \
main.c \ main.c \
about.h \
batch.c \ batch.c \
batch.h \ batch.h \
errors.c \ errors.c \

49
app/about.h Normal file
View File

@ -0,0 +1,49 @@
/* The GIMP -- an 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __ABOUT_H__
#define __ABOUT_H__
#define GIMP_ACRONYM "GIMP"
#define GIMP_NAME \
_("GNU Image Manipulation Program")
#define GIMP_COPYRIGHT \
_("Copyright (C) 1995-2005\n" \
"Spencer Kimball, Peter Mattis and the GIMP Development Team")
#define GIMP_LICENSE \
_("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 2 of the License, or " \
"(at your option) any later version." \
"\n\n" \
"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." \
"\n\n" \
"You should have received a copy of the GNU General Public License " \
"along with this program; if not, write to the Free Software " \
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, " \
"USA.")
#endif /* __ABOUT_H__ */

40
app/dialogs/about-dialog.c
View File

@ -31,38 +31,14 @@
#include "pdb/procedural_db.h" #include "pdb/procedural_db.h"
#include "about.h"
#include "about-dialog.h" #include "about-dialog.h"
#include "authors.h" #include "authors.h"
#include "gimp-intl.h" #include "gimp-intl.h"
#define COPYRIGHT \
"Copyright (C) 1995-2005\n" \
"Spencer Kimball, Peter Mattis and the GIMP Development Team"
#define LICENSE \
"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 2 of the License, or " \
"(at your option) any later version.\n" \
"\n" \
"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.\n" \
"\n" \
"You should have received a copy of the GNU General Public License " \
"along with this program; if not, write to the Free Software " \
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, " \
"USA."
#define NAME "GIMP"
#define COMMENTS _("GNU Image Manipulation Program")
#define WEBSITE "http://www.gimp.org/"
#define WEBSITE_LABEL _("Visit the GIMP website")
#define PDB_URL_LOAD "plug-in-web-browser" #define PDB_URL_LOAD "plug-in-web-browser"
@ -139,14 +115,14 @@ about_dialog_create (GimpContext *context)
widget = g_object_new (GTK_TYPE_ABOUT_DIALOG, widget = g_object_new (GTK_TYPE_ABOUT_DIALOG,
"role", "about-dialog", "role", "about-dialog",
"window-position", GTK_WIN_POS_CENTER, "window-position", GTK_WIN_POS_CENTER,
"name", NAME, "name", GIMP_ACRONYM,
"version", GIMP_VERSION, "version", GIMP_VERSION,
"copyright", COPYRIGHT, "copyright", GIMP_COPYRIGHT,
"comments", COMMENTS, "comments", GIMP_NAME,
"license", LICENSE, "license", GIMP_LICENSE,
"wrap-license", TRUE, "wrap-license", TRUE,
"website", WEBSITE, "website", "http://www.gimp.org/",
"website-label", WEBSITE_LABEL, "website-label", _("Visit the GIMP website"),
"authors", authors, "authors", authors,
"artists", artists, "artists", artists,
"documenters", documenters, "documenters", documenters,

32
app/dialogs/user-install-dialog.c
View File

@ -48,6 +48,8 @@
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "about.h"
#include "user-install-dialog.h" #include "user-install-dialog.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -585,6 +587,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
gchar *filename; gchar *filename;
gchar *version; gchar *version;
gchar *title; gchar *title;
gchar *tmp;
gint i; gint i;
oldgimp = g_strdup (gimp_directory ()); oldgimp = g_strdup (gimp_directory ());
@ -783,8 +786,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
/* GPL_PAGE */ /* GPL_PAGE */
/* version number */ /* version number */
title = g_strdup_printf (_("Welcome to\n" title = g_strdup_printf (_("Welcome to GIMP %d.%d"),
"The GIMP %d.%d User Installation"),
GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION); GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION);
page = user_install_notebook_append_page (GTK_NOTEBOOK (notebook), page = user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
@ -795,33 +797,15 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
/* do not free title yet! */ /* do not free title yet! */
add_label (GTK_BOX (page), tmp = g_strconcat ("<b>", GIMP_NAME, "</b>", "\n", GIMP_COPYRIGHT, NULL);
_("<b>The GIMP - GNU Image Manipulation Program</b>\n" add_label (GTK_BOX (page), tmp);
"Copyright (C) 1995-2005\n" g_free (tmp);
"Spencer Kimball, Peter Mattis and the GIMP Development Team."));
sep = gtk_hseparator_new (); sep = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (page), sep, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (page), sep, FALSE, FALSE, 2);
gtk_widget_show (sep); gtk_widget_show (sep);
add_label add_label (GTK_BOX (page), GIMP_LICENSE);
(GTK_BOX (page),
_("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 2 of the License, or "
"(at your option) any later version."));
add_label
(GTK_BOX (page),
_("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."));
add_label
(GTK_BOX (page),
_("You should have received a copy of the GNU General Public License "
"along with this program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
"MA 02111-1307, USA."));
/* MIGRATION_PAGE */ /* MIGRATION_PAGE */
if (version && migrate) if (version && migrate)

3
app/main.c
View File

@ -45,6 +45,7 @@
#include "core/gimp.h" #include "core/gimp.h"
#include "about.h"
#include "app_procs.h" #include "app_procs.h"
#include "errors.h" #include "errors.h"
#include "sanity.h" #include "sanity.h"
@ -247,7 +248,7 @@ main (int argc,
gimp_init_i18n (); gimp_init_i18n ();
g_set_application_name (_("GNU Image Manipulation Program")); g_set_application_name (GIMP_NAME);
basename = g_path_get_basename (argv[0]); basename = g_path_get_basename (argv[0]);
g_set_prgname (basename); g_set_prgname (basename);

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2005-12-28 Sven Neumann <sven@gimp.org>
* POTFILES.in: added app/about.h.
2005-12-26 Hendrik Richter <hendi@gnome-de.org> 2005-12-26 Hendrik Richter <hendi@gnome-de.org>
* de.po: Updated German translation. * de.po: Updated German translation.

1
po/POTFILES.in
View File

@ -1,6 +1,7 @@
# Files from the Gimp distribution which have already been # Files from the Gimp distribution which have already been
# marked to allow runtime translation of messages # marked to allow runtime translation of messages
app/about.h
app/app_procs.c app/app_procs.c
app/batch.c app/batch.c
app/main.c app/main.c