From 2aba3b63f56ef88dcebbe8ef17d7f4a66cd1728a Mon Sep 17 00:00:00 2001 From: Flavio Date: Mon, 28 Jan 2013 10:31:21 +0100 Subject: [PATCH] Never start with muted volume --- src/mainwindow.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 904ebbb..6102799 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -208,7 +208,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { void MainWindow::createActions() { - QMap *actions = The::globalActions(); + QHash *actions = The::globalActions(); stopAct = new QAction(Utils::icon("media-playback-stop"), tr("&Stop"), this); stopAct->setStatusTip(tr("Stop playback and go back to the search view")); @@ -539,7 +539,7 @@ void MainWindow::createActions() { void MainWindow::createMenus() { - QMap *menus = The::globalMenus(); + QHash *menus = The::globalMenus(); fileMenu = menuBar()->addMenu(tr("&Application")); #ifdef APP_ACTIVATION @@ -782,7 +782,7 @@ void MainWindow::readSettings() { } setDefinitionMode(settings.value("definition", VideoDefinition::getDefinitionNames().first()).toString()); audioOutput->setVolume(settings.value("volume", 1).toDouble()); - audioOutput->setMuted(settings.value("volumeMute").toBool()); + // audioOutput->setMuted(settings.value("volumeMute").toBool()); The::globalActions()->value("manualplay")->setChecked(settings.value("manualplay", false).toBool()); } @@ -848,6 +848,7 @@ void MainWindow::showWidget(QWidget* widget, bool transition) { The::globalActions()->value("previous")->setEnabled(false); The::globalActions()->value("download")->setEnabled(false); The::globalActions()->value("stopafterthis")->setEnabled(false); + The::globalActions()->value("related-videos")->setEnabled(false); } The::globalActions()->value("twitter")->setEnabled(isMediaView); @@ -1459,8 +1460,7 @@ void MainWindow::gotNewVersion(QString version) { #ifdef APP_SIMPLEUPDATE simpleUpdateDialog(version); -#endif -#if defined(APP_ACTIVATION) && !defined(APP_MAC) +#elif defined(APP_ACTIVATION) && !defined(APP_MAC) UpdateDialog *dialog = new UpdateDialog(version, this); dialog->show(); #endif -- 2.39.5