Changeset 137 for smplayer/vendor/current/src/basegui.cpp

Timestamp:

Dec 3, 2012, 5:29:00 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated vendor to 0.8.2

File:

• smplayer/vendor/current/src/basegui.cpp (modified) (11 diffs)

smplayer/vendor/current/src/basegui.cpp

@@ -745 +745 @@
              this, SLOT(helpCheckUpdates()) );
 
-        donateAct = new MyAction( this, "donate" );
-        connect( donateAct, SIGNAL(triggered()),
-             this, SLOT(helpDonate()) );
+        showConfigAct = new MyAction( this, "show_config" );
+        connect( showConfigAct, SIGNAL(triggered()),
+             this, SLOT(helpShowConfig()) );
 
         aboutQtAct = new MyAction( this, "about_qt" );
@@ -955 +955 @@
         channelsSurroundAct = new MyActionGroupItem(this, channelsGroup, "channels_surround", MediaSettings::ChSurround);
         channelsFull51Act = new MyActionGroupItem(this, channelsGroup, "channels_ful51", MediaSettings::ChFull51);
+        channelsFull61Act = new MyActionGroupItem(this, channelsGroup, "channels_ful61", MediaSettings::ChFull61);
+        channelsFull71Act = new MyActionGroupItem(this, channelsGroup, "channels_ful71", MediaSettings::ChFull71);
         connect( channelsGroup, SIGNAL(activated(int)),
              core, SLOT(setAudioChannels(int)) );
@@ -1556 +1558 @@
         showCLOptionsAct->change( Images::icon("cl_help"), tr("&Command line options") );
         showCheckUpdatesAct->change( Images::icon("check_updates"), tr("Check for &updates") );
-        donateAct->change( Images::icon("donate"), tr("&Donate") );
+        showConfigAct->change( Images::icon("show_config"), tr("&Open configuration folder") );
         aboutQtAct->change( QPixmap(":/icons-png/qt.png"), tr("About &Qt") );
         aboutThisAct->change( Images::icon("logo_small"), tr("About &SMPlayer") );
@@ -1761 +1763 @@
         channelsSurroundAct->change( tr("&4.0 Surround") );
         channelsFull51Act->change( tr("&5.1 Surround") );
+        channelsFull61Act->change( tr("&6.1 Surround") );
+        channelsFull71Act->change( tr("&7.1 Surround") );
 
         stereoAct->change( tr("&Stereo") );
@@ -1969 +1973 @@
 #endif
 
-        QHBoxLayout * layout = new QHBoxLayout;
+        QVBoxLayout * layout = new QVBoxLayout;
         layout->setSpacing(0);
         layout->setMargin(0);
@@ -1996 +2000 @@
         connect( mplayerwindow, SIGNAL(mouseMoved(QPoint)),
              this, SLOT(checkMousePos(QPoint)) );
+        connect( mplayerwindow, SIGNAL(mouseMovedDiff(QPoint)),
+             this, SLOT(moveWindow(QPoint)));
 }
 
@@ -2484 +2490 @@
         helpMenu->addAction(showCLOptionsAct);
         helpMenu->addAction(showCheckUpdatesAct);
-        helpMenu->addAction(donateAct);
+        helpMenu->addAction(showConfigAct);
         helpMenu->addSeparator();
         helpMenu->addAction(aboutQtAct);
@@ -3695 +3701 @@
 }
 
-void BaseGui::helpDonate() {
-        QMessageBox d(QMessageBox::NoIcon, tr("Donate"), 
-                tr("If you like SMPlayer, a really good way to support it is by sending a donation, even the smallest one is highly appreciated.") + "<br>" +
-        tr("You can send your donation using %1.").arg("<a href=\"https://sourceforge.net/donate/index.php?group_id=185512\">"+tr("this form")),
-                QMessageBox::Ok, this);
-        d.setIconPixmap( Images::icon("logo", 64) );
-        d.exec();
+void BaseGui::helpShowConfig() {
+        QDesktopServices::openUrl(QUrl::fromLocalFile(Paths::configPath()));
 }
 
@@ -4170 +4171 @@
 void BaseGui::playlistHasFinished() {
         qDebug("BaseGui::playlistHasFinished");
+        core->stop();
+
         exitFullscreenOnStop();
 
@@ -4471 +4474 @@
         QString styleSheet = QLatin1String(file.readAll());
 
+        QDir current = QDir::current();
+        QString td = Images::themesDirectory();
+        QString relativePath = current.relativeFilePath(td);
+        styleSheet.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
+                                                QString("url(%1\\1)").arg(relativePath + "/"));
+        qDebug("styeSheet: %s", styleSheet.toUtf8().constData());
+
         qApp->setStyleSheet(styleSheet);
 }
@@ -4516 +4526 @@
 }
 
+void BaseGui::moveWindow(QPoint diff) {
+        if (pref->fullscreen || isMaximized()) {
+                return;
+        }
+        move(pos() + diff);
+}
 
 void BaseGui::showEvent( QShowEvent * ) {