Changeset 181 for smplayer/trunk/src/defaultgui.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/defaultgui.cpp (modified) (46 diffs)

smplayer/trunk/src/defaultgui.cpp

@@ -52 +52 @@
 #include <QMovie>
 
-#define TOOLBAR_VERSION 1
+#define TOOLBAR_VERSION 2
+#define CONTROLWIDGET_VERSION 0
+#define FLOATING_CONTROL_VERSION 1
 
 using namespace Global;
@@ -61 +63 @@
         createStatusBar();
 
-        connect( this, SIGNAL(timeChanged(QString)),
-             this, SLOT(displayTime(QString)) );
-    connect( this, SIGNAL(frameChanged(int)),
+        connect( this, SIGNAL(frameChanged(int)),
              this, SLOT(displayFrame(int)) );
         connect( this, SIGNAL(ABMarkersChanged(int,int)),
@@ -90 +90 @@
 #endif
 
+        connect(this, SIGNAL(preferencesChanged()), this, SLOT(checkCompactMode()));
+
         menuBar()->setObjectName("menubar");
 
@@ -101 +103 @@
                 controlwidget->hide();
                 toolbar1->hide();
+                #ifdef LANGUAGE_TOOLBAR
                 toolbar2->hide();
+                #endif
 
                 if (pref->floating_display_in_compact_mode) {
@@ -110 +114 @@
 
         applyStyles();
+
+#ifdef ADD_QUICK_ACCESS
+        connect(this, SIGNAL(tabletModeChanged(bool)), this, SLOT(adaptForTabletMode()));
+        adaptForTabletMode();
+#endif
 }
 
@@ -138 +147 @@
 
         // Create the time label
-        time_label_action = new TimeLabelAction(this);
+        time_label_action = createTimeLabelAction(TimeLabelAction::CurrentAndTotalTime, this);
         time_label_action->setObjectName("timelabel_action");
+
+        current_time_label_action = createTimeLabelAction(TimeLabelAction::CurrentTime, this);
+        current_time_label_action->setObjectName("current_timelabel_action");
+
+        total_time_label_action = createTimeLabelAction(TimeLabelAction::TotalTime, this);
+        total_time_label_action->setObjectName("total_timelabel_action");
+
+        remaining_time_label_action = createTimeLabelAction(TimeLabelAction::RemainingTime, this);
+        remaining_time_label_action->setObjectName("remaining_timelabel_action");
 
 #if MINI_ARROW_BUTTONS
@@ -164 +182 @@
              frame_display, SLOT(setVisible(bool)) );
 
+        viewFormatInfoAct = new MyAction( this, "toggle_format_info" );
+        viewFormatInfoAct->setCheckable( true );
+        connect( viewFormatInfoAct, SIGNAL(toggled(bool)),
+             format_info_display, SLOT(setVisible(bool)) );
+
 #if USE_CONFIGURABLE_TOOLBARS
         editToolbar1Act = new MyAction( this, "edit_main_toolbar" );
@@ -204 +227 @@
         toolbar_menu = new QMenu(this);
         toolbar_menu->addAction(toolbar1->toggleViewAction());
+#ifdef LANGUAGE_TOOLBAR
         toolbar_menu->addAction(toolbar2->toggleViewAction());
+#endif
+
 #if USE_CONFIGURABLE_TOOLBARS
         toolbar_menu->addSeparator();
@@ -212 +238 @@
         toolbar_menu->addAction(editFloatingControlAct);
 #endif
+
+        statusbar_menu = new QMenu(this);
+        statusbar_menu->addAction(viewVideoInfoAct);
+        statusbar_menu->addAction(viewFormatInfoAct);
+        statusbar_menu->addAction(viewFrameCounterAct);
+
+        populateMainMenu();
+}
+
+void DefaultGui::populateMainMenu() {
+        qDebug("DefaultGui::populateMainMenu");
+
+        BaseGuiPlus::populateMainMenu();
+
         optionsMenu->addSeparator();
         optionsMenu->addMenu(toolbar_menu);
-
-        statusbar_menu = new QMenu(this);
-        statusbar_menu->addAction(viewVideoInfoAct);
-        statusbar_menu->addAction(viewFrameCounterAct);
-
         optionsMenu->addMenu(statusbar_menu);
 }
@@ -231 +266 @@
 #else
         m->addAction(toolbar1->toggleViewAction());
+        #ifdef LANGUAGE_TOOLBAR
         m->addAction(toolbar2->toggleViewAction());
+        #endif
 #endif
         return m;
@@ -245 +282 @@
         toolbar1_actions << "open_file" << "open_url" << "favorites_menu" << "separator"
                      << "screenshot" << "separator" << "show_file_properties" << "show_playlist"
-                     << "show_tube_browser" << "separator" << "show_preferences"
-                     << "separator" << "play_prev" << "play_next";
+                     #ifndef IDOPT_BUILD
+                     << "show_tube_browser"
+                     #endif
+                     << "separator" << "show_preferences"
+                     #ifndef IDOPT_BUILD
+                     << "separator" << "play_prev" << "play_next"
+                     #endif
+                     << "separator" << "audiotrack_menu" << "subtitlestrack_menu"
+                     #ifdef IDOPT_BUILD
+                     << "separator" << "send_to_screen_menu" << "tablet_mode"
+                     #endif
+                     ;
 
         toolbar1->setDefaultActions(toolbar1_actions);
@@ -268 +315 @@
         toolbar1->addAction(playPrevAct);
         toolbar1->addAction(playNextAct);
+        toolbar1->addSeparator();
+        toolbar1->addAction(audiotrack_menu->menuAction());
+        toolbar1->addAction(subtitles_track_menu->menuAction());
+
         // Test:
         //toolbar1->addSeparator();
@@ -275 +326 @@
         QToolButton * button = qobject_cast<QToolButton *>(toolbar1->widgetForAction(favorites->menuAction()));
         button->setPopupMode(QToolButton::InstantPopup);
-#endif
-
+
+        button = qobject_cast<QToolButton *>(toolbar1->widgetForAction(audiotrack_menu->menuAction()));
+        button->setPopupMode(QToolButton::InstantPopup);
+
+        button = qobject_cast<QToolButton *>(toolbar1->widgetForAction(subtitles_track_menu->menuAction()));
+        button->setPopupMode(QToolButton::InstantPopup);
+
+        #ifdef IDOPT_BUILD
+        toolbar1->addSeparator();
+        toolbar1->addAction(sendToScreen_menu->menuAction());
+        toolbar1->addAction(tabletModeAct);
+
+        button = qobject_cast<QToolButton *>(toolbar1->widgetForAction(sendToScreen_menu->menuAction()));
+        button->setPopupMode(QToolButton::InstantPopup);
+        #endif
+#endif
+
+#ifdef LANGUAGE_TOOLBAR
         toolbar2 = new QToolBar( this );
         toolbar2->setObjectName("toolbar2");
@@ -289 +356 @@
         select_subtitle->setMenu( subtitles_track_menu );
         toolbar2->addWidget(select_subtitle);
+#endif
 
         /*
@@ -301 +369 @@
         tba->setShortcut(Qt::Key_F5);
 
+#ifdef LANGUAGE_TOOLBAR
         tba = toolbar2->toggleViewAction();
         tba->setObjectName("show_language_toolbar");
         tba->setShortcut(Qt::Key_F6);
+#endif
+
+        toolbar1->setIconSize(QSize(32,32));
 }
 
@@ -370 +442 @@
         #endif
         controlwidget_actions << "separator" << "fullscreen" << "mute" << "volumeslider_action";
+
+        #ifdef ADD_QUICK_ACCESS
+        controlwidget_actions << "quick_access_menu";
+        #endif
+
         controlwidget->setDefaultActions(controlwidget_actions);
 #else
@@ -405 +482 @@
 
         controlwidget->addAction(volumeslider_action);
+
+        #ifdef ADD_QUICK_ACCESS
+        controlwidget->addAction(access_menu->menuAction());
+        QToolButton * button = qobject_cast<QToolButton *>(controlwidget->widgetForAction(access_menu->menuAction()));
+        button->setPopupMode(QToolButton::InstantPopup);
+        #endif
 #endif // USE_CONFIGURABLE_TOOLBARS
 
@@ -410 +493 @@
         controlwidget->show();
         */
+
+        controlwidget->setIconSize(QSize(40,40));
 }
 
 void DefaultGui::createFloatingControl() {
         // Floating control
-        floating_control = new AutohideWidget(panel);
+        floating_control = new AutohideWidget(mplayerwindow);
         floating_control->setAutoHide(true);
 
@@ -423 +508 @@
 #if USE_CONFIGURABLE_TOOLBARS
         QStringList floatingcontrol_actions;
-        floatingcontrol_actions << "play" << "pause" << "stop" << "separator";
+        floatingcontrol_actions << "play_or_pause" << "stop" << "separator";
+        /*
         #if MINI_ARROW_BUTTONS
         floatingcontrol_actions << "rewindbutton_action";
@@ -429 +515 @@
         floatingcontrol_actions << "rewind3" << "rewind2" << "rewind1";
         #endif
-        floatingcontrol_actions << "timeslider_action";
+        */
+        floatingcontrol_actions << "rewind1";
+        floatingcontrol_actions << "current_timelabel_action" << "timeslider_action" << "total_timelabel_action";
+        /*
         #if MINI_ARROW_BUTTONS
         floatingcontrol_actions << "forwardbutton_action";
@@ -435 +524 @@
         floatingcontrol_actions << "forward1" << "forward2" << "forward3";
         #endif
-        floatingcontrol_actions << "separator" << "fullscreen" << "mute" << "volumeslider_action" << "separator" << "timelabel_action";
+        */
+        floatingcontrol_actions << "forward1";
+        floatingcontrol_actions << "separator" << "fullscreen" << "mute" << "volumeslider_action";
         iw->setDefaultActions(floatingcontrol_actions);
 #else
+        /*
         iw->addAction(playAct);
         iw->addAction(pauseAct);
+        */
+        iw->addAction(playOrPauseAct);
         iw->addAction(stopAct);
         iw->addSeparator();
@@ -451 +545 @@
         #endif
 
+        iw->addAction(current_time_label_action);
         iw->addAction(timeslider_action);
+        iw->addAction(total_time_label_action);
 
         #if MINI_ARROW_BUTTONS
@@ -465 +561 @@
         iw->addAction(muteAct);
         iw->addAction(volumeslider_action);
+        /*
         iw->addSeparator();
         iw->addAction(time_label_action);
+        */
 #endif // USE_CONFIGURABLE_TOOLBARS
 
         floating_control->setInternalWidget(iw);
+        iw->setIconSize(QSize(48,48));
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -496 +595 @@
         time_display->setText(" 88:88:88 / 88:88:88 ");
         time_display->setMinimumSize(time_display->sizeHint());
+        connect(this, SIGNAL(timeChanged(QString)), time_display, SLOT(setText(QString)));
 
         frame_display = new QLabel( statusBar() );
@@ -516 +616 @@
         video_info_display->setFrameShape(QFrame::NoFrame);
 
+        format_info_display = new QLabel( statusBar() );
+        format_info_display->setObjectName("format_info_display");
+        format_info_display->setAlignment(Qt::AlignRight);
+        format_info_display->setFrameShape(QFrame::NoFrame);
+
 #ifdef BUFFERING_ANIMATION
         state_widget = new StateWidget(statusBar());
@@ -524 +629 @@
         statusBar()->setAutoFillBackground(true);
 
+        /*
         ColorUtils::setBackgroundColor( statusBar(), QColor(0,0,0) );
         ColorUtils::setForegroundColor( statusBar(), QColor(255,255,255) );
@@ -534 +640 @@
         ColorUtils::setBackgroundColor( video_info_display, QColor(0,0,0) );
         ColorUtils::setForegroundColor( video_info_display, QColor(255,255,255) );
+        */
         statusBar()->setSizeGripEnabled(false);
 
         statusBar()->addPermanentWidget( video_info_display );
+        statusBar()->addPermanentWidget( format_info_display );
         statusBar()->addPermanentWidget( ab_section_display );
 
@@ -550 +658 @@
         ab_section_display->show();
         video_info_display->hide();
+        format_info_display->hide();
 }
 
@@ -567 +676 @@
         toolbar1->toggleViewAction()->setIcon(Images::icon("main_toolbar"));
 
+#ifdef LANGUAGE_TOOLBAR
         toolbar2->setWindowTitle( tr("&Language toolbar") );
         toolbar2->toggleViewAction()->setIcon(Images::icon("lang_toolbar"));
@@ -572 +682 @@
         select_audio->setText( tr("Audio") );
         select_subtitle->setText( tr("Subtitle") );
+#endif
 
         viewVideoInfoAct->change(Images::icon("view_video_info"), tr("&Video info") );
         viewFrameCounterAct->change( Images::icon("frame_counter"), tr("&Frame counter") );
+        viewFormatInfoAct->change( Images::icon("view_format_info"), tr("F&ormat info") );
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -589 +701 @@
 
 
-void DefaultGui::displayTime(QString text) {
-        time_display->setText( text );
-        time_label_action->setText(text);
-}
-
 void DefaultGui::displayFrame(int frame) {
         if (frame_display->isVisible()) {
@@ -620 +727 @@
                 video_info_display->setText(" ");
         }
+
+        QString format = core->mdat.video_format;
+        if (!format.isEmpty() && !core->mdat.audio_format.isEmpty()) format += " / ";
+        format += core->mdat.audio_format;
+        format_info_display->setText(format.toUpper());
 }
 
@@ -630 +742 @@
 }
 
-void DefaultGui::applyNewPreferences() {
-        qDebug("DefaultGui::applyNewPreferences");
+void DefaultGui::checkCompactMode() {
+        qDebug("DefaultGui::checkCompactMode");
 
         if ((pref->compact_mode) && (pref->floating_display_in_compact_mode)) {
@@ -639 +751 @@
                 floating_control->deactivate();
         }
-
-        BaseGuiPlus::applyNewPreferences();
-}
+}
+
+#ifdef ADD_QUICK_ACCESS
+void DefaultGui::adaptForTabletMode() {
+        qDebug("DefaultGui::adaptForTabletMode");
+
+        bool b = pref->tablet_mode;
+
+        if (!pref->compact_mode) {
+                menuBar()->setVisible(!b);
+                toolbar1->setVisible(!b);
+        }
+        access_menu->menuAction()->setVisible(b);
+}
+#endif
 
 void DefaultGui::reconfigureFloatingControl() {
@@ -664 +788 @@
         // Save visibility of toolbars
         fullscreen_toolbar1_was_visible = toolbar1->isVisible();
+#ifdef LANGUAGE_TOOLBAR
         fullscreen_toolbar2_was_visible = toolbar2->isVisible();
+#endif
 
         if (!pref->compact_mode) {
@@ -672 +798 @@
                 controlwidget_mini->hide();
                 toolbar1->hide();
+                #ifdef LANGUAGE_TOOLBAR
                 toolbar2->hide();
+                #endif
         }
 }
@@ -692 +820 @@
 
                 toolbar1->setVisible( fullscreen_toolbar1_was_visible );
+                #ifdef LANGUAGE_TOOLBAR
                 toolbar2->setVisible( fullscreen_toolbar2_was_visible );
-        }
+                #endif
+        }
+
+        #ifdef ADD_QUICK_ACCESS
+        if (pref->tablet_mode) menuBar()->hide();
+        #endif
 }
 
@@ -709 +843 @@
         // Save visibility of toolbars
         compact_toolbar1_was_visible = toolbar1->isVisible();
+#ifdef LANGUAGE_TOOLBAR
         compact_toolbar2_was_visible = toolbar2->isVisible();
+#endif
 
         //menuBar()->hide();
@@ -716 +852 @@
         controlwidget_mini->hide();
         toolbar1->hide();
+#ifdef LANGUAGE_TOOLBAR
         toolbar2->hide();
+#endif
 }
 
@@ -732 +870 @@
 
         toolbar1->setVisible( compact_toolbar1_was_visible );
+#ifdef LANGUAGE_TOOLBAR
         toolbar2->setVisible( compact_toolbar2_was_visible );
+#endif
+
+        #ifdef ADD_QUICK_ACCESS
+        if (pref->tablet_mode) menuBar()->hide();
+        #endif
 
         // Recheck size of controlwidget
@@ -772 +916 @@
         //floating_control->adjustSize();
         QWidget *iw = floating_control->internalWidget();
-        QSize iws = iw->size();
-        QMargins m = floating_control->contentsMargins();
-        int new_height = iws.height() + m.top() + m.bottom();
-        if (new_height < 32) new_height = 32;
-        floating_control->resize(floating_control->width(), new_height);
+        if (iw) {
+                QSize iws = iw->size();
+                QMargins m = floating_control->contentsMargins();
+                int new_height = iws.height() + m.top() + m.bottom();
+                if (new_height < 32) new_height = 32;
+                floating_control->resize(floating_control->width(), new_height);
+        }
 }
 
@@ -788 +934 @@
         set->setValue("video_info", viewVideoInfoAct->isChecked());
         set->setValue("frame_counter", viewFrameCounterAct->isChecked());
+        set->setValue("format_info", viewFormatInfoAct->isChecked());
 
         set->setValue("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible);
+        set->setValue("compact_toolbar1_was_visible", compact_toolbar1_was_visible);
+#ifdef LANGUAGE_TOOLBAR
         set->setValue("fullscreen_toolbar2_was_visible", fullscreen_toolbar2_was_visible);
-        set->setValue("compact_toolbar1_was_visible", compact_toolbar1_was_visible);
         set->setValue("compact_toolbar2_was_visible", compact_toolbar2_was_visible);
+#endif
 
         if (pref->save_window_size_on_exit) {
@@ -811 +960 @@
         set->setValue("floating_control", iw->actionsToStringList() );
         set->setValue("toolbar1_version", TOOLBAR_VERSION);
+        set->setValue("controlwidget_version", CONTROLWIDGET_VERSION);
+        set->setValue("floating_control_version", FLOATING_CONTROL_VERSION);
         set->endGroup();
 
@@ -833 +984 @@
         viewVideoInfoAct->setChecked(set->value("video_info", false).toBool());
         viewFrameCounterAct->setChecked(set->value("frame_counter", false).toBool());
+        viewFormatInfoAct->setChecked(set->value("format_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();
+#ifdef LANGUAGE_TOOLBAR
         fullscreen_toolbar2_was_visible = set->value("fullscreen_toolbar2_was_visible", fullscreen_toolbar2_was_visible).toBool();
-        compact_toolbar1_was_visible = set->value("compact_toolbar1_was_visible", compact_toolbar1_was_visible).toBool();
         compact_toolbar2_was_visible = set->value("compact_toolbar2_was_visible", compact_toolbar2_was_visible).toBool();
+#endif
 
         if (pref->save_window_size_on_exit) {
@@ -853 +1007 @@
 
                 if (!DesktopInfo::isInsideScreen(this)) {
-                        move(0,0);
-                        qWarning("DefaultGui::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());
                 }
         }
@@ -867 +1022 @@
                 toolbar1->setActionsFromStringList( toolbar1->defaultActions() );
         }
-        controlwidget->setActionsFromStringList( set->value("controlwidget", controlwidget->defaultActions()).toStringList() );
+
+        int controlwidget_version = set->value("controlwidget_version", 0).toInt();
+        if (controlwidget_version >= CONTROLWIDGET_VERSION) {
+                QStringList l = set->value("controlwidget", controlwidget->defaultActions()).toStringList();
+                #ifdef ADD_QUICK_ACCESS
+                if (l.indexOf("quick_access_menu") == -1) l << "quick_access_menu";
+                #endif
+                controlwidget->setActionsFromStringList(l);
+        } else {
+                controlwidget->setActionsFromStringList( controlwidget->defaultActions() );
+        }
+
         controlwidget_mini->setActionsFromStringList( set->value("controlwidget_mini", controlwidget_mini->defaultActions()).toStringList() );
         EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
-        iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
+
+        int floating_control_version = set->value("floating_control_version", 0).toInt();
+        if (floating_control_version >= FLOATING_CONTROL_VERSION) {
+                iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
+        } else {
+                qDebug("DefaultGui::loadConfig: floating control too old, loading default one");
+                iw->setActionsFromStringList( iw->defaultActions() );
+        }
         set->endGroup();