diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Ui/qsui/actionmanager.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/actionmanager.h | 5 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/mainwindow.h | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/qsuiwaveformseekbar.h | 3 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 795014bc6..683029f99 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2019 by Ilya Kotov * + * Copyright (C) 2010-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -62,7 +62,8 @@ ActionManager::ActionManager(QObject *parent) : m_actions[UI_ANALYZER] = nullptr; //external action m_actions[UI_FILEBROWSER] = nullptr; //external action m_actions[UI_COVER] = nullptr; //external action - m_actions[UI_PLAYLISTBROWSER] = nullptr; //external action + m_actions[UI_PLAYLIST_BROWSER] = nullptr; //external action + m_actions[UI_WAVEFORM_SEEKBAR] = nullptr; //external action m_actions[UI_SHOW_TABS] = createAction2(tr("Show Tabs"), "show_tabs", ""); m_actions[UI_SHOW_TITLEBARS] = createAction2(tr("Show Title Bars"), "show_titlebars", ""); m_actions[UI_BLOCK_TOOLBARS] = createAction2(tr("Block Toolbars"), "block_toolbars", ""); diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h index 4bbad8615..4e3cfc0a8 100644 --- a/src/plugins/Ui/qsui/actionmanager.h +++ b/src/plugins/Ui/qsui/actionmanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2019 by Ilya Kotov * + * Copyright (C) 2010-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -67,7 +67,8 @@ public: UI_ANALYZER, //external UI_FILEBROWSER, //external UI_COVER, //external - UI_PLAYLISTBROWSER, //external + UI_PLAYLIST_BROWSER, //external + UI_WAVEFORM_SEEKBAR, //external UI_SHOW_TABS, UI_SHOW_TITLEBARS, UI_BLOCK_TOOLBARS, diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index 3a489647c..2893fe9eb 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -65,8 +65,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { m_ui.setupUi(this); - m_update = false; - m_wasMaximized = false; m_titleFormatter.setPattern("%if(%p,%p - %t,%t)"); //qmmp objects m_player = MediaPlayer::instance(); @@ -467,9 +465,12 @@ void MainWindow::createActions() ActionManager::instance()->registerAction(ActionManager::UI_COVER, m_ui.coverDockWidget->toggleViewAction(), "cover", ""); - ActionManager::instance()->registerAction(ActionManager::UI_PLAYLISTBROWSER, + ActionManager::instance()->registerAction(ActionManager::UI_PLAYLIST_BROWSER, m_ui.playlistsDockWidget->toggleViewAction(), "playlist_browser", tr("P")); + ActionManager::instance()->registerAction(ActionManager::UI_WAVEFORM_SEEKBAR, + m_ui.waveformSeekBarDockWidget->toggleViewAction(), + "waveform_seekbar", ""); ActionManager::instance()->registerWidget(ActionManager::UI_POS_SLIDER, m_positionSlider, tr("Position"), "position_slider"); ActionManager::instance()->registerWidget(ActionManager::UI_VOL_SLIDER, m_volumeSlider, diff --git a/src/plugins/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h index e0245a0c5..90c14c978 100644 --- a/src/plugins/Ui/qsui/mainwindow.h +++ b/src/plugins/Ui/qsui/mainwindow.h @@ -102,7 +102,7 @@ private: void createWidgets(); void createActions(); void writeSettings(); - bool m_wasMaximized; + bool m_wasMaximized = false; PlayListManager *m_pl_manager; Ui::MainWindow m_ui; MediaPlayer *m_player; @@ -123,7 +123,7 @@ private: QToolButton *m_addListButton, *m_tabListMenuButton; ListWidget *m_listWidget; MetaDataFormatter m_titleFormatter; - bool m_update; + bool m_update = false; bool m_hideOnClose; QSUiTabWidget *m_tabWidget; diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h index 8b3cc5495..6766b2400 100644 --- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h +++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h @@ -34,6 +34,9 @@ class Decoder; class InputSource; class QSUIWaveformScanner; +/** + @author Ilya Kotov <forkotov02@ya.ru> +*/ class QSUIWaveformSeekBar : public QWidget { Q_OBJECT |