Commit 216e716e authored by Andy Hertzfeld's avatar Andy Hertzfeld
Browse files

fixed bug 6312, information about translation in the about box, by adding


	fixed bug 6312, information about translation in the about box,
	by adding a localizable string that is displayed in the lower
	left of the about box if it's changed from the default.

	fixed bug 6708, support link in help menu, by changing the uri to
	the real one we want to ship with, that currently points to a
	placeholder page.  Also, due to popular demand, renamed it back
	to "Support".

	* src/nautilus-about.c: (nautilus_about_new),
	(nautilus_about_draw_info):
	added a translators parameter, and used it to draw the translators
	credits if present.
	* src/nautilus-about.h:
	added translator parameter to nautilus_about_new
	* src/nautilus-shell-ui.xml:
	changed menu name to "support"
	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback),
	(help_menu_support), (nautilus_window_initialize_menus):
	renamed verb to support, changed link to point to intended support site.
parent 9b82fd79
2001-02-22 Andy Hertzfeld <andy@eazel.com>
fixed bug 6312, information about translation in the about box,
by adding a localizable string that is displayed in the lower
left of the about box if it's changed from the default.
fixed bug 6708, support link in help menu, by changing the uri to
the real one we want to ship with, that currently points to a
placeholder page. Also, due to popular demand, renamed it back
to "Support".
* src/nautilus-about.c: (nautilus_about_new),
(nautilus_about_draw_info):
added a translators parameter, and used it to draw the translators
credits if present.
* src/nautilus-about.h:
added translator parameter to nautilus_about_new
* src/nautilus-shell-ui.xml:
changed menu name to "support"
* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback),
(help_menu_support), (nautilus_window_initialize_menus):
renamed verb to support, changed link to point to intended support site.
2001-02-22 Michael Engber <engber@eazel.com>
reviewed by: Pavel Cisler <pavel@eazel.com>
......
......@@ -48,6 +48,7 @@
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-scalable-font.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <libnautilus-extensions/nautilus-theme.h>
struct NautilusAboutDetails {
......@@ -73,6 +74,7 @@ static void nautilus_about_draw_info (NautilusAbout *about,
const char *copyright,
const char **authors,
const char *comments,
const char *translators,
const char *time_stamp);
static int update_authors_if_necessary (gpointer callback_data);
......@@ -187,6 +189,7 @@ nautilus_about_new (const char *title,
const char *copyright,
const char **authors,
const char *comments,
const char *translators,
const char *time_stamp)
{
NautilusAbout *about;
......@@ -194,7 +197,8 @@ nautilus_about_new (const char *title,
about = NAUTILUS_ABOUT (gtk_widget_new (nautilus_about_get_type (), NULL));
/* draw the info onto the pixbuf, once and for all */
nautilus_about_draw_info (about, title, version, copyright, authors, comments, time_stamp);
nautilus_about_draw_info (about, title, version, copyright,
authors, comments, translators, time_stamp);
return GTK_WIDGET (about);
}
......@@ -323,6 +327,7 @@ nautilus_about_draw_info (NautilusAbout *about,
const char *copyright,
const char **authors,
const char *comments,
const char *translators,
const char *time_stamp)
{
char *display_str, *temp_str;
......@@ -356,6 +361,26 @@ nautilus_about_draw_info (NautilusAbout *about,
/* draw the time stamp */
draw_aa_string (plain_font, pixbuf, 11, 284, total_height - 14, grey, black, time_stamp, 0);
/* draw the translator's credit, if necessary */
if (nautilus_strcmp (translators, "Translator Credits") != 0) {
comment_array = g_strsplit (translators, "\n", 10);
index = 0;
while (comment_array[index] != NULL) {
index += 1;
}
xpos = 6;
ypos = total_height - (14 * index);
index = 0;
while (comment_array[index] != NULL) {
draw_aa_string (plain_font, pixbuf, 11, xpos, ypos, black, black, comment_array[index], 0);
ypos += 14;
index++;
}
g_strfreev (comment_array);
}
/* remember the authors */
g_strfreev (about->details->authors);
......@@ -378,7 +403,7 @@ nautilus_about_draw_info (NautilusAbout *about,
index++;
}
g_strfreev (comment_array);
/* release the fonts */
gtk_object_unref (GTK_OBJECT(plain_font));
gtk_object_unref (GTK_OBJECT(bold_font));
......
......@@ -56,6 +56,7 @@ GtkWidget *nautilus_about_new (const char *title,
const char *copyright,
const char **authors,
const char *comments,
const char *translators,
const char *time_stamp);
void nautilus_about_update_authors (NautilusAbout *about);
......
......@@ -564,6 +564,12 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
"for GNOME that makes it\n"
"easy to manage your files\n"
"and the rest of your system."),
/* translators should localize the following
* string which will be displayed at the
* bottom of the about box to give credit
* to the translator(s)
*/
_("Translator Credits"),
time_stamp);
g_free (time_stamp);
......@@ -591,12 +597,12 @@ help_menu_nautilus_quick_reference_callback (BonoboUIComponent *component,
}
static void
help_menu_customer_service (BonoboUIComponent *component,
help_menu_support (BonoboUIComponent *component,
gpointer callback_data,
const char *verb)
{
nautilus_window_go_to (NAUTILUS_WINDOW (callback_data),
"http://services.eazel.com/support");
"http://support.eazel.com");
}
static void
......@@ -1188,7 +1194,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
BONOBO_UI_VERB ("Nautilus Quick Reference", help_menu_nautilus_quick_reference_callback),
BONOBO_UI_VERB ("Customer Service", help_menu_customer_service),
BONOBO_UI_VERB ("Support", help_menu_support),
BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback),
......
......@@ -246,9 +246,9 @@
_tip="Display quick reference pages for Nautilus"
verb="Nautilus Quick Reference"/>
<menuitem name="Support"
_label="_Customer Service"
_label="_Support"
_tip="Display support information for Nautilus and Eazel Services"
verb="Customer Service"/>
verb="Support"/>
<menuitem name="Nautilus Feedback"
_label="_Feedback..."
_tip="Show a page from which you can send feedback about Nautilus and Eazel Services"
......
......@@ -564,6 +564,12 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
"for GNOME that makes it\n"
"easy to manage your files\n"
"and the rest of your system."),
/* translators should localize the following
* string which will be displayed at the
* bottom of the about box to give credit
* to the translator(s)
*/
_("Translator Credits"),
time_stamp);
g_free (time_stamp);
......@@ -591,12 +597,12 @@ help_menu_nautilus_quick_reference_callback (BonoboUIComponent *component,
}
static void
help_menu_customer_service (BonoboUIComponent *component,
help_menu_support (BonoboUIComponent *component,
gpointer callback_data,
const char *verb)
{
nautilus_window_go_to (NAUTILUS_WINDOW (callback_data),
"http://services.eazel.com/support");
"http://support.eazel.com");
}
static void
......@@ -1188,7 +1194,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
BONOBO_UI_VERB ("Nautilus Quick Reference", help_menu_nautilus_quick_reference_callback),
BONOBO_UI_VERB ("Customer Service", help_menu_customer_service),
BONOBO_UI_VERB ("Support", help_menu_support),
BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback),
......
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