Changeset 156 for smplayer/trunk/src/skingui

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/mediabarpanel.cpp (modified) (2 diffs)
• src/skingui/mediabarpanel.h (modified) (2 diffs)
• src/skingui/mediapanel.cpp (modified) (6 diffs)
• src/skingui/mediapanel.h (modified) (4 diffs)
• src/skingui/skingui.cpp (modified) (11 diffs)
• src/skingui/skingui.h (modified) (2 diffs)

smplayer/trunk/src/skingui/mediabarpanel.cpp

@@ -120 +120 @@
 void MediaBarPanel::updateMediaInfo()
 {
-    QString s = QString("%1 (%2x%3)").arg(core->mdat.displayName()).arg(core->mdat.video_width).arg(core->mdat.video_height);
-    mediaPanel->setMediaLabelText(s);
+    //QString s = QString("%1 (%2x%3)").arg(core->mdat.displayName()).arg(core->mdat.video_width).arg(core->mdat.video_height);
+    mediaPanel->setMediaLabelText(core->mdat.displayName());
+    QString s = QString("%1x%2").arg(core->mdat.video_width).arg(core->mdat.video_height);
+    mediaPanel->setResolutionLabelText(s);
+}
+
+void MediaBarPanel::displayMessage(QString status, int time)
+{
+    mediaPanel->setStatusText(status, time);
 }
 
@@ -152 +159 @@
 }
 
+void MediaBarPanel::setResolutionVisible(bool b) { 
+        qDebug("MediaBarPanel::setResolutionVisible: %d", b);
+        mediaPanel->setResolutionVisible(b); 
+}
+
 #include "moc_mediabarpanel.cpp"
 

smplayer/trunk/src/skingui/mediabarpanel.h

@@ -65 +65 @@
     void gotCurrentTime(double time);
     void updateMediaInfo();
+    void displayMessage(QString status, int time);
     void displayMessage(QString status);
     void displayPermanentMessage(QString status);
@@ -70 +71 @@
         void setVolume(int v);
         void setSeeker(int v);
+        void setResolutionVisible(bool b);
 
 signals:

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);
 }
 

smplayer/trunk/src/skingui/mediapanel.h

@@ -28 +28 @@
 #include "mybutton.h"
 #include "panelseeker.h"
+
+class QGridLayout;
 
 class ScrollingLabel : public QWidget
@@ -85 +87 @@
     void setDuration(int duration);
     void setMediaLabelText(QString text);
+    void setResolutionLabelText(QString text);
     void setStatusText(QString text, int time = 2000);
     void setBuffering(bool enable);
@@ -91 +94 @@
 public slots:
         void setSeeker(int v);
+        void setResolutionVisible(bool b);
 
 private:
     Ui::MediaPanelClass ui;
+    QGridLayout * layout;
     QPixmap leftBackground;
     QPixmap centerBackground;
     QPixmap rightBackground;
     ScrollingLabel* mediaLabel;
+    QLabel *resolutionLabel;
     PanelSeeker* seeker;
     MyButton* repeatButton;
@@ -109 +115 @@
 private slots:
     void reverseStatus();
+    void rearrangeWidgets(bool resolution_visible);
 
 protected:

smplayer/trunk/src/skingui/skingui.cpp

@@ -152 +152 @@
 
         playOrPauseAct->setCheckable(true);
+
+        viewVideoInfoAct = new MyAction(this, "toggle_video_info_skingui" );
+        viewVideoInfoAct->setCheckable(true);
 }
 
@@ -202 +205 @@
         optionsMenu->addSeparator();
         optionsMenu->addMenu(toolbar_menu);
+
+        statusbar_menu = new QMenu(this);
+        statusbar_menu->addAction(viewVideoInfoAct);
+        optionsMenu->addMenu(statusbar_menu);
 }
 
@@ -260 +267 @@
         controlwidget = new QToolBar( this );
         controlwidget->setObjectName("controlwidget");
+        controlwidget->setLayoutDirection(Qt::LeftToRight);
         controlwidget->setStyleSheet("QToolBar { spacing: 0px; }");
         controlwidget->setMovable(false);
@@ -308 +316 @@
 #endif
 
+        connect( viewVideoInfoAct, SIGNAL(toggled(bool)),
+             mediaBarPanel, SLOT(setResolutionVisible(bool)) );
+
         controlwidget->addWidget(mediaBarPanel);
 }
@@ -382 +393 @@
         toolbar_menu->menuAction()->setIcon( Images::icon("toolbars") );
 
+        statusbar_menu->menuAction()->setText( tr("Status&bar") );
+        statusbar_menu->menuAction()->setIcon( Images::icon("statusbar") );
+
         toolbar1->setWindowTitle( tr("&Main toolbar") );
         toolbar1->toggleViewAction()->setIcon(Images::icon("main_toolbar"));
@@ -391 +405 @@
         #endif
 #endif
+
+        viewVideoInfoAct->change(Images::icon("view_video_info"), tr("&Video info") );
 
         mediaBarPanel->setVolume(core->mset.volume);
@@ -407 +423 @@
                 case Core::Stopped:             mediaBarPanel->displayMessage( tr("Stop") ); break;
         }
+}
+
+void SkinGui::displayMessage(QString message, int time) {
+        BaseGuiPlus::displayMessage(message, time);
+        mediaBarPanel->displayMessage(message, time);
 }
 
@@ -525 +546 @@
         set->beginGroup( "skin_gui");
 
+        set->setValue("video_info", viewVideoInfoAct->isChecked());
+
         set->setValue("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible);
         set->setValue("compact_toolbar1_was_visible", compact_toolbar1_was_visible);
@@ -532 +555 @@
                 set->setValue( "pos", pos() );
                 set->setValue( "size", size() );
+                set->setValue( "state", (int) windowState() );
         }
 
@@ -556 +580 @@
         set->beginGroup( "skin_gui");
 
+        viewVideoInfoAct->setChecked(set->value("video_info", false).toBool());
+
         fullscreen_toolbar1_was_visible = set->value("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible).toBool();
         compact_toolbar1_was_visible = set->value("compact_toolbar1_was_visible", compact_toolbar1_was_visible).toBool();
@@ -569 +595 @@
                 move(p);
                 resize(s);
+
+                setWindowState( (Qt::WindowStates) set->value("state", 0).toInt() );
 
                 if (!DesktopInfo::isInsideScreen(this)) {

smplayer/trunk/src/skingui/skingui.h

@@ -78 +78 @@
         virtual void displayTime(QString text);
         virtual void displayState(Core::State state);
+        virtual void displayMessage(QString message, int time);
         virtual void displayMessage(QString message);
 
@@ -118 +119 @@
 #endif
 
+        MyAction * viewVideoInfoAct;
+
         QMenu * toolbar_menu;
+        QMenu * statusbar_menu;
 
         int last_second;