Fix shortcuts

src/core/mediaplayer.cpp

@@ -118,7 +118,6 @@ void MediaPlayer::setVolume(qreal v)
 	} else {
 		_localPlayer->audio()->setVolume(v);
 	}
-	qDebug() << Q_FUNC_INFO << "emit volumeChanged(" << v << ")";
 	emit volumeChanged(v);
 }
 

src/core/settings.cpp

@@ -157,6 +157,7 @@ void Settings::initShortcuts()
 		shortcuts.insert("moveTracksDown", "Maj+Down");
 		shortcuts.insert("removeSelectedTracks", "Delete");
 		setValue("shortcuts", shortcuts);
+		setValue("defaultShortcuts", shortcuts);
 	}
 }
 

src/core/settingsprivate.cpp

@@ -478,8 +478,7 @@ void SettingsPrivate::setShortcut(const QString &objectName, const QKeySequence
 
 QKeySequence SettingsPrivate::shortcut(const QString &objectName) const
 {
-	QMap<QString, QVariant> shortcuts = value("shortcuts").toMap();
-	return QKeySequence(shortcuts.value(objectName).toString());
+	return QKeySequence(value("shortcuts").toMap().value(objectName).toString());
 }
 
 int SettingsPrivate::volumeBarHideAfter() const

src/player/dialogs/customizeoptionsdialog.cpp

@@ -291,11 +291,10 @@ void CustomizeOptionsDialog::initPlugins()
 void CustomizeOptionsDialog::initShortcuts()
 {
 	Settings *settings = Settings::instance();
-	QMap<QKeySequenceEdit *, QKeySequence> *defaultShortcuts = new QMap<QKeySequenceEdit *, QKeySequence>();
 	QMap<QString, QVariant> shortcutMap = settings->shortcuts();
+	QMap<QString, QVariant> defaultShortcutMap = settings->value("defaultShortcuts").toMap();
 	for (QKeySequenceEdit *shortcut : shortcutsToolBox->findChildren<QKeySequenceEdit*>()) {
 		QKeySequence sequence = shortcut->keySequence();
-		defaultShortcuts->insert(shortcut, sequence);
 
 		// Init shortcuts: override default shortcuts with existing ones in settings
 		QString shortCutName = shortcut->objectName();
@@ -320,7 +319,8 @@ void CustomizeOptionsDialog::initShortcuts()
 			emit shortcut->editingFinished();
 		});
 		connect(reset, &QPushButton::clicked, this, [=]() {
-			shortcut->setKeySequence(defaultShortcuts->value(shortcut));
+			qDebug() << Q_FUNC_INFO << shortcut->objectName() << QKeySequence(defaultShortcutMap.value(shortcut->objectName()).toString());
+			shortcut->setKeySequence(QKeySequence(defaultShortcutMap.value(shortcut->objectName()).toString()));
 			emit shortcut->editingFinished();
 		});
 	}

src/player/mainwindow.cpp

@@ -78,16 +78,14 @@ void MainWindow::activateLastView()
 		// Find the last active view and connect database to it
 		SettingsPrivate *settingsPrivate = SettingsPrivate::instance();
 		QString actionViewName = settingsPrivate->value("lastActiveView", "actionViewPlaylists").toString();
-		QAction *defaultActionView = nullptr;
-		for (QAction *actionView : menuView->actions()) {
-			if (actionView->objectName() == actionViewName) {
-				defaultActionView = actionView;
-				actionView->trigger();
-				break;
+		QAction *action = this->findChild<QAction*>(actionViewName);
+		if (action) {
+			if (action->isCheckable()) {
+				action->setChecked(true);
 			}
-		}
-		// If no action was triggered, despite an entry in settings, it means some plugin was activated once, but now we couldn't find it
-		if (defaultActionView == nullptr) {
+			this->activateView(action);
+		} else {
+			// If no action was triggered, despite an entry in settings, it means some plugin was activated once, but now we couldn't find it
 			actionViewPlaylists->trigger();
 		}
 	}
@@ -153,22 +151,7 @@ void MainWindow::dispatchDrop(QDropEvent *event)
 
 void MainWindow::init()
 {
-	// Init shortcuts
-	Settings *settings = Settings::instance();
-	QMapIterator<QString, QVariant> it(settings->shortcuts());
-
-	while (it.hasNext()) {
-		it.next();
-
-		QShortcut *s = new QShortcut(this);
-		s->setObjectName("action" + it.key().left(1).toUpper() + it.key().mid(1));
-		s->setKey(it.value().value<QKeySequence>());
-	}
-
-	if (menuBar()->isVisible()) {
-		this->toggleMenuBar(true);
-	}
-
+	this->toggleMenuBar(SettingsPrivate::instance()->value("isMenuHidden").toBool());
 	this->setupActions();
 }
 
@@ -367,14 +350,14 @@ bool MainWindow::event(QEvent *e)
 			if (keyEvent->key() == Qt::Key_Alt) {
 				qDebug() << Q_FUNC_INFO << "Alt was pressed";
 				this->setProperty("altKey", true);
-				this->toggleShortcutsOnMenuBar(true);
+				this->toggleMenuBar(false);
 				// Reactivate shortcuts on the menuBar
 
-				QMapIterator<QString, QVariant> it(Settings::instance()->shortcuts());
+				/*QMapIterator<QString, QVariant> it(Settings::instance()->shortcuts());
 				while (it.hasNext()) {
 					it.next();
 					this->bindShortcut(it.key(), it.value().value<QKeySequence>());
-				}
+				}*/
 
 			} else {
 				this->setProperty("altKey", false);
@@ -428,11 +411,6 @@ void MainWindow::initQuickStart()
 	this->resize(400, 500);
 }
 
-void MainWindow::toggleShortcutsOnMenuBar(bool enabled)
-{
-	qDebug() << Q_FUNC_INFO << enabled;
-}
-
 void MainWindow::createCustomizeOptionsDialog()
 {
 	CustomizeOptionsDialog *dialog = new CustomizeOptionsDialog(_pluginManager, this);
@@ -640,6 +618,7 @@ void MainWindow::activateView(QAction *menuAction)
 	actionPlaybackCurrentItemInLoop->setEnabled(b);
 	if (b) {
 		AbstractViewPlaylists *viewPlaylists = static_cast<AbstractViewPlaylists*>(_currentView);
+		qDebug() << Q_FUNC_INFO;
 		connect(actionOpenFiles, &QAction::triggered, viewPlaylists, &AbstractViewPlaylists::openFiles);
 		connect(actionOpenFolder, &QAction::triggered, viewPlaylists, &AbstractViewPlaylists::openFolderPopup);
 		connect(actionAddPlaylist, &QAction::triggered, viewPlaylists, &AbstractViewPlaylists::addPlaylist);
@@ -808,7 +787,33 @@ void MainWindow::syncLibrary(const QStringList &oldLocations, const QStringList
 
 void MainWindow::toggleMenuBar(bool checked)
 {
+	auto settings = Settings::instance();
+	auto settingsPrivate = SettingsPrivate::instance();
+	settingsPrivate->setValue("isMenuHidden", checked);
 	menuBar()->setVisible(!checked);
-	SettingsPrivate::instance()->setValue("isMenuHidden", checked);
-	this->toggleShortcutsOnMenuBar(!checked);
+
+	// Attach shortcuts to visible menu or "invisible" handler
+	qDeleteAll(_menuShortcuts);
+	_menuShortcuts.clear();
+
+	QMapIterator<QString, QVariant> it(settings->shortcuts());
+	while (it.hasNext()) {
+		it.next();
+
+		QKeySequence sequence = settingsPrivate->shortcut(it.key());
+		QString actionName = "action" + it.key().left(1).toUpper() + it.key().mid(1);
+		QAction *action = this->findChild<QAction*>(actionName);
+		if (!action) {
+			continue;
+		}
+		if (checked) {
+			QShortcut *s = new QShortcut(sequence, this);
+			s->setObjectName(actionName);
+
+			connect(s, &QShortcut::activated, action, &QAction::trigger);
+			_menuShortcuts.insert(s);
+		} else {
+			action->setShortcut(sequence);
+		}
+	}
 }

src/player/mainwindow.h

@@ -3,6 +3,7 @@
 
 #include <QCommandLineParser>
 #include <QMainWindow>
+#include <QShortcut>
 #include <QStack>
 
 #include <qxt/qxtglobalshortcut.h>
@@ -39,6 +40,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindow
 	QxtGlobalShortcut *_shortcutPlayPause;
 	QxtGlobalShortcut *_shortcutSkipForward;
 	QTranslator _translator;
+	QSet<QShortcut*> _menuShortcuts;
 
 public:
 	explicit MainWindow(QWidget *parent = nullptr);
@@ -80,8 +82,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindow
 private:
 	void initQuickStart();
 
-	void toggleShortcutsOnMenuBar(bool enabled);
-
 public slots:
 	void createCustomizeOptionsDialog();
 

src/tabplaylists/viewplaylists.cpp

@@ -105,7 +105,6 @@ ViewPlaylists::ViewPlaylists(MediaPlayer *mediaPlayer, QWidget *parent)
 		searchBar->setText(QString());
 		_searchDialog->clear();
 		library->scrollToTop();
-		qDebug() << "ViewPlaylists -> lambda reload";
 		library->model()->load();
 		this->update();
 	};
@@ -137,7 +136,6 @@ ViewPlaylists::ViewPlaylists(MediaPlayer *mediaPlayer, QWidget *parent)
 		mediaPlayer->setVolume((qreal)value / 100.0);
 	});
 	connect(mediaPlayer, &MediaPlayer::volumeChanged, this, [=](qreal v) {
-		qDebug() << Q_FUNC_INFO;
 		volumeSlider->blockSignals(true);
 		volumeSlider->setValue(v * 100);
 		volumeSlider->blockSignals(false);
@@ -164,7 +162,6 @@ ViewPlaylists::ViewPlaylists(MediaPlayer *mediaPlayer, QWidget *parent)
 	});
 
 	connect(this, &AbstractView::modelReloadRequested, this, [=]() {
-		qDebug() << "AbstractView::modelReloadRequested";
 		library->model()->load();
 		for (Playlist *p : tabPlaylists->playlists()) {
 			p->model()->reload();
@@ -287,10 +284,8 @@ void ViewPlaylists::setMusicSearchEngine(MusicSearchEngine *musicSearchEngine)
 		if (library->layout()) {
 			delete library->layout();
 		}
-		foreach (QWidget *w, library->findChildren<QWidget*>()) {
-			if (w && w->objectName() == "paintable") {
-				delete w;
-			}
+		if (PaintableWidget *w = findChild<PaintableWidget*>("paintable")) {
+			w->deleteLater();
 		}
 	});
 }

src/uniquelibrary/uniquelibrary.cpp

@@ -151,7 +151,8 @@ UniqueLibrary::~UniqueLibrary()
 	disconnect(_mediaPlayerControl->mediaPlayer(), &MediaPlayer::positionChanged, seekSlider, &SeekBar::setPosition);
 	_mediaPlayerControl->mediaPlayer()->stop();
 	if (_currentTrack) {
-		SettingsPrivate::instance()->setValue("uniqueLibraryLastPlayed", _currentTrack->row());
+		qDebug() << _currentTrack << _currentTrack->row();
+		//SettingsPrivate::instance()->setValue("uniqueLibraryLastPlayed", _currentTrack->row());
 	}
 	this->disconnect();
 }
@@ -251,26 +252,11 @@ void UniqueLibrary::setMusicSearchEngine(MusicSearchEngine *musicSearchEngine)
 	});
 
 	connect(musicSearchEngine, &MusicSearchEngine::searchHasEnded, this, [=]() {
-		/*auto l = uniqueTable->layout();
-		while (!l->isEmpty()) {
-			if (QLayoutItem *i = l->takeAt(0)) {
-				if (QWidget *w = i->widget()) {
-					delete w;
-				}
-				delete i;
-			}
-		}
-		delete uniqueTable->layout();
-		uniqueTable->model()->load();
-		uniqueTable->adjust();*/
-
 		if (uniqueTable->layout()) {
 			delete uniqueTable->layout();
 		}
-		foreach (QWidget *w, uniqueTable->findChildren<QWidget*>()) {
-			if (w && w->objectName() == "paintable") {
-				delete w;
-			}
+		if (PaintableWidget *w = findChild<PaintableWidget*>("paintable")) {
+			w->deleteLater();
 		}
 	});
 }