Changeset 176 for smplayer/trunk/src/basegui.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (10 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/basegui.cpp (modified) (128 diffs)

smplayer/trunk/src/basegui.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -40 +40 @@
 #include <QClipboard>
 #include <QMimeData>
+
 
 #include <cmath>
@@ -68 +69 @@
 #include "errordialog.h"
 #include "timedialog.h"
+
+
+
+
+
+
+
 #include "clhelp.h"
 #include "mplayerversion.h"
@@ -98 +106 @@
 
 #include "constants.h"
+
+
+
+
+
 
 #include "extensions.h"
@@ -107 +120 @@
 #endif
 
+
 #include "updatechecker.h"
-
-#ifdef YT_USE_SCRIPT
-#include "codedownloader.h"
-#endif
-
-#ifdef REMINDER_ACTIONS
+#endif
+
+#ifdef YOUTUBE_SUPPORT
+  #ifdef YT_USE_YTSIG
+  #include "codedownloader.h"
+  #endif
+#endif
+
+#ifdef SHARE_ACTIONS
 #include "sharedialog.h"
+
+
+
+
 #endif
 
@@ -126 +147 @@
 BaseGui::BaseGui( QWidget* parent, Qt::WindowFlags flags ) 
         : QMainWindow( parent, flags )
+
+
+
+
+
+
+
+
+
+
 {
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -174 +205 @@
              core, SLOT(wheelDown()) );
 
-        // Set style before changing color of widgets:
-        // Set style
 #if STYLE_SWITCHING
-        qDebug( "Style name: '%s'", qApp->style()->objectName().toUtf8().data() );
-        qDebug( "Style class name: '%s'", qApp->style()->metaObject()->className() );
-
+        qApp->setStyleSheet("");
         default_style = qApp->style()->objectName();
-        if (!pref->style.isEmpty()) {
-                qApp->setStyle( pref->style );
-        }
+        #ifdef Q_OS_LINUX
+        // Some controls aren't displayed correctly with the adwaita style
+        // so try to prevent to use it as the default style
+        if (default_style.toLower() == "adwaita") default_style = "gtk+";
+        #endif
+        qDebug() << "BaseGui::BaseGui: default_style:" << default_style;
+        //qDebug() << "BaseGui::BaseGui: qApp->style:" << qApp->style();
 #endif
 
@@ -216 +247 @@
         panel->setFocus();
 
+
         initializeGui();
 
 #ifdef UPDATE_CHECKER
         update_checker = new UpdateChecker(this, &pref->update_checker_data);
-        connect(update_checker, SIGNAL(newVersionFound(QString)), 
-            this, SLOT(reportNewVersionAvailable(QString)));
 #endif
 
@@ -228 +258 @@
 #endif
 
-#ifdef REMINDER_ACTIONS
+#if
         QTimer::singleShot(1000, this, SLOT(checkReminder()));
+
+
+
+
 #endif
 }
@@ -236 +270 @@
         if (pref->compact_mode) toggleCompactMode(true);
         changeStayOnTop(pref->stay_on_top);
-
-#if ALLOW_CHANGE_STYLESHEET
-        changeStyleSheet(pref->iconset);
-#endif
 
         updateRecents();
@@ -250 +280 @@
         // Single instance
         /* Deleted */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -278 +332 @@
                         /* if (core->state() == Core::Stopped) { emit openFileRequested(); } */
                         playlist->addFiles(file_list);
+
+
+
+
+
                 }
                 else
@@ -453 +512 @@
              core, SLOT(frameStep()) );
 
+
+
+
+
         rewind1Act = new MyAction( Qt::Key_Left, this, "rewind1" );
         rewind1Act->addShortcut(QKeySequence("Shift+Ctrl+B")); // MCE remote key
@@ -565 +628 @@
              core, SLOT(screenshots()) );
 
+
+
+
+
+
+
 #ifdef VIDEOPREVIEW
         videoPreviewAct = new MyAction( this, "video_preview" );
@@ -581 +650 @@
              core, SLOT(toggleMirror(bool)) );
 
+
+
+
 
         // Submenu filter
@@ -684 +756 @@
              core, SLOT(toggleExtrastereo(bool)) );
 
+
         karaokeAct = new MyAction( this, "karaoke_filter" );
         karaokeAct->setCheckable( true );
         connect( karaokeAct, SIGNAL(toggled(bool)),
              core, SLOT(toggleKaraoke(bool)) );
+
 
         volnormAct = new MyAction( this, "volnorm_filter" );
@@ -730 +804 @@
         connect( incSubScaleAct, SIGNAL(triggered()),
              core, SLOT(incSubScale()) );
-    
+
         decSubStepAct = new MyAction( Qt::Key_G, this, "dec_sub_step" );
         connect( decSubStepAct, SIGNAL(triggered()),
@@ -739 +813 @@
              core, SLOT(incSubStep()) );
 
-        useAssAct = new MyAction(this, "use_ass_lib");
-        useAssAct->setCheckable(true);
-        connect( useAssAct, SIGNAL(toggled(bool)), core, SLOT(changeUseAss(bool)) );
+#ifdef MPV_SUPPORT
+        seekNextSubAct = new MyAction(Qt::CTRL | Qt::Key_Right, this, "seek_next_sub");
+        connect(seekNextSubAct, SIGNAL(triggered()),
+            core, SLOT(seekToNextSub()));
+
+        seekPrevSubAct = new MyAction(Qt::CTRL | Qt::Key_Left, this, "seek_prev_sub");
+        connect(seekPrevSubAct, SIGNAL(triggered()),
+            core, SLOT(seekToPrevSub()));
+#endif
+
+        useCustomSubStyleAct = new MyAction(this, "use_custom_sub_style");
+        useCustomSubStyleAct->setCheckable(true);
+        connect( useCustomSubStyleAct, SIGNAL(toggled(bool)), core, SLOT(changeUseCustomSubStyle(bool)) );
 
         useForcedSubsOnlyAct = new MyAction(this, "use_forced_subs_only");
@@ -811 +895 @@
              this, SLOT(helpCheckUpdates()) );
 
-#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
+#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_)
         updateYTAct = new MyAction( this, "update_youtube" );
         connect( updateYTAct, SIGNAL(triggered()),
@@ -821 +905 @@
              this, SLOT(helpShowConfig()) );
 
-#ifdef REMINDER_ACTIONS
+#ifdef _ACTIONS
         donateAct = new MyAction( this, "donate" );
         connect( donateAct, SIGNAL(triggered()),
@@ -850 +934 @@
 #endif
 
+
+
+
+
+
+
+
+
         // Playlist
         playNextAct = new MyAction(Qt::Key_Greater, this, "play_next");
@@ -890 +982 @@
         autoZoom235Act = new MyAction(Qt::SHIFT | Qt::Key_S, this, "zoom_235");
         connect( autoZoom235Act, SIGNAL(triggered()), core, SLOT(autoZoomFor235()) );
-
-#if USE_MPLAYER_PANSCAN
-        incPanscanAct = new MyAction(Qt::SHIFT | Qt::Key_M, this, "inc_panscan");
-        connect( incPanscanAct, SIGNAL(triggered()), core, SLOT(incPanscan()) );
-
-        decPanscanAct = new MyAction(Qt::SHIFT | Qt::Key_N, this, "dec_panscan");
-        connect( decPanscanAct, SIGNAL(triggered()), core, SLOT(decPanscan()) );
-#endif
 
 
@@ -984 +1068 @@
         showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_filename");
         connect( showFilenameAct, SIGNAL(triggered()), core, SLOT(showFilenameOnOSD()) );
+
+
+
 
         toggleDeinterlaceAct = new MyAction(Qt::Key_D, this, "toggle_deinterlacing");
@@ -1152 +1239 @@
         // Subtitle track
         subtitleTrackGroup = new MyActionGroup(this);
-    connect( subtitleTrackGroup, SIGNAL(activated(int)), 
+connect( subtitleTrackGroup, SIGNAL(activated(int)), 
                  core, SLOT(changeSubtitle(int)) );
+
+
+
+
+
+
+
 
         ccGroup = new MyActionGroup(this);
@@ -1190 +1284 @@
                          core, SLOT(changeChapter(int)) );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #if DVDNAV_SUPPORT
         dvdnavUpAct = new MyAction(Qt::SHIFT | Qt::Key_Up, this, "dvdnav_up");
@@ -1227 +1340 @@
         stopAct->setEnabled(b);
         frameStepAct->setEnabled(b);
+
         rewind1Act->setEnabled(b);
         rewind2Act->setEnabled(b);
@@ -1251 +1365 @@
         screenshotAct->setEnabled(b);
         screenshotsAct->setEnabled(b);
+
+
+
         flipAct->setEnabled(b);
         mirrorAct->setEnabled(b);
+
         postProcessingAct->setEnabled(b);
         phaseAct->setEnabled(b);
@@ -1271 +1389 @@
         audioDelayAct->setEnabled(b);
         extrastereoAct->setEnabled(b);
+
         karaokeAct->setEnabled(b);
+
         volnormAct->setEnabled(b);
         loadAudioAct->setEnabled(b);
@@ -1288 +1408 @@
         incSubScaleAct->setEnabled(b);
         decSubScaleAct->setEnabled(b);
+
+
+
+
 
         // Actions not in menus
@@ -1363 +1487 @@
         screenshotsAct->setEnabled( screenshots_enabled );
 
+
+
+
+
         // Disable the compact action if not using video window
         compactAct->setEnabled( panel->isVisible() );
@@ -1379 +1507 @@
                 audioDelayAct->setEnabled(false);
                 extrastereoAct->setEnabled(false);
+
                 karaokeAct->setEnabled(false);
+
                 volnormAct->setEnabled(false);
                 channelsGroup->setActionsEnabled(false);
@@ -1390 +1520 @@
                 screenshotAct->setEnabled(false);
                 screenshotsAct->setEnabled(false);
+
+
+
                 flipAct->setEnabled(false);
                 mirrorAct->setEnabled(false);
+
                 postProcessingAct->setEnabled(false);
                 phaseAct->setEnabled(false);
@@ -1436 +1570 @@
                 flipAct->setEnabled(false);
                 mirrorAct->setEnabled(false);
+
                 postProcessingAct->setEnabled(false);
                 phaseAct->setEnabled(false);
@@ -1466 +1601 @@
         }
 #endif
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1477 +1623 @@
         stopAct->setEnabled(true);
 }
+
 
 void BaseGui::togglePlayAction(Core::State state) {
         qDebug("BaseGui::togglePlayAction");
+
+
         if (state == Core::Playing)
                 playAct->setEnabled(false);
         else
                 playAct->setEnabled(true);
-}
-#endif // AUTODISABLE_ACTIONS
+#endif
+}
 
 void BaseGui::retranslateStrings() {
@@ -1534 +1683 @@
         stopAct->change( Images::icon("stop"), tr("&Stop") );
         frameStepAct->change( Images::icon("frame_step"), tr("&Frame step") );
+
 
         playOrPauseAct->change( tr("Play / Pause") );
@@ -1567 +1717 @@
         screenshotAct->change( Images::icon("screenshot"), tr("&Screenshot") );
         screenshotsAct->change( Images::icon("screenshots"), tr("Start/stop takin&g screenshots") );
+
+
+
 #ifdef VIDEOPREVIEW
         videoPreviewAct->change( Images::icon("video_preview"), tr("Thumb&nail Generator...") );
@@ -1572 +1725 @@
         flipAct->change( Images::icon("flip"), tr("Fli&p image") );
         mirrorAct->change( Images::icon("mirror"), tr("Mirr&or image") );
+
 
         decZoomAct->change( tr("Zoom &-") );
@@ -1583 +1737 @@
         moveUpAct->change( tr("Move &up") );
         moveDownAct->change( tr("Move &down") );
-
-#if USE_MPLAYER_PANSCAN
-        decPanscanAct->change( "Panscan -" );
-        incPanscanAct->change( "Panscan +" );
-#endif
 
         // Submenu Filters
@@ -1614 +1763 @@
         // Submenu Filters
         extrastereoAct->change( tr("&Extrastereo") );
+
         karaokeAct->change( tr("&Karaoke") );
+
         volnormAct->change( tr("Volume &normalization") );
 
@@ -1631 +1782 @@
         incSubStepAct->change( Images::icon("inc_sub_step"), 
                            tr("N&ext line in subtitles") );
-        useAssAct->change( Images::icon("use_ass_lib"), tr("Use SSA/&ASS library") );
+#ifdef MPV_SUPPORT
+        seekNextSubAct->change(Images::icon("seek_next_sub"), tr("Seek to next subtitle"));
+        seekPrevSubAct->change(Images::icon("seek_prev_sub"), tr("Seek to previous subtitle"));
+#endif
+        useCustomSubStyleAct->change( Images::icon("use_custom_sub_style"), tr("Use custo&m style") );
         useForcedSubsOnlyAct->change( Images::icon("forced_subs"), tr("&Forced subtitles only") );
 
@@ -1665 +1820 @@
         // Submenu Logs
 #ifdef LOG_MPLAYER
-        showLogMplayerAct->change( "MPlayer" );
+        showLogMplayerAct->change();
 #endif
 #ifdef LOG_SMPLAYER
@@ -1677 +1832 @@
         showCheckUpdatesAct->change( Images::icon("check_updates"), tr("Check for &updates") );
 
-#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
+#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_)
         updateYTAct->change( Images::icon("update_youtube"), tr("Update &Youtube code") );
 #endif
 
         showConfigAct->change( Images::icon("show_config"), tr("&Open configuration folder") );
-#ifdef REMINDER_ACTIONS
+#ifdef _ACTIONS
         donateAct->change( Images::icon("donate"), tr("&Donate / Share with your friends") );
 #endif
@@ -1694 +1849 @@
         yahooAct->change("&Yahoo!");
 #endif
+
+
+
+
 
         // Playlist
@@ -1736 +1895 @@
 
         showFilenameAct->change( tr("Show filename on OSD") );
+
         toggleDeinterlaceAct->change( tr("Toggle deinterlacing") );
 
@@ -1902 +2062 @@
 
         // Menu Subtitle
-        subtitlestrack_menu->menuAction()->setText( tr("&Select") );
-        subtitlestrack_menu->menuAction()->setIcon( Images::icon("sub") );
+#ifdef MPV_SUPPORT
+        subtitles_track_menu->menuAction()->setText( tr("Prim&ary track") );
+#else
+        subtitles_track_menu->menuAction()->setText( tr("&Select") );
+#endif
+        subtitles_track_menu->menuAction()->setIcon( Images::icon("sub") );
+
+#ifdef MPV_SUPPORT
+        secondary_subtitles_track_menu->menuAction()->setText( tr("Secondary trac&k") );
+        secondary_subtitles_track_menu->menuAction()->setIcon( Images::icon("secondary_sub") );
+#endif
 
         closed_captions_menu->menuAction()->setText( tr("&Closed captions") );
@@ -1921 +2090 @@
         angles_menu->menuAction()->setIcon( Images::icon("angle") );
 
+
+
+
+
+
 #if PROGRAM_SWITCH
         programtrack_menu->menuAction()->setText( tr("P&rogram", "program") );
@@ -1926 +2100 @@
 #endif
 
+
+
+
+
+
+
 
 #if DVDNAV_SUPPORT
@@ -1957 +2137 @@
         // Other things
 #ifdef LOG_MPLAYER
-        mplayer_log_window->setWindowTitle( tr("SMPlayer - MPlayer log") );
+        mplayer_log_window->setWindowTitle( tr(") );
 #endif
 #ifdef LOG_SMPLAYER
-        smplayer_log_window->setWindowTitle( tr("SMPlayer - SMPlayer log") );
+        smplayer_log_window->setWindowTitle( tr("SMPlayer log") );
 #endif
 
@@ -2019 +2199 @@
              this, SLOT(resizeWindow(int,int)) );
 
+
+
+
         connect( core, SIGNAL(showMessage(QString,int)),
              this, SLOT(displayMessage(QString,int)) );
@@ -2099 +2282 @@
         connect(core, SIGNAL(signatureNotFound(const QString &)),
             this, SLOT(YTNoSignature(const QString &)));
+
+
 #endif
         connect(core, SIGNAL(receivedForbidden()), this, SLOT(gotForbidden()));
@@ -2114 +2299 @@
 #if LOGO_ANIMATION
         mplayerwindow->setAnimatedLogo( pref->animated_logo);
+
+
+
+
+
+
+
+
 #endif
 
@@ -2143 +2336 @@
 
         connect( mplayerwindow, SIGNAL(mouseMovedDiff(QPoint)),
-             this, SLOT(moveWindowDiff(QPoint)), Qt::QueuedConnection );
-        mplayerwindow->activateMouseDragTracking(pref->move_when_dragging);
+             this, SLOT(processMouseMovedDiff(QPoint)), Qt::QueuedConnection );
+#ifdef MOUSE_GESTURES
+        mplayerwindow->activateMouseDragTracking(true);
+#else
+        mplayerwindow->activateMouseDragTracking(pref->drag_function == Preferences::MoveWindow);
+#endif
 }
 
@@ -2197 +2394 @@
              core, SLOT(setAudioAudioEqualizerRestart(AudioEqualizerList)) );
 
+
+
+
         connect( audio_equalizer, SIGNAL(visibilityChanged()),
              this, SLOT(updateWidgets()) );
@@ -2250 +2450 @@
 
 void BaseGui::createFilePropertiesDialog() {
+
         QApplication::setOverrideCursor(Qt::WaitCursor);
         file_dialog = new FilePropertiesDialog(this);
@@ -2275 +2476 @@
 
         recentfiles_menu = new QMenu(this);
+
         recentfiles_menu->addAction( clearRecentsAct );
         recentfiles_menu->addSeparator();
+
 
         openMenu->addMenu( recentfiles_menu );
@@ -2311 +2514 @@
         playMenu->addAction(stopAct);
         playMenu->addAction(frameStepAct);
+
         playMenu->addSeparator();
         playMenu->addAction(rewind1Act);
@@ -2455 +2659 @@
         videoMenu->addAction(flipAct);
         videoMenu->addAction(mirrorAct);
+
         videoMenu->addSeparator();
         videoMenu->addAction(videoEqualizerAct);
@@ -2488 +2693 @@
         audiofilter_menu->menuAction()->setObjectName("audiofilter_menu");
         audiofilter_menu->addAction(extrastereoAct);
+
         audiofilter_menu->addAction(karaokeAct);
+
         audiofilter_menu->addAction(volnormAct);
 
@@ -2521 +2728 @@
         // SUBTITLES MENU
         // Track submenu
-        subtitlestrack_menu = new QMenu(this);
-        subtitlestrack_menu->menuAction()->setObjectName("subtitlestrack_menu");
-
-        subtitlesMenu->addMenu(subtitlestrack_menu);
+        subtitles_track_menu = new QMenu(this);
+        subtitles_track_menu->menuAction()->setObjectName("subtitlestrack_menu");
+
+#ifdef MPV_SUPPORT
+        secondary_subtitles_track_menu = new QMenu(this);
+        secondary_subtitles_track_menu->menuAction()->setObjectName("secondary_subtitles_track_menu");
+#endif
+
+        subtitlesMenu->addMenu(subtitles_track_menu);
+#ifdef MPV_SUPPORT
+        subtitlesMenu->addMenu(secondary_subtitles_track_menu);
+#endif
         subtitlesMenu->addSeparator();
 
@@ -2565 +2780 @@
         subtitlesMenu->addAction(decSubStepAct);
         subtitlesMenu->addAction(incSubStepAct);
+
+
+
+
+
         subtitlesMenu->addSeparator();
         subtitlesMenu->addAction(useForcedSubsOnlyAct);
@@ -2570 +2790 @@
         subtitlesMenu->addAction(subVisibilityAct);
         subtitlesMenu->addSeparator();
-        subtitlesMenu->addAction(useAssAct);
+        subtitlesMenu->addAction(useAct);
 #ifdef FIND_SUBTITLES
         subtitlesMenu->addSeparator(); //turbos
@@ -2595 +2815 @@
 
         browseMenu->addMenu(angles_menu);
+
+
+
+
+
+
+
+
 
 #if DVDNAV_SUPPORT
@@ -2638 +2866 @@
         osd_menu->menuAction()->setObjectName("osd_menu");
         osd_menu->addActions(osdGroup->actions());
+
+
+
+
 
         optionsMenu->addMenu(osd_menu);
@@ -2680 +2912 @@
         helpMenu->addSeparator();
         helpMenu->addAction(showCheckUpdatesAct);
-#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
+#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_)
         helpMenu->addAction(updateYTAct);
 #endif
@@ -2686 +2918 @@
         helpMenu->addAction(showConfigAct);
         helpMenu->addSeparator();
-#ifdef REMINDER_ACTIONS
+#ifdef _ACTIONS
         helpMenu->addAction(donateAct);
         helpMenu->addSeparator();
@@ -2807 +3039 @@
         pl->setSavePlaylistOnExit(playlist->savePlaylistOnExit());
         pl->setPlayFilesFromStart(playlist->playFilesFromStart());
+
 
         pref_dialog->show();
@@ -2817 +3050 @@
         bool need_update_language = false;
 
+
+
         pref_dialog->getData(pref);
+
+
+
 
         // Change application font
@@ -2845 +3083 @@
                 need_update_language = true;
                 // Stylesheet
-#if ALLOW_CHANGE_STYLESHEET
-                changeStyleSheet(pref->iconset);
-#endif
-        }
-
-        mplayerwindow->activateMouseDragTracking(pref->move_when_dragging);
+                #if ALLOW_CHANGE_STYLESHEET
+                if (!_interface->guiChanged()) applyStyles();
+                #endif
+        }
+
+#ifdef MOUSE_GESTURES
+        mplayerwindow->activateMouseDragTracking(true);
+#else
+        mplayerwindow->activateMouseDragTracking(pref->drag_function == Preferences::MoveWindow);
+#endif
         mplayerwindow->delayLeftClick(pref->delay_left_click);
 
@@ -2881 +3123 @@
                 mplayerwindow->setMonitorAspect( pref->monitor_aspect_double() );
         }
+
         if (advanced->lavfDemuxerChanged()) {
                 core->mset.forced_demuxer = pref->use_lavf_demuxer ? "lavf" : "";
         }
+
 
         // Update playlist preferences
@@ -2891 +3135 @@
         playlist->setSavePlaylistOnExit(pl->savePlaylistOnExit());
         playlist->setPlayFilesFromStart(pl->playFilesFromStart());
+
 
 
@@ -2902 +3147 @@
 #if STYLE_SWITCHING
         if (_interface->styleChanged()) {
-                qDebug( "selected style: '%s'", pref->style.toUtf8().data() );
-                if ( !pref->style.isEmpty()) {
-                        qApp->setStyle( pref->style );
-                } else {
-                        qDebug("setting default style: '%s'", default_style.toUtf8().data() );
-                        qApp->setStyle( default_style );
-                }
+                applyStyles();
         }
 #endif
@@ -2934 +3173 @@
 #endif
         }
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -2952 +3201 @@
 
 void BaseGui::setDataToFileProperties() {
+
+
+
+
+
         // Save a copy of the original values
         if (core->mset.original_demuxer.isEmpty()) 
@@ -2974 +3228 @@
         file_dialog->setAudioCodec(ac, core->mset.original_audio_codec);
         file_dialog->setVideoCodec(vc, core->mset.original_video_codec);
+
 
         file_dialog->setMplayerAdditionalArguments( core->mset.mplayer_additional_options );
@@ -2986 +3241 @@
 
         bool need_restart = false;
-        bool demuxer_changed = false;
 
 #undef TEST_AND_SET
 #define TEST_AND_SET( Pref, Dialog ) \
         if ( Pref != Dialog ) { Pref = Dialog; need_restart = true; }
+
+
+
 
         QString prev_demuxer = core->mset.forced_demuxer;
@@ -3012 +3269 @@
         if (vc == core->mset.original_video_codec) vc="";
         TEST_AND_SET(core->mset.forced_video_codec, vc);
+
 
         TEST_AND_SET(core->mset.mplayer_additional_options, file_dialog->mplayerAdditionalArguments());
@@ -3017 +3275 @@
         TEST_AND_SET(core->mset.mplayer_additional_audio_filters, file_dialog->mplayerAdditionalAudioFilters());
 
+
         // Restart the video to apply
         if (need_restart) {
@@ -3025 +3284 @@
                 }
         }
+
 }
 
 
 void BaseGui::updateMediaInfo() {
-    qDebug("BaseGui::updateMediaInfo");
+qDebug("BaseGui::updateMediaInfo");
 
         if (file_dialog) {
@@ -3146 +3406 @@
 
 void BaseGui::showMplayerLog() {
-    qDebug("BaseGui::showMplayerLog");
+qDebug("BaseGui::showMplayerLog");
 
         exitFullscreenIfNeeded();
 
-    mplayer_log_window->setText( mplayer_log );
+mplayer_log_window->setText( mplayer_log );
         mplayer_log_window->show();
 }
@@ -3193 +3453 @@
                 a->setData(n);
         }
-        subtitlestrack_menu->addActions( subtitleTrackGroup->actions() );
+        subtitles_track_menu->addActions( subtitleTrackGroup->actions() );
+
+#ifdef MPV_SUPPORT
+        // Secondary Subtitles
+        secondarySubtitleTrackGroup->clear(true);
+        QAction * subSecNoneAct = secondarySubtitleTrackGroup->addAction( tr("&None") );
+        subSecNoneAct->setData(MediaSettings::SubNone);
+        subSecNoneAct->setCheckable(true);
+        for (n=0; n < core->mdat.subs.numItems(); n++) {
+                QAction *a = new QAction(secondarySubtitleTrackGroup);
+                a->setCheckable(true);
+                a->setText(core->mdat.subs.itemAt(n).displayName());
+                a->setData(n);
+        }
+        secondary_subtitles_track_menu->addActions( secondarySubtitleTrackGroup->actions() );
+#endif
 
         // Audio
@@ -3267 +3542 @@
         // Chapters
         chapterGroup->clear(true);
+
         if (core->mdat.chapters.numItems() > 0) {
                 for (n=0; n < core->mdat.chapters.numItems(); n++) {
                         QAction *a = new QAction(chapterGroup);
                         //a->setCheckable(true);
+
                         a->setText(core->mdat.chapters.itemAt(n).name());
                         a->setData(core->mdat.chapters.itemAt(n).ID());
@@ -3309 +3586 @@
         }
         angles_menu->addActions( angleGroup->actions() );
-}
+
+#ifdef BOOKMARKS
+        updateBookmarks();
+#endif
+}
+
+#ifdef BOOKMARKS
+void BaseGui::updateBookmarks() {
+        qDebug("BaseGui::updateBookmarks");
+
+        // Bookmarks
+        bookmarkGroup->clear(true);
+        int n_bookmarks = core->mset.bookmarks.size();
+        if (n_bookmarks > 0) {
+                QMap<int, QString>::const_iterator i = core->mset.bookmarks.constBegin();
+                while (i != core->mset.bookmarks.constEnd()) {
+                        QString name = i.value();
+                        int time = i.key();
+                        QAction *a = new QAction(bookmarkGroup);
+                        QString text;
+                        if (name.isEmpty()) {
+                                text = Helper::formatTime(time);
+                        } else {
+                                text = QString("%1 (%2)").arg(name).arg(Helper::formatTime(time));
+                        }
+                        a->setCheckable(false);
+                        a->setText(text);
+                        a->setData(time);
+                        i++;
+                }
+        }
+        bookmark_menu->clear();
+        bookmark_menu->addAction(addBookmarkAct);
+        bookmark_menu->addAction(editBookmarksAct);
+        bookmark_menu->addSeparator();
+        bookmark_menu->addActions(bookmarkGroup->actions());
+}
+#endif
 
 void BaseGui::updateRecents() {
         qDebug("BaseGui::updateRecents");
 
-        // Not clear the first 2 items
-        while (recentfiles_menu->actions().count() > 2) {
-                QAction * a = recentfiles_menu->actions()[2];
-                recentfiles_menu->removeAction( a );
-                a->deleteLater();
-        }
+        recentfiles_menu->clear();
 
         int current_items = 0;
@@ -3354 +3663 @@
 
         recentfiles_menu->menuAction()->setVisible( current_items > 0 );
+
+
+
+
 }
 
@@ -3373 +3686 @@
         // Subtitles menu
         subtitleTrackGroup->setChecked( core->mset.current_sub_id );
+
+
+
+
+
 
         // Disable the unload subs action if there's no external subtitles
@@ -3416 +3734 @@
         titleGroup->setChecked( core->mset.current_title_id );
 
-        // Chapters
-        chapterGroup->setChecked( core->mset.current_chapter_id );
-
         // Angles
         angleGroup->setChecked( core->mset.current_angle_id );
@@ -3477 +3792 @@
         muteAct->setChecked( (pref->global_volume ? pref->mute : core->mset.mute) );
 
+
         // Karaoke menu option
         karaokeAct->setChecked( core->mset.karaoke_filter );
+
 
         // Extrastereo menu option
@@ -3526 +3843 @@
         mirrorAct->setChecked( core->mset.mirror );
 
-        // Use ass lib
-        useAssAct->setChecked( pref->use_ass_subtitles );
+        // Use 
+        useles );
 
         // Forced subs
@@ -3550 +3867 @@
         decSubStepAct->setEnabled(e);
         incSubStepAct->setEnabled(e);
+
+
+
+
 }
 
@@ -3642 +3963 @@
                 playlist->load_pls(file);
         }
-        else 
+        else
+        if (extension=="xspf") {
+                playlist->loadXSPF(file);
+        }
+        else
         if (QFileInfo(file).isDir()) {
                 openDirectory(file);
@@ -3791 +4116 @@
                 }
                 else
+
+
+
+
                 if (extension=="iso") {
                         if (playlist->maybeSave()) {
@@ -3860 +4189 @@
                 if (playlist->maybeSave()) {
 #if DVDNAV_SUPPORT
-                        core->openDVD( DiscName::joinDVD(pref->use_dvdnav ? 0: 1, pref->dvd_device, pref->use_dvdnav) );
+                        int first_title = 0;
+                        if (!pref->use_dvdnav) first_title = core->firstDVDTitle();
+                        core->openDVD( DiscName::joinDVD(first_title, pref->dvd_device, pref->use_dvdnav) );
 #else
-                        core->openDVD( DiscName::joinDVD(1, pref->dvd_device, false) );
+                        core->openDVD( DiscName::joinDVD(, pref->dvd_device, false) );
 #endif
                 }
@@ -3887 +4218 @@
         pref->last_dvd_directory = directory;
 #if DVDNAV_SUPPORT
-        core->openDVD( DiscName::joinDVD(pref->use_dvdnav ? 0: 1, directory, pref->use_dvdnav) );
+        int first_title = 0;
+        if (!pref->use_dvdnav) first_title = core->firstDVDTitle();
+        core->openDVD( DiscName::joinDVD(first_title, directory, pref->use_dvdnav) );
 #else
-        core->openDVD( DiscName::joinDVD(1, directory, false) );
+        core->openDVD( DiscName::joinDVD(, directory, false) );
 #endif
 }
@@ -3900 +4233 @@
 void BaseGui::openBluRayFromFolder(QString directory) {
         pref->last_dvd_directory = directory;
-        core->openBluRay( DiscName::join(DiscName::BLURAY, 1, directory) );
+        core->openBluRay( DiscName::join(DiscName::BLURAY, , directory) );
 }
 
@@ -3915 +4248 @@
                 configureDiscDevices();
         } else {
-                core->openBluRay( DiscName::join(DiscName::BLURAY, 1, pref->bluray_device) );
+                core->openBluRay( DiscName::join(DiscName::BLURAY, , pref->bluray_device) );
         }
 }
@@ -4000 +4333 @@
 
 void BaseGui::helpFirstSteps() {
-        QDesktopServices::openUrl(QString("http://smplayer.sourceforge.net/first-steps.php?version=%1").arg(Version::printable()));
+        QDesktopServices::openUrl(QString(?version=%1").arg(Version::printable()));
 }
 
 void BaseGui::helpFAQ() {
-        QString url = "http://smplayer.sourceforge.net/faq.php";
+        QString url = ;
         /* if (!pref->language.isEmpty()) url += QString("?tr_lang=%1").arg(pref->language); */
         QDesktopServices::openUrl( QUrl(url) );
@@ -4019 +4352 @@
 
 void BaseGui::helpCheckUpdates() {
-        QString url = "http://smplayer.sourceforge.net/changes.php";
-        /* if (!pref->language.isEmpty()) url += QString("?tr_lang=%1").arg(pref->language); */
+#ifdef UPDATE_CHECKER
+        update_checker->check();
+#else
+        QString url = QString(URL_CHANGES "?version=%1").arg(Version::with_revision());
         QDesktopServices::openUrl( QUrl(url) );
+
 }
 
@@ -4028 +4364 @@
 }
 
-#ifdef REMINDER_ACTIONS
+#ifdef _ACTIONS
 void BaseGui::helpDonate() {
         ShareDialog d(this);
         d.showRemindCheck(false);
+
+
+
+
+
         d.exec();
         int action = d.actions();
@@ -4037 +4378 @@
 
         if (action > 0) {
+
+
+
                 QSettings * set = Global::settings;
                 set->beginGroup("reminder");
                 set->setValue("action", action);
                 set->endGroup();
+
         }
 }
@@ -4053 +4398 @@
 void BaseGui::shareSMPlayer() {
         QString text = QString("SMPlayer - Free Media Player with built-in codecs that can play and download Youtube videos").replace(" ","+");
-        QString url = "http://smplayer.sourceforge.net";
+        QString url = ;
 
         if (sender() == twitterAct) {
@@ -4074 +4419 @@
                 QDesktopServices::openUrl(QUrl("http://www.facebook.com/sharer.php?u=" + url + "&t=" + text));
 
-                #ifdef REMINDER_ACTIONS
+                #ifdef _ACTIONS
                 QSettings * set = Global::settings;
                 set->beginGroup("reminder");
@@ -4127 +4472 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void BaseGui::exitFullscreen() {
         if (pref->fullscreen) {
@@ -4152 +4528 @@
         // If using mplayer window
         if (pref->use_mplayer_window) {
-                core->tellmp("vo_fullscreen " + QString::number(b) );
+                core->);
                 updateWidgets();
                 return;
@@ -4201 +4577 @@
         (!core->mset.add_letterbox)) 
         {
-                core->restart();
+                core->changeLetterboxOnFullscreen(b);
+                /* core->restart(); */
         }
 
@@ -4209 +4586 @@
 
 void BaseGui::aboutToEnterFullscreen() {
+
+
+
+
         if (!pref->compact_mode) {
                 menuBar()->hide();
@@ -4219 +4600 @@
                 menuBar()->show();
                 statusBar()->show();
+
+
+
+
+
+
+
         }
 }
@@ -4404 +4792 @@
 #endif
 
-#ifdef UPDATE_CHECKER
-void BaseGui::reportNewVersionAvailable(QString new_version) {
-        QMessageBox::StandardButton button = QMessageBox::information(this, tr("New version available"),
-                tr("A new version of SMPlayer is available.") + "<br><br>" +
-                tr("Installed version: %1").arg(Version::with_revision()) + "<br>" +
-                tr("Available version: %1").arg(new_version) + "<br><br>" +
-                tr("Would you like to know more about this new version?"),
-                QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-
-        if (button == QMessageBox::Yes) {
-                QDesktopServices::openUrl(QUrl("http://smplayer.sourceforge.net/changes.php"));
-        }
-
-        update_checker->saveVersion(new_version);
-}
-#endif
-
 #ifdef CHECK_UPGRADED
 void BaseGui::checkIfUpgraded() {
@@ -4435 +4806 @@
                 os = "linux";
                 #endif
-                QDesktopServices::openUrl(QString("http://smplayer.sourceforge.net/thank-you.php?version=%1&so=%2").arg(Version::printable()).arg(os));
+                QDesktopServices::openUrl(QString(?version=%1&so=%2").arg(Version::printable()).arg(os));
         }
         pref->smplayer_stable_version = Version::stable();
@@ -4441 +4812 @@
 #endif
 
-#ifdef REMINDER_ACTIONS
+#if
 void BaseGui::checkReminder() {
         qDebug("BaseGui::checkReminder");
@@ -4486 +4857 @@
 
 #ifdef YOUTUBE_SUPPORT
+
+
+
+
+
+
+
+
+
 void BaseGui::YTNoSignature(const QString & title) {
         qDebug("BaseGui::YTNoSignature: %s", title.toUtf8().constData());
@@ -4499 +4879 @@
         }
 
-        #ifdef YT_USE_SCRIPT
+        #ifdef YT_USE_
         int ret = QMessageBox::question(this, tr("Problems with Youtube"),
                                 info_text + "<br><br>" +
@@ -4514 +4894 @@
 }
 
-#ifdef YT_USE_SCRIPT
+#ifdef YT_USE_
 void BaseGui::YTUpdateScript() {
         static CodeDownloader * downloader = 0;
@@ -4520 +4900 @@
         downloader->saveAs(Paths::configPath() + "/yt.js");
         downloader->show();
-        downloader->download(QUrl("http://updates.smplayer.info/yt.js"));
-}
-#endif // YT_USE_SCRIPT
+        downloader->download(QUrl());
+}
+#endif // YT_USE_
 #endif //YOUTUBE_SUPPORT
 
 void BaseGui::gotForbidden() {
         qDebug("BaseGui::gotForbidden");
+
+
+
+
+
+
         static bool busy = false;
 
@@ -4725 +5111 @@
 
 void BaseGui::displayState(Core::State state) {
-        qDebug("BaseGui::displayState: %s", core->stateToString().toUtf8().data());
+        qDebug() << "BaseGui::displayState:" << core->stateToString();
+
         switch (state) {
-                case Core::Playing:     statusBar()->showMessage( tr("Playing %1").arg(core->mdat.filename), 2000); break;
+                //case Core::Playing:   statusBar()->showMessage( tr("Playing %1").arg(core->mdat.filename), 2000); break;
+                case Core::Playing:     statusBar()->showMessage(""); break;
                 case Core::Paused:      statusBar()->showMessage( tr("Pause") ); break;
                 case Core::Stopped:     statusBar()->showMessage( tr("Stop") , 2000); break;
-        }
+                case Core::Buffering: /* statusBar()->showMessage(tr("Buffering...")); */ break;
+        }
+
         if (state == Core::Stopped) setWindowCaption( "SMPlayer" );
 
@@ -4835 +5225 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         resize(new_width, new_height);
 
@@ -4842 +5253 @@
            panel->size().height() );
         qDebug("BaseGui::resizeWindow: done: mplayerwindow->size: %d, %d", 
-           mplayerwindow->size().width(),  
+           mplayerwindow->size().width(),
            mplayerwindow->size().height() );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -4851 +5278 @@
         if (panel->isVisible()) {
                 // Exit from fullscreen mode 
-            if (pref->fullscreen) { toggleFullscreen(false); update(); }
+        if (pref->fullscreen) { toggleFullscreen(false); update(); }
 
                 // Exit from compact mode first
@@ -4864 +5291 @@
                 // Disable compact mode
                 //compactAct->setEnabled(false);
+
+
+
+
+
+
+
+
+
+
+
+
         }
 }
@@ -4974 +5413 @@
 void BaseGui::checkStayOnTop(Core::State state) {
         qDebug("BaseGui::checkStayOnTop");
-    if ((!pref->fullscreen) && (pref->stay_on_top == Preferences::WhilePlayingOnTop)) {
+if ((!pref->fullscreen) && (pref->stay_on_top == Preferences::WhilePlayingOnTop)) {
                 setStayOnTop((state == Core::Playing));
         }
@@ -4997 +5436 @@
 
 #if ALLOW_CHANGE_STYLESHEET
-void BaseGui::loadQss(QString filename) {
+QString BaseGui::loadQss(QString filename) {
+        qDebug("BaseGui::loadQss: %s", filename.toUtf8().constData());
+
         QFile file( filename );
         file.open(QFile::ReadOnly);
-        QString styleSheet = QLatin1String(file.readAll());
+        QString styleheet = QLatin1String(file.readAll());
 
 #ifdef USE_RESOURCES
         Images::setTheme(pref->iconset);
-        QString path = ":/" + pref->iconset;
+        QString path;
+        if (Images::has_rcc) {
+                path = ":/" + pref->iconset;
+        } else {
+                QDir current = QDir::current();
+                QString td = Images::themesDirectory();
+                path = current.relativeFilePath(td);
+        }
 #else
         QDir current = QDir::current();
@@ -5010 +5458 @@
         QString path = current.relativeFilePath(td);
 #endif
-        styleSheet.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
+        styleheet.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
                                                 QString("url(%1\\1)").arg(path + "/"));
-        //qDebug("BaseGui::loadQss: styeSheet: %s", styleSheet.toUtf8().constData());
-        qApp->setStyleSheet(styleSheet);
+        //qDebug("BaseGui::loadQss: styheet.toUtf8().constData());
+        ;
 }
 
 void BaseGui::changeStyleSheet(QString style) {
-        if (style.isEmpty())  {
-                qApp->setStyleSheet("");
-        } 
-        else {
-                QString qss_file = Paths::configPath() + "/themes/" + pref->iconset +"/style.qss";
-                //qDebug("BaseGui::changeStyleSheet: '%s'", qss_file.toUtf8().data());
+        qDebug("BaseGui::changeStyleSheet: %s", style.toUtf8().constData());
+
+        // Load default stylesheet
+        QString stylesheet = loadQss(":/default-theme/style.qss");
+
+        if (!style.isEmpty()) {
+                // Check main.css
+                QString qss_file = Paths::configPath() + "/themes/" + pref->iconset + "/main.css";
                 if (!QFile::exists(qss_file)) {
-                        qss_file = Paths::themesPath() +"/"+ pref->iconset +"/style.qss";
-                }
+                        qss_file = Paths::themesPath() +"/"+ pref->iconset + "/main.css";
+                }
+
+                // Check style.qss
+                if (!QFile::exists(qss_file)) {
+                        qss_file = Paths::configPath() + "/themes/" + pref->iconset + "/style.qss";
+                        if (!QFile::exists(qss_file)) {
+                                qss_file = Paths::themesPath() +"/"+ pref->iconset + "/style.qss";
+                        }
+                }
+
+                // Load style file
                 if (QFile::exists(qss_file)) {
                         qDebug("BaseGui::changeStyleSheet: '%s'", qss_file.toUtf8().data());
-                        loadQss(qss_file);
-                } else {
-                        qApp->setStyleSheet("");
-                }
-        }
-}
-#endif
+                        stylesheet += loadQss(qss_file);
+                }
+        }
+
+        //qDebug("BaseGui::changeStyleSheet: styleSheet: %s", stylesheet.toUtf8().constData());
+        qApp->setStyleSheet(stylesheet);
+}
+#endif
+
+void BaseGui::applyStyles() {
+        qDebug("BaseGui::applyStyles");
+
+#if ALLOW_CHANGE_STYLESHEET
+        qDebug() << "BaseGui::applyStyles: stylesheet:" << pref->iconset;
+        changeStyleSheet(pref->iconset);
+#endif
+
+#if STYLE_SWITCHING
+        QString style = pref->style;
+        if (style.isEmpty()) style = default_style;
+        qDebug() << "BaseGui::applyStyles: style:" << style;
+        if (!style.isEmpty()) qApp->setStyle(style);
+#endif
+
+}
 
 void BaseGui::loadActions() {
@@ -5058 +5536 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void BaseGui::moveWindowDiff(QPoint diff) {
+
+
         if (pref->fullscreen || isMaximized()) {
                 return;
@@ -5089 +5637 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 void BaseGui::showEvent( QShowEvent * ) {
         qDebug("BaseGui::showEvent");
@@ -5112 +5672 @@
         }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 void BaseGui::askForMplayerVersion(QString line) {
@@ -5139 +5734 @@
         if (exit_code != 255 ) {
                 ErrorDialog d(this);
-                d.setText(tr("MPlayer has finished unexpectedly.") + " " + 
+                d.setWindowTitle(tr("%1 Error").arg(PLAYER_NAME));
+                d.setText(tr("%1 has finished unexpectedly.").arg(PLAYER_NAME) + " " + 
                       tr("Exit code: %1").arg(exit_code));
 #ifdef LOG_MPLAYER
@@ -5152 +5748 @@
 
         if (!pref->report_mplayer_crashes) {
-                qDebug("showErrorFromMplayer: not displaying error dialog");
+                qDebug("showErrorFromMplayer: not displaying error dialog");
                 return;
         }
@@ -5158 +5754 @@
         if ((e == QProcess::FailedToStart) || (e == QProcess::Crashed)) {
                 ErrorDialog d(this);
+
                 if (e == QProcess::FailedToStart) {
-                        d.setText(tr("MPlayer failed to start.") + " " + 
-                         tr("Please check the MPlayer path in preferences."));
+                        d.setText(tr(") + " " + 
+                         tr("Please check the ));
                 } else {
-                        d.setText(tr("MPlayer has crashed.") + " " + 
+                        d.setText(tr(") + " " + 
                       tr("See the log for more info."));
                 }
@@ -5236 +5833 @@
 void BaseGui::showTubeBrowser() {
         qDebug("BaseGui::showTubeBrowser");
-        QString exec = Paths::appPath() + "/smtube";
-        qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData());
-        if (!QProcess::startDetached(exec, QStringList())) {
+        #ifdef Q_OS_WIN
+        QString exec = Paths::appPath() + "/smtube.exe";
+        #else
+        QString exec = Helper::findExecutable("smtube");
+        #endif
+
+        if (exec.isEmpty() || !QFile::exists(exec)) {
                 QMessageBox::warning(this, "SMPlayer",
-                        tr("The YouTube Browser couldn't be launched.") +"<br>"+ 
-                        tr("Be sure %1 is installed.").arg("SMTube"));
+                        tr("The YouTube Browser is not installed.") +"<br>"+ 
+                        tr("Visit %1 to get it.").arg("<a href=http://www.smtube.org>http://www.smtube.org</a>"));
+                return;
+        }
+
+        QStringList args;
+        if (!pref->language.isEmpty()) args << "-lang" << pref->language;
+        qDebug() << "BaseGui::showTubeBrowser: exec:" << exec << "args:" << args;
+
+        if (!QProcess::startDetached(exec, args)) {
+                QMessageBox::warning(this, "SMPlayer",
+                        tr("The YouTube Browser failed to run.") +"<br>"+
+                        tr("Be sure it's installed correctly.") +"<br>"+
+                        tr("Visit %1 to get it.").arg("<a href=http://www.smtube.org>http://www.smtube.org</a>"));
         }
 }