summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--ChangeLog.pre-2-102
-rw-r--r--ChangeLog.pre-2-62
-rw-r--r--ChangeLog.pre-2-82
-rw-r--r--docs/reference/ChangeLog13
-rw-r--r--docs/reference/gtk/gtk-docs.sgml2
-rw-r--r--docs/reference/gtk/migrating-GtkAboutDialog.sgml94
-rw-r--r--docs/reference/gtk/tmpl/gtkstock.sgml1
-rw-r--r--gtk/stock-icons/Makefile.am2
9 files changed, 118 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 80ee5a60f..0ab4a359d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2004-11-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/stock-icons/Makefile.am: Typo fix.
+
* gtk/gtkaboutdialog.c: Documentation updates.
2004-11-04 Bastien Nocera <hadess@hadess.net>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 80ee5a60f..0ab4a359d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
2004-11-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/stock-icons/Makefile.am: Typo fix.
+
* gtk/gtkaboutdialog.c: Documentation updates.
2004-11-04 Bastien Nocera <hadess@hadess.net>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 80ee5a60f..0ab4a359d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
2004-11-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/stock-icons/Makefile.am: Typo fix.
+
* gtk/gtkaboutdialog.c: Documentation updates.
2004-11-04 Bastien Nocera <hadess@hadess.net>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 80ee5a60f..0ab4a359d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
2004-11-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/stock-icons/Makefile.am: Typo fix.
+
* gtk/gtkaboutdialog.c: Documentation updates.
2004-11-04 Bastien Nocera <hadess@hadess.net>
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 25b1e6270..a50b00f33 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-04 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/tmpl/gtkstock.sgml: Fix markup.
+
+2004-11-04 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtk-docs.sgml:
+ * gtk/migrating-GtkAboutDialog.sgml: Add a first version
+ of a GnomeAbout --> GtkAboutDialog migration chapter.
+
+ * gtk/tmpl/gtkaboutdialog.sgml: Update.
+
2004-11-04 Bastien Nocera <hadess@hadess.net>
* gtk/tmpl/gtkstock.sgml: add RTL variants for all the media icons
@@ -5,6 +17,7 @@
2004-11-03 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtk-docs.sgml:
* gtk/migrating-GtkIconView.sgml: Add a first version of
a GnomeIconList --> GtkIconView migration chapter.
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 4f9f60f0d..a6dc04610 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -192,6 +192,7 @@
<!ENTITY gtk-migrating-GtkAction SYSTEM "migrating-GtkAction.sgml">
<!ENTITY gtk-migrating-GtkComboBox SYSTEM "migrating-GtkComboBox.sgml">
<!ENTITY gtk-migrating-GtkIconView SYSTEM "migrating-GtkIconView.sgml">
+<!ENTITY gtk-migrating-GtkAboutDialog SYSTEM "migrating-GtkAboutDialog.sgml">
<!ENTITY version SYSTEM "version.xml">
<!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
<!ENTITY gtk-update-icon-cache SYSTEM "gtk-update-icon-cache.xml">
@@ -573,6 +574,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
&gtk-migrating-GtkAction;
&gtk-migrating-GtkComboBox;
&gtk-migrating-GtkIconView;
+ &gtk-migrating-GtkAboutDialog;
</part>
<part>
diff --git a/docs/reference/gtk/migrating-GtkAboutDialog.sgml b/docs/reference/gtk/migrating-GtkAboutDialog.sgml
new file mode 100644
index 000000000..99dd2578e
--- /dev/null
+++ b/docs/reference/gtk/migrating-GtkAboutDialog.sgml
@@ -0,0 +1,94 @@
+<chapter id="gtk-migrating-GtkAboutDialog">
+
+ <title>Migrating from GnomeAbout to GtkAboutDialog</title>
+
+ <para>
+ Since version 2.6, GTK+ provides the <link linkend="GtkIconView">GtkAboutDialog</link>
+ widget as a replacement for the GnomeAbout dialog in the libgnomeui library.
+ views.
+ </para>
+
+ <para>
+ <link linkend="GtkIconView">GtkAboutDialog</link> supports all features found in
+ GnomeAbout. The GtkAboutDialog API is bigger, since it follows the GTK+ policy to
+ have getters and setters for all widget properties, but it isn't much more complex
+ than GnomeAbout.
+ </para>
+
+ <para>
+ To convert an application that uses GnomeAbout to <link linkend="GtkIconView">GtkAboutDialog</link>,
+ as a first step, replace calls like
+ <informalexample><programlisting>
+ const gchar *documentors[] = {
+ "Documenter 1",
+ "Documenter 2",
+ NULL
+ };
+
+ const gchar *documentors[] = {
+ "Author 1",
+ "Author 2",
+ NULL
+ };
+
+ GtkWidget *about = gnome_about_new ("GNOME Test Program", VERSION,
+ "(C) 1998-2001 The Free Software Foundation",
+ "Program to display GNOME functions.",
+ authors,
+ documenters,
+ _("translator-credits"),
+ "logo.png");
+ </programlisting></informalexample>
+ by something like
+ <informalexample><programlisting>
+ GdkPixbuf *logo = gdk_pixbuf_new_from_file ("logo.png", NULL);
+ GtkWidget *about = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+ "name", "GNOME Test Program",
+ "version", VERSION,
+ "copyright", "(C) 1998-2001 The Free Software Foundation",
+ "comments", "Program to display GNOME functions.",
+ "authors", authors,
+ "documenters", documenters,
+ "translator-credits", _("translator-credits"),
+ "logo", logo,
+ NULL);
+ g_object_unref (pixbuf);
+ </programlisting></informalexample>
+ If the <link linkend="g-object-new"><function>g_object_new()</function></link> construction scares you,
+ you can also use <link linkend="g-object-new"><function>gtk_about_dialog_new()</function></link> to
+ construct the dialog and then use the setters for the individual properties.
+ </para>
+
+ <para>
+ Once you are done with the initial conversion, you may want to look into using some of the
+ features of <link linkend="GtkIconView">GtkAboutDialog</link> which are not present in GnomeAbout.
+ <itemizedlist>
+ <listitem><para>
+ You can specify license information
+ with the <link linkend="GtkAboutDialog--license">license</link> property
+ </para></listitem>
+ <listitem><para>
+ You can add separate credits for artists with the
+ <link linkend="GtkAboutDialog--artists">artists</link> property
+ </para></listitem>
+ <listitem><para>
+ You can add a pointer to the website of your application, using the
+ <link linkend="GtkAboutDialog--website">website</link> and
+ <link linkend="GtkAboutDialog--website-label">website-label</link> properties.
+ </para></listitem>
+ <listitem><para>
+ If your credits contain email addresses or urls, you can turn them into clickable
+ links using
+ <link linkend="gtk-about-dialog-set-email-hook"><function>gtk_about_dialog_set_email_hook()</function></link> and
+ <link linkend="gtk-about-dialog-set-url-hook"><function>gtk_about_dialog_set_url_hook()</function></link>.
+ </para></listitem>
+ </itemizedlist>
+ </para>
+</chapter>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
+End:
+-->
diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml
index 2e77e0f6e..245c68bcb 100644
--- a/docs/reference/gtk/tmpl/gtkstock.sgml
+++ b/docs/reference/gtk/tmpl/gtkstock.sgml
@@ -537,7 +537,6 @@ The "Media Pause" item.
<para>
The "Media Play" item.
<inlinegraphic fileref="stock_media_play_24.png" format="PNG"></inlinegraphic>
-</para>
RTL variant
<inlinegraphic fileref="stock_media_play_rtl_24.png" format="PNG"></inlinegraphic>
</para>
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index f7eee0bfc..9963b6236 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -255,7 +255,7 @@ VARIABLES3 = \
stock_media_play_16 $(srcdir)/stock_media_play_16.png \
stock_media_play_24 $(srcdir)/stock_media_play_24.png \
stock_media_play_rtl_16 $(srcdir)/stock_media_play_rtl_16.png \
- stock_media_play_rtl_24 $(srcdir)/stock_media_play_24.png \
+ stock_media_play_rtl_24 $(srcdir)/stock_media_play_rtl_24.png \
stock_media_previous_16 $(srcdir)/stock_media_previous_16.png \
stock_media_previous_24 $(srcdir)/stock_media_previous_24.png \
stock_media_record_16 $(srcdir)/stock_media_record_16.png \