Changeset 156 for smplayer/trunk/src/skingui/skingui.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/skingui.cpp (modified) (11 diffs)

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)) {