eog r4307 - in trunk: . help help/C help/C/figures src

[friemann svn gnome org]

Author: friemann
Date: Sun Jan 13 15:08:12 2008
New Revision: 4307
URL: http://svn.gnome.org/viewvc/eog?rev=4307&view=rev

Log:
2008-01-13  Felix Riemann  <friemann svn gnome org>

	* help/C/eog.xml:
	* help/C/figures/eog_toolbar_editor_window.png
	* help/Makefile.am: Add chapter and figure about toolbar editor.
	* src/eog-window.c: (eog_window_cmd_edit_toolbar_cb),
	(eog_window_cmd_edit_toolbar):
	Add help button to toolbar editor. Fixes bug #503637.


Added:
   trunk/help/C/figures/eog_toolbar_editor_window.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/help/C/eog.xml
   trunk/help/ChangeLog
   trunk/help/Makefile.am
   trunk/src/eog-window.c

Modified: trunk/help/C/eog.xml
==============================================================================
--- trunk/help/C/eog.xml	(original)
+++ trunk/help/C/eog.xml	Sun Jan 13 15:08:12 2008
@@ -688,6 +688,55 @@
 	</sect2>
 		
 </sect1>
+<sect1 id="eog-toolbareditor">
+	<title>Personalizing The Toolbar</title>
+	<para>&appname;'s default toolbar contains only a basic set of items to keep it simple. But you can modify the toolbar if you prefer a different set.</para>
+	<sect2 id="eog-toolbareditor-use">
+		<title>Modifying the Toolbar</title>
+		<para>If you want to modify the toolbar you need to open the toolbar editor by going to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>. The following window will pop up:</para>
+		<figure id="toolbar-editor-fig">
+			<title>The toolbar editor window</title>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="figures/eog_toolbar_editor_window.png" format="PNG"/>
+					</imageobject>
+					<textobject>
+						<phrase>Shows Eye of GNOME toolbar editor window.</phrase>
+					</textobject>
+				</mediaobject>
+			</screenshot>
+		</figure>
+		<para>It contains the items that are not in the toolbar and the separator item. You can now edit the toolbar:</para>
+		<itemizedlist>
+			<listitem>
+				<para>To add new items to the toolbar, drag them from the toolbar editor to the toolbar.</para>
+			</listitem>
+			<listitem>
+				<para>To remove items from the toolbar, drag them from the toolbar to the toolbar editor.</para>
+			</listitem>
+			<listitem>
+				<para>To rearrange items on the toolbar, drag them to their new position on the toolbar.</para>
+			</listitem>
+		</itemizedlist>
+		<para>When you have finished editing the toolbar, click the <guibutton>Close</guibutton> button in the toolbar editor window. This will close the toolbar editor and make your modified toolbar active.</para>
+		</sect2>
+		<sect2 id="eog-toolbareditor-reset">
+			<title>Resetting the Toolbar</title>
+			<para>To revert your changes to the toolbar and return to the default layout, perform the following steps:</para>
+			<orderedlist>
+				<listitem>
+					<para>Open the toolbar editor (see <xref linkend="eog-toolbareditor-use"/>).</para>
+				</listitem>
+				<listitem>
+					<para>Click the <guibutton>Reset to Default</guibutton> button.</para>
+				</listitem>
+				<listitem>
+					<para>Click the <guibutton>Close</guibutton> button to close the toolbar editor. The toolbar has been reset to the default layout now.</para>
+				</listitem>
+			</orderedlist>
+		</sect2>
+</sect1>
 <sect1 id="eog-prefs">
 	<title>Preferences</title>
 	<para>Preferences can be changed by going to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. You will be able to change the options for image viewing and slide shows. The changes apply to all open windows instantly.</para>

Added: trunk/help/C/figures/eog_toolbar_editor_window.png
==============================================================================
Binary file. No diff available.

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Sun Jan 13 15:08:12 2008
@@ -6,6 +6,9 @@
 DOC_MODULE = eog
 DOC_ENTITIES = legal.xml
 DOC_INCLUDES = 
-DOC_FIGURES = figures/eog_save_as_window.png figures/eog_start_window.png 
+DOC_FIGURES = 					\
+	figures/eog_save_as_window.png		\
+	figures/eog_start_window.png		\
+	figures/eog_toolbar_editor_window.png 
 
 DOC_LINGUAS = de en_GB es fr it ko oc pa pt_BR ru sv uk

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Sun Jan 13 15:08:12 2008
@@ -2476,6 +2476,8 @@
 		/* Toolbar would be uneditable now otherwise */
 		egg_editable_toolbar_set_edit_mode
 			(EGG_EDITABLE_TOOLBAR (window->priv->toolbar), TRUE);
+	} else if (response == GTK_RESPONSE_HELP) {
+		eog_util_show_help ("eog-toolbareditor", NULL);
 	} else {
         	egg_editable_toolbar_set_edit_mode
 			(EGG_EDITABLE_TOOLBAR (window->priv->toolbar), FALSE);
@@ -2503,7 +2505,9 @@
 					      _("_Reset to Default"),
 					      EOG_TB_EDITOR_DLG_RESET_RESPONSE,
  					      GTK_STOCK_CLOSE,
-					      GTK_RESPONSE_CLOSE, 
+					      GTK_RESPONSE_CLOSE,
+					      GTK_STOCK_HELP,
+					      GTK_RESPONSE_HELP,
 					      NULL);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),