Git commit 2660d5321f52919528c22e9cb4b2909ae47556de by Gilles Caulier. Committed on 31/08/2016 at 16:21. Pushed by cgilles into branch 'master'.
Introduce Setup page description into Showfoto. Rename Setup Editor sections M +1 -0 TODO M +1 -1 digikam/editor-using.docbook M +3 -3 digikam/index.docbook R +2 -2 digikam/using-setup-editor-iface.docbook [from: digikam/using-setup-editor.docbook - 086% similarity] R +- -- digikam/using-setup-editor-iface.png [from: digikam/using-setup-editor.png - 100% similarity] R +2 -2 digikam/using-setup-editor-save.docbook [from: digikam/using-setup-saveimages.docbook - 095% similarity] R +- -- digikam/using-setup-editor-save.png [from: digikam/using-setup-saveimages.png - 100% similarity] R +2 -2 digikam/using-setup-editor-version.docbook [from: digikam/using-setup-versioning.docbook - 068% similarity] R +- -- digikam/using-setup-editor-version.png [from: digikam/using-setup-versioning.png - 100% similarity] M +3 -3 digikam/using-setup-intro.docbook M +3 -3 digikam/using-setup.docbook M +6 -0 showfoto/index.docbook http://commits.kde.org/digikam-doc/2660d5321f52919528c22e9cb4b2909ae47556de diff --git a/TODO b/TODO index b912b44..eccdc5f 100644 --- a/TODO +++ b/TODO @@ -153,6 +153,7 @@ Update actual handbook with new interface screenshots (if required -> digiKam-la - New tool to remove noise using wavelets working in luminance - IN PROGRESS - Showfoto, Editor, Preview, LightTable: Thumbbar is now dockable everywhere +- Showfoto : add dedicated section about Metadata, Tooltips, and Misc Setup pages. Then add sections to the handbook : diff --git a/digikam/editor-using.docbook b/digikam/editor-using.docbook index d9d7511..4cea6bf 100644 --- a/digikam/editor-using.docbook +++ b/digikam/editor-using.docbook @@ -142,7 +142,7 @@ <para> <menuchoice><guimenu>View</guimenu> - <guimenuitem>Full Screen Mode</guimenuitem></menuchoice> will display the photograph using the full screen mode. You can move back to the normal view by pressing the <keycombo>&Esc;</keycombo> key. By default the toolbar is still displayed even in Full Screen Mode. If you would prefer that the toolbar is not displayed you can turn it off in the Configure &digikam; dialog accessed from the main &digikam; window, see the <link linkend="using-setup-editor">Setup Image Editor Section</link>. + <guimenuitem>Full Screen Mode</guimenuitem></menuchoice> will display the photograph using the full screen mode. You can move back to the normal view by pressing the <keycombo>&Esc;</keycombo> key. By default the toolbar is still displayed even in Full Screen Mode. If you would prefer that the toolbar is not displayed you can turn it off in the Configure &digikam; dialog accessed from the main &digikam; window, see the <link linkend="using-setup-editor-iface">Setup Image Editor Window Section</link>. </para> </sect2> diff --git a/digikam/index.docbook b/digikam/index.docbook index 52ea332..e403c11 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -57,9 +57,9 @@ <!ENTITY doc-using-setup-metadata SYSTEM "using-setup-metadata.docbook"> <!ENTITY doc-using-setup-templates SYSTEM "using-setup-templates.docbook"> <!ENTITY doc-using-setup-mimetype SYSTEM "using-setup-mimetype.docbook"> - <!ENTITY doc-using-setup-editor SYSTEM "using-setup-editor.docbook"> - <!ENTITY doc-using-setup-versioning SYSTEM "using-setup-versioning.docbook"> - <!ENTITY doc-using-setup-saveimages SYSTEM "using-setup-saveimages.docbook"> + <!ENTITY doc-using-setup-editor-iface SYSTEM "using-setup-editor-iface.docbook"> + <!ENTITY doc-using-setup-editor-save SYSTEM "using-setup-editor-save.docbook"> + <!ENTITY doc-using-setup-editor-version SYSTEM "using-setup-editor-version.docbook"> <!ENTITY doc-using-setup-raw SYSTEM "using-setup-raw.docbook"> <!ENTITY doc-using-setup-cm SYSTEM "using-setup-cm.docbook"> <!ENTITY doc-using-setup-lighttable SYSTEM "using-setup-lighttable.docbook"> diff --git a/digikam/using-setup-editor.docbook b/digikam/using-setup-editor-iface.docbook similarity index 86% rename from digikam/using-setup-editor.docbook rename to digikam/using-setup-editor-iface.docbook index 87cf5d0..c33b78e 100644 --- a/digikam/using-setup-editor.docbook +++ b/digikam/using-setup-editor-iface.docbook @@ -1,4 +1,4 @@ -<sect2 id="using-setup-editor"> +<sect2 id="using-setup-editor-iface"> <title>Image Editor Settings</title> <para> @@ -11,7 +11,7 @@ <para> <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-editor.png" format="PNG" /> + <imagedata fileref="&path;using-setup-editor-iface.png" format="PNG" /> </imageobject></inlinemediaobject> </para> diff --git a/digikam/using-setup-editor.png b/digikam/using-setup-editor-iface.png similarity index 100% rename from digikam/using-setup-editor.png rename to digikam/using-setup-editor-iface.png diff --git a/digikam/using-setup-saveimages.docbook b/digikam/using-setup-editor-save.docbook similarity index 95% rename from digikam/using-setup-saveimages.docbook rename to digikam/using-setup-editor-save.docbook index 51b189b..26f8e8c 100644 --- a/digikam/using-setup-saveimages.docbook +++ b/digikam/using-setup-editor-save.docbook @@ -1,4 +1,4 @@ -<sect2 id="using-setup-saveimages"> +<sect2 id="using-setup-editor-save"> <title>Save Image Options</title> <para> @@ -11,7 +11,7 @@ <para> <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-saveimages.png" format="PNG" /> + <imagedata fileref="&path;using-setup-editor-save.png" format="PNG" /> </imageobject></inlinemediaobject> </para> diff --git a/digikam/using-setup-saveimages.png b/digikam/using-setup-editor-save.png similarity index 100% rename from digikam/using-setup-saveimages.png rename to digikam/using-setup-editor-save.png diff --git a/digikam/using-setup-versioning.docbook b/digikam/using-setup-editor-version.docbook similarity index 68% rename from digikam/using-setup-versioning.docbook rename to digikam/using-setup-editor-version.docbook index 9a74733..b9c21d2 100644 --- a/digikam/using-setup-versioning.docbook +++ b/digikam/using-setup-editor-version.docbook @@ -1,4 +1,4 @@ -<sect2 id="using-setup-versioning"> +<sect2 id="using-setup-editor-version"> <title>Image Versioning Settings</title> <para> @@ -7,7 +7,7 @@ <para> <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-versioning.png" format="PNG" /> + <imagedata fileref="&path;using-setup-editor-version.png" format="PNG" /> </imageobject></inlinemediaobject> </para> diff --git a/digikam/using-setup-versioning.png b/digikam/using-setup-editor-version.png similarity index 100% rename from digikam/using-setup-versioning.png rename to digikam/using-setup-editor-version.png diff --git a/digikam/using-setup-intro.docbook b/digikam/using-setup-intro.docbook index 353cce7..02b93ee 100644 --- a/digikam/using-setup-intro.docbook +++ b/digikam/using-setup-intro.docbook @@ -40,15 +40,15 @@ </para></listitem> <listitem><para> - <link linkend="using-setup-editor">Image Editor Settings</link> + <link linkend="using-setup-editor-iface">Image Editor Window Settings</link> </para></listitem> <listitem><para> - <link linkend="using-setup-versioning">Image Versioning Settings</link> + <link linkend="using-setup-editor-version">Image Editor Versioning Settings</link> </para></listitem> <listitem><para> - <link linkend="using-setup-saveimages">Image Saving Options</link> + <link linkend="using-setup-editor-save">Image Editor Saving Settings</link> </para></listitem> <listitem><para> diff --git a/digikam/using-setup.docbook b/digikam/using-setup.docbook index 18a7633..bf6f806 100644 --- a/digikam/using-setup.docbook +++ b/digikam/using-setup.docbook @@ -9,9 +9,9 @@ &doc-using-setup-metadata; &doc-using-setup-templates; &doc-using-setup-mimetype; - &doc-using-setup-editor; - &doc-using-setup-versioning; - &doc-using-setup-saveimages; + &doc-using-setup-editor-iface; + &doc-using-setup-editor-save; + &doc-using-setup-editor-version; &doc-using-setup-raw; &doc-using-setup-cm; &doc-using-setup-lighttable; diff --git a/showfoto/index.docbook b/showfoto/index.docbook index fdc0ad2..778a5ce 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -21,6 +21,12 @@ <!ENTITY doc-using-sidebar-filters SYSTEM "../digikam/using-sidebar-filters.docbook"> <!ENTITY doc-using-sidebar-tools SYSTEM "../digikam/using-sidebar-tools.docbook"> + <!ENTITY doc-using-setup-editor-iface SYSTEM "../digikam/using-setup-editor-iface.docbook"> + <!ENTITY doc-using-setup-editor-save SYSTEM "../digikam/using-setup-editor-save.docbook"> + <!ENTITY doc-using-setup-cm SYSTEM "../digikam/using-setup-cm.docbook"> + <!ENTITY doc-using-setup-raw SYSTEM "../digikam/using-setup-raw.docbook"> + <!ENTITY doc-using-setup-slideshow SYSTEM "../digikam/using-setup-slideshow.docbook"> + <!ENTITY doc-editor-photoediting SYSTEM "../digikam/editor-photoediting.docbook"> <!ENTITY doc-editor-color SYSTEM "../digikam/editor-color.docbook">