[digikam-doc] digikam: merge album mimetype into album settings.
Gilles Caulier
caulier.gilles at gmail.com
Sun Sep 4 16:05:10 UTC 2016
Git commit bfaf57893a8f5b1438b66b9962ea00ce3a94e24b by Gilles Caulier.
Committed on 04/09/2016 at 16:04.
Pushed by cgilles into branch 'master'.
merge album mimetype into album settings.
Update screenshots
M +0 -1 digikam/index.docbook
A +- -- digikam/using-setup-album-categories.png
D +- -- digikam/using-setup-album-category.png
A +- -- digikam/using-setup-album-mimetypes.png
M +95 -37 digikam/using-setup-album.docbook
D +- -- digikam/using-setup-mimetypes.png
M +0 -1 digikam/using-setup.docbook
http://commits.kde.org/digikam-doc/bfaf57893a8f5b1438b66b9962ea00ce3a94e24b
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 08c63c0..5a2eaf9 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -64,7 +64,6 @@
<!ENTITY doc-using-setup-metadata-views SYSTEM "using-setup-metadata-views.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-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">
diff --git a/digikam/using-setup-album-categories.png b/digikam/using-setup-album-categories.png
new file mode 100644
index 0000000..8550a1c
Binary files /dev/null and b/digikam/using-setup-album-categories.png differ
diff --git a/digikam/using-setup-album-category.png b/digikam/using-setup-album-category.png
deleted file mode 100644
index 7d9dabc..0000000
Binary files a/digikam/using-setup-album-category.png and /dev/null differ
diff --git a/digikam/using-setup-album-mimetypes.png b/digikam/using-setup-album-mimetypes.png
new file mode 100644
index 0000000..0275230
Binary files /dev/null and b/digikam/using-setup-album-mimetypes.png differ
diff --git a/digikam/using-setup-album.docbook b/digikam/using-setup-album.docbook
index 2e8938b..45217e0 100644
--- a/digikam/using-setup-album.docbook
+++ b/digikam/using-setup-album.docbook
@@ -1,61 +1,119 @@
<sect2 id="using-setup-album">
<title>Album Settings</title>
- <para>
- The Album settings control how the main application will behave.
- </para>
+ <sect3 id="using-setup-album-iconview">
+ <title>Icon-View Settings</title>
- <para>
+ <para>
+ TODO
+ </para>
- <inlinemediaobject><imageobject>
- <imagedata fileref="&path;using-setup-album-iconview.png" format="PNG" />
- </imageobject></inlinemediaobject>
+ <para>
+ The <guilabel>Thumbnails</guilabel> options are described in the <link linkend="using-imageviewing">Images</link> section.
+ </para>
- </para>
+ <para>
- <para>
- The <guilabel>Album Library Path</guilabel> is the location on your hard disk where &digikam; will store all of the Albums. If you change this location without manually moving all of the Albums on the hard disk, &digikam; assumes that there are no existing Albums and will generate a new database at the new location. Your old Albums will not be altered but you will need to change the Album Library Path back to the old location to access them. If you are not sure of what you are doing it is best not to change this location.
- </para>
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-iconview.png" format="PNG" />
+ </imageobject></inlinemediaobject>
- <para>
- The <guilabel>Thumbnails</guilabel> options are described in the <link linkend="using-imageviewing">Images</link> section.
- </para>
+ </para>
- <para>
- The <guilabel>Click action</guilabel> can be set to <guilabel>Show embedded preview</guilabel> or <guilabel>Start image editor</guilabel>. You herewith define the default behavior of &digikam; when you click on an image item in the main view.
- </para>
+ </sect3>
- <para>
+ <sect3 id="using-setup-album-folderview">
+ <title>Folder View Settings</title>
- <inlinemediaobject><imageobject>
- <imagedata fileref="&path;using-setup-album-folderview.png" format="PNG" />
- </imageobject></inlinemediaobject>
+ <para>
+ TODO
+ </para>
- </para>
+ <para>
- <para>
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-folderview.png" format="PNG" />
+ </imageobject></inlinemediaobject>
- <inlinemediaobject><imageobject>
- <imagedata fileref="&path;using-setup-album-preview.png" format="PNG" />
- </imageobject></inlinemediaobject>
+ </para>
- </para>
+ </sect3>
- <para>
+ <sect3 id="using-setup-album-preview">
+ <title>Album View Preview Settings</title>
- <inlinemediaobject><imageobject>
- <imagedata fileref="&path;using-setup-album-fullscreen.png" format="PNG" />
- </imageobject></inlinemediaobject>
+ <para>
+ TODO
+ </para>
- </para>
+ <para>
+ The <guilabel>Click action</guilabel> can be set to <guilabel>Show embedded preview</guilabel> or <guilabel>Start image editor</guilabel>. You herewith define the default behavior of &digikam; when you click on an image item in the main view.
+ </para>
- <para>
+ <para>
- <inlinemediaobject><imageobject>
- <imagedata fileref="&path;using-setup-album-category.png" format="PNG" />
- </imageobject></inlinemediaobject>
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-preview.png" format="PNG" />
+ </imageobject></inlinemediaobject>
- </para>
+ </para>
+
+ </sect3>
+
+ <sect3 id="using-setup-album-fullscreen">
+ <title>Album View Full-Screen Settings</title>
+
+ <para>
+ TODO
+ </para>
+
+ <para>
+
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-fullscreen.png" format="PNG" />
+ </imageobject></inlinemediaobject>
+
+ </para>
+
+ </sect3>
+
+ <sect3 id="using-setup-album-mimetype">
+ <title>Album Mime Type Settings</title>
+
+ <para>
+ &digikam; can understand lots of different image file types as well as some video and audio formats. To control which types of files &digikam; will try to display you can add or remove file extensions from these lists. Any files that are in the &digikam; Album folders that do not match these extensions will be ignored by &digikam;.
+ </para>
+
+ <note><para>
+ The default settings can be easily restored by clicking on the update buttons to the right of each category.
+ </para></note>
+
+ <para>
+
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-mimetypes.png" format="PNG" />
+ </imageobject></inlinemediaobject>
+
+ </para>
+
+ </sect3>
+
+ <sect3 id="using-setup-album-categories">
+ <title>Album Categories Settings</title>
+
+ <para>
+ TODO
+ </para>
+
+ <para>
+
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="&path;using-setup-album-categories.png" format="PNG" />
+ </imageobject></inlinemediaobject>
+
+ </para>
+
+ </sect3>
</sect2>
diff --git a/digikam/using-setup-mimetypes.png b/digikam/using-setup-mimetypes.png
deleted file mode 100644
index 5f37785..0000000
Binary files a/digikam/using-setup-mimetypes.png and /dev/null differ
diff --git a/digikam/using-setup.docbook b/digikam/using-setup.docbook
index aac66d2..bbae8c6 100644
--- a/digikam/using-setup.docbook
+++ b/digikam/using-setup.docbook
@@ -8,7 +8,6 @@
&doc-using-setup-tooltip;
&doc-using-setup-metadata;
&doc-using-setup-templates;
- &doc-using-setup-mimetype;
&doc-using-setup-editor-iface;
&doc-using-setup-editor-save;
&doc-using-setup-editor-version;
More information about the kde-doc-english
mailing list