Git commit c110646c9cc6f9743731456cb18e6f06f1cc8c36 by Gilles Caulier. Committed on 02/09/2016 at 08:17. Pushed by cgilles into branch 'master'.
share Setup Misc App Behavior between digiKam and Showfoto M +1 -0 digikam/index.docbook A +22 -0 digikam/using-setup-misc-behavior.docbook A +- -- digikam/using-setup-misc-behavior.png M +19 -18 digikam/using-setup-misc.docbook D +- -- digikam/using-setup-misc.png M +17 -1 showfoto/index.docbook http://commits.kde.org/digikam-doc/c110646c9cc6f9743731456cb18e6f06f1cc8c36 diff --git a/digikam/index.docbook b/digikam/index.docbook index 219f994..ef3cbbc 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -75,6 +75,7 @@ <!ENTITY doc-using-setup-camera SYSTEM "using-setup-camera.docbook"> <!ENTITY doc-using-setup-plugins SYSTEM "using-setup-plugins.docbook"> <!ENTITY doc-using-setup-misc SYSTEM "using-setup-misc.docbook"> + <!ENTITY doc-using-setup-misc-behavior SYSTEM "using-setup-misc-behavior.docbook"> <!ENTITY doc-using-setup-theme SYSTEM "using-setup-theme.docbook"> <!-- Image Editor Chapter --> diff --git a/digikam/using-setup-misc-behavior.docbook b/digikam/using-setup-misc-behavior.docbook new file mode 100644 index 0000000..4a054d7 --- /dev/null +++ b/digikam/using-setup-misc-behavior.docbook @@ -0,0 +1,22 @@ +<sect3 id="using-setup-misc-behavior"> + <title>Application Behavior Settings</title> + + <para> + With this settings, you can switch off the display of the splash screen when application loads. This may speed up the start time slightly. + </para> + + <para> + <inlinemediaobject><imageobject> + <imagedata fileref="&path;using-setup-misc-behavior.png" format="PNG" /> + </imageobject></inlinemediaobject> + </para> + +</sect3> + +<!-- +Local Variables: +mode: sgml +sgml-omittag: nil +sgml-shorttag: t +End: +--> diff --git a/digikam/using-setup-misc-behavior.png b/digikam/using-setup-misc-behavior.png new file mode 100644 index 0000000..d6b2be2 Binary files /dev/null and b/digikam/using-setup-misc-behavior.png differ diff --git a/digikam/using-setup-misc.docbook b/digikam/using-setup-misc.docbook index 2aed96b..63b50af 100644 --- a/digikam/using-setup-misc.docbook +++ b/digikam/using-setup-misc.docbook @@ -1,29 +1,30 @@ <sect2 id="using-setup-misc"> <title>Miscellaneous Settings</title> - <para> - With the <guilabel>Confirm when moving items to trash</guilabel> setting you can set the verbosity of &digikam; when you delete a photograph or an Album. See <link linkend="using-deleteimage">Deleting a Photograph</link> and <link linkend="using-deletealbum">Deleting an Album</link> sections for more details. - </para> + <sect3 id="using-setup-misc-General"> + <title>General Settings</title> - <para> - The editorial changes done through the right sidebar can be quietly applied by &digikam; when setting the <guilabel>Apply changes in the right sidebar without confirmation</guilabel> option. Otherwise the changes must be applied by pressing the <guilabel>Apply changes</guilabel> button. - </para> + <para> + With the <guilabel>Confirm when moving items to trash</guilabel> setting you can set the verbosity of &digikam; when you delete a photograph or an Album. See <link linkend="using-deleteimage">Deleting a Photograph</link> and <link linkend="using-deletealbum">Deleting an Album</link> sections for more details. + </para> - <para> - You can also switch off the display of the splash screen when &digikam; loads. This may speed up the start time of &digikam; slightly. - </para> + <para> + The editorial changes done through the right sidebar can be quietly applied by &digikam; when setting the <guilabel>Apply changes in the right sidebar without confirmation</guilabel> option. Otherwise the changes must be applied by pressing the <guilabel>Apply changes</guilabel> button. + </para> - <anchor id="rescan-items" /> + <para> + You can also switch off the display of the splash screen when &digikam; loads. This may speed up the start time of &digikam; slightly. + </para> - <para> - <guilabel>Scan for new items at startup</guilabel> option will force &digikam; to scan the album library tree for new items added or removed between &digikam; sessions. This may slow down the start time of &digikam;. If any items have been removed from album library, &digikam; will ask you confirmation before to remove definitely item references in database. - </para> + <anchor id="rescan-items" /> - <para> - <inlinemediaobject><imageobject> - <imagedata fileref="&path;using-setup-misc.png" format="PNG" /> - </imageobject></inlinemediaobject> - </para> + <para> + <guilabel>Scan for new items at startup</guilabel> option will force &digikam; to scan the album library tree for new items added or removed between &digikam; sessions. This may slow down the start time of &digikam;. If any items have been removed from album library, &digikam; will ask you confirmation before to remove definitely item references in database. + </para> + + </sect3> + + &doc-using-setup-misc-behavior; </sect2> diff --git a/digikam/using-setup-misc.png b/digikam/using-setup-misc.png deleted file mode 100644 index a2abab3..0000000 Binary files a/digikam/using-setup-misc.png and /dev/null differ diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 64813b8..6683f62 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -33,6 +33,7 @@ <!ENTITY doc-using-setup-cm SYSTEM "../digikam/using-setup-cm.docbook"> <!ENTITY doc-using-setup-slideshow SYSTEM "../digikam/using-setup-slideshow.docbook"> <!ENTITY doc-using-setup-theme SYSTEM "../digikam/using-setup-theme.docbook"> + <!ENTITY doc-using-setup-misc-behavior SYSTEM "../digikam/using-setup-misc-behavior.docbook"> <!ENTITY doc-editor-photoediting SYSTEM "../digikam/editor-photoediting.docbook"> @@ -222,7 +223,22 @@ &doc-using-setup-editor-raw; &doc-using-setup-cm; &doc-using-setup-slideshow; - <!-- &doc-using-setup-misc; --> + + <sect2 id="using-setup-misc"> + <title>Miscellaneous Settings</title> + + <sect3 id="using-setup-misc-General"> + <title>General Settings</title> + <para> + TODO + </para> + + </sect3> + + &doc-using-setup-misc-behavior; + + </sect2> + &doc-using-setup-theme; </sect1>
