[gimp-help-2] Update menus/file
- From: Julien Hardlin <jhardlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-help-2] Update menus/file
- Date: Sun, 3 Jun 2012 06:24:41 +0000 (UTC)
commit 1def5c0e927ed98826cd0dcc7803be4043e94658
Author: Julien Hardelin <jm hard wanadoo fr>
Date: Sun Jun 3 08:25:10 2012 +0200
Update menus/file
images/C/menus/file.png | Bin 6376 -> 7389 bytes
images/C/menus/file/create.png | Bin 3364 -> 4527 bytes
images/C/menus/file/create/webpage.png | Bin 0 -> 6636 bytes
images/C/menus/image-menu-bar.png | Bin 0 -> 2702 bytes
src/menus/file.xml | 8 ++-
src/menus/file/close-all.xml | 7 +--
src/menus/file/close.xml | 28 +++------
.../{save-as-template.xml => create-template.xml} | 27 ++++-----
src/menus/file/create.xml | 26 ++++++++
src/menus/file/export-to.xml | 23 +++++++
src/menus/file/export.xml | 61 ++++++++++++++++++++
src/menus/file/new.xml | 9 +--
src/menus/file/quit.xml | 7 +--
src/menus/file/save-as-copy.xml | 4 +-
src/menus/file/save-as.xml | 36 +++---------
src/menus/introduction.xml | 20 +++++++
16 files changed, 174 insertions(+), 82 deletions(-)
---
diff --git a/images/C/menus/file.png b/images/C/menus/file.png
index dbb2eac..941f6d6 100644
Binary files a/images/C/menus/file.png and b/images/C/menus/file.png differ
diff --git a/images/C/menus/file/create.png b/images/C/menus/file/create.png
index 0c8a5d3..b45cddc 100644
Binary files a/images/C/menus/file/create.png and b/images/C/menus/file/create.png differ
diff --git a/images/C/menus/file/create/webpage.png b/images/C/menus/file/create/webpage.png
new file mode 100644
index 0000000..3d2a308
Binary files /dev/null and b/images/C/menus/file/create/webpage.png differ
diff --git a/images/C/menus/image-menu-bar.png b/images/C/menus/image-menu-bar.png
new file mode 100644
index 0000000..2136b3d
Binary files /dev/null and b/images/C/menus/image-menu-bar.png differ
diff --git a/src/menus/file.xml b/src/menus/file.xml
index 84427c0..55e9bd6 100644
--- a/src/menus/file.xml
+++ b/src/menus/file.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
-<!-- section history:
+<!-- section history
+ 2012-06-02 j.h: adapted to 2.8
2009-03-15 ude: moved introduction content here
2009-01-23 ude: moved files to new subdir "menus/file/"
2008-12-30 j.h: added file-create.xml for v2.6
@@ -46,8 +47,11 @@
<xi:include href="file/save.xml"/>
<xi:include href="file/save-as.xml"/>
<xi:include href="file/save-as-copy.xml"/>
- <xi:include href="file/save-as-template.xml"/>
<xi:include href="file/revert.xml"/>
+ <xi:include href="file/export-to.xml"/>
+ <xi:include href="file/export.xml"/>
+ <xi:include href="file/create-template.xml"/>
+
<!-- -->
<!-- TODO: Page Setup --> <!--id="file-print-gtk-page-setup"-->
<xi:include href="file/print.xml"/>
diff --git a/src/menus/file/close-all.xml b/src/menus/file/close-all.xml
index c86fe0d..7b32fbd 100644
--- a/src/menus/file/close-all.xml
+++ b/src/menus/file/close-all.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
- 2007-12-01 AntI: Added 'es'
- 2007-10-26 ude: added German translation
+ 2012-06-02 j.h: update to 2.8
2007-10-17 Created by j.h
-->
<sect2 id="gimp-file-close-all">
<title>Close all</title>
<para>
- This command closes all images you have opened. The main
- window remaining empty is that corresponding to the last
- opened image.
+ This command closes all images you have opened.
</para>
<sect3>
diff --git a/src/menus/file/close.xml b/src/menus/file/close.xml
index 3d85c2a..a736cda 100644
--- a/src/menus/file/close.xml
+++ b/src/menus/file/close.xml
@@ -2,8 +2,8 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2012-06-02 j.h: update to 2.8
2007-10-17 j.h: only added "active image" instead of"image" for v2.4
- 2007-05-19 Added Spanish translation by AntI
-->
<sect2 id="gimp-file-close">
<title>Close</title>
@@ -18,10 +18,8 @@
</indexterm>
<para>
- The <guimenuitem>Close</guimenuitem> command closes the active image. If
- the image is not in the main window, then the window is closed also. If
- the image is in the main window, the image is closed but the window
- remains, empty.
+ The <guimenuitem>Close</guimenuitem> command closes the active image.It is
+ disabled if no image is open.
</para>
<para>
Closing an image is not undoable: once it is
@@ -32,16 +30,16 @@
a file, even if the file format chosen does not preserve all the
information in the image, so it is a good idea to think for a moment
about what you are doing before closing an image. If there is the
- slightest possibility that you will regret it, it can't hurt to save a
- copy as an <link linkend="glossary-xcf">XCF</link> file.
+ slightest possibility that you will regret it, save the file (automatically
+ in the XCF file format since <acronym>GIMP</acronym>-2.8).
</para>
<sect3>
- <title>Activate the Command</title>
+ <title>Activating the Command</title>
<itemizedlist>
<listitem>
<para>
- You can access this command from the image menubar through
+ You can access this command from the image menu through
<menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Close</guimenuitem>
@@ -60,17 +58,9 @@
you can also execute it by clicking on a
<quote>Close</quote> button somewhere on the image window titlebar.
The location and appearance of this button are determined by the
- windowing system and the window manager.
+ windowing system and the window manager. If no image is open,
+ clicking on this button closes GIMP.
</para>
- <note>
- <para>
- If you close the image window, as described above,
- <acronym>GIMP</acronym> simply closes your image.
- However, if you close the Toolbox window by using the
- <quote>Close</quote> button, <acronym>GIMP</acronym>
- itself exits.
- </para>
- </note>
</listitem>
</itemizedlist>
</sect3>
diff --git a/src/menus/file/save-as-template.xml b/src/menus/file/create-template.xml
similarity index 60%
rename from src/menus/file/save-as-template.xml
rename to src/menus/file/create-template.xml
index 0c5c2af..7a2ff0d 100644
--- a/src/menus/file/save-as-template.xml
+++ b/src/menus/file/create-template.xml
@@ -2,30 +2,25 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
- 2007-10-23 j.h: no change for v2.4
- 2007-05-19 Added Spanish translation by AntI
+ 2012-06-01 j.h: created
-->
-<sect2 id="gimp-file-save-as-template">
- <title>Save as Template</title>
+<sect2 id="gimp-file-create-template">
+ <!--TO TRANLATORS: this file comes from the old save-as-template xml file-->
+ <title>Create Template</title>
<indexterm>
- <primary>Image</primary>
- <secondary>Save image</secondary>
- <tertiary>Save as template</tertiary>
- </indexterm>
- <indexterm>
- <primary>Save as Template</primary>
+ <primary>Create Template</primary>
</indexterm>
<indexterm>
<primary>Template</primary>
- <secondary>Save as Template</secondary>
+ <secondary>Create Template</secondary>
</indexterm>
<para>
- The <guimenuitem>Save as Template</guimenuitem> command creates a
+ The <guimenuitem>Create Template</guimenuitem> command creates a
template with the same dimensions and color space as the current
image. A dialog pops up, which asks you to
- name the new template, then the template is saved and becomes
+ name the new template. Then the template is saved and becomes
available in the <link linkend="gimp-file-new">New Image</link>
dialog. If you give a name that already exists,
<acronym>GIMP</acronym> generates a unique name
@@ -35,14 +30,14 @@
</para>
<sect3>
- <title>Activate Command</title>
+ <title>Activating the Command</title>
<itemizedlist>
<listitem>
<para>
- You can access this command from the image menubar through
+ You can access this command from the image menu through
<menuchoice>
<guimenu>File</guimenu>
- <guimenuitem>Save as Template</guimenuitem>
+ <guimenuitem>Create Template</guimenuitem>
</menuchoice>.
There is no default keyboard shortcut.
</para>
diff --git a/src/menus/file/create.xml b/src/menus/file/create.xml
index a3d6f76..554b5bb 100644
--- a/src/menus/file/create.xml
+++ b/src/menus/file/create.xml
@@ -2,6 +2,7 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2012-05-31 j.h: TODO: New brush from text fails
2009-02-16 ude: (brief) v2.6 review/update
2009-01-06 j.h: Improved "mouse pointer capture"
2008-12-29 Created from menus/acquire.xml by j.h
@@ -72,6 +73,24 @@
</para>
</sect3>
+ <sect3>
+ <title>From Web page</title>
+ <para>
+ This command opens a dialog where you can enter the URL of a Web page and
+ get the image in GIMP.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata format="PNG" fileref="images/menus/file/create/webpage.png"/>
+ </imageobject>
+ <caption>
+ <para>
+ The command defaults to gimp.org. Please have a try to it.
+ </para>
+ </caption>
+ </mediaobject>
+ </sect3>
+
<sect3 id="plug-in-screenshot">
<title>Screenshot</title>
@@ -186,4 +205,11 @@
An impressive list of script-fus. Have a look at it!
</para>
</sect3>
+
+ <sect3>
+ <title>New brush from text...</title>
+ <para>
+ TODO (this command fails on my system)
+ </para>
+ </sect3>
</sect2>
diff --git a/src/menus/file/export-to.xml b/src/menus/file/export-to.xml
new file mode 100644
index 0000000..2a6028f
--- /dev/null
+++ b/src/menus/file/export-to.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!-- section history:
+ 2012-06-02 j.h: created
+-->
+<sect2 id="gimp-file-export-to">
+ <title>Export to</title>
+
+ <indexterm>
+ <primary>Export to</primary>
+ </indexterm>
+
+ <para>
+ This command is called <quote>Export to</quote> for a native XCF file.
+ Then, it does the same thing as <command>Export</command>.
+ </para>
+ <para>
+ The name becomes <quote>Overwriting name.extension</quote> for an imported
+ image. So, you can export the imported image directly in its original
+ file format, without going through the export dialog.
+ </para>
+</sect2>
\ No newline at end of file
diff --git a/src/menus/file/export.xml b/src/menus/file/export.xml
new file mode 100644
index 0000000..570c68b
--- /dev/null
+++ b/src/menus/file/export.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!-- section history:
+ 2012-06-01 j.h: created
+-->
+
+<sect2 id="gimp-file-export">
+ <title>Export</title>
+
+ <indexterm>
+ <primary>Image</primary>
+ <secondary>Export</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Export</primary>
+ </indexterm>
+
+ <para>
+ <command>Export</command> allows you to save your image in a format other
+ than XCF.
+ </para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/using/export-image-dialog.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+
+ <note>
+ <para>
+ Please refer to <xref linkend="gimp-using-fileformats"/> for information
+ about exporting in different file formats.
+ </para>
+ </note>
+
+ <sect3>
+ <title>Activating the Command</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ You can access this command from the image menubar through
+ <menuchoice>
+ <guimenu>File</guimenu>
+ <guimenuitem>Export</guimenuitem>
+ </menuchoice>,
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ or by using the keyboard shortcut
+ <keycombo>
+ <keycap>Shift</keycap>
+ <keycap>Ctrl</keycap><keycap>E</keycap>
+ </keycombo>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+</sect2>
\ No newline at end of file
diff --git a/src/menus/file/new.xml b/src/menus/file/new.xml
index a08db7d..863aa24 100644
--- a/src/menus/file/new.xml
+++ b/src/menus/file/new.xml
@@ -2,13 +2,12 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2012-05-31 j.h: minor changes
2008-12-29 j.h: link to File-references to be fixed
2007-10-17 j.h: updated to v2.4 (comment)
- 2007-02-07 added 'no' by KoSt
2006-09-19 lexa: minor change (link enabled)
- 2006-07-03 changed the note en;fr by j.h
- 2006-06-17 added a para en;fr for default image size by j.h
- 2005-09-03 de reviewed by axel.wernicke
+ 2006-07-03 changed the note by j.h
+ 2006-06-17 added a para for default image size by j.h
-->
<sect2 id="gimp-file-new">
<title>New</title>
@@ -36,7 +35,7 @@
<itemizedlist>
<listitem>
<para>
- You can access the command the Image menubar through:
+ You can access the command in the Image menu through:
<menuchoice>
<guimenu>File</guimenu>
<guimenuitem>New</guimenuitem>
diff --git a/src/menus/file/quit.xml b/src/menus/file/quit.xml
index 1179894..0293b3b 100644
--- a/src/menus/file/quit.xml
+++ b/src/menus/file/quit.xml
@@ -50,13 +50,8 @@
<quote>Close</quote> button somewhere on the main image window's
titlebar. The location and appearance of this button are
determined by the windowing system and the window manager.
+ Clicking on this button closes GIMP when no image is open.
</para>
- <note>
- <para>
- The <quote>Close</quote> button in the upper right corner of
- the Toolbox has the same action.
- </para>
- </note>
</listitem>
</itemizedlist>
</sect3>
diff --git a/src/menus/file/save-as-copy.xml b/src/menus/file/save-as-copy.xml
index 139cf23..935f233 100644
--- a/src/menus/file/save-as-copy.xml
+++ b/src/menus/file/save-as-copy.xml
@@ -2,8 +2,8 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2012-05-31 j.h: update to 2.8
2007-10-23 j.h: no change for v2.4
- 2007-05-19 Added Spanish translation by AntI
-->
<sect2 id="gimp-file-save-a-copy">
<title>Save a Copy</title>
@@ -21,7 +21,7 @@
The <guimenuitem>Save a Copy</guimenuitem> command does the same thing
as the <guimenuitem>Save</guimenuitem> command, but with one important
difference. It always asks for a file name and saves the image into the
- specified file, but it does not change the name of the active image
+ XCF file format, but it does not change the name of the active image
or mark it as <quote>clean</quote>. As a result, if you try to delete
the image, or exit from <acronym>GIMP</acronym>, you are
informed that the image is <quote>dirty</quote> and given an opportunity
diff --git a/src/menus/file/save-as.xml b/src/menus/file/save-as.xml
index 3ed6c0d..fac0ce3 100644
--- a/src/menus/file/save-as.xml
+++ b/src/menus/file/save-as.xml
@@ -2,13 +2,11 @@
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xml/4.3/docbookx.dtd";>
<!-- section history:
+ 2012-05-31 j.h: update to 2.8
2008-01-04 ude: replaced calloutlist with orderedlist
- 2007-10-23 j.h: updated en;fr to v2.4
- 2007-05-19 Added Spanish translation by AntI
- 2007-02-08 added 'no' by KoSt
+ 2007-10-23 j.h: updated to v2.4
2006-07-27 en revised by scb
2006-02-25 fixed invalid image reference
- 2005/10/18 zh_CN removed by romanofski - missing translation
-->
<sect2 id="gimp-file-save-as">
<title>Save as</title>
@@ -27,12 +25,10 @@
displays the <quote>Save Image</quote> dialog.
In its basic form, as shown below, this gives you a text box
to assign a name to the file, and a drop-down list of bookmarks
- to select a directory to save it in. Normally the file
- format is determined by the extension you use in the file name
- (i.e., .jpg for a JPEG file). You can use the <guilabel>Select File
- Type</guilabel> option expander to pick a different file type, but you
- should avoid doing this unless absolutely necessary, to avoid
- confusion.
+ to select a directory to save it in. Since <acronym>GIMP</acronym>-2.8, the
+ file is automatically saved in the XCF format. You can use the
+ <guilabel>Select File Type</guilabel> option expander to save in a
+ compressed format.
</para>
<para>
If the directory you want is not in the list of bookmarks, click on
@@ -80,10 +76,7 @@
choose the directory the file should be saved in. If the folder
you want is not on the list, you can type in the path to the
directory, along with the filename. You can also click on the small
- triangle to display the full folder browser. You can also choose
- the image format, by selecting the file extension (e.g.,
- <filename class="extension">.xcf</filename> or
- <filename class="extension">.png</filename>).
+ triangle to display the full folder browser..
</para>
<figure>
<title>The basic <quote>Save Image</quote> dialog</title>
@@ -191,20 +184,9 @@
</listitem>
<listitem>
<para>
- At <guilabel>Select File Type</guilabel>, you have to select
- the file format for saving the file. If you select
- <guilabel>By Extension</guilabel>, the file type is determined
- by the extension you add to the name, for example,
- <quote>.jpg</quote> for JPEG format.
+ At <guilabel>Select File Type</guilabel>, you can select a compressed
+ format for your XCF file.
</para>
- <note>
- <para>
- To preserve all the components of your image when you
- save it â the layers, channels, etc. â use ".xcf" format,
- which is the <acronym>GIMP</acronym>'s native
- format.
- </para>
- </note>
</listitem>
</orderedlist>
</sect3>
diff --git a/src/menus/introduction.xml b/src/menus/introduction.xml
index f04178b..bdd8180 100644
--- a/src/menus/introduction.xml
+++ b/src/menus/introduction.xml
@@ -16,6 +16,7 @@
</indexterm>
<!--TODO: add image menubar screenshot(?)-->
+ <!--Done-->
<para>
There are many places in <acronym>GIMP</acronym> where you can
@@ -25,6 +26,20 @@
for the other dialogs are described elsewhere in the chapters that
describe the dialogs themselves.
</para>
+
+ <sect2>
+ <title>The Image Menu Bar</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/menus/image-menu-bar.png"
+ format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
+ This menu bar may contain other entries if you have added script-fus,
+ python-fus or videos to your GIMP.
+ </para>
+ </sect2>
<sect2 id="context-menus">
<title>Context Menus</title>
@@ -119,6 +134,11 @@
on your computer (often by clicking on an X icon in the upper right
corner of the window).
</para>
+ <para>
+ These tear-off submenus are also created in single-window mode, but are
+ of less interest since they are masked by the window as soon as you
+ click on it.
+ </para>
</sect2>
<sect2 id="tab-menus">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
