$END_LICENSE */
#include "mediaview.h"
-#include "playlistmodel.h"
-#include "playlistview.h"
-#include "loadingwidget.h"
-#include "videoareawidget.h"
-#include "networkaccess.h"
-#include "minisplitter.h"
#include "constants.h"
-#include "downloadmanager.h"
#include "downloaditem.h"
+#include "downloadmanager.h"
+#include "http.h"
+#include "loadingwidget.h"
#include "mainwindow.h"
-#include "temporary.h"
+#include "minisplitter.h"
+#include "playlistmodel.h"
+#include "playlistview.h"
#include "refinesearchwidget.h"
-#include "sidebarwidget.h"
#include "sidebarheader.h"
+#include "sidebarwidget.h"
+#include "temporary.h"
+#include "videoareawidget.h"
#ifdef APP_ACTIVATION
#include "activation.h"
#endif
#ifdef APP_EXTRA
#include "extra.h"
#endif
-#include "videosource.h"
-#include "ytsearch.h"
-#include "searchparams.h"
-#include "ytsinglevideosource.h"
#include "channelaggregator.h"
#include "iconutils.h"
+#include "searchparams.h"
+#include "videosource.h"
#include "ytchannel.h"
+#include "ytsearch.h"
+#include "ytsinglevideosource.h"
#ifdef APP_SNAPSHOT
#include "snapshotsettings.h"
#endif
#include "datautils.h"
-#include "compatibility/qurlqueryhelper.h"
+#include "idle.h"
-namespace The {
-NetworkAccess* http();
-QHash<QString, QAction*>* globalActions();
-QHash<QString, QMenu*>* globalMenus();
-QNetworkAccessManager* networkAccessManager();
-}
-
-MediaView* MediaView::instance() {
+MediaView *MediaView::instance() {
static MediaView *i = new MediaView();
return i;
}
-MediaView::MediaView(QWidget *parent) : View(parent)
- , stopped(false)
- , downloadItem(0)
- #ifdef APP_SNAPSHOT
- , snapshotSettings(0)
- #endif
- , pauseTime(0)
-{ }
+MediaView::MediaView(QWidget *parent)
+ : View(parent), stopped(false), downloadItem(0)
+#ifdef APP_SNAPSHOT
+ ,
+ snapshotSettings(0)
+#endif
+ ,
+ pauseTime(0) {
+}
void MediaView::initialize() {
+ MainWindow *mainWindow = MainWindow::instance();
+
QBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
splitter = new MiniSplitter();
+ layout->addWidget(splitter);
- playlistView = new PlaylistView(this);
- // respond to the user doubleclicking a playlist item
+ playlistView = new PlaylistView();
+ playlistView->setParent(this);
connect(playlistView, SIGNAL(activated(const QModelIndex &)),
SLOT(itemActivated(const QModelIndex &)));
playlistModel = new PlaylistModel();
- connect(playlistModel, SIGNAL(activeRowChanged(int)),
- SLOT(activeRowChanged(int)));
+ connect(playlistModel, SIGNAL(activeRowChanged(int)), SLOT(activeRowChanged(int)));
// needed to restore the selection after dragndrop
- connect(playlistModel, SIGNAL(needSelectionFor(QList<Video*>)),
- SLOT(selectVideos(QList<Video*>)));
+ connect(playlistModel, SIGNAL(needSelectionFor(QVector<Video *>)),
+ SLOT(selectVideos(QVector<Video *>)));
playlistView->setModel(playlistModel);
connect(playlistView->selectionModel(),
sidebar = new SidebarWidget(this);
sidebar->setPlaylist(playlistView);
- connect(sidebar->getRefineSearchWidget(), SIGNAL(searchRefined()),
- SLOT(searchAgain()));
- connect(playlistModel, SIGNAL(haveSuggestions(const QStringList &)),
- sidebar, SLOT(showSuggestions(const QStringList &)));
- connect(sidebar, SIGNAL(suggestionAccepted(QString)),
- MainWindow::instance(), SLOT(search(QString)));
+ connect(sidebar->getRefineSearchWidget(), SIGNAL(searchRefined()), SLOT(searchAgain()));
+ connect(playlistModel, SIGNAL(haveSuggestions(const QStringList &)), sidebar,
+ SLOT(showSuggestions(const QStringList &)));
+ connect(sidebar, SIGNAL(suggestionAccepted(QString)), mainWindow, SLOT(search(QString)));
splitter->addWidget(sidebar);
videoAreaWidget = new VideoAreaWidget(this);
- // videoAreaWidget->setMinimumSize(320,240);
#ifdef APP_PHONON
videoWidget = new Phonon::VideoWidget(this);
splitter->addWidget(videoAreaWidget);
- splitter->setStretchFactor(0, 0);
- splitter->setStretchFactor(1, 8);
-
// restore splitter state
QSettings settings;
- splitter->restoreState(settings.value("splitter").toByteArray());
+ if (settings.contains("splitter"))
+ splitter->restoreState(settings.value("splitter").toByteArray());
+ else {
+ int sidebarDefaultWidth = 180;
+ splitter->setSizes(QList<int>() << sidebarDefaultWidth
+ << splitter->size().width() - sidebarDefaultWidth);
+ }
splitter->setChildrenCollapsible(false);
- connect(splitter, SIGNAL(splitterMoved(int,int)), SLOT(maybeAdjustWindowSize()));
-
- layout->addWidget(splitter);
+ connect(splitter, SIGNAL(splitterMoved(int, int)), SLOT(adjustWindowSize()));
errorTimer = new QTimer(this);
errorTimer->setSingleShot(true);
#ifdef APP_ACTIVATION
demoTimer = new QTimer(this);
demoTimer->setSingleShot(true);
- connect(demoTimer, SIGNAL(timeout()), SLOT(demoMessage()));
+ connect(demoTimer, &QTimer::timeout, mainWindow, &MainWindow::showActivationView,
+ Qt::QueuedConnection);
#endif
- connect(videoAreaWidget, SIGNAL(doubleClicked()),
- The::globalActions()->value("fullscreen"), SLOT(trigger()));
-
- QAction* refineSearchAction = The::globalActions()->value("refine-search");
- connect(refineSearchAction, SIGNAL(toggled(bool)),
- sidebar, SLOT(toggleRefineSearch(bool)));
-
- currentVideoActions
- << The::globalActions()->value("webpage")
- << The::globalActions()->value("pagelink")
- << The::globalActions()->value("videolink")
- << The::globalActions()->value("open-in-browser")
- #ifdef APP_SNAPSHOT
- << The::globalActions()->value("snapshot")
- #endif
- << The::globalActions()->value("findVideoParts")
- << The::globalActions()->value("skip")
- << The::globalActions()->value("previous")
- << The::globalActions()->value("stopafterthis")
- << The::globalActions()->value("related-videos")
- << The::globalActions()->value("refine-search")
- << The::globalActions()->value("twitter")
- << The::globalActions()->value("facebook")
- << The::globalActions()->value("buffer")
- << The::globalActions()->value("email");
+ connect(videoAreaWidget, SIGNAL(doubleClicked()), mainWindow->getAction("fullscreen"),
+ SLOT(trigger()));
+
+ QAction *refineSearchAction = mainWindow->getAction("refineSearch");
+ connect(refineSearchAction, SIGNAL(toggled(bool)), sidebar, SLOT(toggleRefineSearch(bool)));
+
+ const QVector<const char *> videoActionNames = {
+#ifdef APP_SNAPSHOT
+ "snapshot",
+#endif
+ "webpage", "pagelink", "videolink", "openInBrowser", "findVideoParts",
+ "skip", "previous", "stopafterthis", "relatedVideos", "refineSearch",
+ "twitter", "facebook", "email"};
+ currentVideoActions.reserve(videoActionNames.size());
+ for (auto *name : videoActionNames) {
+ currentVideoActions.append(mainWindow->getAction(name));
+ }
#ifndef APP_PHONON_SEEK
- QSlider *slider = MainWindow::instance()->getSlider();
+ QSlider *slider = mainWindow->getSlider();
connect(slider, SIGNAL(valueChanged(int)), SLOT(sliderMoved(int)));
#endif
}
connect(mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
SLOT(stateChanged(Phonon::State, Phonon::State)));
connect(mediaObject, SIGNAL(aboutToFinish()), SLOT(aboutToFinish()));
+ connect(mediaObject, SIGNAL(bufferStatus(int)), loadingWidget, SLOT(bufferStatus(int)));
}
#endif
-SearchParams* MediaView::getSearchParams() {
+SearchParams *MediaView::getSearchParams() {
VideoSource *videoSource = playlistModel->getVideoSource();
if (videoSource && videoSource->metaObject()->className() == QLatin1String("YTSearch")) {
YTSearch *search = qobject_cast<YTSearch *>(videoSource);
void MediaView::search(SearchParams *searchParams) {
if (!searchParams->keywords().isEmpty()) {
if (searchParams->keywords().startsWith("http://") ||
- searchParams->keywords().startsWith("https://")) {
+ searchParams->keywords().startsWith("https://")) {
QString videoId = YTSearch::videoIdFromUrl(searchParams->keywords());
if (!videoId.isEmpty()) {
YTSingleVideoSource *singleVideoSource = new YTSingleVideoSource(this);
singleVideoSource->setVideoId(videoId);
setVideoSource(singleVideoSource);
+ QTime tstamp = YTSearch::videoTimestampFromUrl(searchParams->keywords());
+ pauseTime = QTime(0, 0).msecsTo(tstamp);
return;
}
}
}
- YTSearch *ytSearch = new YTSearch(searchParams, this);
+ YTSearch *ytSearch = new YTSearch(searchParams);
ytSearch->setAsyncDetails(true);
connect(ytSearch, SIGNAL(gotDetails()), playlistModel, SLOT(emitDataChanged()));
setVideoSource(ytSearch);
void MediaView::setVideoSource(VideoSource *videoSource, bool addToHistory, bool back) {
Q_UNUSED(back);
stopped = false;
-
-#ifdef APP_ACTIVATION
- demoTimer->stop();
-#endif
errorTimer->stop();
// qDebug() << "Adding VideoSource" << videoSource->getName() << videoSource;
playlistModel->setVideoSource(videoSource);
+ QSettings settings;
+ if (settings.value("manualplay", false).toBool()) {
+ videoAreaWidget->showPickMessage();
+ }
+
sidebar->showPlaylist();
sidebar->getRefineSearchWidget()->setSearchParams(getSearchParams());
sidebar->hideSuggestions();
SearchParams *searchParams = getSearchParams();
bool isChannel = searchParams && !searchParams->channelId().isEmpty();
playlistView->setClickableAuthors(!isChannel);
-
-
}
void MediaView::searchAgain() {
}
void MediaView::appear() {
+ MainWindow::instance()->showToolbar();
+
Video *currentVideo = playlistModel->activeVideo();
if (currentVideo) {
- MainWindow::instance()->setWindowTitle(
- currentVideo->title() + " - " + Constants::NAME);
+ MainWindow::instance()->setWindowTitle(currentVideo->getTitle() + " - " + Constants::NAME);
}
- // optimize window for 16:9 video
- QTimer::singleShot(50, this, SLOT(maybeAdjustWindowSize()));
-
playlistView->setFocus();
}
void MediaView::disappear() {
-
+ MainWindow::instance()->hideToolbar();
}
void MediaView::handleError(const QString &message) {
}
#ifdef APP_PHONON
-void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/) {
+void MediaView::stateChanged(Phonon::State newState, Phonon::State oldState) {
if (pauseTime > 0 && (newState == Phonon::PlayingState || newState == Phonon::BufferingState)) {
mediaObject->seek(pauseTime);
pauseTime = 0;
videoAreaWidget->showVideo();
} else if (newState == Phonon::ErrorState) {
qWarning() << "Phonon error:" << mediaObject->errorString() << mediaObject->errorType();
- if (mediaObject->errorType() == Phonon::FatalError)
- handleError(mediaObject->errorString());
+ if (mediaObject->errorType() == Phonon::FatalError) handleError(mediaObject->errorString());
+ }
+
+ if (newState == Phonon::PlayingState) {
+ bool res = Idle::preventDisplaySleep(QString("%1 is playing").arg(Constants::NAME));
+ if (!res) qWarning() << "Error disabling idle display sleep" << Idle::displayErrorMessage();
+ } else if (oldState == Phonon::PlayingState) {
+ bool res = Idle::allowDisplaySleep();
+ if (!res) qWarning() << "Error enabling idle display sleep" << Idle::displayErrorMessage();
}
}
#endif
void MediaView::pause() {
#ifdef APP_PHONON
- switch( mediaObject->state() ) {
+ switch (mediaObject->state()) {
case Phonon::PlayingState:
mediaObject->pause();
pauseTimer.start();
default:
if (pauseTimer.hasExpired(60000)) {
pauseTimer.invalidate();
- connect(playlistModel->activeVideo(), SIGNAL(gotStreamUrl(QUrl)), SLOT(resumeWithNewStreamUrl(QUrl)));
+ connect(playlistModel->activeVideo(), SIGNAL(gotStreamUrl(QUrl)),
+ SLOT(resumeWithNewStreamUrl(QUrl)));
playlistModel->activeVideo()->loadStreamUrl();
- } else mediaObject->play();
+ } else
+ mediaObject->play();
break;
}
#endif
while (!history.isEmpty()) {
VideoSource *videoSource = history.takeFirst();
- if (!videoSource->parent()) delete videoSource;
+ // Don't delete videoSource in the Browse view
+ if (!videoSource->parent()) {
+ videoSource->deleteLater();
+ }
}
playlistModel->abortSearch();
downloadItem = 0;
currentVideoSize = 0;
}
- The::globalActions()->value("refine-search")->setChecked(false);
+ MainWindow::instance()->getAction("refineSearch")->setChecked(false);
updateSubscriptionAction(0, false);
#ifdef APP_ACTIVATION
demoTimer->stop();
#endif
- foreach (QAction *action, currentVideoActions)
+ for (QAction *action : currentVideoActions)
action->setEnabled(false);
- QAction *a = The::globalActions()->value("download");
+ QAction *a = MainWindow::instance()->getAction("download");
a->setEnabled(false);
a->setVisible(false);
#ifdef APP_PHONON
mediaObject->stop();
+ mediaObject->clear();
#endif
currentVideoId.clear();
slider->setEnabled(false);
slider->setValue(0);
#else
- Phonon::SeekSlider *slider = MainWindow::instance()->getSeekSlider();
+// Phonon::SeekSlider *slider = MainWindow::instance()->getSeekSlider();
#endif
#ifdef APP_SNAPSHOT
#endif
}
-const QString & MediaView::getCurrentVideoId() {
+const QString &MediaView::getCurrentVideoId() {
return currentVideoId;
}
Video *video = playlistModel->videoAt(row);
if (!video) return;
+ // optimize window for 16:9 video
+ adjustWindowSize();
+
videoAreaWidget->showLoading(video);
- connect(video, SIGNAL(gotStreamUrl(QUrl)),
- SLOT(gotStreamUrl(QUrl)), Qt::UniqueConnection);
- connect(video, SIGNAL(errorStreamUrl(QString)),
- SLOT(skip()), Qt::UniqueConnection);
+ connect(video, SIGNAL(gotStreamUrl(QUrl)), SLOT(gotStreamUrl(QUrl)), Qt::UniqueConnection);
+ connect(video, SIGNAL(errorStreamUrl(QString)), SLOT(skip()), Qt::UniqueConnection);
video->loadStreamUrl();
// video title in titlebar
- MainWindow::instance()->setWindowTitle(video->title() + " - " + Constants::NAME);
+ MainWindow::instance()->setWindowTitle(video->getTitle() + QLatin1String(" - ") +
+ QLatin1String(Constants::NAME));
// ensure active item is visible
if (row != -1) {
}
// enable/disable actions
- The::globalActions()->value("download")->setEnabled(
- DownloadManager::instance()->itemForVideo(video) == 0);
- The::globalActions()->value("previous")->setEnabled(row > 0);
- The::globalActions()->value("stopafterthis")->setEnabled(true);
- The::globalActions()->value("related-videos")->setEnabled(true);
-
- bool enableDownload = video->license() == Video::LicenseCC;
+ MainWindow::instance()
+ ->getAction("download")
+ ->setEnabled(DownloadManager::instance()->itemForVideo(video) == 0);
+ MainWindow::instance()->getAction("previous")->setEnabled(row > 0);
+ MainWindow::instance()->getAction("stopafterthis")->setEnabled(true);
+ MainWindow::instance()->getAction("relatedVideos")->setEnabled(true);
+
+ bool enableDownload = video->getLicense() == Video::LicenseCC;
#ifdef APP_ACTIVATION
enableDownload = enableDownload || Activation::instance().isLegacy();
#endif
#ifdef APP_DOWNLOADS
enableDownload = true;
#endif
- QAction *a = The::globalActions()->value("download");
+ QAction *a = MainWindow::instance()->getAction("download");
a->setEnabled(enableDownload);
a->setVisible(enableDownload);
- updateSubscriptionAction(video, YTChannel::isSubscribed(video->channelId()));
+ updateSubscriptionAction(video, YTChannel::isSubscribed(video->getChannelId()));
- foreach (QAction *action, currentVideoActions)
+ for (QAction *action : currentVideoActions)
action->setEnabled(true);
#ifndef APP_PHONON_SEEK
}
video->disconnect(this);
- currentVideoId = video->id();
+ currentVideoId = video->getId();
#ifdef APP_PHONON_SEEK
mediaObject->setCurrentSource(streamUrl);
}
#ifdef APP_ACTIVATION
- if (!Activation::instance().isActivated())
- demoTimer->start(180000);
+ if (!Activation::instance().isActivated() && !demoTimer->isActive()) {
+ int ms = (60000 * 5) + (qrand() % (60000 * 5));
+ demoTimer->start(ms);
+ }
#endif
#ifdef APP_EXTRA
- Extra::notify(video->title(), video->channelTitle(), video->formattedDuration());
+ Extra::notify(video->getTitle(), video->getChannelTitle(), video->getFormattedDuration());
#endif
ChannelAggregator::instance()->videoWatched(video);
void MediaView::downloadStatusChanged() {
// qDebug() << __PRETTY_FUNCTION__;
- switch(downloadItem->status()) {
+ switch (downloadItem->status()) {
case Downloading:
// qDebug() << "Downloading";
- if (downloadItem->offset() == 0) startPlaying();
+ if (downloadItem->offset() == 0)
+ startPlaying();
else {
#ifdef APP_PHONON
// qDebug() << "Seeking to" << downloadItem->offset();
// qDebug() << "Starting";
break;
case Finished:
- // qDebug() << "Finished" << mediaObject->state();
+// qDebug() << "Finished" << mediaObject->state();
#ifdef APP_PHONON_SEEK
MainWindow::instance()->getSeekSlider()->setEnabled(mediaObject->isSeekable());
#endif
void MediaView::itemActivated(const QModelIndex &index) {
if (playlistModel->rowExists(index.row())) {
-
// if it's the current video, just rewind and play
Video *activeVideo = playlistModel->activeVideo();
Video *video = playlistModel->videoAt(index.row());
#ifdef APP_PHONON
mediaObject->play();
#endif
- } else playlistModel->setActiveRow(index.row());
+ } else
+ playlistModel->setActiveRow(index.row());
// the user doubleclicked on the "Search More" item
} else {
// mediaObject->seek(currentTime);
QTimer::singleShot(500, this, SLOT(playbackResume()));
} else {
- QAction* stopAfterThisAction = The::globalActions()->value("stopafterthis");
+ QAction *stopAfterThisAction = MainWindow::instance()->getAction("stopafterthis");
if (stopAfterThisAction->isChecked()) {
stopAfterThisAction->setChecked(false);
- } else skip();
+ } else
+ skip();
}
#endif
}
#ifdef APP_PHONON
const qint64 currentTime = mediaObject->currentTime();
// qDebug() << __PRETTY_FUNCTION__ << currentTime;
- if (currentTime > 0)
- mediaObject->seek(currentTime);
+ if (currentTime > 0) mediaObject->seek(currentTime);
mediaObject->play();
#endif
}
void MediaView::openWebPage() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
#ifdef APP_PHONON
mediaObject->pause();
#endif
- QString url = video->webpage() + QLatin1String("&t=") + QString::number(mediaObject->currentTime() / 1000);
+ QString url = video->getWebpage() + QLatin1String("&t=") +
+ QString::number(mediaObject->currentTime() / 1000);
QDesktopServices::openUrl(url);
}
void MediaView::copyWebPage() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
- QString address = video->webpage();
+ QString address = video->getWebpage();
QApplication::clipboard()->setText(address);
QString message = tr("You can now paste the YouTube link into another application");
MainWindow::instance()->showMessage(message);
}
void MediaView::copyVideoLink() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
QApplication::clipboard()->setText(video->getStreamUrl().toEncoded());
- QString message = tr("You can now paste the video stream URL into another application")
- + ". " + tr("The link will be valid only for a limited time.");
+ QString message = tr("You can now paste the video stream URL into another application") + ". " +
+ tr("The link will be valid only for a limited time.");
MainWindow::instance()->showMessage(message);
}
void MediaView::openInBrowser() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
#ifdef APP_PHONON
mediaObject->pause();
playlistModel->removeIndexes(indexes);
}
-void MediaView::selectVideos(QList<Video*> videos) {
- foreach (Video *video, videos) {
+void MediaView::selectVideos(const QVector<Video *> &videos) {
+ for (Video *video : videos) {
QModelIndex index = playlistModel->indexForVideo(video);
playlistView->selectionModel()->select(index, QItemSelectionModel::Select);
playlistView->scrollTo(index, QAbstractItemView::EnsureVisible);
void MediaView::selectionChanged(const QItemSelection & /*selected*/,
const QItemSelection & /*deselected*/) {
const bool gotSelection = playlistView->selectionModel()->hasSelection();
- The::globalActions()->value("remove")->setEnabled(gotSelection);
- The::globalActions()->value("moveUp")->setEnabled(gotSelection);
- The::globalActions()->value("moveDown")->setEnabled(gotSelection);
+ MainWindow::instance()->getAction("remove")->setEnabled(gotSelection);
+ MainWindow::instance()->getAction("moveUp")->setEnabled(gotSelection);
+ MainWindow::instance()->getAction("moveDown")->setEnabled(gotSelection);
}
void MediaView::moveUpSelected() {
playlistModel->move(indexes, true);
// set current index after row moves to something more intuitive
- int row = indexes.first().row();
- playlistView->selectionModel()->setCurrentIndex(playlistModel->index(row>1?row:1),
+ int row = indexes.at(0).row();
+ playlistView->selectionModel()->setCurrentIndex(playlistModel->index(row > 1 ? row : 1),
QItemSelectionModel::NoUpdate);
}
// set current index after row moves to something more intuitive
// (respect 1 static item on bottom)
- int row = indexes.first().row()+1, max = playlistModel->rowCount() - 2;
- playlistView->selectionModel()->setCurrentIndex(
- playlistModel->index(row>max?max:row), QItemSelectionModel::NoUpdate);
+ int row = indexes.at(0).row() + 1, max = playlistModel->rowCount() - 2;
+ playlistView->selectionModel()->setCurrentIndex(playlistModel->index(row > max ? max : row),
+ QItemSelectionModel::NoUpdate);
}
-void MediaView::setPlaylistVisible(bool visible) {
- if (splitter->widget(0)->isVisible() == visible) return;
- splitter->widget(0)->setVisible(visible);
+void MediaView::setSidebarVisibility(bool visible) {
+ if (sidebar->isVisible() == visible) return;
+ sidebar->setVisible(visible);
+ sidebar->raise();
playlistView->setFocus();
}
-bool MediaView::isPlaylistVisible() {
- return splitter->widget(0)->isVisible();
-}
-
-void MediaView::saveSplitterState() {
- QSettings settings;
- settings.setValue("splitter", splitter->saveState());
-}
-
-#ifdef APP_ACTIVATION
-
-static QPushButton *continueButton;
-
-void MediaView::demoMessage() {
-#ifdef APP_PHONON
- if (mediaObject->state() != Phonon::PlayingState) return;
- mediaObject->pause();
+void MediaView::removeSidebar() {
+ sidebar->hide();
+#ifndef APP_MAC
+ sidebar->setParent(window());
+ sidebar->move(0, 0);
+ sidebar->raise();
#endif
+}
- QMessageBox msgBox(this);
- msgBox.setIconPixmap(IconUtils::pixmap(":/images/app.png").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
- msgBox.setText(tr("This is just the demo version of %1.").arg(Constants::NAME));
- msgBox.setInformativeText(tr("It allows you to test the application and see if it works for you."));
- msgBox.setModal(true);
- // make it a "sheet" on the Mac
- msgBox.setWindowModality(Qt::WindowModal);
-
- continueButton = msgBox.addButton("5", QMessageBox::RejectRole);
- continueButton->setEnabled(false);
- QPushButton *buyButton = msgBox.addButton(tr("Get the full version"), QMessageBox::ActionRole);
-
- QTimeLine *timeLine = new QTimeLine(6000, this);
- timeLine->setCurveShape(QTimeLine::LinearCurve);
- timeLine->setFrameRange(5, 0);
- connect(timeLine, SIGNAL(frameChanged(int)), SLOT(updateContinueButton(int)));
- timeLine->start();
-
- msgBox.exec();
-
- if (msgBox.clickedButton() == buyButton) {
- MainWindow::instance()->showActivationView();
- } else {
-#ifdef APP_PHONON
- mediaObject->play();
+void MediaView::restoreSidebar() {
+ sidebar->show();
+#ifndef APP_MAC
+ splitter->insertWidget(0, sidebar);
#endif
- demoTimer->start(600000);
- }
-
- delete timeLine;
-
}
-void MediaView::updateContinueButton(int value) {
- if (value == 0) {
- continueButton->setText(tr("Continue"));
- continueButton->setEnabled(true);
- } else {
- continueButton->setText(QString::number(value));
- }
+bool MediaView::isSidebarVisible() {
+ return sidebar->isVisible();
}
-#endif
+void MediaView::saveSplitterState() {
+ QSettings settings;
+ settings.setValue("splitter", splitter->saveState());
+}
void MediaView::downloadVideo() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
DownloadManager::instance()->addItem(video);
- MainWindow::instance()->showActionInStatusBar(The::globalActions()->value("downloads"), true);
- QString message = tr("Downloading %1").arg(video->title());
+ MainWindow::instance()->showActionInStatusBar(MainWindow::instance()->getAction("downloads"),
+ true);
+ QString message = tr("Downloading %1").arg(video->getTitle());
MainWindow::instance()->showMessage(message);
}
}
// QPixmap pixmap = QPixmap::grabWindow(videoWidget->winId());
- QPixmap pixmap = QPixmap::fromImage(image.scaled(videoWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+ QPixmap pixmap = QPixmap::fromImage(
+ image.scaled(videoWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
videoAreaWidget->showSnapshotPreview(pixmap);
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
QString location = SnapshotSettings::getCurrentLocation();
QDir dir(location);
if (!dir.exists()) dir.mkpath(location);
- QString basename = video->title();
- QString format = video->duration() > 3600 ? "h_mm_ss" : "m_ss";
- basename += " (" + QTime().addSecs(currentTime).toString(format) + ")";
+ QString basename = video->getTitle();
+ QString format = video->getDuration() > 3600 ? "h_mm_ss" : "m_ss";
+ basename += " (" + QTime(0, 0, 0).addSecs(currentTime).toString(format) + ")";
basename = DataUtils::stringToFilename(basename);
QString filename = location + "/" + basename + ".png";
qDebug() << filename;
}
QString tempFile = Temporary::filename();
downloadItem = new DownloadItem(videoCopy, video->getStreamUrl(), tempFile, this);
- connect(downloadItem, SIGNAL(statusChanged()),
- SLOT(downloadStatusChanged()), Qt::UniqueConnection);
- connect(downloadItem, SIGNAL(bufferProgress(int)),
- loadingWidget, SLOT(bufferStatus(int)), Qt::UniqueConnection);
+ connect(downloadItem, SIGNAL(statusChanged()), SLOT(downloadStatusChanged()),
+ Qt::UniqueConnection);
+ connect(downloadItem, SIGNAL(bufferProgress(int)), loadingWidget, SLOT(bufferStatus(int)),
+ Qt::UniqueConnection);
// connect(downloadItem, SIGNAL(finished()), SLOT(itemFinished()));
- connect(video, SIGNAL(errorStreamUrl(QString)),
- SLOT(handleError(QString)), Qt::UniqueConnection);
- connect(downloadItem, SIGNAL(error(QString)),
- SLOT(handleError(QString)), Qt::UniqueConnection);
+ connect(video, SIGNAL(errorStreamUrl(QString)), SLOT(handleError(QString)),
+ Qt::UniqueConnection);
+ connect(downloadItem, SIGNAL(error(QString)), SLOT(handleError(QString)), Qt::UniqueConnection);
downloadItem->start();
}
video->disconnect(this);
}
-void MediaView::maybeAdjustWindowSize() {
- QSettings settings;
- if (settings.value("adjustWindowSize", true).toBool())
- adjustWindowSize();
-}
-
void MediaView::sliderMoved(int value) {
Q_UNUSED(value);
#ifdef APP_PHONON
#ifndef APP_PHONON_SEEK
- if (currentVideoSize <= 0 || !downloadItem || !mediaObject->isSeekable())
- return;
+ if (currentVideoSize <= 0 || !downloadItem || !mediaObject->isSeekable()) return;
QSlider *slider = MainWindow::instance()->getSlider();
if (slider->isSliderDown()) return;
if (needsDownload) {
if (downloadItem->isBuffered(offset)) {
qint64 realOffset = downloadItem->blankAtOffset(offset);
- if (offset < currentVideoSize)
- downloadItem->seekTo(realOffset, false);
+ if (offset < currentVideoSize) downloadItem->seekTo(realOffset, false);
mediaObject->seek(offsetToTime(offset));
} else {
mediaObject->pause();
}
void MediaView::findVideoParts() {
-
- // parts
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
- QString query = video->title();
+ QString query = video->getTitle();
- static QString optionalSpace = "\\s*";
- static QString staticCounterSeparators = "[\\/\\-]";
- QString counterSeparators = "( of | " +
- tr("of", "Used in video parts, as in '2 of 3'") +
- " |" + staticCounterSeparators + ")";
+ const QLatin1String optionalSpace("\\s*");
+ const QLatin1String staticCounterSeparators("[\\/\\-]");
+ const QString counterSeparators =
+ QLatin1String("( of | ") + tr("of", "Used in video parts, as in '2 of 3'") +
+ QLatin1String(" |") + staticCounterSeparators + QLatin1String(")");
// numbers from 1 to 15
- static QString counterNumber = "([1-9]|1[0-5])";
+ const QLatin1String counterNumber("([1-9]|1[0-5])");
// query.remove(QRegExp(counterSeparators + optionalSpace + counterNumber));
- query.remove(QRegExp(counterNumber + optionalSpace +
- counterSeparators + optionalSpace + counterNumber));
+ query.remove(QRegExp(counterNumber + optionalSpace + counterSeparators + optionalSpace +
+ counterNumber));
query.remove(wordRE("pr?t\\.?" + optionalSpace + counterNumber));
query.remove(wordRE("ep\\.?" + optionalSpace + counterNumber));
query.remove(wordRE("part" + optionalSpace + counterNumber));
query.remove(wordRE("episode" + optionalSpace + counterNumber));
query.remove(wordRE(tr("part", "This is for video parts, as in 'Cool video - part 1'") +
optionalSpace + counterNumber));
- query.remove(wordRE(tr("episode",
- "This is for video parts, as in 'Cool series - episode 1'") +
+ query.remove(wordRE(tr("episode", "This is for video parts, as in 'Cool series - episode 1'") +
optionalSpace + counterNumber));
query.remove(QRegExp("[\\(\\)\\[\\]]"));
#define NUMBERS "one|two|three|four|five|six|seven|eight|nine|ten"
- QRegExp englishNumberRE = QRegExp(QLatin1String(".*(") + NUMBERS + ").*",
- Qt::CaseInsensitive);
+ QRegExp englishNumberRE = QRegExp(QLatin1String(".*(") + NUMBERS + ").*", Qt::CaseInsensitive);
// bool numberAsWords = englishNumberRE.exactMatch(query);
query.remove(englishNumberRE);
- QRegExp localizedNumberRE = QRegExp(QLatin1String(".*(") + tr(NUMBERS) + ").*",
- Qt::CaseInsensitive);
+ QRegExp localizedNumberRE =
+ QRegExp(QLatin1String(".*(") + tr(NUMBERS) + ").*", Qt::CaseInsensitive);
// if (!numberAsWords) numberAsWords = localizedNumberRE.exactMatch(query);
query.remove(localizedNumberRE);
SearchParams *searchParams = new SearchParams();
searchParams->setTransient(true);
searchParams->setKeywords(query);
- searchParams->setChannelId(video->channelId());
+ searchParams->setChannelId(video->getChannelId());
/*
if (!numberAsWords) {
*/
search(searchParams);
-
}
void MediaView::relatedVideos() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
YTSingleVideoSource *singleVideoSource = new YTSingleVideoSource();
singleVideoSource->setVideo(video->clone());
singleVideoSource->setAsyncDetails(true);
setVideoSource(singleVideoSource);
- The::globalActions()->value("related-videos")->setEnabled(false);
+ MainWindow::instance()->getAction("relatedVideos")->setEnabled(false);
}
void MediaView::shareViaTwitter() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
QUrl url("https://twitter.com/intent/tweet");
- {
- QUrlQueryHelper urlHelper(url);
- urlHelper.addQueryItem("via", "minitubeapp");
- urlHelper.addQueryItem("text", video->title());
- urlHelper.addQueryItem("url", video->webpage());
- }
+ QUrlQuery q;
+ q.addQueryItem("via", "minitubeapp");
+ q.addQueryItem("text", video->getTitle());
+ q.addQueryItem("url", video->getWebpage());
+ url.setQuery(q);
QDesktopServices::openUrl(url);
}
void MediaView::shareViaFacebook() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
QUrl url("https://www.facebook.com/sharer.php");
- {
- QUrlQueryHelper urlHelper(url);
- urlHelper.addQueryItem("t", video->title());
- urlHelper.addQueryItem("u", video->webpage());
- }
- QDesktopServices::openUrl(url);
-}
-
-void MediaView::shareViaBuffer() {
- Video* video = playlistModel->activeVideo();
- if (!video) return;
- QUrl url("http://bufferapp.com/add");
- {
- QUrlQueryHelper urlHelper(url);
- urlHelper.addQueryItem("via", "minitubeapp");
- urlHelper.addQueryItem("text", video->title());
- urlHelper.addQueryItem("url", video->webpage());
- urlHelper.addQueryItem("picture", video->thumbnailUrl());
- }
+ QUrlQuery q;
+ q.addQueryItem("t", video->getTitle());
+ q.addQueryItem("u", video->getWebpage());
+ url.setQuery(q);
QDesktopServices::openUrl(url);
}
void MediaView::shareViaEmail() {
- Video* video = playlistModel->activeVideo();
+ Video *video = playlistModel->activeVideo();
if (!video) return;
QUrl url("mailto:");
- {
- QUrlQueryHelper urlHelper(url);
- urlHelper.addQueryItem("subject", video->title());
- const QString body = video->title() + "\n" +
- video->webpage() + "\n\n" +
- tr("Sent from %1").arg(Constants::NAME) + "\n" +
- Constants::WEBSITE;
- urlHelper.addQueryItem("body", body);
- }
+ QUrlQuery q;
+ q.addQueryItem("subject", video->getTitle());
+ const QString body = video->getTitle() + "\n" + video->getWebpage() + "\n\n" +
+ tr("Sent from %1").arg(Constants::NAME) + "\n" + Constants::WEBSITE;
+ q.addQueryItem("body", body);
+ url.setQuery(q);
QDesktopServices::openUrl(url);
}
void MediaView::authorPushed(QModelIndex index) {
- Video* video = playlistModel->videoAt(index.row());
+ Video *video = playlistModel->videoAt(index.row());
if (!video) return;
- QString channelId = video->channelId();
+ QString channelId = video->getChannelId();
// if (channelId.isEmpty()) channelId = video->channelTitle();
if (channelId.isEmpty()) return;
}
void MediaView::updateSubscriptionAction(Video *video, bool subscribed) {
- QAction *subscribeAction = The::globalActions()->value("subscribe-channel");
+ QAction *subscribeAction = MainWindow::instance()->getAction("subscribeChannel");
QString subscribeTip;
QString subscribeText;
subscribeText = subscribeAction->property("originalText").toString();
subscribeAction->setEnabled(false);
} else if (subscribed) {
- subscribeText = tr("Unsubscribe from %1").arg(video->channelTitle());
+ subscribeText = tr("Unsubscribe from %1").arg(video->getChannelTitle());
subscribeTip = subscribeText;
subscribeAction->setEnabled(true);
} else {
- subscribeText = tr("Subscribe to %1").arg(video->channelTitle());
+ subscribeText = tr("Subscribe to %1").arg(video->getChannelTitle());
subscribeTip = subscribeText;
subscribeAction->setEnabled(true);
}
subscribeAction->setStatusTip(subscribeTip);
if (subscribed) {
-#ifdef APP_LINUX
+#ifdef APP_LINUX_NO
static QIcon tintedIcon;
if (tintedIcon.isNull()) {
- QList<QSize> sizes;
+ QVector<QSize> sizes;
sizes << QSize(16, 16);
tintedIcon = IconUtils::tintedIcon("bookmark-new", QColor(254, 240, 0), sizes);
}
void MediaView::toggleSubscription() {
Video *video = playlistModel->activeVideo();
if (!video) return;
- QString userId = video->channelId();
+ QString userId = video->getChannelId();
if (userId.isEmpty()) return;
bool subscribed = YTChannel::isSubscribed(userId);
if (subscribed) {
YTChannel::unsubscribe(userId);
- MainWindow::instance()->showMessage(tr("Unsubscribed from %1").arg(video->channelTitle()));
+ MainWindow::instance()->showMessage(
+ tr("Unsubscribed from %1").arg(video->getChannelTitle()));
} else {
YTChannel::subscribe(userId);
- MainWindow::instance()->showMessage(tr("Subscribed to %1").arg(video->channelTitle()));
+ MainWindow::instance()->showMessage(tr("Subscribed to %1").arg(video->getChannelTitle()));
}
updateSubscriptionAction(video, !subscribed);
}
void MediaView::adjustWindowSize() {
- if (!MainWindow::instance()->isMaximized() && !MainWindow::instance()->isFullScreen()) {
+ Video *video = playlistModel->activeVideo();
+ if (!video) return;
+ QWidget *window = this->window();
+ if (!window->isMaximized() && !window->isFullScreen()) {
const double ratio = 16. / 9.;
- const int w = videoAreaWidget->width();
- const int h = videoAreaWidget->height();
- const double currentVideoRatio = (double)w / (double)h;
+ const double w = (double)videoAreaWidget->width();
+ const double h = (double)videoAreaWidget->height();
+ const double currentVideoRatio = w / h;
if (currentVideoRatio != ratio) {
- if (false && currentVideoRatio > ratio) {
- // we have vertical black bars
- int newWidth = (MainWindow::instance()->width() - w) + (h * ratio);
- MainWindow::instance()->resize(newWidth, MainWindow::instance()->height());
- } else {
- // horizontal black bars
- int newHeight = (MainWindow::instance()->height() - h) + (w / ratio);
- MainWindow::instance()->resize(MainWindow::instance()->width(), newHeight);
- }
+ int newHeight = std::round((window->height() - h) + (w / ratio));
+ window->resize(window->width(), newHeight);
}
}
}
projects / minitube / blobdiff