[gimp-help-2] Rename/move misc remaining menu images

From: Ulf-D. Ehlert <ulfehlert src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gimp-help-2] Rename/move misc remaining menu images
Date: Thu, 5 Nov 2009 20:27:36 +0000 (UTC)
commit 184eb85f42778fce0fe2e208f5681b9381cef34e
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Nov 5 19:39:19 2009 +0100

    Rename/move misc remaining menu images

 .../{ => colors/components}/channel-mixer-ex1.png  |  Bin 2381 -> 2381 bytes
 .../{ => colors/components}/channel-mixer-ex2.png  |  Bin 2779 -> 2779 bytes
 .../{ => colors/components}/channel-mixer-ex3.png  |  Bin 3158 -> 3158 bytes
 .../{ => colors/components}/channel-mixer-ex4.png  |  Bin 1840 -> 1840 bytes
 images/C/menus/file-open-dialog.png                |  Bin 83194 -> 0 bytes
 .../alpha-to-logo.png}                             |  Bin 10720 -> 10720 bytes
 .../{filters-distorts.png => filters/distorts.png} |  Bin 36912 -> 36912 bytes
 .../light-and-shadow.png}                          |  Bin 19884 -> 19884 bytes
 .../script-fu-console-browse-applied.png           |  Bin 16394 -> 16394 bytes
 images/C/menus/folder-context-menu.png             |  Bin 2981 -> 0 bytes
 images/C/{menus => tool-options}/jitter.png        |  Bin 1204 -> 1204 bytes
 images/C/{menus => toolbox}/color-picker-info.png  |  Bin 18003 -> 18003 bytes
 .../colors-desaturate-orig.png}                    |  Bin 36230 -> 36230 bytes
 .../alpha-to-logo.png}                             |  Bin 12253 -> 12253 bytes
 .../light-and-shadow.png}                          |  Bin 8923 -> 8923 bytes
 images/de/{menus => toolbox}/color-picker-info.png |  Bin 16033 -> 16033 bytes
 .../alpha-to-logo.png}                             |  Bin 24651 -> 24651 bytes
 .../{filters-distorts.png => filters/distorts.png} |  Bin 6513 -> 6513 bytes
 .../light-and-shadow.png}                          |  Bin 23861 -> 23861 bytes
 images/fr/{menus => toolbox}/color-picker-info.png |  Bin 19644 -> 19644 bytes
 .../alpha-to-logo.png}                             |  Bin 39420 -> 39420 bytes
 .../{filters-distorts.png => filters/distorts.png} |  Bin 47304 -> 47304 bytes
 .../light-and-shadow.png}                          |  Bin 34386 -> 34386 bytes
 images/it/{menus => toolbox}/color-picker-info.png |  Bin 14102 -> 14102 bytes
 .../alpha-to-logo.png}                             |  Bin 8495 -> 8495 bytes
 .../{filters-distorts.png => filters/distorts.png} |  Bin 12568 -> 12568 bytes
 .../light-and-shadow.png}                          |  Bin 7329 -> 7329 bytes
 images/ja/{menus => toolbox}/color-picker-info.png |  Bin 7834 -> 7834 bytes
 .../alpha-to-logo.png}                             |  Bin 28933 -> 28933 bytes
 .../light-and-shadow.png}                          |  Bin 15889 -> 15889 bytes
 images/nn/{menus => toolbox}/color-picker-info.png |  Bin 15440 -> 15440 bytes
 images/ru/{menus => toolbox}/color-picker-info.png |  Bin 18139 -> 18139 bytes
 src/filters/alpha-to-logo/introduction.xml         |    2 +-
 src/filters/distort.xml                            |    2 +-
 src/filters/introduction.xml                       |    3 +++
 .../{light-effects.xml => light-and-shadow.xml}    |    3 ++-
 src/gimp.xml                                       |    2 +-
 {images/C/menus => src/images}/sunflower.png       |  Bin 36230 -> 36230 bytes
 src/menus/colors/components/channel-mixer.xml      |   11 +++++------
 src/menus/filters/script-fu.xml                    |    5 +++--
 src/toolbox/tool-brush.xml                         |    3 ++-
 src/toolbox/tool-color-picker.xml                  |   18 +++++++++++++-----
 src/toolbox/tool-desaturate.xml                    |    4 +++-
 43 files changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/images/C/menus/channel-mixer-ex1.png b/images/C/menus/colors/components/channel-mixer-ex1.png
similarity index 100%
rename from images/C/menus/channel-mixer-ex1.png
rename to images/C/menus/colors/components/channel-mixer-ex1.png
diff --git a/images/C/menus/channel-mixer-ex2.png b/images/C/menus/colors/components/channel-mixer-ex2.png
similarity index 100%
rename from images/C/menus/channel-mixer-ex2.png
rename to images/C/menus/colors/components/channel-mixer-ex2.png
diff --git a/images/C/menus/channel-mixer-ex3.png b/images/C/menus/colors/components/channel-mixer-ex3.png
similarity index 100%
rename from images/C/menus/channel-mixer-ex3.png
rename to images/C/menus/colors/components/channel-mixer-ex3.png
diff --git a/images/C/menus/channel-mixer-ex4.png b/images/C/menus/colors/components/channel-mixer-ex4.png
similarity index 100%
rename from images/C/menus/channel-mixer-ex4.png
rename to images/C/menus/colors/components/channel-mixer-ex4.png
diff --git a/images/C/menus/filters-alpha-to-logo.png b/images/C/menus/filters/alpha-to-logo.png
similarity index 100%
rename from images/C/menus/filters-alpha-to-logo.png
rename to images/C/menus/filters/alpha-to-logo.png
diff --git a/images/C/menus/filters-distorts.png b/images/C/menus/filters/distorts.png
similarity index 100%
rename from images/C/menus/filters-distorts.png
rename to images/C/menus/filters/distorts.png
diff --git a/images/C/menus/filters-light+shadow.png b/images/C/menus/filters/light-and-shadow.png
similarity index 100%
rename from images/C/menus/filters-light+shadow.png
rename to images/C/menus/filters/light-and-shadow.png
diff --git a/images/C/menus/script-fu-console-browse-applied.png b/images/C/menus/filters/script-fu-console-browse-applied.png
similarity index 100%
rename from images/C/menus/script-fu-console-browse-applied.png
rename to images/C/menus/filters/script-fu-console-browse-applied.png
diff --git a/images/C/menus/jitter.png b/images/C/tool-options/jitter.png
similarity index 100%
rename from images/C/menus/jitter.png
rename to images/C/tool-options/jitter.png
diff --git a/images/C/menus/color-picker-info.png b/images/C/toolbox/color-picker-info.png
similarity index 100%
rename from images/C/menus/color-picker-info.png
rename to images/C/toolbox/color-picker-info.png
diff --git a/images/C/menus/sunflower.png b/images/C/toolbox/colors-desaturate-orig.png
similarity index 100%
copy from images/C/menus/sunflower.png
copy to images/C/toolbox/colors-desaturate-orig.png
diff --git a/images/de/menus/filters-alpha-to-logo.png b/images/de/menus/filters/alpha-to-logo.png
similarity index 100%
rename from images/de/menus/filters-alpha-to-logo.png
rename to images/de/menus/filters/alpha-to-logo.png
diff --git a/images/de/menus/filters-light+shadow.png b/images/de/menus/filters/light-and-shadow.png
similarity index 100%
rename from images/de/menus/filters-light+shadow.png
rename to images/de/menus/filters/light-and-shadow.png
diff --git a/images/de/menus/color-picker-info.png b/images/de/toolbox/color-picker-info.png
similarity index 100%
rename from images/de/menus/color-picker-info.png
rename to images/de/toolbox/color-picker-info.png
diff --git a/images/fr/menus/filters-alpha-to-logo.png b/images/fr/menus/filters/alpha-to-logo.png
similarity index 100%
rename from images/fr/menus/filters-alpha-to-logo.png
rename to images/fr/menus/filters/alpha-to-logo.png
diff --git a/images/fr/menus/filters-distorts.png b/images/fr/menus/filters/distorts.png
similarity index 100%
rename from images/fr/menus/filters-distorts.png
rename to images/fr/menus/filters/distorts.png
diff --git a/images/fr/menus/filters-light+shadow.png b/images/fr/menus/filters/light-and-shadow.png
similarity index 100%
rename from images/fr/menus/filters-light+shadow.png
rename to images/fr/menus/filters/light-and-shadow.png
diff --git a/images/fr/menus/color-picker-info.png b/images/fr/toolbox/color-picker-info.png
similarity index 100%
rename from images/fr/menus/color-picker-info.png
rename to images/fr/toolbox/color-picker-info.png
diff --git a/images/it/menus/filters-alpha-to-logo.png b/images/it/menus/filters/alpha-to-logo.png
similarity index 100%
rename from images/it/menus/filters-alpha-to-logo.png
rename to images/it/menus/filters/alpha-to-logo.png
diff --git a/images/it/menus/filters-distorts.png b/images/it/menus/filters/distorts.png
similarity index 100%
rename from images/it/menus/filters-distorts.png
rename to images/it/menus/filters/distorts.png
diff --git a/images/it/menus/filters-light+shadow.png b/images/it/menus/filters/light-and-shadow.png
similarity index 100%
rename from images/it/menus/filters-light+shadow.png
rename to images/it/menus/filters/light-and-shadow.png
diff --git a/images/it/menus/color-picker-info.png b/images/it/toolbox/color-picker-info.png
similarity index 100%
rename from images/it/menus/color-picker-info.png
rename to images/it/toolbox/color-picker-info.png
diff --git a/images/ja/menus/filters-alpha-to-logo.png b/images/ja/menus/filters/alpha-to-logo.png
similarity index 100%
rename from images/ja/menus/filters-alpha-to-logo.png
rename to images/ja/menus/filters/alpha-to-logo.png
diff --git a/images/ja/menus/filters-distorts.png b/images/ja/menus/filters/distorts.png
similarity index 100%
rename from images/ja/menus/filters-distorts.png
rename to images/ja/menus/filters/distorts.png
diff --git a/images/ja/menus/filters-light+shadow.png b/images/ja/menus/filters/light-and-shadow.png
similarity index 100%
rename from images/ja/menus/filters-light+shadow.png
rename to images/ja/menus/filters/light-and-shadow.png
diff --git a/images/ja/menus/color-picker-info.png b/images/ja/toolbox/color-picker-info.png
similarity index 100%
rename from images/ja/menus/color-picker-info.png
rename to images/ja/toolbox/color-picker-info.png
diff --git a/images/nn/menus/filters-alpha-to-logo.png b/images/nn/menus/filters/alpha-to-logo.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/nn/menus/filters-alpha-to-logo.png
rename to images/nn/menus/filters/alpha-to-logo.png
diff --git a/images/nn/menus/filters-light+shadow.png b/images/nn/menus/filters/light-and-shadow.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/nn/menus/filters-light+shadow.png
rename to images/nn/menus/filters/light-and-shadow.png
diff --git a/images/nn/menus/color-picker-info.png b/images/nn/toolbox/color-picker-info.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/nn/menus/color-picker-info.png
rename to images/nn/toolbox/color-picker-info.png
diff --git a/images/ru/menus/color-picker-info.png b/images/ru/toolbox/color-picker-info.png
similarity index 100%
rename from images/ru/menus/color-picker-info.png
rename to images/ru/toolbox/color-picker-info.png
diff --git a/src/filters/alpha-to-logo/introduction.xml b/src/filters/alpha-to-logo/introduction.xml
index 5c1eedd..d721f59 100644
--- a/src/filters/alpha-to-logo/introduction.xml
+++ b/src/filters/alpha-to-logo/introduction.xml
@@ -20,7 +20,7 @@
     <mediaobject>
       <imageobject>
         <imagedata  format="PNG"
-          fileref="images/menus/filters-alpha-to-logo.png"/>
+          fileref="images/menus/filters/alpha-to-logo.png"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/src/filters/distort.xml b/src/filters/distort.xml
index 5b4ed63..7bc0425 100644
--- a/src/filters/distort.xml
+++ b/src/filters/distort.xml
@@ -13,7 +13,7 @@
     <title>The Distort filters menu</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/menus/filters-distorts.png" format="PNG"/>
+        <imagedata fileref="images/menus/filters/distorts.png" format="PNG"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/src/filters/introduction.xml b/src/filters/introduction.xml
index d33bfa5..1bd3ac7 100644
--- a/src/filters/introduction.xml
+++ b/src/filters/introduction.xml
@@ -74,6 +74,9 @@
     <listitem>
       <para><xref linkend="filters-animation"/></para>
     </listitem>
+    <listitem>
+      <para><xref linkend="filters-alpha-to-logo"/></para>
+    </listitem>
   </itemizedlist>
 
   <sect2>
diff --git a/src/filters/light-effects.xml b/src/filters/light-and-shadow.xml
similarity index 93%
rename from src/filters/light-effects.xml
rename to src/filters/light-and-shadow.xml
index 68cc6db..6ec0165 100644
--- a/src/filters/light-effects.xml
+++ b/src/filters/light-and-shadow.xml
@@ -16,7 +16,8 @@
     <title>The Light and Shadow filters menu</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/menus/filters-light+shadow.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/menus/filters/light-and-shadow.png"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/src/gimp.xml b/src/gimp.xml
index b827f29..c267ed9 100644
--- a/src/gimp.xml
+++ b/src/gimp.xml
@@ -189,7 +189,7 @@
       <xi:include href="filters/blur.xml"/>
       <xi:include href="filters/enhance.xml"/>
       <xi:include href="filters/distort.xml"/>
-      <xi:include href="filters/light-effects.xml"/>
+      <xi:include href="filters/light-and-shadow.xml"/>
       <xi:include href="filters/noise.xml"/>
       <xi:include href="filters/edge-detect.xml"/>
       <xi:include href="filters/generic.xml"/>
diff --git a/images/C/menus/sunflower.png b/src/images/sunflower.png
similarity index 100%
rename from images/C/menus/sunflower.png
rename to src/images/sunflower.png
diff --git a/src/menus/colors/components/channel-mixer.xml b/src/menus/colors/components/channel-mixer.xml
index cfc6c83..f6c0802 100644
--- a/src/menus/colors/components/channel-mixer.xml
+++ b/src/menus/colors/components/channel-mixer.xml
@@ -186,7 +186,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
-                  fileref="images/menus/channel-mixer-ex1.png"/>
+                  fileref="images/menus/colors/components/channel-mixer-ex1.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -204,11 +204,10 @@
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
-                  fileref="images/menus/channel-mixer-ex2.png"/>
+                  fileref="images/menus/colors/components/channel-mixer-ex2.png"/>
               </imageobject>
               <caption>
-                <para><!-- en improved: "relative values" instead
-                    of "percentage" 2008-01-12 -->
+                <para>
                   In the red square, the pixel values are 230;10;10. Relative
                   values are 1;0.5;0. The calculation result is 230*1 + 10*0,5
                   + 10*0 =235. The same reasoning is valid for the green and
@@ -230,7 +229,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
-                  fileref="images/menus/channel-mixer-ex3.png"/>
+                  fileref="images/menus/colors/components/channel-mixer-ex3.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -258,7 +257,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
-                  fileref="images/menus/channel-mixer-ex4.png"/>
+                  fileref="images/menus/colors/components/channel-mixer-ex4.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/menus/filters/script-fu.xml b/src/menus/filters/script-fu.xml
index 0a9bb5b..71db526 100644
--- a/src/menus/filters/script-fu.xml
+++ b/src/menus/filters/script-fu.xml
@@ -17,7 +17,8 @@
     <title>The <quote>Script-Fu</quote> submenu</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/menus/filters/script-fu.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/menus/filters/script-fu.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -120,7 +121,7 @@
           <mediaobject>
             <imageobject>
               <imagedata format="PNG"
-            fileref="images/menus/script-fu-console-browse-applied.png" />
+                fileref="images/menus/filters/script-fu-console-browse-applied.png"/>
             </imageobject>
             <caption>
               <para>
diff --git a/src/toolbox/tool-brush.xml b/src/toolbox/tool-brush.xml
index a382d98..8fa0c7c 100644
--- a/src/toolbox/tool-brush.xml
+++ b/src/toolbox/tool-brush.xml
@@ -448,7 +448,8 @@
             <title><quote>Jitter</quote> example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/jitter.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/tool-options/jitter.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/toolbox/tool-color-picker.xml b/src/toolbox/tool-color-picker.xml
index 9a3e150..efaec1d 100644
--- a/src/toolbox/tool-color-picker.xml
+++ b/src/toolbox/tool-color-picker.xml
@@ -1,5 +1,6 @@
 <?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";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-04-06 j.h: reviewed for v2.6
   2008-01-29 j.h: updated to v2.4 'en;fr'
@@ -14,6 +15,7 @@
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-color-picker">
   <title>Color Picker</title>
+
   <indexterm>
     <primary>Tools</primary>
     <secondary>Color Picker</secondary>
@@ -28,11 +30,13 @@
     <primary>Color</primary>
     <secondary>Grab color</secondary>
   </indexterm>
+
   <figure>
     <title>Eye dropper</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/toolbox-eyedropper.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/toolbox/toolbox-eyedropper.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -46,6 +50,7 @@
     <emphasis>Only colors in visible layers are used</emphasis>. An
     <guilabel>Info window</guilabel> opens when you click on the image.
   </para>
+
   <sect3>
     <title>Activating the Tool</title>
     <para>You can get to this tool in several ways :</para>
@@ -129,7 +134,8 @@
       <title>Color Picker Options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/color-picker-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/color-picker-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -198,7 +204,8 @@
               <listitem>
                 <para>
                   When this option box is checked, the picked color is sent
-                  to the active color palette. see <link linkend="gimp-palette-editor-dialog">Palette Editor</link>
+                  to the active color palette. See <link
+                  linkend="gimp-palette-editor-dialog">Palette Editor</link>.
                 </para>
               </listitem>
             </varlistentry>
@@ -217,7 +224,8 @@
             <title>Color Picker Info Window</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/color-picker-info.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/toolbox/color-picker-info.png"/>
               </imageobject>
             </mediaobject>
           </figure>
diff --git a/src/toolbox/tool-desaturate.xml b/src/toolbox/tool-desaturate.xml
index abd2d3a..916d017 100644
--- a/src/toolbox/tool-desaturate.xml
+++ b/src/toolbox/tool-desaturate.xml
@@ -133,7 +133,9 @@
       <title>Comparing the three options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/sunflower.png" format="PNG"/>
+          <!--was: "images/menus/sunflower.png"-->
+          <imagedata format="PNG"
+            fileref="images/toolbox/colors-desaturate-orig.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]