[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1
From:       Roland Gigler <rolandg () web ! de>
Date:       2005-02-09 19:18:23
Message-ID: 20050209191823.E46DF1D19D () office ! kde ! org
[Download RAW message or body]

CVS commit by rolandg: 

add Filename to the OSD

BUG: 98725


  M +1 -1      amarok/src/Options5.ui   1.42
  M +4 -2      amarok/src/osd.cpp   1.90
  M +5 -0      doc/amarok/config.docbook   1.23


--- kdeextragear-1/amarok/src/osd.cpp  #1.89:1.90
@@ -393,10 +393,12 @@ amaroK::OSD::show( const MetaBundle &bun
     tokens << i18n("%artist - %title")
            << i18n("%artist") << i18n("%album") << i18n("%title")   << \
                i18n("%genre")
-           << i18n("%year")   << i18n("%track") << i18n("%bitrate") << \
i18n("%length"); +           << i18n("%year")   << i18n("%track") << i18n("%bitrate") \
<< i18n("%length") +           << i18n("%file");
 
     tags   << bundle.prettyTitle()
            << bundle.artist() << bundle.album() << bundle.title() << bundle.genre()
            << bundle.year() << bundle.track() << bundle.prettyBitrate()
-           << (bundle.length() > 0 ? bundle.prettyLength() : QString::null); \
//ignore '-' or '?' +           << (bundle.length() > 0 ? bundle.prettyLength() : \
QString::null) //ignore '-' or '?' +           << bundle.url().fileName();
 
     for( QStringList::ConstIterator tok = tokens.begin(), end = tokens.end(), tag = \
tags.begin(); tok != end; ++tok, ++tag )

--- kdeextragear-1/amarok/src/Options5.ui  #1.41:1.42
@@ -365,5 +365,5 @@
                                     </property>
                                     <property name="toolTip" stdset="0">
-                                        <string>&lt;b&gt;Tags Displayed in \
OSD&lt;/b&gt;&lt;br&gt;Valid Variables:&lt;ul&gt;&lt;li&gt;Title - \
%title&lt;li&gt;Album - %album&lt;li&gt;Artist - %artist&lt;li&gt; Genre - \
%genre&lt;li&gt;Bitrate - %bitrate&lt;li&gt;Year - %year&lt;li&gt;Track Length - \
%length&lt;li&gt;Track Number - %track&lt;/ul&gt;&lt;br&gt;Braces { } can be added \
around text which includes one of the above variables, and will only be displayed if \
the track element exists.</string> +                                        \
<string>&lt;b&gt;Tags Displayed in OSD&lt;/b&gt;&lt;br&gt;Valid \
Variables:&lt;ul&gt;&lt;li&gt;Title - %title&lt;li&gt;Album - %album&lt;li&gt;Artist \
- %artist&lt;li&gt; Genre - %genre&lt;li&gt;Bitrate - %bitrate&lt;li&gt;Year - \
%year&lt;li&gt;Track Length - %length&lt;li&gt;Track Number - \
%track&lt;li&gt;Filename - %file&lt;/ul&gt;&lt;br&gt;Braces { } can be added around \
text which includes one of the above variables, and will only be displayed if the \
track element exists.</string>  </property>
                                     <property name="whatsThis" stdset="0">

--- kdeextragear-1/doc/amarok/config.docbook  #1.22:1.23
@@ -224,4 +224,9 @@
 </row>
 
+<row>
+<entry>Filename</entry>
+<entry>%file</entry>
+</row>
+
 </tbody>
 </tgroup>


[prev in list] [next in list] [prev in thread] [next in thread]