From a1badd59575697bc727a3b72ed4140f0f0b13f6b Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 20 Jan 2020 21:19:26 +0000 Subject: qsui: added color settings for waveform seekbar git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9210 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/colorwidget.cpp | 5 +- src/plugins/Ui/qsui/forms/qsuisettings.ui | 1538 +++++++++++++++------------ src/plugins/Ui/qsui/mainwindow.cpp | 1 + src/plugins/Ui/qsui/qsuisettings.cpp | 11 + src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp | 25 +- src/plugins/Ui/qsui/qsuiwaveformseekbar.h | 2 +- 6 files changed, 889 insertions(+), 693 deletions(-) (limited to 'src') diff --git a/src/plugins/Ui/qsui/colorwidget.cpp b/src/plugins/Ui/qsui/colorwidget.cpp index d774dbfdc..8c07bed3d 100644 --- a/src/plugins/Ui/qsui/colorwidget.cpp +++ b/src/plugins/Ui/qsui/colorwidget.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include "colorwidget.h" ColorWidget::ColorWidget(QWidget *parent) : QFrame(parent) @@ -42,11 +43,11 @@ void ColorWidget::setOptions(QColorDialog::ColorDialogOptions options) void ColorWidget::mousePressEvent(QMouseEvent *) { - QColor color = QColorDialog::getColor(palette().color(backgroundRole()), parentWidget(), + QColor color = QColorDialog::getColor(QColor(m_colorName), parentWidget(), tr("Select Color"), m_options); if (color.isValid()) { - setColor(color.name()); + setColor(color.name((m_options & QColorDialog::ShowAlphaChannel) ? QColor::HexArgb : QColor::HexRgb)); } } diff --git a/src/plugins/Ui/qsui/forms/qsuisettings.ui b/src/plugins/Ui/qsui/forms/qsuisettings.ui index f69395c7a..9308d4800 100644 --- a/src/plugins/Ui/qsui/forms/qsuisettings.ui +++ b/src/plugins/Ui/qsui/forms/qsuisettings.ui @@ -6,8 +6,8 @@ 0 0 - 497 - 529 + 512 + 578 @@ -186,685 +186,867 @@ - - - Visualization Colors - - - - - - Color #1: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - Peaks: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Color #2: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Background: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Color #3: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 10 - 20 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Reset colors - - - - - - - - - - - - Playlist Colors + + + true - - - - - Use system colors - - - true - - - - - - - false - - - - - - Background #1: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Qt::Horizontal - - - - 40 - 43 - - - - - - - - Normal text: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Qt::Horizontal - - - - 66 - 68 - - - - - - - - Background #2: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Current text: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Highlighted background: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - - - - - Highlighted text: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - Splitter: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - Group text: - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - false - - - Group background: - - - - - - - false - - - - 0 - 0 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - Override current track background - - - - - - - false - - - Current track background: - - - - - - - false - - - - 0 - 0 - - - - - 20 - 20 - - - - QFrame::Box - - - QFrame::Plain - - - - - - - Override group background - - - - - - - Qt::Horizontal - - - - 110 - 20 - - - - - - - - Qt::Horizontal - - - - 189 - 20 - - - - - - - - + + + + 0 + -28 + 454 + 535 + + + + + + + Visualization Colors + + + + + + Color #1: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + Peaks: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Color #2: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Background: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Color #3: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 20 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Reset colors + + + + + + + + + + + + Playlist Colors + + + + + + Use system colors + + + true + + + + + + + false + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + false + + + + 0 + 0 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Qt::Horizontal + + + + 40 + 43 + + + + + + + + Qt::Horizontal + + + + 66 + 68 + + + + + + + + Background #2: + + + + + + + Qt::Horizontal + + + + 189 + 20 + + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Highlighted background: + + + + + + + Normal text: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + Splitter: + + + + + + + Current text: + + + + + + + Highlighted text: + + + + + + + false + + + Current track background: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Override current track background + + + + + + + false + + + + 0 + 0 + + + + + 20 + 20 + + + + QFrame::Box + + + QFrame::Plain + + + + + + + Qt::Horizontal + + + + 110 + 20 + + + + + + + + false + + + Group background: + + + + + + + Override group background + + + + + + + Group text: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Background #1: + + + + + + + + + + + + + Waveform Seekbar Colors + + + + + + Progress bar: + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Background: + + + + + + + RMS: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 20 + 20 + + + + + 20 + 20 + + + + QFrame::Box + + + + + + + Waveform: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Vertical - - - - 20 - 129 - - - - diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index afa5bbeb8..54332c1c9 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -344,6 +344,7 @@ void MainWindow::showSettings() readSettings(); ActionManager::instance()->saveActions(); m_analyzer->readSettings(); + m_seekBar->readSettings(); } void MainWindow::updateVolumeIcon() diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp index c84ce26f1..89b13fb23 100644 --- a/src/plugins/Ui/qsui/qsuisettings.cpp +++ b/src/plugins/Ui/qsui/qsuisettings.cpp @@ -45,6 +45,8 @@ QSUiSettings::QSUiSettings(QWidget *parent) : QWidget(parent) m_ui.toolBarIconSizeComboBox->addItem(tr("32x32"), 32); m_ui.toolBarIconSizeComboBox->addItem(tr("48x48"), 48); m_ui.toolBarIconSizeComboBox->addItem(tr("64x64"), 64); + //other settings + m_ui.wfsbProgressBarColor->setOptions(QColorDialog::ShowAlphaChannel); //load settings readSettings(); loadFonts(); @@ -207,6 +209,11 @@ void QSUiSettings::readSettings() m_ui.plCurrentTrackBgColor->setColor(settings.value("pl_current_bg_color", normal_bg).toString()); m_ui.plOverrideGroupBgCheckBox->setChecked(settings.value("pl_override_group_bg", false).toBool()); m_ui.plOverrideCurrentBgCheckBox->setChecked(settings.value("pl_override_current_bg", false).toBool()); + //waveform seekbar color + m_ui.wfsbBgColor->setColor(settings.value("wfsb_bg_color", "Black").toString()); + m_ui.wfsbRmsColor->setColor(settings.value("wfsb_rms_color", "#DDDDDD").toString()); + m_ui.wfsbWaveFormColor->setColor(settings.value("wfsb_waveform_color", "#BECBFF").toString()); + m_ui.wfsbProgressBarColor->setColor(settings.value("wfsb_progressbar_color", "#9633CA10").toString()); //toolbar int index = m_ui.toolBarIconSizeComboBox->findData(settings.value("toolbar_icon_size", -1).toInt()); m_ui.toolBarIconSizeComboBox->setCurrentIndex(index > 0 ? index : 0); @@ -254,6 +261,10 @@ void QSUiSettings::writeSettings() settings.setValue("use_system_fonts", m_ui.systemFontsCheckBox->isChecked()); int index = m_ui.toolBarIconSizeComboBox->currentIndex(); settings.setValue("toolbar_icon_size", m_ui.toolBarIconSizeComboBox->itemData(index)); + settings.setValue("wfsb_bg_color", m_ui.wfsbBgColor->colorName()); + settings.setValue("wfsb_rms_color", m_ui.wfsbRmsColor->colorName()); + settings.setValue("wfsb_waveform_color", m_ui.wfsbWaveFormColor->colorName()); + settings.setValue("wfsb_progressbar_color", m_ui.wfsbProgressBarColor->colorName()); settings.endGroup(); } diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp index 339080105..872144c87 100644 --- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp +++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp @@ -44,6 +44,19 @@ QSize QSUIWaveformSeekBar::sizeHint() const return QSize(200, 100); } +void QSUIWaveformSeekBar::readSettings() +{ + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); + settings.beginGroup("Simple"); + m_bgColor.setNamedColor(settings.value("wfsb_bg_color", "Black").toString()); + m_rmsColor.setNamedColor(settings.value("wfsb_rms_color", "#DDDDDD").toString()); + m_waveFormColor.setNamedColor(settings.value("wfsb_waveform_color", "#BECBFF").toString()); + m_progressBar.setNamedColor(settings.value("wfsb_progressbar_color", "#9633CA10").toString()); + settings.endGroup(); + drawWaveform(); +} + + void QSUIWaveformSeekBar::onStateChanged(Qmmp::State state) { switch (state) @@ -294,18 +307,6 @@ void QSUIWaveformSeekBar::drawWaveform() update(); } -void QSUIWaveformSeekBar::readSettings() -{ - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("Simple"); - m_bgColor.setNamedColor(settings.value("wfsb_bg_color", "Black").toString()); - m_rmsColor.setNamedColor(settings.value("wfsb_rms_color", "#DDDDDD").toString()); - m_waveFormColor.setNamedColor(settings.value("wfsb_waveform_color", "#BECBFF").toString()); - m_progressBar.setNamedColor(settings.value("wfsb_progressbar_color", "#9633CA10").toString()); - settings.endGroup(); - drawWaveform(); -} - QSUIWaveformScanner::QSUIWaveformScanner(QObject *parent) : QThread(parent) {} diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h index 226552ebc..d768e7312 100644 --- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h +++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h @@ -39,6 +39,7 @@ class QSUIWaveformSeekBar : public QWidget public: explicit QSUIWaveformSeekBar(QWidget *parent = nullptr); QSize sizeHint() const override; + void readSettings(); private slots: void onStateChanged(Qmmp::State state); @@ -53,7 +54,6 @@ private: void mouseReleaseEvent(QMouseEvent *) override; void mouseMoveEvent(QMouseEvent *e) override; void drawWaveform(); - void readSettings(); SoundCore *m_core; QSUIWaveformScanner *m_scanner = nullptr; -- cgit v1.2.3-13-gbd6f