Merge branch 'master' into 2.2-dev

marcusbirkin · Oct 17, 2019 · 6f1ae83 · 6f1ae83
2 parents 821997c + 505b21f
commit 6f1ae83
Show file tree

Hide file tree

Showing 24 changed files with 742 additions and 1,085 deletions.
diff --git a/docs/404.html b/docs/404.html
@@ -0,0 +1 @@
+<meta http-equiv="Refresh" content="0; url=http://www.sacnview.org/">
diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+www.sacnview.org
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,4 +1,4 @@
-theme: jekyll-theme-tactile
+theme: jekyll-theme-cayman
 title: sACNView
 description: sACNView, a tool for sending and receiving the Streaming ACN control protocol
 show_downloads: true

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -1,17 +1,19 @@
 <!DOCTYPE html>
 <html lang="{{ site.lang | default: "en-US" }}">
   <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <link href='https://fonts.googleapis.com/css?family=Chivo:900' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
-    <link rel="stylesheet" type="text/css" href="{{ '/assets/css/print.css' | relative_url }}" media="print">
-    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-    <title>{{ site.title | default: site.github.repository_name }}</title>
-	<!-- Script updates the links to the latest release -->
+
+    {% if site.google_analytics %}
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+      <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+        gtag('config', '{{ site.google_analytics }}');
+      </script>
+    {% endif %}
+	  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+
+	  <!-- Script updates the links to the latest release -->
 	<script>
 
     <!-- Polyfill for older ECMAScript -->
@@ -27,15 +29,17 @@
 
 	$.getJSON('https://api.github.com/repos/docsteer/sacnview/releases/latest', function (data) {
 
-    document.getElementById("name_release").innerHTML = data.name;
+    document.getElementById("name_release").innerHTML = "Release Version : " + data.name;
 
 		$.each(data.assets, function(index, obj){
 			var download_url = obj.browser_download_url;
-			if( download_url.endsWith('exe'))
+      			if( download_url.endsWith('-WindowsXP.exe'))
+          			$('#download-winxp').attr('href', download_url);
+			else if( download_url.endsWith('exe'))
 				$('#download-win').attr('href', download_url);
-			if( download_url.endsWith('dmg'))
+			else if( download_url.endsWith('dmg'))
 				$('#download-mac').attr('href', download_url);
-			if( download_url.endsWith('deb'))
+			else if( download_url.endsWith('deb'))
 				$('#download-linux').attr('href', download_url);
 		});
 	});
@@ -44,7 +48,7 @@
 
   $.getJSON('https://api.github.com/repos/docsteer/sacnview/releases', function (data) {
 
-    document.getElementById("name_prerelease").innerHTML = data[0].name;
+    document.getElementById("name_prerelease").innerHTML = "Pre-Release Version : "+data[0].name;
 
     $.each(data[0].assets, function(index, obj){
 
@@ -64,69 +68,49 @@
     }
   });
   </script>
+
+    <meta charset="UTF-8">
 
+{% seo %}
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="theme-color" content="#157878">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
   </head>
-
   <body>
-    <div id="container">
-
-	<img src="./assets/images/icon.png" style="display:block; margin:auto; padding:10px" />
+    <header class="page-header" role="banner">
+      <h1 class="project-name">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>
+      <h2 class="project-tagline">{{ page.description | default: site.description | default: site.github.project_tagline }}</h2>
+      {% if site.show_downloads %}
+	  <section>
+	  <h2 id="name_release">Download Release</h2>
+	    <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-win" class="btn"><span><img src="/assets/images/win-icon.png" /> Windows</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-winxp" class="btn"><span><img src="/assets/images/winxp-icon.png" /> Win XP</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-mac" class="btn"><span><img src="/assets/images/mac-icon.png" /> macOS</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-linux" class="btn"><span><img src="/assets/images/linux-icon.png" /> Linux</span></a>
+	  </section>
+	  <section id="prerelease-download" style="display:none">
+            <h2 id="name_prerelease"></h1>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="btn"><span> Windows</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="btn"><span> Win XP</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="btn"><span> macOS</span></a>
+            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="btn"><span> Linux</span></a>
+          </section>
+      {% endif %}
+      {% if site.github.is_project_page %}
+        <a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
+      {% endif %}
+    </header>
 
-	<div class="inner">
-        <header>
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-          <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        </header>
-        <section id="downloads" class="clearfix">
-          {% if site.show_downloads %}
-          <h1 id="name_release"></h1>
-          <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-win" class="button"><span>Windows</span></a>
-          <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-mac" class="button"><span>macOS</span></a>
-          <a href="https://github.com/docsteer/sacnview/releases/latest" id="download-linux" class="button"><span>Linux</span></a>
-        </section>
-        <section id="pre-downloads" class="clearfix">
-          <div id="prerelease-download" style="display:none">
-            <h1 id="name_prerelease"></h1>
-            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="button"><span>Windows</span></a>
-            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="button"><span>Win XP</span></a>
-            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="button"><span>macOS</span></a>
-            <a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="button"><span>Linux</span></a>
-          </div>
-        </section>
-          {% endif %}
-        <section id="source" class="clearfix">
-	  {% if site.github.is_project_page %}
-          <br><h2 id="name_prerelease">Source</h2>
-          <a href="{{ site.github.repository_url }}" id="view-on-github" class="button"><span>Source</span></a>
-	  {% else %}
-          <br><h2 id="name_prerelease">Source</h2>
-          <a href="{{ site.github.owner_url }}" id="view-on-github" class="button"><span>Source</span></a>
-	  {% endif %}
-        </section>
-        <hr>
-        <section id="main_content">
-          {{ content }}
-        </section>
+    <main id="content" class="main-content" role="main">
+      {{ content }}
 
-        <footer>
+      <footer class="site-footer">
         {% if site.github.is_project_page %}
-          {{ site.title | default: site.github.repository_name }} is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a><br>
+          <span class="site-footer-owner"><a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a> is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</span>
         {% endif %}
-          This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.
-        </footer>
-
-      </div>
-    </div>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', '{{ site.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-      </script>
-    {% endif %}
+        <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
+      </footer>
+    </main>
   </body>
 </html>
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
@@ -11,29 +11,3 @@
 a.button {
   width: 126px;
 }
-
-#download-win span {
-  background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
-}
-#download-winxp span {
-  background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
-}
-#download-mac span {
-  background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
-}
-#download-linux span {
-  background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
-}
-
-#pre-download-win span {
-  background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
-}
-#pre-download-winxp span {
-  background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
-}
-#pre-download-mac span {
-  background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
-}
-#pre-download-linux span {
-  background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
-}
diff --git a/install/win/install.nsi b/install/win/install.nsi
@@ -18,7 +18,7 @@ SetCompressor /SOLID lzma
 
 !define PRODUCT_NAME "sACNView"
 !define PRODUCT_PUBLISHER "Tom Barthel-Steer"
-!define PRODUCT_WEB_SITE "http://www.tomsteer.net"
+!define PRODUCT_WEB_SITE "https://www.sacnview.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\sACNView.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -187,4 +187,4 @@ Function UN.onInit
          ;begin uninstall, could be added on top of uninstall section instead
          !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
 
-FunctionEnd
+FunctionEnd
diff --git a/sACNView.pro b/sACNView.pro
@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = sACNView
 TEMPLATE = app
 DESCRIPTION = $$shell_quote("A tool for sending and receiving the Streaming ACN control protocol")
-URL = $$shell_quote("https://docsteer.github.io/sacnview/")
+URL = $$shell_quote("https://www.sacnview.org")
 LICENSE = $$shell_quote("Apache 2.0")
 
 macx {

diff --git a/src/addmultidialog.cpp b/src/addmultidialog.cpp
@@ -48,7 +48,13 @@ AddMultiDialog::AddMultiDialog(QWidget *parent) :
     connect(ui->sbStartUniverse, SIGNAL(valueChanged(int)), this, SLOT(rangeChanged()));
     connect(ui->sbNumUniverses, SIGNAL(valueChanged(int)), this, SLOT(rangeChanged()));
 
+
+    ui->dlFadeRate->setMinimum(0);
+    ui->dlFadeRate->setMaximum(FX_FADE_RATES.count()-1);
+    ui->dlFadeRate->setValue(0);
+
     rangeChanged();
+    on_dlFadeRate_valueChanged(ui->dlFadeRate->value());
 }
 
 AddMultiDialog::~AddMultiDialog()
@@ -159,9 +165,10 @@ int AddMultiDialog::level()
     return ui->slLevel->value();
 }
 
-int AddMultiDialog::rate()
+qreal AddMultiDialog::rate()
 {
-    return ui->slLevel->value();
+    qreal rate = FX_FADE_RATES[ui->dlFadeRate->value()];
+    return rate;
 }
 
 int AddMultiDialog::priority()
@@ -173,3 +180,9 @@ void AddMultiDialog::on_slLevel_valueChanged(int value)
 {
     on_slLevel_sliderMoved(value);
 }
+
+void AddMultiDialog::on_dlFadeRate_valueChanged(int value)
+{
+    qreal rate = FX_FADE_RATES[ui->dlFadeRate->value()];
+    ui->lblRate->setText(tr("Fade Rate %1 Hz").arg(rate));
+}
diff --git a/src/addmultidialog.h b/src/addmultidialog.h
@@ -38,15 +38,15 @@ class AddMultiDialog : public QDialog
     int endAddress();
     bool startNow();
     int level();
-    int rate();
+    qreal rate();
     int priority();
 
 private slots:
     void rangeChanged();
     void on_cbEffect_currentIndexChanged(int index);
     void on_slLevel_sliderMoved(int value);
     void on_slLevel_valueChanged(int value);
-
+    void on_dlFadeRate_valueChanged(int value);
 private:
     Ui::AddMultiDialog *ui;
     void setupFxControl();

diff --git a/src/clssnapshot.cpp b/src/clssnapshot.cpp
@@ -56,13 +56,14 @@ void clsSnapshot::setUniverse(quint16 universe) {
 
     m_sbUniverse->setValue(m_universe);
 
-    if (m_listener)
-        m_listener->deleteLater();
+    // Bug #197
+    //if (m_listener)
+    //    m_listener->deleteLater();
     m_listener = sACNManager::getInstance()->getListener(m_universe);
     connect(m_listener.data(), SIGNAL(levelsChanged()), this, SLOT(levelsChanged()));
-    connect(m_listener.data(), SIGNAL(sourceFound()), this, SLOT(levelsChanged()));
-    connect(m_listener.data(), SIGNAL(sourceLost()), this, SLOT(levelsChanged()));
-    connect(m_listener.data(), SIGNAL(sourceResumed()), this, SLOT(levelsChanged()));
+    connect(m_listener.data(), SIGNAL(sourceFound(sACNSource *source)), this, SLOT(levelsChanged()));
+    connect(m_listener.data(), SIGNAL(sourceLost(sACNSource *source)), this, SLOT(levelsChanged()));
+    connect(m_listener.data(), SIGNAL(sourceResumed(sACNSource *source)), this, SLOT(levelsChanged()));
 
     m_sender->setUniverse(m_universe);
 }

diff --git a/src/consts.h b/src/consts.h
@@ -23,7 +23,7 @@
 
 // If this is a full release, only show the newer version message for other full releases
 // If this is prerelease, show all newer versions
-#define PRERELEASE      true
+#define PRERELEASE      false
 
 #define nNumOfSecPerHour 3600
 #define nNumberOfSecPerMin 60

diff --git a/src/multiuniverse.cpp b/src/multiuniverse.cpp
@@ -55,7 +55,7 @@ MultiUniverse::~MultiUniverse()
 
 void MultiUniverse::addSource(int universe, int min_address, int max_address,
                               sACNEffectEngine::FxMode mode, QString name, bool startSending,
-                              int level, int rate, int priority)
+                              int level, qreal rate, int priority)
 {
     int row = ui->tableWidget->rowCount();
     ui->tableWidget->setRowCount(row+1);
@@ -147,6 +147,9 @@ void MultiUniverse::addSource(int universe, int min_address, int max_address,
     cb->addItems(sACNEffectEngine::FxModeDescriptions());
     cb->setCurrentIndex((int) mode);
     ui->tableWidget->setCellWidget(row, COL_EFFECT, cb);
+    ui->tableWidget->setColumnWidth(
+                COL_EFFECT,
+                std::max(ui->tableWidget->columnWidth(COL_EFFECT), cb->width()));
     m_widgetToFxEngine[cb] = m_fxEngines.last();
     m_widgetToSender[cb] = m_senders.last().data();
 

diff --git a/src/multiuniverse.h b/src/multiuniverse.h
@@ -74,7 +74,7 @@ private slots:
 
     void setupControl(int row, sACNEffectEngine::FxMode mode, int value);
     void addSource(int universe, int min_address, int max_address, sACNEffectEngine::FxMode mode,
-           QString name, bool startSending, int level = 0, int rate = 5, int priority = DEFAULT_SACN_PRIORITY);
+           QString name, bool startSending, int level = 0, qreal rate = 10.0, int priority = DEFAULT_SACN_PRIORITY);
 };
 
 #endif // MULTIUNIVERSE_H
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<meta http-equiv="Refresh" content="0; url=http://www.sacnview.org/">