[kaffeine] /: Improvement of the Kaffeine doc by adding a chapter for the menu bar items.

Antoni Bella Pérez null at kde.org
Sun Nov 26 12:47:57 UTC 2017


Git commit ee74bc1a4dd2ee18b25372d665f4cfa98a2f2414 by Antoni Bella Pérez.
Committed on 26/11/2017 at 12:47.
Pushed by bellaperez into branch 'master'.

Improvement of the Kaffeine doc by adding a chapter for the menu bar items.

A  +-    --    doc/application-x-subrip.png
A  +-    --    doc/audio-volume-high.png
A  +-    --    doc/audio-volume-low.png
A  +-    --    doc/audio-volume-medium.png
A  +-    --    doc/audio-volume-muted.png
A  +-    --    doc/configure-shortcuts.png
A  +-    --    doc/configure.png
A  +-    --    doc/dialog-information.png
A  +-    --    doc/document-open-folder.png
A  +-    --    doc/document-open-recent.png
A  +-    --    doc/document-save-as.png
M  +-    --    doc/document-save.png
A  +-    --    doc/edit-clear-list.png
A  +-    --    doc/edit-delete.png
A  +-    --    doc/edit-rename.png
A  +-    --    doc/format-justify-center.png
A  +-    --    doc/go-jump.png
A  +-    --    doc/gtk-quit.png
M  +669  -1    doc/index.docbook
A  +-    --    doc/list-add.png
A  +-    --    doc/media-optical-audio.png
A  +-    --    doc/media-optical-video.png
A  +-    --    doc/media-optical.png
M  +-    --    doc/media-playback-pause.png
M  +-    --    doc/media-playback-start.png
A  +-    --    doc/media-playback-stop.png
A  +-    --    doc/media-playlist-repeat.png
A  +-    --    doc/media-playlist-shuffle.png
M  +-    --    doc/media-record.png
A  +-    --    doc/media-skip-backward.png
A  +-    --    doc/media-skip-forward.png
D  +-    --    doc/startwindow.png
A  +-    --    doc/text-html.png
A  +-    --    doc/video-television.png
A  +-    --    doc/view-fullscreen.png
A  +-    --    doc/view-list-details.png
A  +-    --    doc/view-pim-calendar.png
A  +-    --    doc/view-restore.png
M  +2    -2    src/mainwindow.cpp
M  +1    -1    src/playlist/playlisttab.cpp

https://commits.kde.org/kaffeine/ee74bc1a4dd2ee18b25372d665f4cfa98a2f2414

diff --git a/doc/application-x-subrip.png b/doc/application-x-subrip.png
new file mode 100644
index 0000000..d592247
Binary files /dev/null and b/doc/application-x-subrip.png differ
diff --git a/doc/audio-volume-high.png b/doc/audio-volume-high.png
new file mode 100644
index 0000000..917364f
Binary files /dev/null and b/doc/audio-volume-high.png differ
diff --git a/doc/audio-volume-low.png b/doc/audio-volume-low.png
new file mode 100644
index 0000000..7f8986d
Binary files /dev/null and b/doc/audio-volume-low.png differ
diff --git a/doc/audio-volume-medium.png b/doc/audio-volume-medium.png
new file mode 100644
index 0000000..34cb503
Binary files /dev/null and b/doc/audio-volume-medium.png differ
diff --git a/doc/audio-volume-muted.png b/doc/audio-volume-muted.png
new file mode 100644
index 0000000..ac2e9c8
Binary files /dev/null and b/doc/audio-volume-muted.png differ
diff --git a/doc/configure-shortcuts.png b/doc/configure-shortcuts.png
new file mode 100644
index 0000000..6501836
Binary files /dev/null and b/doc/configure-shortcuts.png differ
diff --git a/doc/configure.png b/doc/configure.png
new file mode 100644
index 0000000..fedf74d
Binary files /dev/null and b/doc/configure.png differ
diff --git a/doc/dialog-information.png b/doc/dialog-information.png
new file mode 100644
index 0000000..cfcb72e
Binary files /dev/null and b/doc/dialog-information.png differ
diff --git a/doc/document-open-folder.png b/doc/document-open-folder.png
new file mode 100644
index 0000000..81716c1
Binary files /dev/null and b/doc/document-open-folder.png differ
diff --git a/doc/document-open-recent.png b/doc/document-open-recent.png
new file mode 100644
index 0000000..4209fa8
Binary files /dev/null and b/doc/document-open-recent.png differ
diff --git a/doc/document-save-as.png b/doc/document-save-as.png
new file mode 100644
index 0000000..5688e25
Binary files /dev/null and b/doc/document-save-as.png differ
diff --git a/doc/document-save.png b/doc/document-save.png
index 5e813d1..b97b6a9 100644
Binary files a/doc/document-save.png and b/doc/document-save.png differ
diff --git a/doc/edit-clear-list.png b/doc/edit-clear-list.png
new file mode 100644
index 0000000..4e3fc49
Binary files /dev/null and b/doc/edit-clear-list.png differ
diff --git a/doc/edit-delete.png b/doc/edit-delete.png
new file mode 100644
index 0000000..2d77a2a
Binary files /dev/null and b/doc/edit-delete.png differ
diff --git a/doc/edit-rename.png b/doc/edit-rename.png
new file mode 100644
index 0000000..924224e
Binary files /dev/null and b/doc/edit-rename.png differ
diff --git a/doc/format-justify-center.png b/doc/format-justify-center.png
new file mode 100644
index 0000000..c9eb729
Binary files /dev/null and b/doc/format-justify-center.png differ
diff --git a/doc/go-jump.png b/doc/go-jump.png
new file mode 100644
index 0000000..9f9ec26
Binary files /dev/null and b/doc/go-jump.png differ
diff --git a/doc/gtk-quit.png b/doc/gtk-quit.png
new file mode 100644
index 0000000..abab448
Binary files /dev/null and b/doc/gtk-quit.png differ
diff --git a/doc/index.docbook b/doc/index.docbook
index ab94346..579aa4a 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -47,7 +47,7 @@
 </copyright>
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2017-11-11</date>
+<date>2017-11-26</date>
 <releaseinfo>&kaffeine; 2.0.14</releaseinfo>
 
 <!-- Abstract about this handbook -->
@@ -695,7 +695,675 @@ the recording schedule.
 </para>
 
 </sect1>
+</chapter>
+
+<chapter id="kaffeine-menubar">
+<title>The &kaffeine; menubar</title>
+
+<sect1 id="file-menu">
+<title>The File Menu</title>
+
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Open...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="document-open-folder.png" format="PNG"/></imageobject> <action>Opens the file dialog</action> and allows you to select a local file to play.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Open URL...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="text-html.png" format="PNG"/></imageobject> <action>Open a dialog for text input</action>, so you can enter the &URL; of a supported external media stream.
+<!-- TODO: Must add supported Streamings -->
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Open Recent</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="document-open-recent.png" format="PNG"/></imageobject> <action>Offers a drop-down list to open a local recent resource</action>. It has an <guimenuitem>Clear List</guimenuitem> option to clear that list.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Play Audio &CD;</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-optical-audio.png" format="PNG"/></imageobject> <action>Select the playback of an Audio &CD;</action> that should already be in the reading drive.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Play Video &CD;</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-optical-video.png" format="PNG"/></imageobject> <action>Select the playback of a Video &CD;</action> that should already be in the reading drive.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Play &DVD;</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-optical.png" format="PNG"/></imageobject> <action>Select the playback of a &DVD;</action> that should already be in the reading drive.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Play &DVD; Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-optical.png" format="PNG"/></imageobject> <action>Opens the file dialog</action> and allows you to select a &DVD; folder to play. This folder contains the raw data found on the &DVD;.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Quit</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="gtk-quit.png" format="PNG"/></imageobject> <action>Quits</action> &kaffeine;.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</sect1>
+
+<sect1 id="playback-menu">
+<title>The Playback Menu</title>
+
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&PgUp;</keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Previous</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-skip-backward.png" format="PNG"/></imageobject> If you playback two streams or more in one session, <action>will select the previous one</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Space;</keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Play\Pause</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-playback-start.png" format="PNG"/></imageobject> and <imageobject><imagedata fileref="media-playback-pause.png" format="PNG"/></imageobject> icons. <action>With A check box for play a stream or pause</action> what you are watching. On a television's stream will proceed to record it, this is known as <ulink url="https://en.wikipedia.org/wiki/Time_shifting">time shifting</ulink>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Backspace;</keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Stop</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-playback-stop.png" format="PNG"/></imageobject> <action>Stop a stream</action> what you are watching.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&PgDn;</keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Next</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-skip-forward.png" format="PNG"/></imageobject> If you playback two streams or more in one session and you are watching the previous one, <action>will select the next one</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>F</keycap></keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Full Screen Mode\Exit Full Screen Mode</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="view-fullscreen.png" format="PNG"/></imageobject> and <imageobject><imagedata fileref="view-restore.png" format="PNG"/></imageobject> icons. <action>Switch the full screen mode</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>.</keycap></keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Minimal Mode\Exit Minimal Mode</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="view-restore.png" format="PNG"/></imageobject> and <imageobject><imagedata fileref="view-fullscreen.png" format="PNG"/></imageobject> icons. <action>Switch the minimal mode</action>. A &GUI; mode in a window, where we only have contextual menu and keyboard shortcuts.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Subtitle</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Offers a drop-down list with <action>options related to the subtitle stream(s)</action>.
+</para>
+
+  <variablelist>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Subtitle</guisubmenu>
+  <guimenuitem>off\<replaceable>Name-of-subtitle</replaceable></guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <action>Select the avaible subtitle</action> from this drop-down list. These subtitles channels will vary depending on the content of the source stream.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Subtitle</guisubmenu>
+  <guimenuitem>Add subtitle file</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="application-x-subrip.png" format="PNG"/></imageobject> This option is for <action>add a local subtitle file</action> through a file dialog.
+  </para></listitem>
+  </varlistentry>
+
+</variablelist>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Audio</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Offers a drop-down list with <action>options related to the audio stream(s)</action>.
+</para>
 
+  <variablelist>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Audio</guisubmenu>
+  <guimenuitem>Audio Device</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  Offers a drop-down list shows the <action>available audio devices</action>.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Audio</guisubmenu>
+  <guimenuitem>Increase Volume</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="audio-volume-high.png" format="PNG"/></imageobject> Raise the audio volume.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Audio</guisubmenu>
+  <guimenuitem>Decrease Volume</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="audio-volume-low.png" format="PNG"/></imageobject> Lower the audio volume.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Audio</guisubmenu>
+  <guimenuitem>Mute Volume</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="audio-volume-medium.png" format="PNG"/></imageobject> and <imageobject><imagedata fileref="audio-volume-muted.png" format="PNG"/></imageobject> icons. Silence the audio volume and return it.
+  </para></listitem>
+  </varlistentry>
+
+</variablelist>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Video</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Offers a drop-down list with <action>options related to the video stream(s)</action>.
+</para>
+
+  <variablelist>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Video</guisubmenu>
+  <guimenuitem>Deinterlace</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="format-justify-center.png" format="PNG"/></imageobject> Whith a check box to verify your selection. <action>Is the process of converting interlaced video</action>, such as common analog television signals and more. See <ulink url="https://en.wikipedia.org/wiki/Deinterlacing">Wikipedia</ulink> article for more details.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Video</guisubmenu>
+  <guimenuitem>Aspect Ratio</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <action>Offers a drop-down list with disponible aspect ratios</action>, more an <guimenuitem>Automatic</guimenuitem> option. The <ulink url="https://en.wikipedia.org/wiki/Aspect_ratio_(image)">aspect ratio of an image</ulink> describes the proportional relationship between its width and height.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Video</guisubmenu>
+  <guimenuitem>Video size</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <action>Offers a drop-down list with disponible video sizes</action>. Change the size of the image by a percentage, more <guimenuitem>Automatic</guimenuitem> and <guimenuitem>Original Size</guimenuitem> options.
+  </para></listitem>
+  </varlistentry>
+
+</variablelist>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo>
+</shortcut>
+<guimenu>Playback</guimenu>
+<guimenuitem>Jump to Position</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="go-jump.png" format="PNG"/></imageobject> <action>Offers a spin box for setting the desired time point to which you want to go</action>; with hours, minutes and seconds.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Skip</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<action>Offers a drop-down list with four predefined jump times</action>. With the following options:
+</para>
+
+  <variablelist>
+
+  <varlistentry>
+  <term><menuchoice>
+  <shortcut>
+  <keycombo action="simul">&Shift;&Left;</keycombo>
+  </shortcut>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Skip</guisubmenu>
+  <guimenuitem>Skip 60s Backward</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="media-skip-backward.png" format="PNG"/></imageobject> <action>It goes 60 seconds back</action>.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <shortcut>
+  <keycombo action="simul">&Left;</keycombo>
+  </shortcut>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Skip</guisubmenu>
+  <guimenuitem>Skip 15s Backward</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="media-skip-backward.png" format="PNG"/></imageobject> <action>It goes 15 seconds back</action>.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <shortcut>
+  <keycombo action="simul">&Right;</keycombo>
+  </shortcut>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Skip</guisubmenu>
+  <guimenuitem>Skip 15s Forward</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="media-skip-forward.png" format="PNG"/></imageobject> <action>It goes 15 seconds forward</action>.
+  </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+  <term><menuchoice>
+  <shortcut>
+  <keycombo action="simul">&Shift;&Right;</keycombo>
+  </shortcut>
+  <guimenu>Playback</guimenu>
+  <guisubmenu>Skip</guisubmenu>
+  <guimenuitem>Skip 60s Forward</guimenuitem>
+  </menuchoice></term>
+  <listitem><para>
+  <imageobject><imagedata fileref="media-skip-forward.png" format="PNG"/></imageobject> <action>It goes 60 seconds forward</action>.
+  </para></listitem>
+  </varlistentry>
+
+</variablelist>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>DVD Menu</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-optical-video.png" format="PNG"/></imageobject> <action>Start with the original &DVD; graphic menu</action>. That is explored using the cursor keys and the mouse. See <ulink url="https://en.wikipedia.org/wiki/DVD-Video">Wikipedia</ulink> article for more details.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Title</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<action>The &DVD; content is divided into titles to easy navigation</action>. From here you can go directly.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Chapter</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<action>The &DVD; content is divided into chapters to easy navigation</action>. From here you can go directly.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playback</guimenu>
+<guimenuitem>Angle</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<action>A variant of the chapters: it is possible that they have included several versions (called <quote>angles</quote>) of certain scenes</action>. From here you can go directly.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</sect1>
+
+<sect1 id="playlist-menu">
+<title>The Playlist Menu</title>
+
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Repeat</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-playlist-repeat.png" format="PNG"/></imageobject> A check box to <action>replay in a loop the file(s)</action> that are in the playlist.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Random</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="media-playlist-shuffle.png" format="PNG"/></imageobject> A check box to <action>replay randomly the files</action> that are in the playlist until all of them have been played.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Clear</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="edit-clear-list.png" format="PNG"/></imageobject> <action>Erase all entries in the playlist</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>New</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="list-add.png" format="PNG"/></imageobject> <action>Create a new playlist</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Rename</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="edit-rename.png" format="PNG"/></imageobject> <action>Rename the current playlist</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Remove</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="edit-delete.png" format="PNG"/></imageobject> <action>Remove the current playlist</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Save</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="document-save.png" format="PNG"/></imageobject> <action>Save the current playlist</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo>
+</shortcut>
+<guimenu>Playlist</guimenu>
+<guimenuitem>Save As...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="document-save-as.png" format="PNG"/></imageobject> <action>Save the current playlist with a new name</action>.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</sect1>
+
+<sect1 id="television-menu">
+<title>The Television Menu</title>
+
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>C</keycap></keycombo>
+</shortcut>
+<guimenu>Television</guimenu>
+<guimenuitem>Channels</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>
+<imageobject><imagedata fileref="video-television.png" format="PNG"/></imageobject> A settings panel will appear for <action>set the channels</action> corresponding to your area. See <link linkend="dtv-channel-setup">Digital TV channel setup</link> section for more details.
+</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>G</keycap></keycombo>
+</shortcut>
+<guimenu>Television</guimenu>
+<guimenuitem>Program Guide</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="view-list-details.png" format="PNG"/></imageobject> A window will appear for <action>manage the program guide</action>. See <link linkend="program-guide">Program Guide</link> section for more details.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>O</keycap></keycombo>
+</shortcut>
+<guimenu>Television</guimenu>
+<guimenuitem>OSD</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="dialog-information.png" format="PNG"/></imageobject> <action>Show the on screen display infobox on the playback window during three seconds</action> with program guide information on the current and next program. Double-clicking on it to see extended information about the current program, and then click again to remove this infobox. See <ulink url="https://en.wikipedia.org/wiki/On-screen_display">Wikipedia</ulink> article for more details.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>R</keycap></keycombo>
+</shortcut>
+<guimenu>Television</guimenu>
+<guimenuitem>Recording Schedule</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="view-pim-calendar.png" format="PNG"/></imageobject> A window will appear for <action>manage the recording(s) scheduled</action>. See <link linkend="recording-schedule">Recording Schedule</link> section for more details.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Television</guimenu>
+<guimenuitem>Instant Record</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="document-save.png" format="PNG"/></imageobject> Whith a check box to verify your selection. <action>Start instantly recording of the stream that is being played</action>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Television</guimenu>
+<guimenuitem>Configure Television...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="configure.png" format="PNG"/></imageobject> A window will appear for <action>setting the parameters that manage the <acronym>DVB</acronym> device(s)</action>. See <link linkend="digital-tv">Digital TV configuration</link> section for more details.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</sect1>
+
+<sect1 id="settings-menu">
+<title>The Settings Menu</title> 
+
+<para>
+In order to simplify the use of the &kaffeine;, this menu only contains two menú items:
+</para>
+
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Shortcuts...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="configure-shortcuts.png" format="PNG"/></imageobject> Allows you to enable, disable, and modify keyboard shortcuts. For more information, see the section called <quote>Using and Customizing Shortcuts</quote>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure &kaffeine;...</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+<imageobject><imagedata fileref="configure.png" format="PNG"/></imageobject> Opens the configuration panel.
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+</sect1>
+
+<sect1 id="help-menu">
+<title>The Help Menu</title> 
+<para>
+&kaffeine; has the common &kde; <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals.
+</para>
+</sect1>
 </chapter>
 
 <chapter id="credits">
diff --git a/doc/list-add.png b/doc/list-add.png
new file mode 100644
index 0000000..a4e9fa0
Binary files /dev/null and b/doc/list-add.png differ
diff --git a/doc/media-optical-audio.png b/doc/media-optical-audio.png
new file mode 100644
index 0000000..9920031
Binary files /dev/null and b/doc/media-optical-audio.png differ
diff --git a/doc/media-optical-video.png b/doc/media-optical-video.png
new file mode 100644
index 0000000..6a8d1aa
Binary files /dev/null and b/doc/media-optical-video.png differ
diff --git a/doc/media-optical.png b/doc/media-optical.png
new file mode 100644
index 0000000..db93eb4
Binary files /dev/null and b/doc/media-optical.png differ
diff --git a/doc/media-playback-pause.png b/doc/media-playback-pause.png
index 2377717..c233d6a 100644
Binary files a/doc/media-playback-pause.png and b/doc/media-playback-pause.png differ
diff --git a/doc/media-playback-start.png b/doc/media-playback-start.png
index 1113056..cc567d6 100644
Binary files a/doc/media-playback-start.png and b/doc/media-playback-start.png differ
diff --git a/doc/media-playback-stop.png b/doc/media-playback-stop.png
new file mode 100644
index 0000000..859a2ab
Binary files /dev/null and b/doc/media-playback-stop.png differ
diff --git a/doc/media-playlist-repeat.png b/doc/media-playlist-repeat.png
new file mode 100644
index 0000000..2366986
Binary files /dev/null and b/doc/media-playlist-repeat.png differ
diff --git a/doc/media-playlist-shuffle.png b/doc/media-playlist-shuffle.png
new file mode 100644
index 0000000..2ae7675
Binary files /dev/null and b/doc/media-playlist-shuffle.png differ
diff --git a/doc/media-record.png b/doc/media-record.png
index 8bc8573..0f2d3ec 100644
Binary files a/doc/media-record.png and b/doc/media-record.png differ
diff --git a/doc/media-skip-backward.png b/doc/media-skip-backward.png
new file mode 100644
index 0000000..d8ef3ab
Binary files /dev/null and b/doc/media-skip-backward.png differ
diff --git a/doc/media-skip-forward.png b/doc/media-skip-forward.png
new file mode 100644
index 0000000..9519b86
Binary files /dev/null and b/doc/media-skip-forward.png differ
diff --git a/doc/startwindow.png b/doc/startwindow.png
deleted file mode 100644
index dd63ee7..0000000
Binary files a/doc/startwindow.png and /dev/null differ
diff --git a/doc/text-html.png b/doc/text-html.png
new file mode 100644
index 0000000..b09a8ef
Binary files /dev/null and b/doc/text-html.png differ
diff --git a/doc/video-television.png b/doc/video-television.png
new file mode 100644
index 0000000..4679b9f
Binary files /dev/null and b/doc/video-television.png differ
diff --git a/doc/view-fullscreen.png b/doc/view-fullscreen.png
new file mode 100644
index 0000000..83688a1
Binary files /dev/null and b/doc/view-fullscreen.png differ
diff --git a/doc/view-list-details.png b/doc/view-list-details.png
new file mode 100644
index 0000000..5946e94
Binary files /dev/null and b/doc/view-list-details.png differ
diff --git a/doc/view-pim-calendar.png b/doc/view-pim-calendar.png
new file mode 100644
index 0000000..8d8ca47
Binary files /dev/null and b/doc/view-pim-calendar.png differ
diff --git a/doc/view-restore.png b/doc/view-restore.png
new file mode 100644
index 0000000..76de403
Binary files /dev/null and b/doc/view-restore.png differ
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7e2aa85..40759be 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -123,7 +123,7 @@ StartTab::StartTab(MainWindow *mainWindow)
 	connect(button, SIGNAL(clicked()), mainWindow, SLOT(openAudioCd()));
 	gridLayout->addWidget(button, 0, 1);
 
-	button = addShortcut(i18n("&3 Play Video CD"), QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical")), this);
+	button = addShortcut(i18n("&3 Play Video CD"), QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical-video")), this);
 	button->setShortcut(Qt::Key_3);
 	button->setWhatsThis(i18n("Start playing a Video CD. It assumes that the CD is already there at the CD drive"));
 	connect(button, SIGNAL(clicked()), mainWindow, SLOT(openVideoCd()));
@@ -227,7 +227,7 @@ void MainWindow::run()
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openAudioCd()));
 	menu->addAction(collection->addAction(QLatin1String("file_play_audiocd"), action));
 
-	action = new QAction(QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical")), i18n("Play Video CD"), collection);
+	action = new QAction(QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical-video")), i18n("Play Video CD"), collection);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openVideoCd()));
 	menu->addAction(collection->addAction(QLatin1String("file_play_videocd"), action));
 
diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
index 99839fb..01f1290 100644
--- a/src/playlist/playlisttab.cpp
+++ b/src/playlist/playlisttab.cpp
@@ -413,7 +413,7 @@ PlaylistTab::PlaylistTab(QMenu *menu, KActionCollection *collection, MediaWidget
 
 	menu->addSeparator();
 
-	QAction *newAction = new QAction(QIcon::fromTheme(QLatin1String("list-add"), QIcon(":list-add")), i18nc("@action", "New"), this);
+	QAction *newAction = new QAction(QIcon::fromTheme(QLatin1String("list-add"), QIcon(":list-add")), i18nc("@action:inmenu playlist", "New"), this);
 	connect(newAction, SIGNAL(triggered(bool)), this, SLOT(newPlaylist()));
 	menu->addAction(collection->addAction(QLatin1String("playlist_new"), newAction));
 


More information about the kde-doc-english mailing list