diff --git a/app/musicmuster.py b/app/musicmuster.py index 5cd86d3..c5de17c 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -191,9 +191,9 @@ class Window(QMainWindow, Ui_MainWindow): # self.select_unplayed) self.actionSetNext.triggered.connect( lambda: self.tabPlaylist.currentWidget().set_selected_as_next()) - # ***kae -# self.actionSkip_next.triggered.connect(self.play_next) + self.actionSkipToNext.triggered.connect(self.play_next) self.actionStop.triggered.connect(self.stop) + # ***kae # self.btnDrop3db.clicked.connect(self.drop3db) # self.btnHidePlayed.clicked.connect(self.hide_played) self.btnFade.clicked.connect(self.fade) diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index 0417f05..67d0a05 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -778,7 +778,7 @@ border: 1px solid rgb(85, 87, 83); - + @@ -816,7 +816,7 @@ border: 1px solid rgb(85, 87, 83); Return - + :/icons/next:/icons/next diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index c62e097..029521f 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -361,11 +361,11 @@ class Ui_MainWindow(object): icon3.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon-play.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionPlay_next.setIcon(icon3) self.actionPlay_next.setObjectName("actionPlay_next") - self.actionSkip_next = QtWidgets.QAction(MainWindow) + self.actionSkipToNext = QtWidgets.QAction(MainWindow) icon4 = QtGui.QIcon() icon4.addPixmap(QtGui.QPixmap(":/icons/next"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionSkip_next.setIcon(icon4) - self.actionSkip_next.setObjectName("actionSkip_next") + self.actionSkipToNext.setIcon(icon4) + self.actionSkipToNext.setObjectName("actionSkipToNext") self.actionInsert = QtWidgets.QAction(MainWindow) icon5 = QtGui.QIcon() icon5.addPixmap(QtGui.QPixmap("app/ui/../../../../.designer/backup/icon_search_database.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -462,7 +462,7 @@ class Ui_MainWindow(object): self.menuPlaylist.addAction(self.actionFade) self.menuPlaylist.addAction(self.actionStop) self.menuPlaylist.addSeparator() - self.menuPlaylist.addAction(self.actionSkip_next) + self.menuPlaylist.addAction(self.actionSkipToNext) self.menuPlaylist.addSeparator() self.menuPlaylist.addAction(self.actionInsert) self.menuPlaylist.addAction(self.actionRemove) @@ -516,8 +516,8 @@ class Ui_MainWindow(object): self.menuPlaylist.setTitle(_translate("MainWindow", "Sho&wtime")) self.actionPlay_next.setText(_translate("MainWindow", "&Play next")) self.actionPlay_next.setShortcut(_translate("MainWindow", "Return")) - self.actionSkip_next.setText(_translate("MainWindow", "Skip to &next")) - self.actionSkip_next.setShortcut(_translate("MainWindow", "Ctrl+Alt+Return")) + self.actionSkipToNext.setText(_translate("MainWindow", "Skip to &next")) + self.actionSkipToNext.setShortcut(_translate("MainWindow", "Ctrl+Alt+Return")) self.actionInsert.setText(_translate("MainWindow", "Insert &track...")) self.actionInsert.setShortcut(_translate("MainWindow", "Ctrl+D")) self.actionAdd_file.setText(_translate("MainWindow", "Add &file"))