Add new style plugin: randrew/phantomstyle (modified)

Author: ThePBone

V4L_Frontend.pro

@@ -12,6 +12,7 @@ TEMPLATE = app
 QMAKE_CXXFLAGS += "-Wno-old-style-cast -Wno-unused-function"
 
 include(visualization/SpectrumAudioViewer.pri)
+include(phantom/phantom.pri)
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings

dialog/settings.ui

@@ -113,7 +113,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>0</number>
+        <number>1</number>
        </property>
        <widget class="QWidget" name="general">
         <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -366,7 +366,13 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="themeSelect"/>
+            <widget class="QComboBox" name="themeSelect">
+             <item>
+              <property name="text">
+               <string>Phantom</string>
+              </property>
+             </item>
+            </widget>
            </item>
           </layout>
          </item>

mainwindow.cpp

@@ -9,6 +9,7 @@
 #include "misc/eventfilter.h"
 #include "dialog/firstlaunchwizard.h"
 
+#include <phantomstyle.h>
 #include <Animation/Animation.h>
 
 #include <QMenu>
@@ -54,8 +55,6 @@ MainWindow::MainWindow(QString exepath, bool statupInTray, bool allowMultipleIns
     conf->setConfigMap(readConfig());
     LoadConfig();
 
-
-
     conv_dlg = new ConvolverDlg(this,this);
     preset_dlg = new PresetDlg(this);
 
@@ -167,6 +166,8 @@ MainWindow::MainWindow(QString exepath, bool statupInTray, bool allowMultipleIns
         LaunchFirstRunSetup();
     else
         RunDiagnosticChecks();
+
+    //setStyle(new PhantomStyle);
 }
 
 MainWindow::~MainWindow()
@@ -254,12 +255,15 @@ void MainWindow::InitializeSpectrum(){
     else if(refresh > 500) refresh = 500;
     m_audioengine->setNotifyIntervalMs(refresh);
 
-    analysisLayout.reset(new QHBoxLayout());
-    analysisLayout->addWidget(m_spectrograph);
+    analysisLayout.reset(new QFrame());
+    analysisLayout->setFrameShape(QFrame::Shape::StyledPanel);
+    analysisLayout->setLayout(new QHBoxLayout);
+    analysisLayout->layout()->setMargin(0);
+    analysisLayout->layout()->addWidget(m_spectrograph);
     m_spectrograph->hide();
 
     auto buttonbox = ui->centralWidget->layout()->takeAt(ui->centralWidget->layout()->count()-1);
-    ui->centralWidget->layout()->addItem(analysisLayout.data());
+    ui->centralWidget->layout()->addWidget(analysisLayout.data());
     ui->centralWidget->layout()->addItem(buttonbox);
     analysisLayout.take();
 
@@ -299,10 +303,22 @@ void MainWindow::RefreshSpectrumParameters(){
 
     if(maxfreq < minfreq) maxfreq = minfreq + 100;
 
+    QColor outline;
+    if (palette().window().style() == Qt::TexturePattern)
+        outline = QColor(0, 0, 0, 160);
+    else
+        outline = palette().window().color().lighter(140);
+
     if(m_appwrapper->getSpectrumTheme() == 0)
-        m_spectrograph->setTheme(Qt::black,QColor(51,204,201),QColor(255,255,0),m_appwrapper->getSpetrumGrid());
+        m_spectrograph->setTheme(Qt::black,QColor(51,204,201),QColor(51,204,201).darker(),QColor(255,255,0),m_appwrapper->getSpetrumGrid());
     else
-        m_spectrograph->setTheme(palette().window().color().lighter(),palette().highlight().color(),palette().text().color(),m_appwrapper->getSpetrumGrid());
+        m_spectrograph->setTheme(palette().window().color().lighter(),
+                                 palette().highlight().color(),
+                                 palette().text().color(),
+                                 outline.lighter(108),
+                                 m_appwrapper->getSpetrumGrid());
+
+
 
     m_spectrograph->setParams(bands, minfreq, maxfreq);
     m_audioengine->setNotifyIntervalMs(refresh);

mainwindow.h

@@ -122,7 +122,7 @@ private slots:
     PresetDlg *preset_dlg;
     LogDlg *log_dlg;
 
-    QScopedPointer<QHBoxLayout> analysisLayout;
+    QScopedPointer<QFrame> analysisLayout;
     Spectrograph* m_spectrograph;
     AudioStreamEngine* m_audioengine;
 

misc/stylehelper.cpp

@@ -2,6 +2,7 @@
 #include "ui_mainwindow.h"
 #include "mainwindow.h"
 #include "config/appconfigwrapper.h"
+#include "phantom/phantomstyle.h"
 
 #include <QTextStream>
 #include <QApplication>
@@ -12,7 +13,11 @@ StyleHelper::StyleHelper(QObject* host){
 void StyleHelper::SetStyle(){
     MainWindow* m_host = qobject_cast<MainWindow*>(m_objhost);
     AppConfigWrapper* m_appconf = m_host->getACWrapper();
-    QApplication::setStyle(m_appconf->getTheme());
+    if(m_appconf->getTheme() == "Phantom")
+        QApplication::setStyle(new PhantomStyle);
+    else
+        QApplication::setStyle(m_appconf->getTheme());
+
     QString style_sheet = m_appconf->getStylesheet();
     int theme_mode = m_appconf->getThememode();
     QString color_palette = m_appconf->getColorpalette();
@@ -27,7 +32,6 @@ void StyleHelper::SetStyle(){
         else if (style_sheet=="vsdark")stylepath = ":/vsdark/vsdark/vsdark.qss";
         else if (style_sheet=="vslight")stylepath = ":/vslight/vslight/vslight.qss";
         else stylepath = ":/default.qss";
-        m_host->ui->vb->setContentsMargins(4,4,4,4);
         QFile f(stylepath);
         if (!f.exists())printf("Unable to set stylesheet, file not found\n");
         else
@@ -62,6 +66,7 @@ void StyleHelper::SetStyle(){
     }else{
         loadIcons(false);
         if(color_palette=="dark"){
+            loadIcons(true);
             QColor background = QColor(53,53,53);
             QColor foreground = Qt::white;
             QColor base = QColor(25,25,25);

phantom/phantom.pri

@@ -0,0 +1,10 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/phantomcolor.h \
+    $$PWD/phantomstyle.h \
+    $$PWD/phantomtweak.h
+
+SOURCES += \
+    $$PWD/phantomcolor.cpp \
+    $$PWD/phantomstyle.cpp