DKM-Tech
/
pa-calculator
3
3
Fork 0
Code Issues 2 Pull Requests Projects Releases 5 Wiki Activity

Layout changes and about dialog corrected

Browse Source
pull/4/head v1.0
Alexander Diamadis 5 years ago
parent 5f34ea8e82
commit 64c52e708b
7 changed files with 179 additions and 44 deletions
Show Stats Download Patch File Download Diff File

2
installer/config/config.xml
Unescape Escape View File

@ -4,6 +4,6 @@
<Version>1.0</Version>
<Title>PA Calculator Installer</Title>
<Publisher>DKM-Tech</Publisher>
<StartMenuDir>PA Tools</StartMenuDir>
<StartMenuDir>DKM-Tech</StartMenuDir>
<TargetDir>@ApplicationsDirX64@\PA Calculator</TargetDir>
</Installer>

1
installer/packages/com.dkmtech.pacalculator/meta/installscript.qs
Unescape Escape View File

@ -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
}

21
source/PA_Calculator.pro
Unescape Escape View File

@ -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}\\\"\"

8
source/about.cpp
Unescape Escape View File

@ -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()

59
source/about.ui
Unescape Escape View File

@ -78,7 +78,7 @@
<x>290</x>
<y>10</y>
<width>331</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="font">
@ -96,7 +96,7 @@
<property name="geometry">
<rect>
<x>290</x>
<y>70</y>
<y>50</y>
<width>321</width>
<height>16</height>
</rect>
@ -105,6 +105,61 @@
<string>Based on QT </string>
</property>
</widget>
<widget class="QLabel" name="label_Copyright">
<property name="geometry">
<rect>
<x>290</x>
<y>110</y>
<width>321</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Copyright (C) 2021 Alexander Diamadis</string>
</property>
</widget>
<widget class="QTextBrowser" name="textBrowser">
<property name="geometry">
<rect>
<x>290</x>
<y>140</y>
<width>341</width>
<height>121</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>7</pointsize>
</font>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;&quot;&gt;&lt;a name=&quot;license-text&quot;&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;&quot;&gt;T&lt;/span&gt;&lt;span style=&quot; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;&quot;&gt;You should have received a copy of the GNU General Public License along with this program. If not, see &lt;/span&gt;&lt;a href=&quot;https://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; font-family:'Courier New'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Consolas','Monaco','Courier','monospace'; font-size:8pt; color:#5c5855; background-color:#ffffff;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label_build">
<property name="geometry">
<rect>
<x>290</x>
<y>80</y>
<width>321</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Build: </string>
</property>
</widget>
</widget>
<resources>
<include location="resources.qrc"/>

7
source/defines.h
Unescape Escape View File

@ -1,7 +0,0 @@
#ifndef DEFINES_H
#define DEFINES_H
#define PAC_VERSION "0.2"
#endif // DEFINES_H

125
source/mainwindow.ui
Unescape Escape View File

@ -6,10 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>1141</width>
<height>611</height>
<width>1242</width>
<height>590</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>1242</width>
<height>590</height>
</size>
</property>
<property name="windowTitle">
<string>PA Calculator</string>
</property>
@ -139,14 +151,14 @@
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>select mode</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QComboBox" name="comboBox_libraryAmoMode">
<property name="minimumSize">
<size>
@ -169,8 +181,13 @@
</property>
</spacer>
</item>
<item row="7" column="1">
<item row="8" column="0" colspan="2">
<widget class="QPushButton" name="pushButton">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Load Amp-Preset</string>
</property>
@ -183,6 +200,12 @@
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>408</width>
@ -200,6 +223,9 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
@ -315,19 +341,6 @@
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QPushButton" name="pushButton_loadSpeaker">
<property name="minimumSize">
<size>
<width>179</width>
<height>33</height>
</size>
</property>
<property name="text">
<string>Load Speaker-Preset</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="spinBox_speakerCount">
<property name="minimum">
@ -358,6 +371,24 @@
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QPushButton" name="pushButton_loadSpeaker">
<property name="minimumSize">
<size>
<width>179</width>
<height>33</height>
</size>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Load Speaker-Preset</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@ -396,23 +427,16 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Load DAC from library</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="comboBox_dacPreset"/>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="pushButton_loadDac">
<property name="text">
<string>Load DAC-Preset</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
@ -420,8 +444,49 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="4" column="1">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0" colspan="2">
<widget class="QPushButton" name="pushButton_loadDac">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Load DAC-Preset</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@ -705,8 +770,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1141</width>
<height>24</height>
<width>1242</width>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuLibrary">

Write Preview
Loading…
Cancel
Save