diff --git a/installer/config/config.xml b/installer/config/config.xml index 116575d..ef09646 100644 --- a/installer/config/config.xml +++ b/installer/config/config.xml @@ -4,6 +4,6 @@ 1.0 PA Calculator Installer DKM-Tech - PA Tools + DKM-Tech @ApplicationsDirX64@\PA Calculator diff --git a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs index 4daf530..7e55b36 100644 --- a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs +++ b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs @@ -12,6 +12,7 @@ Component.prototype.createOperations = function() var userProfile = installer.environmentVariable("USERPROFILE"); installer.setValue("UserProfile", userProfile); component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk"); + component.addOperation("CreateShortcut", "@TargetDir@/PA_Calculator.exe", "@StartMenuDir@/PA_Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator"); } catch (e) { // Do nothing if key doesn't exist } diff --git a/source/PA_Calculator.pro b/source/PA_Calculator.pro index 7857818..ee2d0a9 100644 --- a/source/PA_Calculator.pro +++ b/source/PA_Calculator.pro @@ -24,7 +24,6 @@ HEADERS += \ campmode.h \ cdac.h \ cspeaker.h \ - defines.h \ library.h \ mainwindow.h @@ -50,3 +49,23 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin RESOURCES += \ resources.qrc + +VERSION=1.0.0 +QMAKE_TARGET_PRODUCT = "PA-Calculator" +QMAKE_TARGET_COMPANY = "Alexander Diamadis" +QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2021 by Alexander Diamadis (alex@dkm-tech.de)" + +win32 { + commit = $$system("FOR /F \"tokens=*\" %H IN ('git rev-parse --short HEAD') DO @SET /A DECIMAL=0x%H") +} else { + commit = $$system("printf '%d' 0x`git rev-parse --short HEAD`") +} + + +DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\" \ + APP_PRODUCT=\"\\\"$${QMAKE_TARGET_PRODUCT}\\\"\" \ + APP_COMPANY=\"\\\"$${QMAKE_TARGET_COMPANY}\\\"\" \ + APP_COMMIT=\"\\\"$${commit}\\\"\" \ + APP_COPYRIGHT=\"\\\"$${QMAKE_TARGET_COPYRIGHT}\\\"\" + + diff --git a/source/about.cpp b/source/about.cpp index 8df441f..01e62ca 100644 --- a/source/about.cpp +++ b/source/about.cpp @@ -1,15 +1,17 @@ #include "about.h" #include "ui_about.h" -#include "defines.h" + + about::about(QWidget *parent) : QDialog(parent), ui(new Ui::about) { ui->setupUi(this); - ui->label_nameVersion->setText(QString("PA Calculator ")+QString(PAC_VERSION)); + ui->label_nameVersion->setText(QString("PA Calculator ")+APP_VERSION); ui->label_QT_Version->setText(QString("Based on QT ")+QString(QT_VERSION_STR)+QString(" (")+QSysInfo::prettyProductName()+QString(", ")+QSysInfo::currentCpuArchitecture()+QString(")")); - + ui->label_Copyright->setText(APP_COPYRIGHT); + ui->label_build->setText(QString("Build: ")+QString::fromStdString(__DATE__) +QString(" (")+APP_COMMIT+QString(")")); } about::~about() diff --git a/source/about.ui b/source/about.ui index b41759b..58ce7d6 100644 --- a/source/about.ui +++ b/source/about.ui @@ -78,7 +78,7 @@ 290 10 331 - 21 + 31 @@ -96,7 +96,7 @@ 290 - 70 + 50 321 16 @@ -105,6 +105,61 @@ Based on QT + + + + 290 + 110 + 321 + 16 + + + + Copyright (C) 2021 Alexander Diamadis + + + + + + 290 + 140 + 341 + 121 + + + + + 7 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><a name="license-text"></a><span style=" font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;">T</span><span style=" font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;">his program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;">You should have received a copy of the GNU General Public License along with this program. If not, see </span><a href="https://www.gnu.org/licenses/"><span style=" font-family:'Courier New'; font-size:8pt; text-decoration: underline; color:#0000ff;">https://www.gnu.org/licenses/</span></a><span style=" font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;">.</span></p></body></html> + + + false + + + + + + 290 + 80 + 321 + 16 + + + + Build: + + diff --git a/source/defines.h b/source/defines.h deleted file mode 100644 index 9962c03..0000000 --- a/source/defines.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef DEFINES_H -#define DEFINES_H - -#define PAC_VERSION "0.2" - - -#endif // DEFINES_H diff --git a/source/mainwindow.ui b/source/mainwindow.ui index ebbbdc9..3106a04 100644 --- a/source/mainwindow.ui +++ b/source/mainwindow.ui @@ -6,10 +6,22 @@ 0 0 - 1141 - 611 + 1242 + 590 + + + 0 + 0 + + + + + 1242 + 590 + + PA Calculator @@ -139,14 +151,14 @@ - + select mode - + @@ -169,8 +181,13 @@ - + + + + 14 + + Load Amp-Preset @@ -183,6 +200,12 @@ + + + 0 + 0 + + 408 @@ -200,6 +223,9 @@ + + QLayout::SetDefaultConstraint + @@ -315,19 +341,6 @@ - - - - - 179 - 33 - - - - Load Speaker-Preset - - - @@ -358,6 +371,24 @@ + + + + + 179 + 33 + + + + + 14 + + + + Load Speaker-Preset + + + @@ -396,23 +427,16 @@ - + Load DAC from library - + - - - - Load DAC-Preset - - - @@ -420,8 +444,49 @@ - + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 20 + 40 + + + + + + + + + 14 + + + + Load DAC-Preset + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + Qt::Vertical @@ -705,8 +770,8 @@ 0 0 - 1141 - 24 + 1242 + 21