Changeset 181 for smplayer/trunk/src/skingui/skingui.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/skingui/skingui.cpp

@@ -56 +56 @@
         , was_muted(false)
 {
-        connect( this, SIGNAL(timeChanged(QString)),
-             this, SLOT(displayTime(QString)) );
-
         createActions();
         createMainToolBars();
@@ -106 +103 @@
 
         // Create the time label
-        time_label_action = new TimeLabelAction(this);
+        time_label_action = createTimeLabelAction(TimeLabelAction::CurrentAndTotalTime, this);
         time_label_action->setObjectName("timelabel_action");
 
@@ -183 +180 @@
         #endif
 #endif
-        optionsMenu->addSeparator();
-        optionsMenu->addMenu(toolbar_menu);
 
         statusbar_menu = new QMenu(this);
         statusbar_menu->addAction(viewVideoInfoAct);
         statusbar_menu->addAction(scrollTitleAct);
+
+        populateMainMenu();
+}
+
+void SkinGui::populateMainMenu() {
+        BaseGuiPlus::populateMainMenu();
+
+        optionsMenu->addSeparator();
+        optionsMenu->addMenu(toolbar_menu);
         optionsMenu->addMenu(statusbar_menu);
 }
@@ -308 +312 @@
 void SkinGui::createFloatingControl() {
         // Floating control
-        floating_control = new AutohideWidget(panel);
+        floating_control = new AutohideWidget(mplayerwindow);
         floating_control->setAutoHide(true);
 
@@ -407 +411 @@
         viewVideoInfoAct->change(Images::icon("view_video_info"), tr("&Video info") );
         scrollTitleAct->change(Images::icon("scroll_title"), tr("&Scroll title") );
-}
-
-void SkinGui::displayTime(QString text) {
-        time_label_action->setText(text);
 }
 
@@ -591 +591 @@
 
                 if (!DesktopInfo::isInsideScreen(this)) {
-                        move(0,0);
-                        qWarning("SkinGui::loadConfig: window is outside of the screen, moved to 0x0");
+                        QPoint tl = DesktopInfo::topLeftPrimaryScreen();
+                        move(tl);
+                        qWarning("DefaultGui::loadConfig: window is outside of the screen, moved to %d x %d", tl.x(), tl.y());
                 }
         }