Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Sep 29 17:51:00 CEST 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-09-15 17:43:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-09-25 18:59:32.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 18:59:27 CEST 2008 - dmueller@suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.1.1.tar.bz2 New: ---- kdemultimedia-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.bM8932/_old 2008-09-29 17:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bM8932/_new 2008-09-29 17:50:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 4.1.1) +# spec file for package kdemultimedia4 (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.1.1 -Release: 11 +Version: 4.1.2 +Release: 1 Source0: kdemultimedia-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -301,6 +301,9 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Sep 25 2008 dmueller@suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php * Mon Sep 15 2008 dmueller@suse.de - fix requires * Thu Aug 28 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.bM8932/_old 2008-09-29 17:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bM8932/_new 2008-09-29 17:50:50.000000000 +0200 @@ -1,7 +1,15 @@ -package: kdemultimedia-4.1.1.tar.bz2 +package: kdemultimedia-4.1.2.tar.bz2 kdemod: kdemultimedia --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 853806 -+svn di between //tags/KDE/4.1.1/kdemultimedia and //tags/KDE/4.1.1/kdemultimedia ++current HEAD: ++svn di between //tags/KDE/4.1.2/kdemultimedia and //branches/KDE/4.1/kdemultimedia + +Eigenschaftsänderungen: . +___________________________________________________________________ +Gelöscht: svn:mergeinfo +Hinzugefügt: svn:externals + + + + ++++++ kdemultimedia-4.1.1.tar.bz2 -> kdemultimedia-4.1.2.tar.bz2 ++++++ Files old/kdemultimedia-4.1.1/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/dragonplayer/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/dragonplayer/index.docbook new/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook --- old/kdemultimedia-4.1.1/doc/dragonplayer/index.docbook 2008-06-03 11:34:57.000000000 +0200 +++ new/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -112,8 +112,6 @@ </chapter> - - <chapter id="commands"> <title>Menu and Command Reference</title> @@ -123,7 +121,7 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>Ctrl</keycap><keycap>o</keycap></keycombo> +<keycombo>&Ctrl;<keycap>O</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> <guimenuitem>Play Media...</guimenuitem> @@ -137,16 +135,27 @@ <keycombo><keycap>Space</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> -<guimenuitem>Play/Pause</guimenuitem> +<guimenuitem>Play</guimenuitem> </menuchoice></term> -<listitem><para><action>If a movie is loaded, this option allows you to pause or resume playback.</action></para></listitem> +<listitem><para><action>If a movie is loaded, this option allows you to pause playback.</action></para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<shortcut> +<keycombo><keycap>S</keycap></keycombo> +</shortcut> +<guimenu>Play</guimenu> +<guimenuitem>Stop</guimenuitem> +</menuchoice></term> +<listitem><para><action>If a movie is loaded, this option allows you to resume playback.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>Ctrl</keycap><keycap>q</keycap></keycombo> +<keycombo>&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>Play</guimenu> <guimenuitem>Quit</guimenuitem> @@ -163,6 +172,9 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycombo><keycap>F</keycap></keycombo> +</shortcut> <guimenu>Settings</guimenu> <guimenuitem>Full Screen Mode</guimenuitem> </menuchoice></term> @@ -174,7 +186,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Aspect Ratio</guimenuitem> +<guisubmenu>Aspect Ratio</guisubmenu> </menuchoice></term> <listitem><para><action>This menu lets you pick the aspect ratio of the playing movie. The aspect ratio is width of movie compared to the height.</action></para></listitem> </varlistentry> @@ -182,7 +194,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Subtitles</guimenuitem> +<guisubmenu>Subtitles</guisubmenu> </menuchoice></term> <listitem><para><action> This menu is active if there are any subtitles available from the currently playing movie. Note that it may take a few seconds of playback before the subtitles become available. @@ -192,7 +204,7 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Audio Channels</guimenuitem> +<guisubmenu>Audio Channels</guisubmenu> </menuchoice></term> <listitem><para><action> This menu is active if there are any additional audio channels available. For instance, some DVDs have additional languages. Note that it may take a few seconds of playback before the audio channels become available. @@ -201,79 +213,58 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycombo><keycap>R</keycap></keycombo> +</shortcut> <guimenu>Settings</guimenu> -<guimenuitem>Configure Shortcuts...</guimenuitem> +<guimenuitem>Menu Toggle</guimenuitem> </menuchoice></term> -<listitem><para><action>Allows you to configure the &codeine; shortcuts.</action></para></listitem> +<listitem><para><action> + To be written</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Toolbars...</guimenuitem> +<guimenuitem>Videosettings</guimenuitem> </menuchoice></term> -<listitem><para><action>Allows you to configure the &codeine; what buttons are available on the toolbar.</action></para></listitem> +<listitem><para><action> + To be written +</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Show Toolbar</guimenuitem> +<guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> -<listitem><para><action>Enables or disable the main application toolbar.</action></para></listitem> +<listitem><para><action>Allows you to configure the &codeine; shortcuts.</action></para></listitem> </varlistentry> -</variablelist> -</sect1> - -<sect1 id="help_menu"> -<title>The Help Menu</title> -<variablelist> - <varlistentry> <term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>&codeine; Handbook</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term> -<listitem><para><action>Opens this help document.</action></para></listitem> +<listitem><para><action>Allows you to configure the &codeine; what buttons are available on the toolbar.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> -<shortcut> -<keycombo><keycap>Shift</keycap><keycap>F1</keycap></keycombo> -</shortcut> -<guimenu>Help</guimenu> -<guimenuitem>What's This?</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Show Toolbar</guimenuitem> </menuchoice></term> -<listitem><para><action>Activates the "What's This?" mouse cursor allowing you to click an object to get a "What's this?" tooltip.</action></para></listitem> +<listitem><para><action>Enables or disable the main application toolbar.</action></para></listitem> </varlistentry> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>Report Bug...</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the bug report tool dialog window.</action></para></listitem> -</varlistentry> +</variablelist> +</sect1> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>About &codeine;</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the About &codeine; dialog window.</action></para></listitem> -</varlistentry> +<sect1 id="help_menu"> +<title>The Help Menu</title> -<varlistentry> -<term><menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>About KDE</guimenuitem> -</menuchoice></term> -<listitem><para><action>Starts the About &kde; dialog window.</action></para></listitem> -</varlistentry> +&help.menu.documentation; -</variablelist> </sect1> @@ -379,7 +370,7 @@ <title>How to obtain &codeine;</title> <para> -&codeine; is not yet part of the &kde; project, it can be found at: +&codeine; is part of the &kde; multimedia module, it can be found at: <ulink url="http://www.dragonplayer.org">http://www.dragonplayer.org</ulink>. </para> </sect1> Files old/kdemultimedia-4.1.1/doc/juk/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/juk/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/juk/index.docbook new/kdemultimedia-4.1.2/doc/juk/index.docbook --- old/kdemultimedia-4.1.1/doc/juk/index.docbook 2008-01-05 01:02:08.000000000 +0100 +++ new/kdemultimedia-4.1.2/doc/juk/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -548,7 +548,7 @@ <para>You can select multiple files in the list view, and edit one or more fields in the tags for all files at once.</para> -<para>Use <keycap>Shift</keycap> and the &LMB; to select a contiguous +<para>Use &Shift; and the &LMB; to select a contiguous list of files, and &Ctrl; and &LMB; to select individual non-contiguous files.</para> @@ -669,7 +669,7 @@ <para>You can test your filename scheme by using the <guilabel>Current filename</guilabel> editor at the bottom of the dialog. Type in a filename of a music file, and the <guilabel>New -filename</guilabel> area will display would &juk; would rename the file as given the current +filename</guilabel> area will display how &juk; would rename the file as given the current settings. </para> </sect1> @@ -730,7 +730,7 @@ </para> <para>The Advanced Search dialog is used to create <link linkend="juk-search-playlists">Search -Playlists</link>. It allows you create a fine-grained search among the different tags of +Playlists</link>. It allows you to make a fine-grained search among the different tags of your song collection.</para> <para>At the top of the dialog, you can type in the name of your search playlist. Then, you @@ -814,7 +814,7 @@ <title>Examples of adding covers</title> -<para>So just as an example, let's say you wanted to set a cover for tracks you just ripped off of your &CD;. We'll use <quote>Alabama - Greatest Hits III</quote> for the sake of discussion. In &juk; 2.2, you could simply select any one of those tracks, and import a cover from the Internet by right-clicking on that track, and using the <menuchoice><guimenu>Tagger</guimenu> <guisubmenu>Cover Manager</guisubmenu> <guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. As a side effect of the way &juk; worked, the cover would then be immediately applied to <emphasis>all</emphasis> of the <quote>Alabama - Greatest Hits III</quote> tracks, <emphasis>whether you wanted that or not</emphasis></para> +<para>So just as an example, let's say you wanted to set a cover for tracks you just ripped off of your &CD;. We'll use <quote>Alabama - Greatest Hits III</quote> for the sake of discussion. In &juk; 2.2, you could simply select any one of those tracks, and import a cover from the Internet by right-clicking on that track, and using the <menuchoice><guimenu>Tagger</guimenu> <guisubmenu>Cover Manager</guisubmenu> <guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. As a side effect of the way &juk; worked, the cover would then be immediately applied to <emphasis>all</emphasis> of the <quote>Alabama - Greatest Hits III</quote> tracks, <emphasis>whether you wanted that or not</emphasis>.</para> <para>In &juk; 2.3, the procedure is exactly the same, with one exception: You should select all of the tracks you want to apply the cover to first. So you would select all the <quote>Alabama - Greatest Hits III</quote> tracks before using the <menuchoice><guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. Or if you only wanted to set cover art to half of the tracks for some reason, you'd only select half the tracks before running the <menuchoice><guimenuitem>Get Cover From Internet</guimenuitem></menuchoice> command. Don't worry about duplicating covers, either: &juk; is smart enough to re-use the same image, so you won't get 14 duplicate <literal role="extension">.png</literal> images cluttering your hard drive.</para> </sect3> Files old/kdemultimedia-4.1.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.1.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.1.2/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/doc/kscd/index.docbook new/kdemultimedia-4.1.2/doc/kscd/index.docbook --- old/kdemultimedia-4.1.1/doc/kscd/index.docbook 2008-05-29 13:20:13.000000000 +0200 +++ new/kdemultimedia-4.1.2/doc/kscd/index.docbook 2008-09-25 14:01:51.000000000 +0200 @@ -76,12 +76,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2005-12-22</date> +<date>2008-08-01</date> <releaseinfo>1.5</releaseinfo> <abstract> <para>&kscd; is a small, fast, <abbrev>CDDB</abbrev> enabled audio -<abbrev>&CD;</abbrev> player for &UNIX; platforms.</para> +<abbrev>&CD;</abbrev> player for &UNIX;, &Windows; and &MacOS; platforms.</para> </abstract> <keywordset> @@ -98,8 +98,8 @@ <chapter id="introduction"> <title>Introduction</title> -<para>&kscd; is a fast, <acronym>CDDB</acronym> enabled &CD; player for the &UNIX; -platform. &kscd; stands for <quote>The KDE Project's small/simple &CD; +<para>&kscd; is a fast, <acronym>CDDB</acronym> enabled &CD; player for &UNIX;, +&Windows; and &MacOS; platforms. &kscd; stands for <quote>The &kde; Project's small/simple &CD; player</quote>.</para> <para><emphasis>New</emphasis>: the <filename>workman2cddb.pl</filename> Perl @@ -130,6 +130,8 @@ <listitem><para>Sony NEWS</para></listitem> <listitem><para>OSF/1</para></listitem> <listitem><para>Ultrix</para></listitem> +<listitem><para>&Windows;</para></listitem> +<listitem><para>&MacOS;</para></listitem> </itemizedlist> <para>and should compile on many others with few modifications.</para> @@ -210,7 +212,7 @@ </sect2> <sect2 id="configuration-button"> -<title>The <guibutton>Configuration</guibutton> button</title> +<title>The <guibutton>Extras</guibutton> button</title> <screenshot> <screeninfo>The Extras button</screeninfo> @@ -253,8 +255,6 @@ </sect2> - - <sect2> <title>The Volume slider</title> @@ -283,7 +283,7 @@ </mediaobject> </screenshot> -<para>This combo box shows you the current track number, the name of the track and the time (in minutes and seconds). You can use this drop down box to directly select +<para>This drop down box shows you the current track number, the name of the track and the time (in minutes and seconds). You can use this drop down box to directly select any track on the &CD;. </para> </sect2> @@ -296,7 +296,7 @@ <title>The primary configuration window</title> <para>You configure &kscd; by clicking on the <guibutton>Extras</guibutton> button. This will bring up a menu, select -<guilabel>Configure &kscd;...</guilabel>. This will open a new window.</para> +<guilabel>Configure &kscd;...</guilabel> to open a new window.</para> <para>The primary configuration window for &kscd; is divided into two major sections. </para> @@ -316,46 +316,17 @@ <screeninfo>The <guilabel>CD Player</guilabel> dialog</screeninfo> <mediaobject> <imageobject><imagedata fileref="kscd12.png" format="PNG"/></imageobject> -<textobject><phrase>The <guilabel>KSCD Configuration</guilabel> dialog</phrase></textobject> +<textobject><phrase>The <guilabel>CD Player</guilabel> dialog</phrase></textobject> </mediaobject> </screenshot> -<para>The <guilabel>LCD font:</guilabel> text box lists the currently selected font to display all information in the &kscd; status display. To change the font, click the <guibutton>Choose...</guibutton> button.</para> +<para>The <guilabel>LCD font</guilabel> text box lists the currently selected font to display all information in the &kscd; status display. To change the font, click the <guibutton>Choose...</guibutton> button.</para> -<para>The <guilabel>LCD color:</guilabel> and <guilabel>Background -color:</guilabel> fields show the color selected for the foreground and +<para>The <guilabel>LCD color</guilabel> and <guilabel>Background +color</guilabel> fields show the color selected for the foreground and background of the status display. Press the color bars to change these colors.</para> - -<!-- -<para>The <guilabel>Unix mail command</guilabel> field shows the -command used to send new <acronym>CDDB</acronym> entries to the -database. The default value is <userinput><command>mail</command> -<option>-s <replaceable>%s</replaceable></option></userinput>. You -will need to make sure this command will actually send mail to -non-local systems if you want to submit <acronym>CDDB</acronym> -entries, especially if you access the Internet through a dial-up -connection. Check the documentation for your &Linux; distribution for -details. Some Linux distributions that use sendmail to deliver email -require only that you enter your mail host into the -<option>"Smart" relay host</option> field in -<filename>/etc/sendmail.cf</filename>. In addition, the -<acronym>CDDB</acronym> site will want to be able to mail you back; it -may therefore also be necessary to edit -<filename>/etc/sendmail.cf</filename> to ensure that the return -address on the submission is valid. Your mileage is likely to vary. If -all else fails, use <link linkend="smtp-options">SMTP</link> -instead.</para> - -<para>The <guilabel>WWW-Browser</guilabel> section lets you choose which web -browser to use to access the web sites in the <link linkend="information-button">information button</link> menus. You can choose -either &konqueror; or a custom browser with the radio buttons. By default, the -<guilabel>Use Custom Browser</guilabel> field contains -<userinput><command>kfmclient</command> -<option><replaceable>openURL %s</replaceable></option></userinput>.</para> ---> - <para>Placing a mark in the check box labeled <guilabel>Show icon in system tray</guilabel> causes a &kscd; control to appear in the &kicker; panel.</para> @@ -370,11 +341,6 @@ </mediaobject> </screenshot> - -<para>Set the <guilabel>Skip interval</guilabel> box to the desired number of -seconds to move ahead or behind when the <guibutton>forward skip</guibutton> -or <guibutton>reverse skip</guibutton> buttons in the Control Panel are pressed.</para> - <para><guilabel>Autoplay when CD inserted</guilabel> causes &kscd; to start playing the &CD; when the tray is closed, with no need to press the <guibutton>Play</guibutton> button.</para> @@ -406,14 +372,15 @@ <para>The check box labeled <guilabel>Use direct digital playback</guilabel> determines which method &kscd; uses to read the audio tracts. If there is a mark in the check box, the first method is used. If there is no mark in the check box, the second method is utilized.</para> -<para>If you have selected direct digital playback, a drop down box labeled <guilabel>Select audio backend:</guilabel> will let you select which +<para>If you have selected direct digital playback, a drop down box labeled <guilabel>Select audio backend</guilabel> will let you select which sound backend the digital information should be sent to. The contents of the drop down box will vary depending on your system. Most users should select <guilabel>arts</guilabel>. You can also select the device the audio backend uses by entering the device location in -the text box labeled <guilabel>Select audio device:</guilabel>. A full discussion of audio devices and audio backends is beyond the scope of this manual.</para> +the text box labeled <guilabel>Select audio device</guilabel>. A full discussion of audio devices and audio backends is beyond the scope of this manual.</para> <para>If a mark is placed in the check box labeled <guilabel>Allow encoding selection</guilabel>, you can select the text encoding for the results of a CDDB request.</para> <tip><para>The standard describes CDDB results as being strictly Latin 1. If you are not having problems with your CDDB information, leave this box unchecked.</para></tip> +<!-- Music Information Services missing--> <para>The <guibutton>Help</guibutton> button opens the &kscd; help contents page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; @@ -421,34 +388,36 @@ <guibutton>Cancel</guibutton> exits without saving. </para> </sect1> -<sect1 id="freedb-tab"> -<title>The <guilabel>freedb Lookup</guilabel> tab</title> + +<sect1 id="cddb-page"> +<title>The <guilabel>CDDB</guilabel> Page</title> +<para>The <guilabel>CDDB</guilabel> page is divided in the <guilabel>Lookup</guilabel> tab +and the <guilabel>Submit</guilabel> tab.</para> + +<sect2 id="lookup-tab"> +<title>The <guilabel>Lookup</guilabel> Tab</title> <screenshot> -<screeninfo>The <guilabel>freedb Lookup</guilabel> tab of the configuration dialog</screeninfo> +<screeninfo>The <guilabel>Lookup</guilabel> tab of the configuration dialog</screeninfo> <mediaobject> <imageobject> <imagedata fileref="kscd14.png" format="PNG"/> </imageobject> -<textobject><phrase>The <guilabel>freedb Lookup</guilabel> tab of the configuration +<textobject><phrase>The <guilabel>Lookup</guilabel> tab of the configuration dialog</phrase></textobject> </mediaobject> </screenshot> -<para> The <guilabel>freedb Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions +<para> The <guilabel>Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions of &kscd;.</para> -<para>The <guilabel>Mode</guilabel> option determines how <acronym>CDDB</acronym> lookups -are performed. Setting <guilabel>Cache only</guilabel> means that only information already -on your computer will be used. <guilabel>Cache and remote</guilabel> will look up -information you do not already have while <guilabel>Remote only</guilabel> looks up -every disc over the Internet.</para> - +<para>You can select the options <guilabel>Enable MusicBrainz lookup</guilabel> or +<guilabel>Enable freedb lookup</guilabel>.</para> -<para>The <guilabel>CDDB Server:</guilabel> section determines which CDDB mirror site is used by &kscd; to +<para>The <guilabel>Freedb server</guilabel> section determines which CDDB mirror site is used by &kscd; to get album information. You can enter a server name, port number and protocol using the text boxes and drop down boxes or you can click the <guibutton>Show Mirror List</guibutton> button. Clicking this button will open a new window with a list of CDDB mirrors and their locations. Simply select the server you want from the list and click <guibutton>OK</guibutton>.</para> -<para>The section labeled <guilabel>Cache locations</guilabel> lets you determine where &kscd; saves CDDB information +<para>The section labeled <guilabel>Cache Locations</guilabel> lets you determine where &kscd; saves CDDB information on your computer. To add a folder, enter the folder location in the text box at the top of the section and click <guibutton>Add</guibutton>. You can also select a folder by clicking on the blue file folder to the right of the text box. To delete a folder, click on the folder name @@ -460,23 +429,24 @@ <guibutton>Apply</guibutton> saves the current settings without exiting; <guibutton>Cancel</guibutton> exits without saving. </para> -</sect1> +</sect2> -<sect1 id="smtp-options"> -<title>The <guilabel>freedb Submit</guilabel> tab</title> +<sect2 id="submit-tab"> +<title>The <guilabel>Submit</guilabel> Tab</title> <screenshot> -<screeninfo>The freedb Submit tab</screeninfo> +<screeninfo>The Submit tab</screeninfo> <mediaobject> <imageobject><imagedata fileref="kscd16.png" format="PNG"/></imageobject> </mediaobject> </screenshot> -<para>The freedb Submit tab sets up connection to a mail +<para>The f<guilabel>Submit</guilabel> tab sets up connection to a mail server or a web server to submit new <acronym>CDDB</acronym> entries. This is useful if you do not have your own system configured as a server. </para> -<para>If you plan to submit a CDDB entry, first you must decide between submitting between &HTTP; +<para>If you plan to submit a CDDB entry, enter your email address into the first textbox, +then you must decide between submitting between &HTTP; and submitting the entry as an email (via &SMTP;). </para> <tip><para>It is simpler to submit new entries using &HTTP;. Some firewalls block this traffic. If your @@ -485,36 +455,37 @@ <para>First select either <guilabel>&HTTP;</guilabel> or <guilabel>SMTP (Email)</guilabel> to determine which protocol to use.</para> -<sect2 id="http-options"> +<sect3 id="http-options"> <title>Using &HTTP; to send CDDB information</title> <para>You can enter a server name or port number in the text boxes provided. If you want to send this information to the international servers, you do not need to change anything.</para> -</sect2> +</sect3> -<sect2 id="smtp2-options"> +<sect3 id="smtp-options"> <title>Using &SMTP; (Email) to send CDDB information</title> <para>To prepare to submit information using email, enter your email address in the text box labeled <guilabel>Reply-To:</guilabel>, your email server in the text box -labeled <guilabel>SMTP-server:</guilabel> and select the port number in the drop down box +labeled <guilabel>SMTP server:</guilabel> and select the port number in the spinbox labeled <guilabel>Port:</guilabel>.</para> <para>If you need to use a password to send email using the email server, place a mark in the check box labeled <guilabel>Server needs authentication</guilabel> and enter your -username in the text box labeled <guilabel>Username:</guilabel>.</para> +username in the text box labeled <guilabel>Username</guilabel>.</para> <para>The <guibutton>Help</guibutton> button opens the &kscd; help contents page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; <guibutton>Apply</guibutton> saves the current settings without exiting; <guibutton>Cancel</guibutton> exits without saving. </para> +</sect3> </sect2> </sect1> - </chapter> +<!-- follwing chapters need proofreading --> <chapter id="cddb-editor"> -<title>The <guilabel>CD Database Editor</guilabel></title> +<title>The CD Database Editor</title> <screenshot> <screeninfo>The &CD; Database Editor</screeninfo> @@ -529,7 +500,7 @@ Data Base)</link> entries.</para> <para>If there is an entry in your local <acronym>CDDB</acronym> tree -(see the <link linkend="freedb-tab">CDDB subsection</link> in the +(see the <link linkend="cddb-page">CDDB subsection</link> in the Configuration chapter) for the &CD; in your &CD-ROM; drive, or if the disc could be found in the freedb, you will see the name of the artist and the title of the &CD; in the <guilabel>Artist:</guilabel> and @@ -538,7 +509,7 @@ you will see a list of tracks and play times without titles.</para> <para>You can make an annotation for the entire disc with the -<guibutton>Comment</guibutton> button under the +<guilabel>Comment</guilabel> field under the <guilabel>Title</guilabel> field, or for a selected track in the <guilabel>Tracks</guilabel> selection box with the adjacent <guibutton>Comment</guibutton> button. If you select a track in the @@ -560,7 +531,7 @@ <guilabel>freedb</guilabel> entry. These categories correspond to the subfolders tree of the folder chosen in the <guilabel>freedb Base Folder:</guilabel> in the <link -linkend="freedb-tab"><guilabel>freedb</guilabel> tab</link> of the &kscd; +linkend="cddb-page"><guilabel>CDDB</guilabel> page</link> of the &kscd; Configuration window.</para> <para>The <guilabel>Length:</guilabel> display shows the total play time of @@ -586,18 +557,17 @@ </screenshot> <para>When the <guilabel>Show icon in system tray</guilabel> box is checked, a -small &kscd; applet is also displayed in the &kicker;. Unlike the main &kscd; window, this applet is available on +small &kscd; applet is also displayed in the panel. Unlike the main &kscd; window, this applet is available on any desktop. <mousebutton>Right</mousebutton> click on the applet to pop up a -menu to control &CD; playback. A <mousebutton>left</mousebutton> click on the +menu to control &CD; playback. A &LMB; click on the applet hides the main &kscd; window. If the main window is hidden, a second -<mousebutton>left</mousebutton> click on the applet restores it. </para> +&LMB; click on the applet restores it. </para> <note><para>To be precise, the applet is displayed in the <application>system tray</application> in the panel. If no applet appears when &kscd; is minimized, you may have removed the tray. To add it, <mousebutton>right</mousebutton> click -on an empty spot on the panel and select <menuchoice><guisubmenu>Add</guisubmenu> -<guisubmenu>Applet</guisubmenu> <guimenuitem>System Tray</guimenuitem> -</menuchoice></para></note> +on an empty spot on the panel and select <guimenuitem>Add Widgets...</guimenuitem>. +In the upcoming dialog, choose <guimenuitem>System Tray</guimenuitem></para></note> </chapter> @@ -608,7 +578,7 @@ over the Internet that contains information about most audio &CD;s in circulation. If you have Internet access, you will likely never have to manually enter track information for your &CD;s if you have this set up properly. See -<link linkend="freedb-tab">The freedb Tab</link> subsection in the configuring +<link linkend="cddb-page">The CDDB Page</link> subsection in the configuring &kscd; chapter for detailed instructions on how to configure this service, and the <link linkend="cddb-editor">The &CD; Database Editor</link> section for instructions on how to edit <acronym>CDDB</acronym> entries.</para> @@ -649,6 +619,9 @@ better to do with your spare time.</para> </chapter> +<!-- quoting aaron +most of that chapter is now really irrelevant to the current kscd. if it is +kept, it would need a massive rewrite. <chapter id="troubleshooting"> <title>Troubleshooting the &CD; player</title> @@ -675,7 +648,7 @@ <textobject><phrase>The Volume slider</phrase></textobject> </mediaobject> </screenshot> -<para>Click once on the vertical yellow bar and drag the bar all the way to the right end of the slider.</para> +<para>Click once on the vertical bar and drag the bar all the way to the right end of the slider.</para> <para>If you can hear music now, the problem is solved. If you still cannot hear the music, click <link linkend="ts-kmixlevels">here</link> to continue.</para> </sect1> @@ -684,33 +657,30 @@ <para>The next step is to determine if &kmix; volume levels are appropriate.</para> <note><para>&kmix; is a sound mixer panel that is included in &kde;. This mixer allows you to adjust the relative volume levels of many sound components.</para></note> <para>To start &kmix;, select -<menuchoice><guimenu>K-Button</guimenu><guimenuitem>Multimedia</guimenuitem> -<guimenuitem>&kmix;</guimenuitem></menuchoice>.</para> -<para>Once &kmix; has started, you will be presented with a new window with a number of volume sliders. Depending on the configuration, the sliders may have labels, or the labels may be hidden. If you do not see any labels for the sliders, you should make the labels visible before continuing. To make the labels visible, select +<menuchoice><guimenu>Applications</guimenu><guisubmenu>Multimedia</guisubmenu> +<guimenuitem>Sound Mixer &kmix;</guimenuitem></menuchoice> in the &kmenu;.</para> +<para>Click with the &LMB; on the &kmix; icon in the panel and choose <guilabel>Mixer</guilabel> to display a new window with a number of volume sliders. Depending on the configuration, the sliders may have labels, or the labels may be hidden. If you do not see any labels for the sliders, you should make the labels visible before continuing. To make the labels visible, select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmix;...</guimenuitem></menuchoice> from the &kmix; window. This will open a small window with a few check boxes. To -turn the labels on, place a mark in the check box labeld <guilabel>Show labels</guilabel> and click <guibutton>OK</guibutton>.</para> -<para>Each slider controls the volume of a different audio device. There are two parts to each device that may need to be altered. If you look at a slider, there is a green -light above each slider. If you click on this light you can toggle between bright green and dark green. If the light is dark green, that audio device is muted and will not produce any sound. If the light is light green, the device is not muted. Once you have verified that the device is not muted, you increase the volume of the device by draging the yellow bar up the slider. The volume of an audio device is decreased by dragging the yellow bar down the slider.</para> -<note><para>Some sliders will have a red light as well. This light is not important for playback of compact discs so you can ignore them for now.</para></note> +turn the labels on, place a mark in the check box labeled <guilabel>Show labels</guilabel> and click <guibutton>OK</guibutton>.</para> +<para>Each slider controls the volume of a different audio device. There are two parts to each device that may need to be altered. If you look at a slider, there is a small check box above each slider labelled <guilabel>Mute</guilabel>. If you click on this checkbox you can mute the audio device and it will not produce any sound. Once you have verified that the device is not muted, you increase the volume of the device by draging the bar up the slider. The volume of an audio device is decreased by dragging the bar down the slider.</para> <para>Click on the tab labeled <guilabel>Output</guilabel>.</para> -<para>Please make sure the sliders are not muted (bright green light) and that the yellow bar is all the way at the top of the slider for the following audio devices:</para> +<para>Please make sure the sliders are not muted and that the bar is all the way at the top of the slider for the following audio devices:</para> <itemizedlist> <listitem><para><guilabel>Master</guilabel></para></listitem> <listitem><para><guilabel>Master Mono</guilabel></para></listitem> <listitem><para><guilabel>PC Speaker</guilabel></para></listitem> <listitem><para><guilabel>PCM</guilabel></para></listitem> </itemizedlist> - <para>If you still do not hear the &CD;, click on the tab labeled <guilabel>Input</guilabel></para> -<para>Now make sure the slider labeled <guilabel>CD</guilabel> is not muted (bright green light) and that the yellow bar is all the way at the top of the slider.</para> +<para>Now make sure the slider labeled <guilabel>CD</guilabel> is not muted and that the bar is all the way at the top of the slider.</para> <para>If you can hear the &CD; now, you can stop troubleshooting. If not, click <link linkend="ts-othersounds">here</link> to continue</para> </sect1> <sect1 id="ts-othersounds"> <title>Determine if other sounds are audible on my computer</title> <para>In this section, we are going to test to see if other types of sounds are audible on your computer. We will do this by playing a sound over the speakers that is stored on your hard drive. </para> <para>First we must locate an appropriate test file. This will be done using the command line.</para> -<para>Select <menuchoice><guimenu>K-Button</guimenu><guimenuitem>System</guimenuitem> -<guimenuitem>&konsole;</guimenuitem></menuchoice>. A new window will appear with a command prompt. At the prompt type:</para> +<para>Select <menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>System</guimenuitem> +<guimenuitem>Terminal &konsole;</guimenuitem></menuchoice> in the &kmenu;. A new window will appear with a command prompt. At the prompt type:</para> <para><screen><prompt>$</prompt> <userinput><command>locate -n1 KDE_Window_Open.wav</command></userinput></screen></para> <para>When you press return, there will be a pause, and a single line with a file location will be printed below your typed command.</para> <para><screen><prompt>$</prompt> <userinput><command>locate -n1 KDE_Window_Open.wav</command></userinput> @@ -730,7 +700,7 @@ <itemizedlist> <listitem><para>Please make sure the speakers are connected to your computer appropriatly (see your user manual if necessary).</para></listitem> <listitem><para>If your speakers require batteries, please replace the batteries with fresh batteries.</para></listitem> -<listitem><para>If your external speakers plug into the wall, please make sure they are plugged in to the socket, the power cord is securly plugged into the back of the speakers and the wall outlet is working.</para></listitem> +<listitem><para>If your external speakers plug into the wall, please make sure they are plugged in to the socket, the power cord is securely plugged into the back of the speakers and the wall outlet is working.</para></listitem> <listitem><para>If your speakers have a power button, please make sure the power is turned on.</para></listitem> <listitem><para>If your speakers have a volume knob, please make sure the volume is turned half way between off and maximum.</para></listitem> </itemizedlist> @@ -803,7 +773,7 @@ as <ulink url="http://www.google.com">Google</ulink>.</para> </sect1> </chapter> - +--> <chapter id="questions-and-answers"> <title>Questions and answers</title> @@ -819,7 +789,7 @@ </screenshot> </question> <answer><para>This means that &kscd; couldn't open your &CD-ROM; drive. The name of -the device in the <guilabel>&CD-ROM; Device</guilabel>cdrom field of the +the device in the <guilabel>&CD-ROM; Device</guilabel> field of the <guilabel>Kscd Configuration</guilabel> must actually refer to the block device associated with your &CD-ROM; drive. This will often be a hardlink to the appropriate <acronym>IDE</acronym> (<filename>/dev/hdx</filename>) or @@ -871,7 +841,7 @@ <para>Special thanks to Ti Kan and Steve Scherf, the inventors of the <acronym>CDDB</acronym> database concept. Visit <ulink -url="http://www.cddb.com/">http://ww.cddb.com</ulink> for more information on +url="http://www.cddb.com/">http://www.cddb.com</ulink> for more information on <acronym>CDDB</acronym>.</para> <para>A very special thank you also to David White who wrote the original &kscd; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp new/kdemultimedia-4.1.2/dragonplayer/src/app/videoWindow.cpp --- old/kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp 2008-06-10 13:41:37.000000000 +0200 +++ new/kdemultimedia-4.1.2/dragonplayer/src/app/videoWindow.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -529,15 +529,13 @@ refreshXineStream(); updateChannels(); - if(m_adjustedSize==false) - { - ( (QWidget*) mainWindow() )->adjustSize(); - m_adjustedSize=true; - debug() << "adjusting size to video resolution"; - } - //m_vWidget->updateGeometry(); - //updateGeometry(); - + if(m_adjustedSize==false) + { + if( mainWindow() ) + ( (QWidget*) mainWindow() )->adjustSize(); + m_adjustedSize=true; + debug() << "adjusting size to video resolution"; + } } emit stateChanged( state( currentState ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/playlistsplitter.cpp new/kdemultimedia-4.1.2/juk/playlistsplitter.cpp --- old/kdemultimedia-4.1.1/juk/playlistsplitter.cpp 2008-06-18 14:42:28.000000000 +0200 +++ new/kdemultimedia-4.1.2/juk/playlistsplitter.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -199,6 +199,8 @@ m_playlistBox->object(), SLOT(slotCreateSearchPlaylist())); connect(m_searchWidget, SIGNAL(signalShown(bool)), m_playlistBox->object(), SLOT(slotSetSearchEnabled(bool))); + connect(m_searchWidget, SIGNAL(returnPressed()), + m_playlistBox->object(), SLOT(slotPlayFirst())); connect(ActionCollection::action<KToggleAction>("showSearch"), SIGNAL(toggled(bool)), m_searchWidget, SLOT(setEnabled(bool))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/searchwidget.cpp new/kdemultimedia-4.1.2/juk/searchwidget.cpp --- old/kdemultimedia-4.1.1/juk/searchwidget.cpp 2008-01-05 01:02:03.000000000 +0100 +++ new/kdemultimedia-4.1.2/juk/searchwidget.cpp 2008-09-25 14:01:50.000000000 +0200 @@ -209,6 +209,7 @@ connect(&m_searchLine, SIGNAL(signalQueryChanged()), this, SIGNAL(signalQueryChanged())); connect(&m_searchLine, SIGNAL(signalDownPressed()), this, SIGNAL(signalDownPressed())); + connect(m_searchLine.m_lineEdit, SIGNAL(returnPressed()), this, SIGNAL(returnPressed())); // I've decided that I think this is ugly, for now. /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.1/juk/searchwidget.h new/kdemultimedia-4.1.2/juk/searchwidget.h --- old/kdemultimedia-4.1.1/juk/searchwidget.h 2008-01-05 01:02:04.000000000 +0100 +++ new/kdemultimedia-4.1.2/juk/searchwidget.h 2008-09-25 14:01:50.000000000 +0200 @@ -30,11 +30,14 @@ class KComboBox; class KLineEdit; +class SearchWidget; class SearchLine : public QFrame { Q_OBJECT + friend class SearchWidget; + public: enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 }; @@ -88,6 +91,7 @@ signals: void signalQueryChanged(); void signalAdvancedSearchClicked(); + void returnPressed(); // This signal is only emitted when the Show/Hide action is triggered. // Minimizing/closing the JuK window will not trigger this signal. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org