Add legacy compatibility + setup CI deployment

Author: ThePBone

.travis.yml

@@ -1,22 +1,26 @@
 language: cpp
-dist: trusty
+dist: bionic
+os: linux
 compiler: g++
-sudo: required
+group: travis_latest
+addons:
+  ssh_known_hosts: local.timschneeberger.me
 env:
-  - secure: "NMEKVXaMl6LhpJ6lW7jPGt9IxukC2mWCKE+ltEeE96+TZqHYQYiXBIbod8mNDi1IbKWsOMngQhmLdwojbYoVQsw4aGWbcBfWWkwURRnWvWybFkufQWHtOQ/Fh9tNai0fPkIqIRt8gdPyNIjTAkmaD6NEHtWiqWQYpv/FbS0rLIunSgecmNNLwDMxSEyZyUhWT3o1Dp4bjJvIITJOwPlZ4bB+Y9RrXerLGsMnN9jj5s21dwVsUwsWZoYEB0KPGXPTV2XXAvZtFDhU7leZwa4IpuBoKy4MYvRGSWAPYncBsFqLjCOvWacDtPyUs04oGFt4dybEGKc9AIERwdq9/G0ROBQcQk5HeMC9yzhW/BTQGDZ89/KYVhrYQv+8OCq6JvPePCYBO4jDhz1ODAdtnJQlon2B2Dz/sNPZX6FaG7Xc1s7++oun8ExxNuwI5jpFsBn4Vhko5x0QI8678OnUCodnaH2r+wlSj18iH5vLlNDBkuEiIHWjeFeJQMK0KBFWUiDlMy5NqBxeRABvk/3yinzBcJlbT4FE8NPUugnVtKJqlxMhHrkNEqIOO2wE1hMDp4i0+poFhxx4JmiDYvs5bvnTRg/WzxBBzkoHLlmRwXtjh79AelCgZ4704ShpxJwusoxv6/6KjNvdagN9qLAKWDYdSeFG912i24/2eWz1kp/4da8="
-  
+  global:
+  - base_version: 1.3
+  - secure: MUZVB76DqKEtZB38CIM9qN6SnxCKeHWAIxcWBrHlsNfx3Cz0dfAWb0xCUX9v/yuupnoR9MKzppt0G02GCjtypS9VzZ6s0Xm1oYjA4OhLSAREJ+fqL8aYxh2G34k2ZLitMRAiZzlycGgOwltKXb8vX18UtKyY+9ml0tkvzN9Mv/7NyNYMPP5+ZJKLnXwoN5ygNQa2gq07zW80KkpJzlYQUaWtwcyEZyL2INBEt6zh5R/MMagH3apTHnaB2Y9ZMrfpH52VghEvZ0LoZlB/5UeXLgkByF8i9jJsALwAk185iufQkXGErAgLXWobdBvWrIXZVUT5I5nrgNdQjpuYOHGvkwa0V8aLWD2US975IGP6PY0aZDsRQ3dKvJRCM4bukqGXKkuFsBt9pH8ZtfUsfff4gkQLDe+VAiuaU810bG2uua1JrwTLDInxFXISkd5h2ZZeJ4QvA5mGhOKEI2CuQCB3nYHKQXPzFsC4uaTe7F/2fYOctlxvgLZ8Wxpi0yvBa1vMoQfPZplh+jJMwa139MqVRjoqhWJQvtLHCfr+iWlUlBbGu1QBgqseCpIb4BIrsAM2/KG090X3nEjXaIN79gjI7a8P/wXGni5lHOLG3WHIeYD4CiVhpcrhKcKaQHsUk1fRmc9yj/WIH2a3Sr/vX3de4vD680nX5p3njQvL/PzDKQQ=
 before_install:
-  - sudo add-apt-repository ppa:beineri/opt-qt595-trusty -y
-  - sudo apt-get update
-
-install:
-  - sudo apt-get install qt59base qt59-meta-minimal libgl1-mesa-dev
-  - source /opt/qt59/bin/qt59-env.sh
-
-
+- sudo apt-get update -qq
+- sudo apt-get install lftp
+- sudo apt-get install qtbase5-dev libqt5svg5-dev qt5-default qttools5-dev-tools qtmultimedia5-dev 
 script:
-  - /opt/qt59/bin/qmake PREFIX=/usr
-  - make
-
+- qmake V4L_Frontend.pro
+- make
+- chmod +x ./deployment/build_deb_package.sh
+- "./deployment/build_deb_package.sh"
 after_success:
-  - curl -F file=@V4L_Frontend "https://nightly.thebone.cf/api/upload.php?key=$KEY&project=viper-gui"
+- for file in ./*.deb; do if [ -f "$file" ]; then export artifact=$file; break 1;
+  fi; done;
+- echo $artifact
+- lftp -u pi,${SFTP_PWD} -e "set sftp:auto-confirm true;set ssl:check-hostname false;set
+  ssl:verify-certificate false;put $artifact;quit" sftp://local.timschneeberger.me/disks/sandisk/www/nightly/vipergui-debian/

config/appconfigwrapper.cpp

@@ -20,7 +20,7 @@ void AppConfigWrapper::loadAppConfig(){
 }
 
 bool AppConfigWrapper::getAutoFx(){
-    return appconf->getBool("apply.auto.enable");
+    return appconf->getBool("apply.auto.enable", true, true);
 }
 void AppConfigWrapper::setAutoFx(bool afx){
     appconf->setValue("apply.auto.enable",QVariant(afx));
@@ -98,7 +98,7 @@ bool AppConfigWrapper::getWhiteIcons(){
     return appconf->getBool("theme.icons.white");
 }
 int AppConfigWrapper::getAutoFxMode(){
-    return appconf->getInt("apply.auto.mode");
+    return appconf->getInt("apply.auto.mode", 1);
 }
 void AppConfigWrapper::setAutoFxMode(int mode){
     appconf->setValue("apply.auto.mode",QVariant(mode));
@@ -199,7 +199,7 @@ bool AppConfigWrapper::getSpetrumGrid(){
     return appconf->getBool("visualizer.spectrum.grid");
 }
 int AppConfigWrapper::getSpectrumTheme(){
-    return appconf->getInt("visualizer.spectrum.theme");
+    return appconf->getInt("visualizer.spectrum.theme", 1);
 }
 void AppConfigWrapper::setSpectrumTheme(int number){
     appconf->setValue("visualizer.spectrum.theme",QVariant(number));
@@ -263,6 +263,13 @@ void AppConfigWrapper::setLegacyTabs(bool b){
 bool AppConfigWrapper::getLegacyTabs(){
     return appconf->getBool("theme.tab.legacy");
 }
+void AppConfigWrapper::setLegacyMode(bool b){
+    appconf->setValue("app.legacymode",QVariant(b));
+    saveAppConfig();
+}
+bool AppConfigWrapper::getLegacyMode(){
+    return appconf->getBool("app.legacymode");
+}
 //--------
 QString AppConfigWrapper::getAppConfigFilePath(){
     return QString("%1/.config/viper4linux/ui.2.conf").arg(QDir::homePath());

config/appconfigwrapper.h

@@ -94,6 +94,8 @@ class AppConfigWrapper : public QObject
     int getSpectrumShape();
     bool getLegacyTabs();
     void setLegacyTabs(bool b);
+    void setLegacyMode(bool b);
+    bool getLegacyMode();
 signals:
     void spectrumChanged();
     void spectrumReloadRequired();

config/container.cpp

@@ -22,11 +22,11 @@ QString ConfigContainer::getString(const QString& key,bool setToDefaultIfMissing
     }
     return getVariant(key).toString();
 }
-int ConfigContainer::getInt(const QString& key){
+int ConfigContainer::getInt(const QString& key, int alternative){
     if(!map.contains(key)){
         qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
-        map[key] = 0;
-        return 0;
+        map[key] = alternative;
+        return alternative;
     }
     return getVariant(key).toInt();
 }
@@ -38,11 +38,11 @@ float ConfigContainer::getFloat(const QString& key){
     }
     return getVariant(key).toFloat();
 }
-bool ConfigContainer::getBool(const QString& key, bool setToDefaultIfMissing){
+bool ConfigContainer::getBool(const QString& key, bool setToDefaultIfMissing, bool alternative){
     if(!map.contains(key)){
         qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
-        if(setToDefaultIfMissing)map[key] = false;
-        return false;
+        if(setToDefaultIfMissing)map[key] = alternative;
+        return alternative;
     }
     return getVariant(key).toBool();
 }

config/container.h

@@ -25,9 +25,9 @@ class ConfigContainer
     void setValue(const QString& key,QVariant value);
     QVariant getVariant(const QString& key);
     QString getString(const QString& key,bool setToDefaultIfMissing=true);
-    int getInt(const QString& key);
+    int getInt(const QString& key, int alternative = 0);
     float getFloat(const QString& key);
-    bool getBool(const QString& key, bool setToDefaultIfMissing=true);
+    bool getBool(const QString& key, bool setToDefaultIfMissing=true, bool alternative=false);
 
     QVariantMap getConfigMap();
     void setConfigMap(const QVariantMap& newmap);

deployment/build_deb_package.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+#DEB build script for Travis-CI
+#V4L_Frontend binary needs to be in working directory
+
+debname="viper4linux-gui_"$base_version"-build"$TRAVIS_BUILD_NUMBER
+echo $debname
+mkdir $debname
+mkdir $debname"/DEBIAN"
+mkdir -p $debname"/usr/bin"
+mkdir -p $debname"/usr/share/applications"
+mkdir -p $debname"/usr/share/pixmaps"
+cp "V4L_Frontend" $debname"/usr/bin/viper-gui"
+
+cp "viper.png" $debname"/usr/share/pixmaps/viper-gui.png"
+cp "LICENSE" $debname"/DEBIAN"
+
+cat <<EOT >> $debname"/usr/share/applications/viper-gui.desktop"
+[Desktop Entry]
+Name=Viper4Linux
+GenericName=Equalizer
+Comment=Official UI for Viper4Linux
+Keywords=equalizer
+Categories=AudioVideo;Audio;
+Exec=viper-gui
+Icon=/usr/share/pixmaps/viper-gui.png
+StartupNotify=false
+Terminal=false
+Type=Application
+EOT
+
+cat <<EOT >> $debname"/DEBIAN/control"
+Package: viper4linux-gui
+Version: $base_version-$TRAVIS_BUILD_NUMBER
+Section: sound
+Priority: optional
+Architecture: amd64
+Depends: qtbase5-dev (>= 5.9.5), libqt5core5a (>= 5.9.5), libqt5widgets5 (>= 5.9.5), libqt5gui5 (>= 5.9.5), libqt5core5a (>= 5.9.5), libgl1-mesa-dev
+Maintainer: ThePBone <[email protected]>
+Description: Official UI for Viper4Linux
+Homepage: https://github.com/Audio4Linux/Viper4Linux-GUI
+EOT
+
+dpkg-deb --build $debname

dialog/firstlaunchwizard.cpp

@@ -20,31 +20,49 @@ FirstLaunchWizard::FirstLaunchWizard(AppConfigWrapper* _appconf, MainWindow* mai
 
     appconf = _appconf;
 
+    ui->stackedWidget->setCurrentIndex(0);
+
     QTimer::singleShot(1000, [&]{
         ui->p1_icon->startAnimation();
     });
+    ui->p1dot5_icon->startAnimation();
     ui->p2_icon->startAnimation();
     ui->p3_icon->startAnimation();
     ui->p4_icon->startAnimation();
 
-
     ui->stackedWidget->setAnimation(QEasingCurve::Type::OutCirc);
     connect(ui->p1_next,&QPushButton::clicked,[&]{
         ui->stackedWidget->slideInIdx(1);
     });
-    connect(ui->p2_next,&QPushButton::clicked,[&]{
+    connect(ui->p1dot5_next,&QPushButton::clicked,[&]{
         ui->stackedWidget->slideInIdx(2);
     });
-    connect(ui->p3_next,&QPushButton::clicked,[&]{
+    connect(ui->p2_next,&QPushButton::clicked,[&]{
         ui->stackedWidget->slideInIdx(3);
     });
+    connect(ui->p3_next,&QPushButton::clicked,[&]{
+        ui->stackedWidget->slideInIdx(4);
+    });
     connect(ui->p4_next,&QPushButton::clicked,[&]{
         emit wizardFinished();
     });
     connect(ui->p4_telegram,&QPushButton::clicked,[&]{
         QDesktopServices::openUrl(QUrl("https://t.me/joinchat/FTKC2A2bolHkFAyO-fuPjw"));
     });
 
+    ui->p1dot5_mode_legacy->setChecked(appconf->getLegacyMode());
+
+    auto legacy_radio = [this]{
+        if(lockslot)return;
+        int mode = 0;
+        if(ui->p1dot5_mode_a4l->isChecked())mode=0;
+        else if(ui->p1dot5_mode_legacy->isChecked())mode=1;
+        appconf->setLegacyMode(mode);
+    };
+
+    connect(ui->p1dot5_mode_a4l,&QRadioButton::clicked,this,legacy_radio);
+    connect(ui->p1dot5_mode_legacy,&QRadioButton::clicked,this,legacy_radio);
+
     auto deviceUpdated = [this](){
         if(lockslot) return;
         QString absolute =
@@ -64,7 +82,6 @@ FirstLaunchWizard::FirstLaunchWizard(AppConfigWrapper* _appconf, MainWindow* mai
     };
     refreshDevices();
 
-
     ui->p3_systray_disable->setChecked(!appconf->getTrayMode());
     ui->p3_systray_enable->setChecked(appconf->getTrayMode());
     ui->p3_systray_icon_box->setEnabled(appconf->getTrayMode());