From fd89d4742aa412a33842dba777a3f36ef56a4f90 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 24 Dec 2020 13:16:47 +0100 Subject: [PATCH 1/5] Preferences: refactor addPageWidget(), include createIcons() --- src/controllers/dlgprefcontrollers.cpp | 61 ++-- src/controllers/dlgprefcontrollers.h | 8 +- src/preferences/dialog/dlgpreferences.cpp | 334 ++++++++++------------ src/preferences/dialog/dlgpreferences.h | 16 +- 4 files changed, 195 insertions(+), 224 deletions(-) diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp index c734944bad64..c65b208a8eb1 100644 --- a/src/controllers/dlgprefcontrollers.cpp +++ b/src/controllers/dlgprefcontrollers.cpp @@ -10,20 +10,22 @@ #include "preferences/dialog/dlgpreferences.h" DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences, - UserSettingsPointer pConfig, - ControllerManager* pControllerManager, - QTreeWidgetItem* pControllerTreeItem) + UserSettingsPointer pConfig, + ControllerManager* pControllerManager, + QTreeWidgetItem* pControllersRootItem) : DlgPreferencePage(pPreferences), m_pDlgPreferences(pPreferences), m_pConfig(pConfig), m_pControllerManager(pControllerManager), - m_pControllerTreeItem(pControllerTreeItem) { + m_pControllersRootItem(pControllersRootItem) { setupUi(this); setupControllerWidgets(); const QString presetsPath = userPresetsPath(m_pConfig); - connect(btnOpenUserPresets, &QPushButton::clicked, - this, [this, presetsPath] { slotOpenLocalFile(presetsPath); }); + connect(btnOpenUserPresets, + &QPushButton::clicked, + this, + [this, presetsPath] { slotOpenLocalFile(presetsPath); }); // Connections connect(m_pControllerManager, @@ -76,7 +78,7 @@ bool DlgPrefControllers::handleTreeItemClick(QTreeWidgetItem* clickedItem) { m_pDlgPreferences->switchToPage(controllerWidget); } return true; - } else if (clickedItem == m_pControllerTreeItem) { + } else if (clickedItem == m_pControllersRootItem) { // Switch to the root page and expand the controllers tree item. m_pDlgPreferences->expandTreeItem(clickedItem); m_pDlgPreferences->switchToPage(this); @@ -98,9 +100,9 @@ void DlgPrefControllers::destroyControllerWidgets() { } m_controllerTreeItems.clear(); - while(m_pControllerTreeItem->childCount() > 0) { - QTreeWidgetItem* controllerWindowLink = m_pControllerTreeItem->takeChild(0); - delete controllerWindowLink; + while (m_pControllersRootItem->childCount() > 0) { + QTreeWidgetItem* controllerTreeItem = m_pControllersRootItem->takeChild(0); + delete controllerTreeItem; } } @@ -109,11 +111,18 @@ void DlgPrefControllers::setupControllerWidgets() { // treepane on the left. QList controllerList = m_pControllerManager->getControllerList(false, true); + if (controllerList.isEmpty()) { + // If no controllers are available, show the "No controllers available" message. + txtNoControllersAvailable->setVisible(true); + return; + } + + txtNoControllersAvailable->setVisible(false); std::sort(controllerList.begin(), controllerList.end(), controllerCompare); foreach (Controller* pController, controllerList) { DlgPrefController* controllerDlg = new DlgPrefController( - this, pController, m_pControllerManager, m_pConfig); + this, pController, m_pControllerManager, m_pConfig); connect(controllerDlg, &DlgPrefController::mappingStarted, m_pDlgPreferences, @@ -124,7 +133,6 @@ void DlgPrefControllers::setupControllerWidgets() { &DlgPreferences::show); m_controllerWindows.append(controllerDlg); - m_pDlgPreferences->addPageWidget(controllerDlg); connect(pController, &Controller::openChanged, @@ -132,24 +140,21 @@ void DlgPrefControllers::setupControllerWidgets() { slotHighlightDevice(controllerDlg, bOpen); }); - QTreeWidgetItem * controllerWindowLink = new QTreeWidgetItem(QTreeWidgetItem::Type); - controllerWindowLink->setIcon(0, QIcon(":/images/preferences/ic_preferences_controllers.png")); - QString curDeviceName = pController->getName(); - controllerWindowLink->setText(0, curDeviceName); - controllerWindowLink->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - controllerWindowLink->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - m_pControllerTreeItem->addChild(controllerWindowLink); - m_controllerTreeItems.append(controllerWindowLink); - - // Set the font correctly - QFont temp = controllerWindowLink->font(0); + QTreeWidgetItem* controllerTreeItem = new QTreeWidgetItem( + QTreeWidgetItem::Type); + m_pDlgPreferences->addPageWidget(controllerDlg, + controllerTreeItem, + pController->getName(), + "controllers.svg"); + + m_pControllersRootItem->addChild(controllerTreeItem); + m_controllerTreeItems.append(controllerTreeItem); + + // If controller is open make controller label bold + QFont temp = controllerTreeItem->font(0); temp.setBold(pController->isOpen()); - controllerWindowLink->setFont(0, temp); + controllerTreeItem->setFont(0, temp); } - - // If no controllers are available, show the "No controllers available" - // message. - txtNoControllersAvailable->setVisible(controllerList.empty()); } void DlgPrefControllers::slotHighlightDevice(DlgPrefController* dialog, bool enabled) { diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h index 82f1530e8083..3126ea9c12f2 100644 --- a/src/controllers/dlgprefcontrollers.h +++ b/src/controllers/dlgprefcontrollers.h @@ -18,9 +18,9 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle Q_OBJECT public: DlgPrefControllers(DlgPreferences* pDlgPreferences, - UserSettingsPointer pConfig, - ControllerManager* pControllerManager, - QTreeWidgetItem* pControllerTreeItem); + UserSettingsPointer pConfig, + ControllerManager* pControllerManager, + QTreeWidgetItem* pControllersRootItem); virtual ~DlgPrefControllers(); bool handleTreeItemClick(QTreeWidgetItem* clickedItem); @@ -48,7 +48,7 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle DlgPreferences* m_pDlgPreferences; UserSettingsPointer m_pConfig; ControllerManager* m_pControllerManager; - QTreeWidgetItem* m_pControllerTreeItem; + QTreeWidgetItem* m_pControllersRootItem; QList m_controllerWindows; QList m_controllerTreeItems; }; diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp index 8297f500d4d5..3872e2bd8a3b 100644 --- a/src/preferences/dialog/dlgpreferences.cpp +++ b/src/preferences/dialog/dlgpreferences.cpp @@ -16,7 +16,7 @@ #ifdef __VINYLCONTROL__ #include "preferences/dialog/dlgprefvinyl.h" -#else +#else /* __VINYLCONTROL__ */ #include "preferences/dialog/dlgprefnovinyl.h" #endif @@ -34,7 +34,7 @@ #ifdef __BROADCAST__ #include "preferences/dialog/dlgprefbroadcast.h" -#endif +#endif /* __BROADCAST__ */ #include "preferences/dialog/dlgprefrecord.h" #include "preferences/dialog/dlgprefbeats.h" @@ -43,7 +43,7 @@ #ifdef __MODPLUG__ #include "preferences/dialog/dlgprefmodplug.h" -#endif +#endif /* __MODPLUG__ */ #include "controllers/controllermanager.h" #include "library/library.h" @@ -73,80 +73,173 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, this, &DlgPreferences::slotButtonPressed); - createIcons(); - while (pagesWidget->count() > 0) { pagesWidget->removeWidget(pagesWidget->currentWidget()); } - // Construct widgets for use in tabs. + // Construct widgets for use in tabs: + // * create the tree view button first (important for 'Controllers' page!) + // * instantiate preferences page + m_pSoundButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_soundPage = new DlgPrefSound(this, soundman, m_pConfig); - addPageWidget(m_soundPage); + addPageWidget(m_soundPage, + m_pSoundButton, + tr("Sound Hardware"), + "soundhardware.svg"); + + m_pLibraryButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_libraryPage = new DlgPrefLibrary(this, m_pConfig, pLibrary); - addPageWidget(m_libraryPage); + addPageWidget(m_libraryPage, + m_pLibraryButton, + tr("Library"), + "library.svg"); connect(m_libraryPage, &DlgPrefLibrary::scanLibrary, pLibrary->trackCollections(), &TrackCollectionManager::startLibraryScan); - m_controllersPage = new DlgPrefControllers(this, m_pConfig, controllers, - m_pControllerTreeItem); - addPageWidget(m_controllersPage); + + m_pControllersRootButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); + m_controllersPage = new DlgPrefControllers( + this, m_pConfig, controllers, m_pControllersRootButton); + addPageWidget(m_controllersPage, + m_pControllersRootButton, + tr("Controllers"), + "controllers.svg"); #ifdef __VINYLCONTROL__ // It's important for this to be before the connect for wsound. // TODO(rryan) determine why/if this is still true + m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_vinylControlPage = new DlgPrefVinyl(this, pVCManager, m_pConfig); - addPageWidget(m_vinylControlPage); - Q_UNUSED(m_noVinylControlPage); -#else + addPageWidget(m_vinylControlPage, + m_pVinylControlButton, + tr("Vinyl Control"), + "vinyl.svg"); +#else /* __VINYLCONTROL__ */ + + m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_noVinylControlPage = new DlgPrefNoVinyl(this, soundman, m_pConfig); - addPageWidget(m_noVinylControlPage); - Q_UNUSED(m_vinylControlPage); + addPageWidget(m_noVinylControlPage, + m_pVinylControlButton, + tr("Vinyl Control"), + "vinyl.svg"); #endif + m_pInterfaceButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_interfacePage = new DlgPrefInterface(this, mixxx, pSkinLoader, m_pConfig); - addPageWidget(m_interfacePage); + addPageWidget(m_interfacePage, + m_pInterfaceButton, + tr("Interface"), + "interface.svg"); + + m_pWaveformButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_waveformPage = new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary); - addPageWidget(m_waveformPage); + addPageWidget(m_waveformPage, + m_pWaveformButton, + tr("Waveforms"), + "waveforms.svg"); + + m_pDecksButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_deckPage = new DlgPrefDeck(this, m_pConfig); - addPageWidget(m_deckPage); + addPageWidget(m_deckPage, + m_pDecksButton, + tr("Decks"), + "decks.svg"); + + m_pColorsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_colorsPage = new DlgPrefColors(this, m_pConfig, pLibrary); - addPageWidget(m_colorsPage); + addPageWidget(m_colorsPage, + m_pColorsButton, + tr("Colors"), + "colors.svg"); + + m_pEqButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_equalizerPage = new DlgPrefEQ(this, pEffectsManager, m_pConfig); - addPageWidget(m_equalizerPage); + addPageWidget(m_equalizerPage, + m_pEqButton, + tr("Equalizers"), + "equalizers.svg"); + + m_pCrossfaderButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_crossfaderPage = new DlgPrefCrossfader(this, m_pConfig); - addPageWidget(m_crossfaderPage); + addPageWidget(m_crossfaderPage, + m_pCrossfaderButton, + tr("Crossfader"), + "crossfader.svg"); + + m_pEffectsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_effectsPage = new DlgPrefEffects(this, m_pConfig, pEffectsManager); - addPageWidget(m_effectsPage); + addPageWidget(m_effectsPage, + m_pEffectsButton, + tr("Effects"), + "effects.svg"); + #ifdef __LILV__ + m_pLV2Button = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_lv2Page = new DlgPrefLV2(this, pLV2Backend, m_pConfig, pEffectsManager); - addPageWidget(m_lv2Page); + addPageWidget(m_lv2Page, + m_pLV2Button, + tr("LV2 Plugins"), + "lv2.svg"); #endif /* __LILV__ */ + + m_pAutoDJButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_autoDjPage = new DlgPrefAutoDJ(this, m_pConfig); - addPageWidget(m_autoDjPage); + addPageWidget(m_autoDjPage, + m_pAutoDJButton, + tr("Auto DJ"), + "autodj.svg"); #ifdef __BROADCAST__ - m_broadcastingPage = new DlgPrefBroadcast(this, - pSettingsManager->broadcastSettings()); - addPageWidget(m_broadcastingPage); -#endif + m_pBroadcastButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); + m_broadcastingPage = new DlgPrefBroadcast(this, pSettingsManager->broadcastSettings()); + addPageWidget(m_broadcastingPage, + m_pBroadcastButton, + tr("Live Broadcasting"), + "broadcast.svg"); +#endif /* __BROADCAST__ */ + m_pRecordingButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_recordingPage = new DlgPrefRecord(this, m_pConfig); - addPageWidget(m_recordingPage); + addPageWidget(m_recordingPage, + m_pRecordingButton, + tr("Recording"), + "recording.svg"); + m_pBeatDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_beatgridPage = new DlgPrefBeats(this, m_pConfig); - addPageWidget (m_beatgridPage); + addPageWidget(m_beatgridPage, + m_pBeatDetectionButton, + tr("Beat Detection"), + "bpmdetect.svg"); + m_pKeyDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_musicalKeyPage = new DlgPrefKey(this, m_pConfig); - addPageWidget(m_musicalKeyPage); + addPageWidget(m_musicalKeyPage, + m_pKeyDetectionButton, + tr("Key Detection"), + "keydetect.svg"); + m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_replayGainPage = new DlgPrefReplayGain(this, m_pConfig); - addPageWidget(m_replayGainPage); + addPageWidget(m_replayGainPage, + m_pReplayGainButton, + tr("Normalization"), + "replaygain.svg"); #ifdef __MODPLUG__ + m_pModplugButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_modplugPage = new DlgPrefModplug(this, m_pConfig); - addPageWidget(m_modplugPage); -#endif + addPageWidget(m_modplugPage, + m_pModplugButton, + tr("Modplug Decoder"), + "modplug.svg"); +#endif /* __MODPLUG__ */ + + connect(contentsTreeWidget, + &QTreeWidget::currentItemChanged, + this, + &DlgPreferences::changePage); // Install event handler to generate closeDlg signal installEventFilter(this); @@ -170,145 +263,6 @@ DlgPreferences::~DlgPreferences() { delete m_controllersPage; } -void DlgPreferences::createIcons() { - m_pSoundButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pSoundButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_soundhardware.svg")); - m_pSoundButton->setText(0, tr("Sound Hardware")); - m_pSoundButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pSoundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pLibraryButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pLibraryButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_library.svg")); - m_pLibraryButton->setText(0, tr("Library")); - m_pLibraryButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pLibraryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pControllerTreeItem = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pControllerTreeItem->setIcon(0, QIcon(":/images/preferences/ic_preferences_controllers.svg")); - m_pControllerTreeItem->setText(0, tr("Controllers")); - m_pControllerTreeItem->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pControllerTreeItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - -#ifdef __VINYLCONTROL__ - m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - //QT screws up my nice vinyl svg for some reason, so we'll use a PNG version - //instead... - m_pVinylControlButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_vinyl.svg")); - m_pVinylControlButton->setText(0, tr("Vinyl Control")); - m_pVinylControlButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pVinylControlButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); -#else - m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - //QT screws up my nice vinyl svg for some reason, so we'll use a PNG version - //instead... - m_pVinylControlButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_vinyl.svg")); - m_pVinylControlButton->setText(0, tr("Vinyl Control")); - m_pVinylControlButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pVinylControlButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); -#endif - - m_pInterfaceButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pInterfaceButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_interface.svg")); - m_pInterfaceButton->setText(0, tr("Interface")); - m_pInterfaceButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pInterfaceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pWaveformButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pWaveformButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_waveforms.svg")); - m_pWaveformButton->setText(0, tr("Waveforms")); - m_pWaveformButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pWaveformButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pDecksButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pDecksButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_decks.svg")); - m_pDecksButton->setText(0, tr("Decks")); - m_pDecksButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pDecksButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pColorsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pColorsButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_colors.svg")); - m_pColorsButton->setText(0, tr("Colors")); - m_pColorsButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pColorsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pEqButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pEqButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_equalizers.svg")); - m_pEqButton->setText(0, tr("Equalizers")); - m_pEqButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pEqButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pCrossfaderButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pCrossfaderButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_crossfader.svg")); - m_pCrossfaderButton->setText(0, tr("Crossfader")); - m_pCrossfaderButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pCrossfaderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pEffectsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pEffectsButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_effects.svg")); - m_pEffectsButton->setText(0, tr("Effects")); - m_pEffectsButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pEffectsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - -#ifdef __LILV__ - m_pLV2Button = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pLV2Button->setIcon(0, QIcon(":/images/preferences/ic_preferences_lv2.svg")); - m_pLV2Button->setText(0, tr("LV2 Plugins")); - m_pLV2Button->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pLV2Button->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); -#endif /* __LILV__ */ - - m_pAutoDJButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pAutoDJButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_autodj.svg")); - m_pAutoDJButton->setText(0, tr("Auto DJ")); - m_pAutoDJButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pAutoDJButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - -#ifdef __BROADCAST__ - m_pBroadcastButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pBroadcastButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_broadcast.svg")); - m_pBroadcastButton->setText(0, tr("Live Broadcasting")); - m_pBroadcastButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pBroadcastButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); -#endif - - m_pRecordingButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pRecordingButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_recording.svg")); - m_pRecordingButton->setText(0, tr("Recording")); - m_pRecordingButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pRecordingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pBeatDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pBeatDetectionButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_bpmdetect.svg")); - m_pBeatDetectionButton->setText(0, tr("Beat Detection")); - m_pBeatDetectionButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pBeatDetectionButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pKeyDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pKeyDetectionButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_keydetect.svg")); - m_pKeyDetectionButton->setText(0, tr("Key Detection")); - m_pKeyDetectionButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pKeyDetectionButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - - m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pReplayGainButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_replaygain.svg")); - m_pReplayGainButton->setText(0, tr("Normalization")); - m_pReplayGainButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pReplayGainButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - -#ifdef __MODPLUG__ - m_pModplugButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_pModplugButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_modplug.svg")); - m_pModplugButton->setText(0, tr("Modplug Decoder")); - m_pModplugButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - m_pModplugButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); -#endif - - connect(contentsTreeWidget, - &QTreeWidget::currentItemChanged, - this, - &DlgPreferences::changePage); -} - void DlgPreferences::changePage(QTreeWidgetItem* current, QTreeWidgetItem* previous) { if (!current) { current = previous; @@ -323,7 +277,7 @@ void DlgPreferences::changePage(QTreeWidgetItem* current, QTreeWidgetItem* previ #ifdef __VINYLCONTROL__ } else if (current == m_pVinylControlButton) { switchToPage(m_vinylControlPage); -#else +#else /* __VINYLCONTROL__ */ } else if (current == m_pVinylControlButton) { switchToPage(m_noVinylControlPage); #endif @@ -350,7 +304,7 @@ void DlgPreferences::changePage(QTreeWidgetItem* current, QTreeWidgetItem* previ #ifdef __BROADCAST__ } else if (current == m_pBroadcastButton) { switchToPage(m_broadcastingPage); -#endif +#endif /* __BROADCAST__ */ } else if (current == m_pRecordingButton) { switchToPage(m_recordingPage); } else if (current == m_pBeatDetectionButton) { @@ -362,7 +316,7 @@ void DlgPreferences::changePage(QTreeWidgetItem* current, QTreeWidgetItem* previ #ifdef __MODPLUG__ } else if (current == m_pModplugButton) { switchToPage(m_modplugPage); -#endif +#endif /* __MODPLUG__ */ } } @@ -426,10 +380,11 @@ void DlgPreferences::onShow() { // Update geometry with last values #ifdef __WINDOWS__ resize(m_geometry[2].toInt(), m_geometry[3].toInt()); -#else - // On linux, when the window is opened for the first time by the window manager, QT does not have - // information about the frame size so the offset is zero. As such, the first time it opens the window - // does not include the offset, so it is moved from the last position it had. +#else /* __WINDOWS__ */ + // On linux, when the window is opened for the first time by the window manager, + // QT does not have information about the frame size so the offset is zero. + // As such, the first time it opens the window does not include the offset, + // so it is moved from the last position it had. // Excluding the offset from the saved value tries to fix that. int offsetX = geometry().left() - frameGeometry().left(); int offsetY = geometry().top() - frameGeometry().top(); @@ -483,11 +438,19 @@ void DlgPreferences::slotButtonPressed(QAbstractButton* pButton) { } } -void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget) { +void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget, + QTreeWidgetItem* treeItem, + const QString& pageTitle, + const QString& iconFile) { + // Configure the tree button linked to the page + treeItem->setIcon(0, QIcon(":/images/preferences/ic_preferences_" + iconFile)); + treeItem->setText(0, pageTitle); + treeItem->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); + treeItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + connect(this, &DlgPreferences::showDlg, pWidget, &DlgPreferencePage::slotShow); connect(this, &DlgPreferences::closeDlg, pWidget, &DlgPreferencePage::slotHide); connect(this, &DlgPreferences::showDlg, pWidget, &DlgPreferencePage::slotUpdate); - connect(this, &DlgPreferences::applyPreferences, pWidget, &DlgPreferencePage::slotApply); connect(this, &DlgPreferences::cancelPreferences, pWidget, &DlgPreferencePage::slotCancel); connect(this, @@ -495,16 +458,15 @@ void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget) { pWidget, &DlgPreferencePage::slotResetToDefaults); + // Add a new scroll area containing the page to the stacked pages widget QScrollArea* sa = new QScrollArea(pagesWidget); sa->setWidgetResizable(true); - sa->setWidget(pWidget); pagesWidget->addWidget(sa); int iframe = 2 * sa->frameWidth(); m_pageSizeHint = m_pageSizeHint.expandedTo( pWidget->sizeHint()+QSize(iframe, iframe)); - } DlgPreferencePage* DlgPreferences::currentPage() { @@ -551,7 +513,7 @@ void DlgPreferences::moveEvent(QMoveEvent* e) { Q_UNUSED(e); m_geometry[0] = QString::number(frameGeometry().left()); m_geometry[1] = QString::number(frameGeometry().top()); -#else +#else /* __WINDOWS__ */ // Warning! geometry does NOT include the frame/title. int offsetX = geometry().left() - frameGeometry().left(); int offsetY = geometry().top() - frameGeometry().top(); diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h index f19b7b955eb2..55b5dac480ed 100644 --- a/src/preferences/dialog/dlgpreferences.h +++ b/src/preferences/dialog/dlgpreferences.h @@ -61,7 +61,10 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { Library* pLibrary); virtual ~DlgPreferences(); - void addPageWidget(DlgPreferencePage* pWidget); + void addPageWidget(DlgPreferencePage* pWidget, + QTreeWidgetItem* treeItem, + const QString& pageTitle, + const QString& iconFile); void removePageWidget(DlgPreferencePage* pWidget); void expandTreeItem(QTreeWidgetItem* pItem); void switchToPage(DlgPreferencePage* pWidget); @@ -88,7 +91,6 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { private: DlgPreferencePage* currentPage(); - void createIcons(); void onShow(); void onHide(); QRect getDefaultGeometry(); @@ -98,8 +100,11 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { DlgPrefSound* m_soundPage; DlgPrefLibrary* m_libraryPage; DlgPrefControllers *m_controllersPage; +#ifdef __VINYLCONTROL__ DlgPrefVinyl* m_vinylControlPage; +#else /* __VINYLCONTROL__ */ DlgPrefNoVinyl* m_noVinylControlPage; +#endif DlgPrefInterface* m_interfacePage; DlgPrefWaveform* m_waveformPage; DlgPrefDeck* m_deckPage; @@ -118,11 +123,11 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { #endif /* __LILV__ */ #ifdef __MODPLUG__ DlgPrefModplug* m_modplugPage; -#endif +#endif /* __MODPLUG__ */ QTreeWidgetItem* m_pSoundButton; QTreeWidgetItem* m_pLibraryButton; - QTreeWidgetItem* m_pControllerTreeItem; + QTreeWidgetItem* m_pControllersRootButton; QTreeWidgetItem* m_pVinylControlButton; QTreeWidgetItem* m_pInterfaceButton; QTreeWidgetItem* m_pWaveformButton; @@ -134,7 +139,6 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { #endif /* __LILV__ */ QTreeWidgetItem* m_pEffectsButton; QTreeWidgetItem* m_pCrossfaderButton; - //QTreeWidgetItem* m_pEffectsButton; QTreeWidgetItem* m_pAutoDJButton; QTreeWidgetItem* m_pBroadcastButton; QTreeWidgetItem* m_pRecordingButton; @@ -143,7 +147,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { QTreeWidgetItem* m_pReplayGainButton; #ifdef __MODPLUG__ QTreeWidgetItem* m_pModplugButton; -#endif +#endif /* __MODPLUG__ */ QSize m_pageSizeHint; }; From 6a350f78731de15c254b0a24bf741ec6f085345c Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 24 Dec 2020 13:41:55 +0100 Subject: [PATCH 2/5] DlgPrefControllers: use more distinct variable names --- src/controllers/dlgprefcontrollers.cpp | 77 +++++++++++++------------- src/controllers/dlgprefcontrollers.h | 2 +- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp index c65b208a8eb1..d9a44f331d55 100644 --- a/src/controllers/dlgprefcontrollers.cpp +++ b/src/controllers/dlgprefcontrollers.cpp @@ -43,26 +43,26 @@ void DlgPrefControllers::slotOpenLocalFile(const QString& file) { } void DlgPrefControllers::slotUpdate() { - for (DlgPrefController* pControllerWindows : qAsConst(m_controllerWindows)) { - pControllerWindows->slotUpdate(); + for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) { + pControllerDlg->slotUpdate(); } } void DlgPrefControllers::slotCancel() { - for (DlgPrefController* pControllerWindows : qAsConst(m_controllerWindows)) { - pControllerWindows->slotCancel(); + for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) { + pControllerDlg->slotCancel(); } } void DlgPrefControllers::slotApply() { - for (DlgPrefController* pControllerWindows : qAsConst(m_controllerWindows)) { - pControllerWindows->slotApply(); + for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) { + pControllerDlg->slotApply(); } } void DlgPrefControllers::slotResetToDefaults() { - for (DlgPrefController* pControllerWindows : qAsConst(m_controllerWindows)) { - pControllerWindows->slotResetToDefaults(); + for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) { + pControllerDlg->slotResetToDefaults(); } } @@ -73,9 +73,9 @@ QUrl DlgPrefControllers::helpUrl() const { bool DlgPrefControllers::handleTreeItemClick(QTreeWidgetItem* clickedItem) { int controllerIndex = m_controllerTreeItems.indexOf(clickedItem); if (controllerIndex >= 0) { - DlgPrefController* controllerWidget = m_controllerWindows.value(controllerIndex); - if (controllerWidget) { - m_pDlgPreferences->switchToPage(controllerWidget); + DlgPrefController* pControllerDlg = m_controllerPages.value(controllerIndex); + if (pControllerDlg) { + m_pDlgPreferences->switchToPage(pControllerDlg); } return true; } else if (clickedItem == m_pControllersRootItem) { @@ -93,16 +93,16 @@ void DlgPrefControllers::rescanControllers() { } void DlgPrefControllers::destroyControllerWidgets() { - while (!m_controllerWindows.isEmpty()) { - DlgPrefController* controllerDlg = m_controllerWindows.takeLast(); - m_pDlgPreferences->removePageWidget(controllerDlg); - delete controllerDlg; + while (!m_controllerPages.isEmpty()) { + DlgPrefController* pControllerDlg = m_controllerPages.takeLast(); + m_pDlgPreferences->removePageWidget(pControllerDlg); + delete pControllerDlg; } m_controllerTreeItems.clear(); while (m_pControllersRootItem->childCount() > 0) { - QTreeWidgetItem* controllerTreeItem = m_pControllersRootItem->takeChild(0); - delete controllerTreeItem; + QTreeWidgetItem* pControllerTreeItem = m_pControllersRootItem->takeChild(0); + delete pControllerTreeItem; } } @@ -121,56 +121,55 @@ void DlgPrefControllers::setupControllerWidgets() { std::sort(controllerList.begin(), controllerList.end(), controllerCompare); foreach (Controller* pController, controllerList) { - DlgPrefController* controllerDlg = new DlgPrefController( + DlgPrefController* pControllerDlg = new DlgPrefController( this, pController, m_pControllerManager, m_pConfig); - connect(controllerDlg, + connect(pControllerDlg, &DlgPrefController::mappingStarted, m_pDlgPreferences, &DlgPreferences::hide); - connect(controllerDlg, + connect(pControllerDlg, &DlgPrefController::mappingEnded, m_pDlgPreferences, &DlgPreferences::show); - m_controllerWindows.append(controllerDlg); + m_controllerPages.append(pControllerDlg); connect(pController, &Controller::openChanged, - [this, controllerDlg](bool bOpen) { - slotHighlightDevice(controllerDlg, bOpen); + [this, pControllerDlg](bool bOpen) { + slotHighlightDevice(pControllerDlg, bOpen); }); - QTreeWidgetItem* controllerTreeItem = new QTreeWidgetItem( + QTreeWidgetItem* pControllerTreeItem = new QTreeWidgetItem( QTreeWidgetItem::Type); - m_pDlgPreferences->addPageWidget(controllerDlg, - controllerTreeItem, + m_pDlgPreferences->addPageWidget(pControllerDlg, + pControllerTreeItem, pController->getName(), "controllers.svg"); - m_pControllersRootItem->addChild(controllerTreeItem); - m_controllerTreeItems.append(controllerTreeItem); + m_pControllersRootItem->addChild(pControllerTreeItem); + m_controllerTreeItems.append(pControllerTreeItem); // If controller is open make controller label bold - QFont temp = controllerTreeItem->font(0); + QFont temp = pControllerTreeItem->font(0); temp.setBold(pController->isOpen()); - controllerTreeItem->setFont(0, temp); + pControllerTreeItem->setFont(0, temp); } } -void DlgPrefControllers::slotHighlightDevice(DlgPrefController* dialog, bool enabled) { - int dialogIndex = m_controllerWindows.indexOf(dialog); - if (dialogIndex < 0) { +void DlgPrefControllers::slotHighlightDevice(DlgPrefController* pControllerDlg, bool enabled) { + int controllerPageIndex = m_controllerPages.indexOf(pControllerDlg); + if (controllerPageIndex < 0) { return; } - QTreeWidgetItem * controllerWindowLink = - m_controllerTreeItems.at(dialogIndex); - - if (!controllerWindowLink) { + QTreeWidgetItem* pControllerTreeItem = + m_controllerTreeItems.at(controllerPageIndex); + if (!pControllerTreeItem) { return; } - QFont temp = controllerWindowLink->font(0); + QFont temp = pControllerTreeItem->font(0); temp.setBold(enabled); - controllerWindowLink->setFont(0,temp); + pControllerTreeItem->setFont(0, temp); } diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h index 3126ea9c12f2..ea5d5c8596d9 100644 --- a/src/controllers/dlgprefcontrollers.h +++ b/src/controllers/dlgprefcontrollers.h @@ -49,6 +49,6 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle UserSettingsPointer m_pConfig; ControllerManager* m_pControllerManager; QTreeWidgetItem* m_pControllersRootItem; - QList m_controllerWindows; + QList m_controllerPages; QList m_controllerTreeItems; }; From 0246082c9ac119ef091c02f00839e4c2be1e5db6 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Sat, 26 Dec 2020 22:54:02 +0100 Subject: [PATCH 3/5] Preferences: choose dark or light icons depending to OS theme... dark foreground text color > dark icons, light text > light icons --- res/images/ic_custom.svg | 67 - res/images/ic_mixxx_symbolic.svg | 1308 ----------------- res/images/ic_none.svg | 77 - res/images/preferences/dark/ic_custom.svg | 5 + .../preferences/dark/ic_mixxx_symbolic.svg | 186 +++ res/images/preferences/dark/ic_none.svg | 7 + .../dark/ic_preferences_autodj.svg | 13 + .../dark/ic_preferences_bpmdetect.svg | 7 + .../dark/ic_preferences_broadcast.svg | 12 + .../dark/ic_preferences_colors.svg | 7 + .../dark/ic_preferences_controllers.svg | 4 + .../dark/ic_preferences_crossfader.svg | 8 + .../preferences/dark/ic_preferences_decks.svg | 4 + .../dark/ic_preferences_effects.svg | 6 + .../dark/ic_preferences_equalizers.svg | 15 + .../dark/ic_preferences_interface.svg | 13 + .../dark/ic_preferences_keydetect.svg | 8 + .../dark/ic_preferences_library.svg | 14 + .../preferences/dark/ic_preferences_lv2.svg | 4 + .../dark/ic_preferences_midicontrollers.svg | 13 + .../dark/ic_preferences_modplug.svg | 12 + .../dark/ic_preferences_recording.svg | 4 + .../dark/ic_preferences_replaygain.svg | 9 + .../dark/ic_preferences_sampler.svg | 4 + .../dark/ic_preferences_soundhardware.svg | 13 + .../preferences/dark/ic_preferences_vinyl.svg | 10 + .../dark/ic_preferences_waveforms.svg | 4 + .../preferences/ic_preferences_autodj.svg | 375 ----- .../preferences/ic_preferences_bpmdetect.svg | 365 ----- .../preferences/ic_preferences_broadcast.svg | 419 ------ .../preferences/ic_preferences_colors.svg | 7 - .../ic_preferences_controllers.svg | 405 ----- .../preferences/ic_preferences_crossfader.svg | 487 ------ .../preferences/ic_preferences_decks.svg | 615 -------- .../preferences/ic_preferences_effects.svg | 486 ------ .../preferences/ic_preferences_equalizers.svg | 796 ---------- .../preferences/ic_preferences_interface.svg | 646 -------- .../preferences/ic_preferences_keydetect.svg | 512 ------- .../preferences/ic_preferences_library.svg | 538 ------- res/images/preferences/ic_preferences_lv2.svg | 436 ------ .../ic_preferences_midicontrollers.svg | 560 ------- .../preferences/ic_preferences_modplug.svg | 503 ------- .../preferences/ic_preferences_recording.svg | 438 ------ .../preferences/ic_preferences_replaygain.svg | 610 -------- .../preferences/ic_preferences_sampler.svg | 606 -------- .../ic_preferences_soundhardware.svg | 713 --------- .../preferences/ic_preferences_vinyl.svg | 673 --------- .../preferences/ic_preferences_waveforms.svg | 643 -------- res/images/preferences/light/ic_custom.svg | 5 + .../preferences/light/ic_mixxx_symbolic.svg | 186 +++ res/images/preferences/light/ic_none.svg | 7 + .../light/ic_preferences_autodj.svg | 13 + .../light/ic_preferences_bpmdetect.svg | 7 + .../light/ic_preferences_broadcast.svg | 12 + .../light/ic_preferences_colors.svg | 7 + .../light/ic_preferences_controllers.svg | 4 + .../light/ic_preferences_crossfader.svg | 8 + .../light/ic_preferences_decks.svg | 4 + .../light/ic_preferences_effects.svg | 6 + .../light/ic_preferences_equalizers.svg | 15 + .../light/ic_preferences_interface.svg | 13 + .../light/ic_preferences_keydetect.svg | 8 + .../light/ic_preferences_library.svg | 14 + .../preferences/light/ic_preferences_lv2.svg | 4 + .../light/ic_preferences_midicontrollers.svg | 13 + .../light/ic_preferences_modplug.svg | 12 + .../light/ic_preferences_recording.svg | 4 + .../light/ic_preferences_replaygain.svg | 9 + .../light/ic_preferences_sampler.svg | 4 + .../light/ic_preferences_soundhardware.svg | 13 + .../light/ic_preferences_vinyl.svg | 10 + .../light/ic_preferences_waveforms.svg | 4 + res/mixxx.qrc | 74 +- src/controllers/dlgprefcontroller.cpp | 17 +- src/controllers/dlgprefcontrollers.cpp | 2 +- src/preferences/dialog/dlgpreferences.cpp | 52 +- src/preferences/dialog/dlgpreferences.h | 3 + 77 files changed, 861 insertions(+), 12336 deletions(-) delete mode 100644 res/images/ic_custom.svg delete mode 100644 res/images/ic_mixxx_symbolic.svg delete mode 100644 res/images/ic_none.svg create mode 100644 res/images/preferences/dark/ic_custom.svg create mode 100644 res/images/preferences/dark/ic_mixxx_symbolic.svg create mode 100644 res/images/preferences/dark/ic_none.svg create mode 100644 res/images/preferences/dark/ic_preferences_autodj.svg create mode 100644 res/images/preferences/dark/ic_preferences_bpmdetect.svg create mode 100644 res/images/preferences/dark/ic_preferences_broadcast.svg create mode 100644 res/images/preferences/dark/ic_preferences_colors.svg create mode 100644 res/images/preferences/dark/ic_preferences_controllers.svg create mode 100644 res/images/preferences/dark/ic_preferences_crossfader.svg create mode 100644 res/images/preferences/dark/ic_preferences_decks.svg create mode 100644 res/images/preferences/dark/ic_preferences_effects.svg create mode 100644 res/images/preferences/dark/ic_preferences_equalizers.svg create mode 100644 res/images/preferences/dark/ic_preferences_interface.svg create mode 100644 res/images/preferences/dark/ic_preferences_keydetect.svg create mode 100644 res/images/preferences/dark/ic_preferences_library.svg create mode 100644 res/images/preferences/dark/ic_preferences_lv2.svg create mode 100644 res/images/preferences/dark/ic_preferences_midicontrollers.svg create mode 100644 res/images/preferences/dark/ic_preferences_modplug.svg create mode 100644 res/images/preferences/dark/ic_preferences_recording.svg create mode 100644 res/images/preferences/dark/ic_preferences_replaygain.svg create mode 100644 res/images/preferences/dark/ic_preferences_sampler.svg create mode 100644 res/images/preferences/dark/ic_preferences_soundhardware.svg create mode 100644 res/images/preferences/dark/ic_preferences_vinyl.svg create mode 100644 res/images/preferences/dark/ic_preferences_waveforms.svg delete mode 100644 res/images/preferences/ic_preferences_autodj.svg delete mode 100644 res/images/preferences/ic_preferences_bpmdetect.svg delete mode 100644 res/images/preferences/ic_preferences_broadcast.svg delete mode 100644 res/images/preferences/ic_preferences_colors.svg delete mode 100644 res/images/preferences/ic_preferences_controllers.svg delete mode 100644 res/images/preferences/ic_preferences_crossfader.svg delete mode 100644 res/images/preferences/ic_preferences_decks.svg delete mode 100644 res/images/preferences/ic_preferences_effects.svg delete mode 100644 res/images/preferences/ic_preferences_equalizers.svg delete mode 100644 res/images/preferences/ic_preferences_interface.svg delete mode 100644 res/images/preferences/ic_preferences_keydetect.svg delete mode 100644 res/images/preferences/ic_preferences_library.svg delete mode 100644 res/images/preferences/ic_preferences_lv2.svg delete mode 100644 res/images/preferences/ic_preferences_midicontrollers.svg delete mode 100644 res/images/preferences/ic_preferences_modplug.svg delete mode 100644 res/images/preferences/ic_preferences_recording.svg delete mode 100644 res/images/preferences/ic_preferences_replaygain.svg delete mode 100644 res/images/preferences/ic_preferences_sampler.svg delete mode 100644 res/images/preferences/ic_preferences_soundhardware.svg delete mode 100644 res/images/preferences/ic_preferences_vinyl.svg delete mode 100644 res/images/preferences/ic_preferences_waveforms.svg create mode 100644 res/images/preferences/light/ic_custom.svg create mode 100644 res/images/preferences/light/ic_mixxx_symbolic.svg create mode 100644 res/images/preferences/light/ic_none.svg create mode 100644 res/images/preferences/light/ic_preferences_autodj.svg create mode 100644 res/images/preferences/light/ic_preferences_bpmdetect.svg create mode 100644 res/images/preferences/light/ic_preferences_broadcast.svg create mode 100644 res/images/preferences/light/ic_preferences_colors.svg create mode 100644 res/images/preferences/light/ic_preferences_controllers.svg create mode 100644 res/images/preferences/light/ic_preferences_crossfader.svg create mode 100644 res/images/preferences/light/ic_preferences_decks.svg create mode 100644 res/images/preferences/light/ic_preferences_effects.svg create mode 100644 res/images/preferences/light/ic_preferences_equalizers.svg create mode 100644 res/images/preferences/light/ic_preferences_interface.svg create mode 100644 res/images/preferences/light/ic_preferences_keydetect.svg create mode 100644 res/images/preferences/light/ic_preferences_library.svg create mode 100644 res/images/preferences/light/ic_preferences_lv2.svg create mode 100644 res/images/preferences/light/ic_preferences_midicontrollers.svg create mode 100644 res/images/preferences/light/ic_preferences_modplug.svg create mode 100644 res/images/preferences/light/ic_preferences_recording.svg create mode 100644 res/images/preferences/light/ic_preferences_replaygain.svg create mode 100644 res/images/preferences/light/ic_preferences_sampler.svg create mode 100644 res/images/preferences/light/ic_preferences_soundhardware.svg create mode 100644 res/images/preferences/light/ic_preferences_vinyl.svg create mode 100644 res/images/preferences/light/ic_preferences_waveforms.svg diff --git a/res/images/ic_custom.svg b/res/images/ic_custom.svg deleted file mode 100644 index 44a0fe3f680b..000000000000 --- a/res/images/ic_custom.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/res/images/ic_mixxx_symbolic.svg b/res/images/ic_mixxx_symbolic.svg deleted file mode 100644 index c51004a4556d..000000000000 --- a/res/images/ic_mixxx_symbolic.svg +++ /dev/null @@ -1,1308 +0,0 @@ - - - - - - - - image/svg+xml - - Mixxx application icon - - - - - - - Mixxx application icon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/images/ic_none.svg b/res/images/ic_none.svg deleted file mode 100644 index 1d4ae648d3aa..000000000000 --- a/res/images/ic_none.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/res/images/preferences/dark/ic_custom.svg b/res/images/preferences/dark/ic_custom.svg new file mode 100644 index 000000000000..afb9881b2e68 --- /dev/null +++ b/res/images/preferences/dark/ic_custom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/res/images/preferences/dark/ic_mixxx_symbolic.svg b/res/images/preferences/dark/ic_mixxx_symbolic.svg new file mode 100644 index 000000000000..348a1f128747 --- /dev/null +++ b/res/images/preferences/dark/ic_mixxx_symbolic.svg @@ -0,0 +1,186 @@ + + Mixxx application icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_none.svg b/res/images/preferences/dark/ic_none.svg new file mode 100644 index 000000000000..ba2cb6a54267 --- /dev/null +++ b/res/images/preferences/dark/ic_none.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_autodj.svg b/res/images/preferences/dark/ic_preferences_autodj.svg new file mode 100644 index 000000000000..2ff8701be13c --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_autodj.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_bpmdetect.svg b/res/images/preferences/dark/ic_preferences_bpmdetect.svg new file mode 100644 index 000000000000..25ecf03c0c14 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_bpmdetect.svg @@ -0,0 +1,7 @@ + + Mixxx 1.12+ iconset + + + + + diff --git a/res/images/preferences/dark/ic_preferences_broadcast.svg b/res/images/preferences/dark/ic_preferences_broadcast.svg new file mode 100644 index 000000000000..05bb64fb88a9 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_broadcast.svg @@ -0,0 +1,12 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_colors.svg b/res/images/preferences/dark/ic_preferences_colors.svg new file mode 100644 index 000000000000..214b78d58fb3 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_colors.svg @@ -0,0 +1,7 @@ + + Mixxx 1.12+ iconset + + + + + diff --git a/res/images/preferences/dark/ic_preferences_controllers.svg b/res/images/preferences/dark/ic_preferences_controllers.svg new file mode 100644 index 000000000000..fc34415d2e1f --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_controllers.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/dark/ic_preferences_crossfader.svg b/res/images/preferences/dark/ic_preferences_crossfader.svg new file mode 100644 index 000000000000..d70d4f6fb8d4 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_crossfader.svg @@ -0,0 +1,8 @@ + + Mixxx 1.12+ iconset + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_decks.svg b/res/images/preferences/dark/ic_preferences_decks.svg new file mode 100644 index 000000000000..e2e6d721a955 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_decks.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/dark/ic_preferences_effects.svg b/res/images/preferences/dark/ic_preferences_effects.svg new file mode 100644 index 000000000000..9a292ee13b68 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_effects.svg @@ -0,0 +1,6 @@ + + Mixxx 1.12+ iconset + + + + diff --git a/res/images/preferences/dark/ic_preferences_equalizers.svg b/res/images/preferences/dark/ic_preferences_equalizers.svg new file mode 100644 index 000000000000..add3b2f0f256 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_equalizers.svg @@ -0,0 +1,15 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_interface.svg b/res/images/preferences/dark/ic_preferences_interface.svg new file mode 100644 index 000000000000..2e3209eca992 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_interface.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_keydetect.svg b/res/images/preferences/dark/ic_preferences_keydetect.svg new file mode 100644 index 000000000000..86c71d68b3a7 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_keydetect.svg @@ -0,0 +1,8 @@ + + Mixxx 1.12+ iconset + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_library.svg b/res/images/preferences/dark/ic_preferences_library.svg new file mode 100644 index 000000000000..8788cd5e9644 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_library.svg @@ -0,0 +1,14 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_lv2.svg b/res/images/preferences/dark/ic_preferences_lv2.svg new file mode 100644 index 000000000000..2f13a81b5ad2 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_lv2.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/dark/ic_preferences_midicontrollers.svg b/res/images/preferences/dark/ic_preferences_midicontrollers.svg new file mode 100644 index 000000000000..142a8779701a --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_midicontrollers.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_modplug.svg b/res/images/preferences/dark/ic_preferences_modplug.svg new file mode 100644 index 000000000000..302e03632b5e --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_modplug.svg @@ -0,0 +1,12 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_recording.svg b/res/images/preferences/dark/ic_preferences_recording.svg new file mode 100644 index 000000000000..0b731101e420 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_recording.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/dark/ic_preferences_replaygain.svg b/res/images/preferences/dark/ic_preferences_replaygain.svg new file mode 100644 index 000000000000..22cbef665ced --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_replaygain.svg @@ -0,0 +1,9 @@ + + Mixxx 1.12+ iconset + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_sampler.svg b/res/images/preferences/dark/ic_preferences_sampler.svg new file mode 100644 index 000000000000..c3e3f5d8b84e --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_sampler.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/dark/ic_preferences_soundhardware.svg b/res/images/preferences/dark/ic_preferences_soundhardware.svg new file mode 100644 index 000000000000..39c62ff9ea68 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_soundhardware.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_vinyl.svg b/res/images/preferences/dark/ic_preferences_vinyl.svg new file mode 100644 index 000000000000..391c105652ab --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_vinyl.svg @@ -0,0 +1,10 @@ + + Mixxx 1.12+ iconset + + + + + + + + diff --git a/res/images/preferences/dark/ic_preferences_waveforms.svg b/res/images/preferences/dark/ic_preferences_waveforms.svg new file mode 100644 index 000000000000..cc25285087f7 --- /dev/null +++ b/res/images/preferences/dark/ic_preferences_waveforms.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/ic_preferences_autodj.svg b/res/images/preferences/ic_preferences_autodj.svg deleted file mode 100644 index 40683a2bb1a5..000000000000 --- a/res/images/preferences/ic_preferences_autodj.svg +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_bpmdetect.svg b/res/images/preferences/ic_preferences_bpmdetect.svg deleted file mode 100644 index fe70517e1baf..000000000000 --- a/res/images/preferences/ic_preferences_bpmdetect.svg +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_broadcast.svg b/res/images/preferences/ic_preferences_broadcast.svg deleted file mode 100644 index 80eefee4e14d..000000000000 --- a/res/images/preferences/ic_preferences_broadcast.svg +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_colors.svg b/res/images/preferences/ic_preferences_colors.svg deleted file mode 100644 index cb7199750b8f..000000000000 --- a/res/images/preferences/ic_preferences_colors.svg +++ /dev/null @@ -1,7 +0,0 @@ - - Mixxx 1.12+ iconset - - - - - diff --git a/res/images/preferences/ic_preferences_controllers.svg b/res/images/preferences/ic_preferences_controllers.svg deleted file mode 100644 index ce6b0b94554b..000000000000 --- a/res/images/preferences/ic_preferences_controllers.svg +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_crossfader.svg b/res/images/preferences/ic_preferences_crossfader.svg deleted file mode 100644 index 9c995c0aac59..000000000000 --- a/res/images/preferences/ic_preferences_crossfader.svg +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_decks.svg b/res/images/preferences/ic_preferences_decks.svg deleted file mode 100644 index 610d154e3946..000000000000 --- a/res/images/preferences/ic_preferences_decks.svg +++ /dev/null @@ -1,615 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_effects.svg b/res/images/preferences/ic_preferences_effects.svg deleted file mode 100644 index 4c0effcf8c93..000000000000 --- a/res/images/preferences/ic_preferences_effects.svg +++ /dev/null @@ -1,486 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_equalizers.svg b/res/images/preferences/ic_preferences_equalizers.svg deleted file mode 100644 index 6ffaa6b61eef..000000000000 --- a/res/images/preferences/ic_preferences_equalizers.svg +++ /dev/null @@ -1,796 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_interface.svg b/res/images/preferences/ic_preferences_interface.svg deleted file mode 100644 index 7dfcf4db4a52..000000000000 --- a/res/images/preferences/ic_preferences_interface.svg +++ /dev/null @@ -1,646 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_keydetect.svg b/res/images/preferences/ic_preferences_keydetect.svg deleted file mode 100644 index c65160da675d..000000000000 --- a/res/images/preferences/ic_preferences_keydetect.svg +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_library.svg b/res/images/preferences/ic_preferences_library.svg deleted file mode 100644 index 098833b7bed8..000000000000 --- a/res/images/preferences/ic_preferences_library.svg +++ /dev/null @@ -1,538 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_lv2.svg b/res/images/preferences/ic_preferences_lv2.svg deleted file mode 100644 index 407f50ed0c6e..000000000000 --- a/res/images/preferences/ic_preferences_lv2.svg +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_midicontrollers.svg b/res/images/preferences/ic_preferences_midicontrollers.svg deleted file mode 100644 index 4bda7004c968..000000000000 --- a/res/images/preferences/ic_preferences_midicontrollers.svg +++ /dev/null @@ -1,560 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_modplug.svg b/res/images/preferences/ic_preferences_modplug.svg deleted file mode 100644 index 694e005d6cff..000000000000 --- a/res/images/preferences/ic_preferences_modplug.svg +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_recording.svg b/res/images/preferences/ic_preferences_recording.svg deleted file mode 100644 index 1a3a1979f820..000000000000 --- a/res/images/preferences/ic_preferences_recording.svg +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_replaygain.svg b/res/images/preferences/ic_preferences_replaygain.svg deleted file mode 100644 index af5b92f0b14b..000000000000 --- a/res/images/preferences/ic_preferences_replaygain.svg +++ /dev/null @@ -1,610 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_sampler.svg b/res/images/preferences/ic_preferences_sampler.svg deleted file mode 100644 index ac40c1fc28fa..000000000000 --- a/res/images/preferences/ic_preferences_sampler.svg +++ /dev/null @@ -1,606 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_soundhardware.svg b/res/images/preferences/ic_preferences_soundhardware.svg deleted file mode 100644 index e2b0386a743c..000000000000 --- a/res/images/preferences/ic_preferences_soundhardware.svg +++ /dev/null @@ -1,713 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_vinyl.svg b/res/images/preferences/ic_preferences_vinyl.svg deleted file mode 100644 index 78cec69a19d9..000000000000 --- a/res/images/preferences/ic_preferences_vinyl.svg +++ /dev/null @@ -1,673 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - - - - diff --git a/res/images/preferences/ic_preferences_waveforms.svg b/res/images/preferences/ic_preferences_waveforms.svg deleted file mode 100644 index e3954fdc1ca1..000000000000 --- a/res/images/preferences/ic_preferences_waveforms.svg +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - Mixxx 1.12+ iconset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - en - - - image/svg+xml - - Mixxx 1.12+ iconset - - - Mixxx - GUI - Interface - Icons - - - - - s.brandt@mixxx.org - - - - 2014-04-18 - www.mixxx.org - Iconset for use in Mixxx 1.12s+. Optimized for 48px (16px) icon size. Contains icons for preference menu and library widget - -Grid based on suggestions from http://techbase.kde.org/Projects/Oxygen/Style - - en - - - - - - - - - - diff --git a/res/images/preferences/light/ic_custom.svg b/res/images/preferences/light/ic_custom.svg new file mode 100644 index 000000000000..0bb9cee123c7 --- /dev/null +++ b/res/images/preferences/light/ic_custom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/res/images/preferences/light/ic_mixxx_symbolic.svg b/res/images/preferences/light/ic_mixxx_symbolic.svg new file mode 100644 index 000000000000..968670f7d25a --- /dev/null +++ b/res/images/preferences/light/ic_mixxx_symbolic.svg @@ -0,0 +1,186 @@ + + Mixxx application icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_none.svg b/res/images/preferences/light/ic_none.svg new file mode 100644 index 000000000000..680b54637bdb --- /dev/null +++ b/res/images/preferences/light/ic_none.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_autodj.svg b/res/images/preferences/light/ic_preferences_autodj.svg new file mode 100644 index 000000000000..4d6b4af906b2 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_autodj.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_bpmdetect.svg b/res/images/preferences/light/ic_preferences_bpmdetect.svg new file mode 100644 index 000000000000..5566885dc8bd --- /dev/null +++ b/res/images/preferences/light/ic_preferences_bpmdetect.svg @@ -0,0 +1,7 @@ + + Mixxx 1.12+ iconset + + + + + diff --git a/res/images/preferences/light/ic_preferences_broadcast.svg b/res/images/preferences/light/ic_preferences_broadcast.svg new file mode 100644 index 000000000000..eda9ab0123d8 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_broadcast.svg @@ -0,0 +1,12 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_colors.svg b/res/images/preferences/light/ic_preferences_colors.svg new file mode 100644 index 000000000000..9421215b3916 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_colors.svg @@ -0,0 +1,7 @@ + + Mixxx 1.12+ iconset + + + + + diff --git a/res/images/preferences/light/ic_preferences_controllers.svg b/res/images/preferences/light/ic_preferences_controllers.svg new file mode 100644 index 000000000000..8d36f4d0147f --- /dev/null +++ b/res/images/preferences/light/ic_preferences_controllers.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/light/ic_preferences_crossfader.svg b/res/images/preferences/light/ic_preferences_crossfader.svg new file mode 100644 index 000000000000..786128b92568 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_crossfader.svg @@ -0,0 +1,8 @@ + + Mixxx 1.12+ iconset + + + + + + diff --git a/res/images/preferences/light/ic_preferences_decks.svg b/res/images/preferences/light/ic_preferences_decks.svg new file mode 100644 index 000000000000..79b874e6fd4a --- /dev/null +++ b/res/images/preferences/light/ic_preferences_decks.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/light/ic_preferences_effects.svg b/res/images/preferences/light/ic_preferences_effects.svg new file mode 100644 index 000000000000..f3fb6af38723 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_effects.svg @@ -0,0 +1,6 @@ + + Mixxx 1.12+ iconset + + + + diff --git a/res/images/preferences/light/ic_preferences_equalizers.svg b/res/images/preferences/light/ic_preferences_equalizers.svg new file mode 100644 index 000000000000..b9371aad9b27 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_equalizers.svg @@ -0,0 +1,15 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_interface.svg b/res/images/preferences/light/ic_preferences_interface.svg new file mode 100644 index 000000000000..cfd48cb57e97 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_interface.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_keydetect.svg b/res/images/preferences/light/ic_preferences_keydetect.svg new file mode 100644 index 000000000000..9afb445fa689 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_keydetect.svg @@ -0,0 +1,8 @@ + + Mixxx 1.12+ iconset + + + + + + diff --git a/res/images/preferences/light/ic_preferences_library.svg b/res/images/preferences/light/ic_preferences_library.svg new file mode 100644 index 000000000000..34abdab3b346 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_library.svg @@ -0,0 +1,14 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_lv2.svg b/res/images/preferences/light/ic_preferences_lv2.svg new file mode 100644 index 000000000000..9742706279e8 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_lv2.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/light/ic_preferences_midicontrollers.svg b/res/images/preferences/light/ic_preferences_midicontrollers.svg new file mode 100644 index 000000000000..68f55cbdf9e3 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_midicontrollers.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_modplug.svg b/res/images/preferences/light/ic_preferences_modplug.svg new file mode 100644 index 000000000000..d684fe09bc43 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_modplug.svg @@ -0,0 +1,12 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_recording.svg b/res/images/preferences/light/ic_preferences_recording.svg new file mode 100644 index 000000000000..25fe3a239356 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_recording.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/light/ic_preferences_replaygain.svg b/res/images/preferences/light/ic_preferences_replaygain.svg new file mode 100644 index 000000000000..08c8dfe67ef6 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_replaygain.svg @@ -0,0 +1,9 @@ + + Mixxx 1.12+ iconset + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_sampler.svg b/res/images/preferences/light/ic_preferences_sampler.svg new file mode 100644 index 000000000000..e0766ac4490a --- /dev/null +++ b/res/images/preferences/light/ic_preferences_sampler.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/images/preferences/light/ic_preferences_soundhardware.svg b/res/images/preferences/light/ic_preferences_soundhardware.svg new file mode 100644 index 000000000000..67fafc3bb875 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_soundhardware.svg @@ -0,0 +1,13 @@ + + Mixxx 1.12+ iconset + + + + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_vinyl.svg b/res/images/preferences/light/ic_preferences_vinyl.svg new file mode 100644 index 000000000000..7f895e62b893 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_vinyl.svg @@ -0,0 +1,10 @@ + + Mixxx 1.12+ iconset + + + + + + + + diff --git a/res/images/preferences/light/ic_preferences_waveforms.svg b/res/images/preferences/light/ic_preferences_waveforms.svg new file mode 100644 index 000000000000..409e43f0eb55 --- /dev/null +++ b/res/images/preferences/light/ic_preferences_waveforms.svg @@ -0,0 +1,4 @@ + + Mixxx 1.12+ iconset + + diff --git a/res/mixxx.qrc b/res/mixxx.qrc index e2cef8820d56..b73a94d650ae 100644 --- a/res/mixxx.qrc +++ b/res/mixxx.qrc @@ -9,6 +9,7 @@ images/library/ic_library_locked_tracklist.svg images/library/cover_default.svg + images/library/ic_library_autodj.svg images/library/ic_library_banshee.svg images/library/ic_library_computer.svg @@ -28,35 +29,60 @@ images/library/ic_library_traktor.svg images/library/ic_library_rekordbox.svg images/library/ic_library_serato.svg - images/mixxx_logo.svg - images/mixxx_icon.svg + + images/mixxx_logo.svg + images/mixxx_icon.svg images/mixxx-icon-logo-symbolic.svg images/skin_preview_placeholder.png images/ic_checkmark.svg - images/ic_custom.svg images/ic_delete.svg - images/ic_mixxx_symbolic.svg - images/ic_none.svg - images/preferences/ic_preferences_autodj.svg - images/preferences/ic_preferences_bpmdetect.svg - images/preferences/ic_preferences_broadcast.svg - images/preferences/ic_preferences_colors.svg - images/preferences/ic_preferences_controllers.svg - images/preferences/ic_preferences_crossfader.svg - images/preferences/ic_preferences_decks.svg - images/preferences/ic_preferences_effects.svg - images/preferences/ic_preferences_equalizers.svg - images/preferences/ic_preferences_interface.svg - images/preferences/ic_preferences_keydetect.svg - images/preferences/ic_preferences_library.svg - images/preferences/ic_preferences_lv2.svg - images/preferences/ic_preferences_modplug.svg - images/preferences/ic_preferences_recording.svg - images/preferences/ic_preferences_replaygain.svg - images/preferences/ic_preferences_soundhardware.svg - images/preferences/ic_preferences_vinyl.svg + + images/preferences/dark/ic_preferences_autodj.svg + images/preferences/dark/ic_preferences_bpmdetect.svg + images/preferences/dark/ic_preferences_broadcast.svg + images/preferences/dark/ic_preferences_colors.svg + images/preferences/dark/ic_preferences_controllers.svg + images/preferences/dark/ic_preferences_crossfader.svg + images/preferences/dark/ic_preferences_decks.svg + images/preferences/dark/ic_preferences_effects.svg + images/preferences/dark/ic_preferences_equalizers.svg + images/preferences/dark/ic_preferences_interface.svg + images/preferences/dark/ic_preferences_keydetect.svg + images/preferences/dark/ic_preferences_library.svg + images/preferences/dark/ic_preferences_lv2.svg + images/preferences/dark/ic_preferences_modplug.svg + images/preferences/dark/ic_preferences_recording.svg + images/preferences/dark/ic_preferences_replaygain.svg + images/preferences/dark/ic_preferences_soundhardware.svg + images/preferences/dark/ic_preferences_vinyl.svg + images/preferences/dark/ic_preferences_waveforms.svg + images/preferences/dark/ic_custom.svg + images/preferences/dark/ic_mixxx_symbolic.svg + images/preferences/dark/ic_none.svg + + images/preferences/light/ic_preferences_autodj.svg + images/preferences/light/ic_preferences_bpmdetect.svg + images/preferences/light/ic_preferences_broadcast.svg + images/preferences/light/ic_preferences_colors.svg + images/preferences/light/ic_preferences_controllers.svg + images/preferences/light/ic_preferences_crossfader.svg + images/preferences/light/ic_preferences_decks.svg + images/preferences/light/ic_preferences_effects.svg + images/preferences/light/ic_preferences_equalizers.svg + images/preferences/light/ic_preferences_interface.svg + images/preferences/light/ic_preferences_keydetect.svg + images/preferences/light/ic_preferences_library.svg + images/preferences/light/ic_preferences_lv2.svg + images/preferences/light/ic_preferences_modplug.svg + images/preferences/light/ic_preferences_recording.svg + images/preferences/light/ic_preferences_replaygain.svg + images/preferences/light/ic_preferences_soundhardware.svg + images/preferences/light/ic_preferences_vinyl.svg + images/preferences/light/ic_preferences_waveforms.svg + images/preferences/light/ic_custom.svg + images/preferences/light/ic_mixxx_symbolic.svg + images/preferences/light/ic_none.svg images/preferences/ic_preferences_warning.svg - images/preferences/ic_preferences_waveforms.svg schema.xml shaders/filteredsignal.frag shaders/passthrough.vert diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index fcff5f53acc7..0a9810dbe966 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -1,6 +1,7 @@ #include "controllers/dlgprefcontroller.h" #include +#include #include #include #include @@ -311,15 +312,23 @@ void DlgPrefController::enumeratePresets(const QString& selectedPresetPath) { // qDebug() << "Enumerating presets for controller" << m_pController->getName(); + // Check the text color of the palette for whether to use dark or light icons + QDir iconsPath; + if (!Color::isDimColor(palette().text().color())) { + iconsPath.setPath(":/images/preferences/light/"); + } else { + iconsPath.setPath(":/images/preferences/dark/"); + } + // Insert a dummy item at the top to try to make it less confusing. // (We don't want the first found file showing up as the default item when a // user has their controller plugged in) - QIcon noPresetIcon(":/images/ic_none.svg"); - m_ui.comboBoxPreset->addItem(noPresetIcon, "No Preset"); + QIcon noPresetIcon(iconsPath.filePath("ic_none.svg")); + m_ui.comboBoxPreset->addItem(noPresetIcon, tr("No Preset")); PresetInfo match; // Enumerate user presets - QIcon userPresetIcon(":/images/ic_custom.svg"); + QIcon userPresetIcon(iconsPath.filePath("ic_custom.svg")); // Reload user presets to detect added, changed or removed mappings m_pControllerManager->getMainThreadUserPresetEnumerator()->loadSupportedPresets(); @@ -335,7 +344,7 @@ void DlgPrefController::enumeratePresets(const QString& selectedPresetPath) { m_ui.comboBoxPreset->insertSeparator(m_ui.comboBoxPreset->count()); // Enumerate system presets - QIcon systemPresetIcon(":/images/ic_mixxx_symbolic.svg"); + QIcon systemPresetIcon(iconsPath.filePath("ic_mixxx_symbolic.svg")); PresetInfo systemPresetsMatch = enumeratePresetsFromEnumerator( m_pControllerManager->getMainThreadSystemPresetEnumerator(), systemPresetIcon); diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp index d9a44f331d55..0c12cad8c1ab 100644 --- a/src/controllers/dlgprefcontrollers.cpp +++ b/src/controllers/dlgprefcontrollers.cpp @@ -145,7 +145,7 @@ void DlgPrefControllers::setupControllerWidgets() { m_pDlgPreferences->addPageWidget(pControllerDlg, pControllerTreeItem, pController->getName(), - "controllers.svg"); + "ic_preferences_controllers.svg"); m_pControllersRootItem->addChild(pControllerTreeItem); m_controllerTreeItems.append(pControllerTreeItem); diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp index 3872e2bd8a3b..3536e1f47b76 100644 --- a/src/preferences/dialog/dlgpreferences.cpp +++ b/src/preferences/dialog/dlgpreferences.cpp @@ -50,6 +50,7 @@ #include "library/trackcollectionmanager.h" #include "mixxx.h" #include "skin/skinloader.h" +#include "util/color/color.h" #include "util/widgethelper.h" DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, @@ -78,21 +79,28 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, } // Construct widgets for use in tabs: + // * check the text color of the palette for whether to use dark or light icons // * create the tree view button first (important for 'Controllers' page!) // * instantiate preferences page + if (!Color::isDimColor(palette().text().color())) { + m_iconsPath.setPath(":/images/preferences/light/"); + } else { + m_iconsPath.setPath(":/images/preferences/dark/"); + } + m_pSoundButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_soundPage = new DlgPrefSound(this, soundman, m_pConfig); addPageWidget(m_soundPage, m_pSoundButton, tr("Sound Hardware"), - "soundhardware.svg"); + "ic_preferences_soundhardware.svg"); m_pLibraryButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_libraryPage = new DlgPrefLibrary(this, m_pConfig, pLibrary); addPageWidget(m_libraryPage, m_pLibraryButton, tr("Library"), - "library.svg"); + "ic_preferences_library.svg"); connect(m_libraryPage, &DlgPrefLibrary::scanLibrary, pLibrary->trackCollections(), @@ -104,7 +112,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_controllersPage, m_pControllersRootButton, tr("Controllers"), - "controllers.svg"); + "ic_preferences_controllers.svg"); #ifdef __VINYLCONTROL__ // It's important for this to be before the connect for wsound. @@ -114,7 +122,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_vinylControlPage, m_pVinylControlButton, tr("Vinyl Control"), - "vinyl.svg"); + "ic_preferences_vinyl.svg"); #else /* __VINYLCONTROL__ */ m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -122,7 +130,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_noVinylControlPage, m_pVinylControlButton, tr("Vinyl Control"), - "vinyl.svg"); + "ic_preferences_vinyl.svg"); #endif m_pInterfaceButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -130,49 +138,49 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_interfacePage, m_pInterfaceButton, tr("Interface"), - "interface.svg"); + "ic_preferences_interface.svg"); m_pWaveformButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_waveformPage = new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary); addPageWidget(m_waveformPage, m_pWaveformButton, tr("Waveforms"), - "waveforms.svg"); + "ic_preferences_waveforms.svg"); m_pDecksButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_deckPage = new DlgPrefDeck(this, m_pConfig); addPageWidget(m_deckPage, m_pDecksButton, tr("Decks"), - "decks.svg"); + "ic_preferences_decks.svg"); m_pColorsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_colorsPage = new DlgPrefColors(this, m_pConfig, pLibrary); addPageWidget(m_colorsPage, m_pColorsButton, tr("Colors"), - "colors.svg"); + "ic_preferences_colors.svg"); m_pEqButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_equalizerPage = new DlgPrefEQ(this, pEffectsManager, m_pConfig); addPageWidget(m_equalizerPage, m_pEqButton, tr("Equalizers"), - "equalizers.svg"); + "ic_preferences_equalizers.svg"); m_pCrossfaderButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_crossfaderPage = new DlgPrefCrossfader(this, m_pConfig); addPageWidget(m_crossfaderPage, m_pCrossfaderButton, tr("Crossfader"), - "crossfader.svg"); + "ic_preferences_crossfader.svg"); m_pEffectsButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_effectsPage = new DlgPrefEffects(this, m_pConfig, pEffectsManager); addPageWidget(m_effectsPage, m_pEffectsButton, tr("Effects"), - "effects.svg"); + "ic_preferences_effects.svg"); #ifdef __LILV__ m_pLV2Button = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -180,7 +188,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_lv2Page, m_pLV2Button, tr("LV2 Plugins"), - "lv2.svg"); + "ic_preferences_lv2.svg"); #endif /* __LILV__ */ m_pAutoDJButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -188,7 +196,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_autoDjPage, m_pAutoDJButton, tr("Auto DJ"), - "autodj.svg"); + "ic_preferences_autodj.svg"); #ifdef __BROADCAST__ m_pBroadcastButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -196,7 +204,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_broadcastingPage, m_pBroadcastButton, tr("Live Broadcasting"), - "broadcast.svg"); + "ic_preferences_broadcast.svg"); #endif /* __BROADCAST__ */ m_pRecordingButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -204,28 +212,28 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_recordingPage, m_pRecordingButton, tr("Recording"), - "recording.svg"); + "ic_preferences_recording.svg"); m_pBeatDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_beatgridPage = new DlgPrefBeats(this, m_pConfig); addPageWidget(m_beatgridPage, m_pBeatDetectionButton, tr("Beat Detection"), - "bpmdetect.svg"); + "ic_preferences_bpmdetect.svg"); m_pKeyDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_musicalKeyPage = new DlgPrefKey(this, m_pConfig); addPageWidget(m_musicalKeyPage, m_pKeyDetectionButton, tr("Key Detection"), - "keydetect.svg"); + "ic_preferences_keydetect.svg"); m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_replayGainPage = new DlgPrefReplayGain(this, m_pConfig); addPageWidget(m_replayGainPage, m_pReplayGainButton, tr("Normalization"), - "replaygain.svg"); + "ic_preferences_replaygain.svg"); #ifdef __MODPLUG__ m_pModplugButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); @@ -233,7 +241,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, addPageWidget(m_modplugPage, m_pModplugButton, tr("Modplug Decoder"), - "modplug.svg"); + "ic_preferences_modplug.svg"); #endif /* __MODPLUG__ */ connect(contentsTreeWidget, @@ -443,7 +451,7 @@ void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget, const QString& pageTitle, const QString& iconFile) { // Configure the tree button linked to the page - treeItem->setIcon(0, QIcon(":/images/preferences/ic_preferences_" + iconFile)); + treeItem->setIcon(0, QIcon(m_iconsPath.filePath(iconFile))); treeItem->setText(0, pageTitle); treeItem->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); treeItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); @@ -458,7 +466,7 @@ void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget, pWidget, &DlgPreferencePage::slotResetToDefaults); - // Add a new scroll area containing the page to the stacked pages widget + // Add a new scroll area to the stacked pages widget containing the page QScrollArea* sa = new QScrollArea(pagesWidget); sa->setWidgetResizable(true); sa->setWidget(pWidget); diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h index 55b5dac480ed..39291d8fe2b2 100644 --- a/src/preferences/dialog/dlgpreferences.h +++ b/src/preferences/dialog/dlgpreferences.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -150,4 +151,6 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { #endif /* __MODPLUG__ */ QSize m_pageSizeHint; + + QDir m_iconsPath; }; From 73e590c90d7abc89b2f78d0d4e2989e774336b1a Mon Sep 17 00:00:00 2001 From: ronso0 Date: Sun, 27 Dec 2020 21:12:27 +0100 Subject: [PATCH 4/5] move dlgpreferencepage to src/preferences/dialog/ --- CMakeLists.txt | 2 +- src/controllers/dlgprefcontroller.h | 2 +- src/controllers/dlgprefcontrollers.h | 4 ++-- src/preferences/dialog/dlgprefautodj.h | 2 +- src/preferences/dialog/dlgprefbeats.h | 8 ++++---- src/preferences/dialog/dlgprefbroadcast.h | 8 ++++---- src/preferences/dialog/dlgprefcolors.h | 2 +- src/preferences/dialog/dlgprefcrossfader.h | 5 ++--- src/preferences/dialog/dlgprefdeck.h | 2 +- src/preferences/dialog/dlgprefeffects.h | 2 +- src/preferences/dialog/dlgprefeq.h | 10 +++++----- src/preferences/{ => dialog}/dlgpreferencepage.cpp | 2 +- src/preferences/{ => dialog}/dlgpreferencepage.h | 6 ++++-- src/preferences/dialog/dlgpreferences.h | 6 +++--- src/preferences/dialog/dlgprefinterface.h | 2 +- src/preferences/dialog/dlgprefkey.h | 2 +- src/preferences/dialog/dlgpreflibrary.h | 2 +- src/preferences/dialog/dlgpreflv2.h | 6 +++--- src/preferences/dialog/dlgprefmodplug.h | 3 ++- src/preferences/dialog/dlgprefnovinyl.h | 2 +- src/preferences/dialog/dlgprefrecord.h | 4 ++-- src/preferences/dialog/dlgprefreplaygain.h | 4 ++-- src/preferences/dialog/dlgprefsound.h | 2 +- src/preferences/dialog/dlgprefvinyl.h | 2 +- src/preferences/dialog/dlgprefwaveform.h | 2 +- 25 files changed, 47 insertions(+), 45 deletions(-) rename src/preferences/{ => dialog}/dlgpreferencepage.cpp (83%) rename src/preferences/{ => dialog}/dlgpreferencepage.h (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d32da31ffc16..4c1fbacfc7d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -683,6 +683,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dialog/dlgprefeffectsdlg.ui src/preferences/dialog/dlgprefeq.cpp src/preferences/dialog/dlgprefeqdlg.ui + src/preferences/dialog/dlgpreferencepage.cpp src/preferences/dialog/dlgpreferences.cpp src/preferences/dialog/dlgpreferencesdlg.ui src/preferences/dialog/dlgprefinterface.cpp @@ -705,7 +706,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dialog/dlgprefvinyldlg.ui src/preferences/dialog/dlgprefwaveform.cpp src/preferences/dialog/dlgprefwaveformdlg.ui - src/preferences/dlgpreferencepage.cpp src/preferences/effectsettingsmodel.cpp src/preferences/colorpaletteeditor.cpp src/preferences/colorpaletteeditormodel.cpp diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h index 8b114d9719ad..cdadd661d8b9 100644 --- a/src/controllers/dlgprefcontroller.h +++ b/src/controllers/dlgprefcontroller.h @@ -9,8 +9,8 @@ #include "controllers/controllerpresetinfo.h" #include "controllers/dlgcontrollerlearning.h" #include "controllers/ui_dlgprefcontrollerdlg.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" // Forward declarations class Controller; diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h index ea5d5c8596d9..7e3039291924 100644 --- a/src/controllers/dlgprefcontrollers.h +++ b/src/controllers/dlgprefcontrollers.h @@ -2,9 +2,9 @@ #include -#include "preferences/usersettings.h" #include "controllers/ui_dlgprefcontrollersdlg.h" -#include "preferences/dlgpreferencepage.h" +#include "preferences/dialog/dlgpreferencepage.h" +#include "preferences/usersettings.h" class DlgPreferences; class DlgPrefController; diff --git a/src/preferences/dialog/dlgprefautodj.h b/src/preferences/dialog/dlgprefautodj.h index 56dc245ad77e..f7c324ae05c1 100644 --- a/src/preferences/dialog/dlgprefautodj.h +++ b/src/preferences/dialog/dlgprefautodj.h @@ -2,9 +2,9 @@ #include +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefautodjdlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg { Q_OBJECT diff --git a/src/preferences/dialog/dlgprefbeats.h b/src/preferences/dialog/dlgprefbeats.h index 69a6bf2db2dc..fea83f484e31 100644 --- a/src/preferences/dialog/dlgprefbeats.h +++ b/src/preferences/dialog/dlgprefbeats.h @@ -1,14 +1,14 @@ #pragma once -#include -#include #include +#include +#include #include "analyzer/plugins/analyzerplugin.h" #include "preferences/beatdetectionsettings.h" -#include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefbeatsdlg.h" +#include "preferences/usersettings.h" class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg { Q_OBJECT diff --git a/src/preferences/dialog/dlgprefbroadcast.h b/src/preferences/dialog/dlgprefbroadcast.h index f8e78c1862f8..a8a1b301a020 100644 --- a/src/preferences/dialog/dlgprefbroadcast.h +++ b/src/preferences/dialog/dlgprefbroadcast.h @@ -3,13 +3,13 @@ #include #include -#include "preferences/dialog/ui_dlgprefbroadcastdlg.h" -#include "control/controlobject.h" -#include "preferences/usersettings.h" #include "broadcast/defs_broadcast.h" -#include "preferences/dlgpreferencepage.h" +#include "control/controlobject.h" #include "preferences/broadcastsettings.h" #include "preferences/broadcastsettingsmodel.h" +#include "preferences/dialog/dlgpreferencepage.h" +#include "preferences/dialog/ui_dlgprefbroadcastdlg.h" +#include "preferences/usersettings.h" class ControlProxy; diff --git a/src/preferences/dialog/dlgprefcolors.h b/src/preferences/dialog/dlgprefcolors.h index ee6fada3023f..eec7fd3e1c71 100644 --- a/src/preferences/dialog/dlgprefcolors.h +++ b/src/preferences/dialog/dlgprefcolors.h @@ -5,8 +5,8 @@ #include "control/controlproxy.h" #include "preferences/colorpaletteeditor.h" #include "preferences/colorpalettesettings.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefcolorsdlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/usersettings.h" #include "util/parented_ptr.h" diff --git a/src/preferences/dialog/dlgprefcrossfader.h b/src/preferences/dialog/dlgprefcrossfader.h index a6b1a3290db4..ccf2e92646b8 100644 --- a/src/preferences/dialog/dlgprefcrossfader.h +++ b/src/preferences/dialog/dlgprefcrossfader.h @@ -2,11 +2,10 @@ #include +#include "control/controlproxy.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefcrossfaderdlg.h" #include "preferences/usersettings.h" -#include "control/controlproxy.h" -#include "preferences/dlgpreferencepage.h" - class DlgPrefCrossfader : public DlgPreferencePage, public Ui::DlgPrefCrossfaderDlg { Q_OBJECT diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h index 7a97c668f8f5..ac885b5c981a 100644 --- a/src/preferences/dialog/dlgprefdeck.h +++ b/src/preferences/dialog/dlgprefdeck.h @@ -6,8 +6,8 @@ #include "engine/controls/cuecontrol.h" #include "engine/controls/ratecontrol.h" #include "preferences/constants.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefdeckdlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/usersettings.h" #include "util/parented_ptr.h" diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h index c787804bc1bf..8d254a3496b0 100644 --- a/src/preferences/dialog/dlgprefeffects.h +++ b/src/preferences/dialog/dlgprefeffects.h @@ -2,8 +2,8 @@ #include +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefeffectsdlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/effectsettingsmodel.h" #include "preferences/usersettings.h" diff --git a/src/preferences/dialog/dlgprefeq.h b/src/preferences/dialog/dlgprefeq.h index f6c10c96291c..3beb233b5853 100644 --- a/src/preferences/dialog/dlgprefeq.h +++ b/src/preferences/dialog/dlgprefeq.h @@ -1,14 +1,14 @@ #pragma once -#include #include +#include -#include "preferences/dialog/ui_dlgprefeqdlg.h" -#include "preferences/usersettings.h" #include "control/controlproxy.h" -#include "preferences/dlgpreferencepage.h" -#include "effects/effectsmanager.h" #include "effects/effectrack.h" +#include "effects/effectsmanager.h" +#include "preferences/dialog/dlgpreferencepage.h" +#include "preferences/dialog/ui_dlgprefeqdlg.h" +#include "preferences/usersettings.h" class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg { Q_OBJECT diff --git a/src/preferences/dlgpreferencepage.cpp b/src/preferences/dialog/dlgpreferencepage.cpp similarity index 83% rename from src/preferences/dlgpreferencepage.cpp rename to src/preferences/dialog/dlgpreferencepage.cpp index 61b912b4419e..fc4b3eddd69d 100644 --- a/src/preferences/dlgpreferencepage.cpp +++ b/src/preferences/dialog/dlgpreferencepage.cpp @@ -1,4 +1,4 @@ -#include "preferences/dlgpreferencepage.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "defs_urls.h" #include "moc_dlgpreferencepage.cpp" diff --git a/src/preferences/dlgpreferencepage.h b/src/preferences/dialog/dlgpreferencepage.h similarity index 95% rename from src/preferences/dlgpreferencepage.h rename to src/preferences/dialog/dlgpreferencepage.h index 114cb043e4dc..638aaa8cb12f 100644 --- a/src/preferences/dlgpreferencepage.h +++ b/src/preferences/dialog/dlgpreferencepage.h @@ -39,8 +39,10 @@ class DlgPreferencePage : public QWidget { /// Called when the preferences dialog is shown to the user (not necessarily /// when this PreferencePage is shown to the user). - virtual void slotShow() {} + virtual void slotShow() { + } /// Called when the preferences dialog is hidden from the user. - virtual void slotHide() {} + virtual void slotHide() { + } }; diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h index 39291d8fe2b2..ab99bec10c3a 100644 --- a/src/preferences/dialog/dlgpreferences.h +++ b/src/preferences/dialog/dlgpreferences.h @@ -6,11 +6,11 @@ #include #include -#include "preferences/dialog/ui_dlgpreferencesdlg.h" -#include "preferences/usersettings.h" #include "control/controlpushbutton.h" -#include "preferences/dlgpreferencepage.h" +#include "preferences/dialog/dlgpreferencepage.h" +#include "preferences/dialog/ui_dlgpreferencesdlg.h" #include "preferences/settingsmanager.h" +#include "preferences/usersettings.h" class MixxxMainWindow; class SoundManager; diff --git a/src/preferences/dialog/dlgprefinterface.h b/src/preferences/dialog/dlgprefinterface.h index 1dfe7aaf6e20..0b635abc9237 100644 --- a/src/preferences/dialog/dlgprefinterface.h +++ b/src/preferences/dialog/dlgprefinterface.h @@ -3,9 +3,9 @@ #include #include "preferences/constants.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefinterfacedlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" class ControlProxy; class ControlPotmeter; diff --git a/src/preferences/dialog/dlgprefkey.h b/src/preferences/dialog/dlgprefkey.h index f76a02babc0d..fa541a6533e7 100644 --- a/src/preferences/dialog/dlgprefkey.h +++ b/src/preferences/dialog/dlgprefkey.h @@ -7,8 +7,8 @@ #include "analyzer/plugins/analyzerplugin.h" #include "control/controlproxy.h" #include "defs_urls.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefkeydlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/keydetectionsettings.h" #include "preferences/usersettings.h" #include "track/keyutils.h" diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h index 09bbd9a33601..341b7e61f1bc 100644 --- a/src/preferences/dialog/dlgpreflibrary.h +++ b/src/preferences/dialog/dlgpreflibrary.h @@ -7,8 +7,8 @@ #include "defs_urls.h" #include "library/library.h" #include "library/library_preferences.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgpreflibrarydlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/usersettings.h" class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg { diff --git a/src/preferences/dialog/dlgpreflv2.h b/src/preferences/dialog/dlgpreflv2.h index b3c9318d6c96..fe37ca05f565 100644 --- a/src/preferences/dialog/dlgpreflv2.h +++ b/src/preferences/dialog/dlgpreflv2.h @@ -1,12 +1,12 @@ #pragma once -#include #include +#include +#include "effects/lv2/lv2backend.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgpreflv2dlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" -#include "effects/lv2/lv2backend.h" class EffectsManager; diff --git a/src/preferences/dialog/dlgprefmodplug.h b/src/preferences/dialog/dlgprefmodplug.h index 1e59f528f6a6..34855047d716 100644 --- a/src/preferences/dialog/dlgprefmodplug.h +++ b/src/preferences/dialog/dlgprefmodplug.h @@ -3,8 +3,9 @@ #pragma once #include + +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" namespace Ui { class DlgPrefModplug; diff --git a/src/preferences/dialog/dlgprefnovinyl.h b/src/preferences/dialog/dlgprefnovinyl.h index b03d9237b8e8..e6987fa972cc 100644 --- a/src/preferences/dialog/dlgprefnovinyl.h +++ b/src/preferences/dialog/dlgprefnovinyl.h @@ -2,9 +2,9 @@ #include +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefnovinyldlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" class SoundManager; diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h index c6ff03eb2524..1f2df3f647f3 100644 --- a/src/preferences/dialog/dlgprefrecord.h +++ b/src/preferences/dialog/dlgprefrecord.h @@ -4,10 +4,10 @@ #include #include +#include "encoder/encoder.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefrecorddlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" -#include "encoder/encoder.h" class ControlObject; class ControlProxy; diff --git a/src/preferences/dialog/dlgprefreplaygain.h b/src/preferences/dialog/dlgprefreplaygain.h index 6153a51f2ad3..5266f413ea0a 100644 --- a/src/preferences/dialog/dlgprefreplaygain.h +++ b/src/preferences/dialog/dlgprefreplaygain.h @@ -3,10 +3,10 @@ #include #include +#include "control/controlproxy.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefreplaygaindlg.h" #include "preferences/replaygainsettings.h" -#include "control/controlproxy.h" -#include "preferences/dlgpreferencepage.h" class DlgPrefReplayGain: public DlgPreferencePage, public Ui::DlgPrefReplayGainDlg { diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h index 8eea151afe01..63cdfa12e31b 100644 --- a/src/preferences/dialog/dlgprefsound.h +++ b/src/preferences/dialog/dlgprefsound.h @@ -1,8 +1,8 @@ #pragma once #include "defs_urls.h" +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefsounddlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/usersettings.h" #include "soundio/sounddevice.h" #include "soundio/sounddeviceerror.h" diff --git a/src/preferences/dialog/dlgprefvinyl.h b/src/preferences/dialog/dlgprefvinyl.h index 16f6fd20c1cd..5c388c6ea04b 100644 --- a/src/preferences/dialog/dlgprefvinyl.h +++ b/src/preferences/dialog/dlgprefvinyl.h @@ -3,8 +3,8 @@ #include #include +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefvinyldlg.h" -#include "preferences/dlgpreferencepage.h" #include "preferences/usersettings.h" #include "vinylcontrol/vinylcontrolsignalwidget.h" diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h index e3325cf1ec60..a400e0b92902 100644 --- a/src/preferences/dialog/dlgprefwaveform.h +++ b/src/preferences/dialog/dlgprefwaveform.h @@ -2,9 +2,9 @@ #include +#include "preferences/dialog/dlgpreferencepage.h" #include "preferences/dialog/ui_dlgprefwaveformdlg.h" #include "preferences/usersettings.h" -#include "preferences/dlgpreferencepage.h" class MixxxMainWindow; class Library; From 2de8ce0bce506fa19ac6596e591ec56939008139 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Tue, 29 Dec 2020 15:10:59 +0100 Subject: [PATCH 5/5] dlgpreferences: use 'p' pointer prefix --- src/preferences/dialog/dlgpreferences.cpp | 87 ++++++++++++----------- src/preferences/dialog/dlgpreferences.h | 10 +-- 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp index 3536e1f47b76..a8598aec63c8 100644 --- a/src/preferences/dialog/dlgpreferences.cpp +++ b/src/preferences/dialog/dlgpreferences.cpp @@ -53,15 +53,18 @@ #include "util/color/color.h" #include "util/widgethelper.h" -DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, - SoundManager * soundman, PlayerManager* pPlayerManager, - ControllerManager * controllers, VinylControlManager *pVCManager, - LV2Backend* pLV2Backend, - EffectsManager* pEffectsManager, - SettingsManager* pSettingsManager, - Library *pLibrary) - : m_pConfig(pSettingsManager->settings()), - m_pageSizeHint(QSize(0, 0)) { +DlgPreferences::DlgPreferences( + MixxxMainWindow* pMixxx, + SkinLoader* pSkinLoader, + SoundManager* pSoundManager, + PlayerManager* pPlayerManager, + ControllerManager* pControllerManager, + VinylControlManager* pVCManager, + LV2Backend* pLV2Backend, + EffectsManager* pEffectsManager, + SettingsManager* pSettingsManager, + Library* pLibrary) + : m_pConfig(pSettingsManager->settings()), m_pageSizeHint(QSize(0, 0)) { #ifndef __LILV__ Q_UNUSED(pLV2Backend); #endif /* __LILV__ */ @@ -89,7 +92,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, } m_pSoundButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_soundPage = new DlgPrefSound(this, soundman, m_pConfig); + m_soundPage = new DlgPrefSound(this, pSoundManager, m_pConfig); addPageWidget(m_soundPage, m_pSoundButton, tr("Sound Hardware"), @@ -108,7 +111,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, m_pControllersRootButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); m_controllersPage = new DlgPrefControllers( - this, m_pConfig, controllers, m_pControllersRootButton); + this, m_pConfig, pControllerManager, m_pControllersRootButton); addPageWidget(m_controllersPage, m_pControllersRootButton, tr("Controllers"), @@ -126,7 +129,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, #else /* __VINYLCONTROL__ */ m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_noVinylControlPage = new DlgPrefNoVinyl(this, soundman, m_pConfig); + m_noVinylControlPage = new DlgPrefNoVinyl(this, pSoundManager, m_pConfig); addPageWidget(m_noVinylControlPage, m_pVinylControlButton, tr("Vinyl Control"), @@ -134,14 +137,14 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, #endif m_pInterfaceButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_interfacePage = new DlgPrefInterface(this, mixxx, pSkinLoader, m_pConfig); + m_interfacePage = new DlgPrefInterface(this, pMixxx, pSkinLoader, m_pConfig); addPageWidget(m_interfacePage, m_pInterfaceButton, tr("Interface"), "ic_preferences_interface.svg"); m_pWaveformButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type); - m_waveformPage = new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary); + m_waveformPage = new DlgPrefWaveform(this, pMixxx, m_pConfig, pLibrary); addPageWidget(m_waveformPage, m_pWaveformButton, tr("Waveforms"), @@ -271,58 +274,58 @@ DlgPreferences::~DlgPreferences() { delete m_controllersPage; } -void DlgPreferences::changePage(QTreeWidgetItem* current, QTreeWidgetItem* previous) { - if (!current) { - current = previous; +void DlgPreferences::changePage(QTreeWidgetItem* pCurrent, QTreeWidgetItem* pPrevious) { + if (!pCurrent) { + pCurrent = pPrevious; } - if (current == m_pSoundButton) { + if (pCurrent == m_pSoundButton) { switchToPage(m_soundPage); - } else if (current == m_pLibraryButton) { + } else if (pCurrent == m_pLibraryButton) { switchToPage(m_libraryPage); - } else if (m_controllersPage->handleTreeItemClick(current)) { + } else if (m_controllersPage->handleTreeItemClick(pCurrent)) { // Do nothing. m_controllersPage handled this click. #ifdef __VINYLCONTROL__ - } else if (current == m_pVinylControlButton) { + } else if (pCurrent == m_pVinylControlButton) { switchToPage(m_vinylControlPage); #else /* __VINYLCONTROL__ */ - } else if (current == m_pVinylControlButton) { + } else if (pCurrent == m_pVinylControlButton) { switchToPage(m_noVinylControlPage); #endif - } else if (current == m_pInterfaceButton) { + } else if (pCurrent == m_pInterfaceButton) { switchToPage(m_interfacePage); - } else if (current == m_pWaveformButton) { + } else if (pCurrent == m_pWaveformButton) { switchToPage(m_waveformPage); - } else if (current == m_pDecksButton) { + } else if (pCurrent == m_pDecksButton) { switchToPage(m_deckPage); - } else if (current == m_pColorsButton) { + } else if (pCurrent == m_pColorsButton) { switchToPage(m_colorsPage); - } else if (current == m_pEqButton) { + } else if (pCurrent == m_pEqButton) { switchToPage(m_equalizerPage); - } else if (current == m_pCrossfaderButton) { + } else if (pCurrent == m_pCrossfaderButton) { switchToPage(m_crossfaderPage); - } else if (current == m_pEffectsButton) { + } else if (pCurrent == m_pEffectsButton) { switchToPage(m_effectsPage); #ifdef __LILV__ - } else if (current == m_pLV2Button) { + } else if (pCurrent == m_pLV2Button) { switchToPage(m_lv2Page); #endif /* __LILV__ */ - } else if (current == m_pAutoDJButton) { + } else if (pCurrent == m_pAutoDJButton) { switchToPage(m_autoDjPage); #ifdef __BROADCAST__ - } else if (current == m_pBroadcastButton) { + } else if (pCurrent == m_pBroadcastButton) { switchToPage(m_broadcastingPage); #endif /* __BROADCAST__ */ - } else if (current == m_pRecordingButton) { + } else if (pCurrent == m_pRecordingButton) { switchToPage(m_recordingPage); - } else if (current == m_pBeatDetectionButton) { + } else if (pCurrent == m_pBeatDetectionButton) { switchToPage(m_beatgridPage); - } else if (current == m_pKeyDetectionButton) { + } else if (pCurrent == m_pKeyDetectionButton) { switchToPage(m_musicalKeyPage); - } else if (current == m_pReplayGainButton) { + } else if (pCurrent == m_pReplayGainButton) { switchToPage(m_replayGainPage); #ifdef __MODPLUG__ - } else if (current == m_pModplugButton) { + } else if (pCurrent == m_pModplugButton) { switchToPage(m_modplugPage); #endif /* __MODPLUG__ */ } @@ -447,14 +450,14 @@ void DlgPreferences::slotButtonPressed(QAbstractButton* pButton) { } void DlgPreferences::addPageWidget(DlgPreferencePage* pWidget, - QTreeWidgetItem* treeItem, + QTreeWidgetItem* pTreeItem, const QString& pageTitle, const QString& iconFile) { // Configure the tree button linked to the page - treeItem->setIcon(0, QIcon(m_iconsPath.filePath(iconFile))); - treeItem->setText(0, pageTitle); - treeItem->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); - treeItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + pTreeItem->setIcon(0, QIcon(m_iconsPath.filePath(iconFile))); + pTreeItem->setText(0, pageTitle); + pTreeItem->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter); + pTreeItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); connect(this, &DlgPreferences::showDlg, pWidget, &DlgPreferencePage::slotShow); connect(this, &DlgPreferences::closeDlg, pWidget, &DlgPreferencePage::slotHide); diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h index ab99bec10c3a..b57d3db257c3 100644 --- a/src/preferences/dialog/dlgpreferences.h +++ b/src/preferences/dialog/dlgpreferences.h @@ -50,11 +50,11 @@ class DlgPrefModplug; class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { Q_OBJECT public: - DlgPreferences(MixxxMainWindow* mixxx, + DlgPreferences(MixxxMainWindow* pMixxx, SkinLoader* pSkinLoader, - SoundManager* soundman, + SoundManager* pSoundManager, PlayerManager* pPlayerManager, - ControllerManager* controllers, + ControllerManager* pControllerManager, VinylControlManager* pVCManager, LV2Backend* pLV2Backend, EffectsManager* pEffectsManager, @@ -63,7 +63,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { virtual ~DlgPreferences(); void addPageWidget(DlgPreferencePage* pWidget, - QTreeWidgetItem* treeItem, + QTreeWidgetItem* pTreeItem, const QString& pageTitle, const QString& iconFile); void removePageWidget(DlgPreferencePage* pWidget); @@ -71,7 +71,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg { void switchToPage(DlgPreferencePage* pWidget); public slots: - void changePage(QTreeWidgetItem* current, QTreeWidgetItem* previous); + void changePage(QTreeWidgetItem* pCurrent, QTreeWidgetItem* pPrevious); void showSoundHardwarePage(); void slotButtonPressed(QAbstractButton* pButton); signals: