[vlc-commits] Qt: split the track number/total for now

Jean-Baptiste Kempf git at videolan.org
Mon Jul 8 14:40:58 CEST 2013


vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul  7 23:16:02 2013 +0200| [52ddfd216d26e40a15eea1fa6632ac23b74e1755] | committer: Jean-Baptiste Kempf

Qt: split the track number/total for now

Close #8511

(cherry picked from commit 81a1b751bbd64e35f9f0d323d2acb87b9063f934)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/components/info_panels.cpp |   16 +++++++++++-----
 modules/gui/qt4/components/info_panels.hpp |    1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index 835022d..c637041 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -97,7 +97,7 @@ MetaPanel::MetaPanel( QWidget *parent,
     date_text = new QLineEdit;
     date_text->setAlignment( Qt::AlignRight );
     date_text->setInputMask("0000");
-    date_text->setMaximumWidth( 128 );
+    date_text->setMaximumWidth( 140 );
     metaLayout->addWidget( date_text, line, 7, 1, -1 );
     line++;
 
@@ -108,13 +108,19 @@ MetaPanel::MetaPanel( QWidget *parent,
     /* Number - on the same line */
     label = new QLabel( qtr( VLC_META_TRACK_NUMBER ) );
     label->setFont( smallFont ); label->setContentsMargins( 3, 2, 0, 0 );
-    metaLayout->addWidget( label, line - 1, 7, 1, 3  );
+    metaLayout->addWidget( label, line - 1, 7, 1, 3 );
 
     tracknumber_text = new QLineEdit;
+    tracktotal_text = new QLineEdit;
     tracknumber_text->setAlignment( Qt::AlignRight );
-    tracknumber_text->setInputMask("0000/0000");
-    tracknumber_text->setMaximumWidth( 128 );
-    metaLayout->addWidget( tracknumber_text, line, 7, 1, -1 );
+    tracktotal_text->setAlignment( Qt::AlignRight );
+    tracknumber_text->setMaximumWidth( 64 );
+    tracktotal_text->setMaximumWidth( 64 );
+    metaLayout->addWidget( tracknumber_text, line, 7, 1, 1 );
+    metaLayout->addWidget( tracktotal_text, line, 9, 1, -1 );
+
+    QLabel *sep = new QLabel( "/" );
+    metaLayout->addWidget( sep, line, 8, 1, -1 );
 
     line++;
 
diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp
index 0510a46..1c9ddad 100644
--- a/modules/gui/qt4/components/info_panels.hpp
+++ b/modules/gui/qt4/components/info_panels.hpp
@@ -75,6 +75,7 @@ private:
     QLineEdit *copyright_text;
     QLineEdit *collection_text;
     QLineEdit *tracknumber_text;
+    QLineEdit *tracktotal_text;
 
     QTextEdit *description_text;
 //    QSpinBox *rating_text;



More information about the vlc-commits mailing list