[vlc-commits] Revert "Qt, recents: elipse on the left the mrl"

Jean-Baptiste Kempf git at videolan.org
Tue May 10 13:42:37 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 10 13:22:02 2011 +0200| [d317831dd65b302a6250546d657fa8195f475a6c] | committer: Jean-Baptiste Kempf

Revert "Qt, recents: elipse on the left the mrl"

This reverts commit 7e1526b90947a146aa963e92f8a7326b6a697712.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d317831dd65b302a6250546d657fa8195f475a6c
---

 modules/gui/qt4/recents.cpp |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index dd4c57d..5112c99 100644
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -31,7 +31,6 @@
 #include <QSettings>
 #include <QRegExp>
 #include <QSignalMapper>
-#include <QFontMetrics>
 
 #ifdef WIN32
     #include <shlobj.h>
@@ -43,7 +42,7 @@
         SHARD_APPIDINFOIDLIST   = 0x00000005,
         SHARD_LINK              = 0x00000006,
         SHARD_APPIDINFOLINK     = 0x00000007,
-        SHARD_SHELLITEM         = 0x00000008
+        SHARD_SHELLITEM         = 0x00000008 
     } SHARD; */
     #define SHARD_PATHW 0x00000003
 #endif
@@ -91,9 +90,8 @@ void RecentsMRL::addRecent( const QString &mrl )
     /* Add to the Windows 7 default list in taskbar */
     SHAddToRecentDocs( SHARD_PATHW, qtu( mrl ) );
 #endif
-    QString mrl2 = QApplication::fontMetrics().elidedText( mrl, Qt::ElideLeft, 400 );
 
-    int i_index = stack->indexOf( mrl2 );
+    int i_index = stack->indexOf( mrl );
     if( 0 <= i_index )
     {
         /* move to the front */
@@ -101,7 +99,7 @@ void RecentsMRL::addRecent( const QString &mrl )
     }
     else
     {
-        stack->prepend( mrl2 );
+        stack->prepend( mrl );
         if( stack->size() > RECENTS_LIST_SIZE )
             stack->takeLast();
     }



More information about the vlc-commits mailing list