Changeset 156 for smplayer/trunk/src/skingui/mediapanel.cpp

Timestamp:

Feb 21, 2014, 5:26:03 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.6

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/mediapanel.cpp (modified) (6 diffs)

smplayer/trunk/src/skingui/mediapanel.cpp

@@ -50 +50 @@
         setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         mediaLabel = new ScrollingLabel(this);
+        resolutionLabel = new QLabel(this);
+        resolutionLabel->setObjectName("panel-resolution");
+        resolutionLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
         repeatButton = new MyButton(this);
         shuffleButton = new MyButton(this);
@@ -61 +64 @@
         mediaLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         mediaLabel->setObjectName("panel-main-label");
-        QGridLayout* layout = new QGridLayout;
+        layout = new QGridLayout;
         elapsedLabel = new QLabel(this);
         elapsedLabel->setObjectName("panel-elapsed-label");
@@ -67 +70 @@
         elapsedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
         elapsedLabel->setIndent(3);
+        elapsedLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
         totalLabel = new QLabel(this);
         totalLabel->setObjectName("panel-total-label");
@@ -72 +76 @@
         totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
         totalLabel->setIndent(3);
+        /*
         layout->addWidget( mediaLabel, 0, 0, 1, 2 );
-        layout->addWidget( repeatButton, 0, 2  );
-        layout->addWidget( shuffleButton, 0, 3  );
+        layout->addWidget( resolutionLabel, 0, 2, 1, 1 );
+        layout->addWidget( repeatButton, 0, 3  );
+        layout->addWidget( shuffleButton, 0, 4  );
         layout->addWidget(elapsedLabel, 1, 0, 1, 1);
-        layout->addWidget(seeker, 1, 1, 1, 1);
-        layout->addWidget(totalLabel, 1, 2, 1, 2);
+        layout->addWidget(seeker, 1, 1, 1, 2);
+        layout->addWidget(totalLabel, 1, 3, 1, 2);
+        */
+        rearrangeWidgets(false);
         layout->setSpacing(0);
         layout->setContentsMargins(8,3,8, 3);
         elapsedLabel->setText("00:00:00");
         totalLabel->setText("00:00:00");
+        //resolutionLabel->setText("1920x1024");
+        //resolutionLabel->hide();
         setLayout(layout);
         timer = new QTimer(this);
@@ -93 +103 @@
 }
 
+void MediaPanel::rearrangeWidgets(bool resolution_visible) {
+        if (resolution_visible) {
+                layout->addWidget( mediaLabel, 0, 0, 1, 2 );
+                layout->addWidget( resolutionLabel, 0, 2, 1, 1 );
+                layout->addWidget( repeatButton, 0, 3  );
+                layout->addWidget( shuffleButton, 0, 4  );
+                layout->addWidget(elapsedLabel, 1, 0, 1, 1);
+                layout->addWidget(seeker, 1, 1, 1, 2);
+                layout->addWidget(totalLabel, 1, 3, 1, 2);
+                resolutionLabel->setVisible(true);
+        } else {
+                layout->addWidget( mediaLabel, 0, 0, 1, 2 );
+                layout->addWidget( repeatButton, 0, 2  );
+                layout->addWidget( shuffleButton, 0, 3  );
+                layout->addWidget(elapsedLabel, 1, 0, 1, 1);
+                layout->addWidget(seeker, 1, 1, 1, 1);
+                layout->addWidget(totalLabel, 1, 2, 1, 2);
+                resolutionLabel->setVisible(false);
+        }
+}
+
+void MediaPanel::setResolutionVisible(bool b) {
+        rearrangeWidgets(b);
+}
+
 void MediaPanel::paintEvent(QPaintEvent * e) {
         QPainter p(this);
@@ -145 +180 @@
         mediaLabel->update();
         originalTitle = text;
+}
+
+void MediaPanel::setResolutionLabelText(QString text) {
+        resolutionLabel->setText(text);
 }