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

List:       kde-commits
Subject:    extragear/multimedia/kmplayer/src
From:       Jonathan Marten <jjm () keelhaul ! me ! uk>
Date:       2013-06-06 18:55:27
Message-ID: 20130606185527.46480AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1357116 by marten:

Show the URL being played in the window title, instead of just "URL".


 M  +14 -4     kmplayerpartbase.cpp  
 M  +2 -0      kmplayersource.h  


--- trunk/extragear/multimedia/kmplayer/src/kmplayerpartbase.cpp #1357115:1357116
@@ -1132,8 +1132,15 @@
     }
     if (m_player->source () == this)
         m_player->updateTree ();
+
+    QTimer::singleShot (0, this, SLOT(changedUrl ()));
 }
 
+void Source::changedUrl()
+{
+    emit titleChanged (this->prettyName ());
+}
+
 void Source::setTitle (const QString & title) {
     emit titleChanged (title);
 }
@@ -1521,11 +1528,14 @@
     if (m_url.isEmpty ())
         return i18n ("URL");
     if (m_url.url ().size () > 50) {
-        QString newurl = m_url.protocol () + QString ("://");
+        QString newurl;
+        if (!m_url.isLocalFile ()) {
+            newurl = m_url.protocol () + QString ("://");
         if (m_url.hasHost ())
             newurl += m_url.host ();
-        if (m_url.port ())
+            if (m_url.port () != -1)
             newurl += QString (":%1").arg (m_url.port ());
+        }
         QString file = m_url.fileName ();
         int len = newurl.size () + file.size ();
         KUrl path = KUrl (m_url.directory ());
@@ -1540,9 +1550,9 @@
         if (modified)
             dir += QString (".../");
         newurl += dir + file;
-        return i18n ("Url - ") + newurl;
+        return i18n ("URL - ") + newurl;
     }
-    return i18n ("Url - ") + m_url.prettyUrl ();
+    return i18n ("URL - ") + m_url.prettyUrl ();
 }
 
 bool URLSource::authoriseUrl (const QString &url) {
--- trunk/extragear/multimedia/kmplayer/src/kmplayersource.h #1357115:1357116
@@ -172,6 +172,8 @@
     int m_length;
     int m_position;
     int m_doc_timer;
+private slots:
+    void changedUrl();
 };
 
 class KMPLAYER_EXPORT SourceDocument : public Document {
[prev in list] [next in list] [prev in thread] [next in thread]