Merge pull request #1 from bloguetronica/v2.0

V2.0
bloguetronica · Mar 30, 2021 · 48fd2e7 · 48fd2e7
2 parents cc65ec2 + 4a4550d
commit 48fd2e7
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 219 deletions.
diff --git a/README.txt b/README.txt
@@ -6,7 +6,7 @@ installation, you must certify that your system is Debian based (or at least
 uses apt-get) and that you have an active Internet connection. It is important
 to note that you should also have the control commands for the function
 generator already installed, but you can always install them later (please
-refer to the package "gf2-1.0.tar.gz" to do so).
+refer to the packages "gf2-1.1.tar.gz" or "gf2-1.0.tar.gz" to do so).
 
 A list of the included scripts follows:
 – install.sh;

diff --git a/src/about.cpp b/src/about.cpp
@@ -1,5 +1,5 @@
-/* GF2 GUI - Version 1.0 for Debian Linux
-   Copyright (c) 2018 Samuel Lourenço
+/* GF2 GUI - Version 2.0 for Debian Linux
+   Copyright (c) 2018-2019 Samuel Lourenço
 
    This 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

diff --git a/src/about.h b/src/about.h
@@ -1,5 +1,5 @@
-/* GF2 GUI - Version 1.0 for Debian Linux
-   Copyright (c) 2018 Samuel Lourenço
+/* GF2 GUI - Version 2.0 for Debian Linux
+   Copyright (c) 2018-2019 Samuel Lourenço
 
    This 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

diff --git a/src/about.ui b/src/about.ui
@@ -49,7 +49,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;GF2 Graphical User Interface - Version 1.0&lt;br/&gt;Copyright &amp;copy; 2018 Samuel Lourenço&lt;/p&gt;&lt;p&gt;This program is distributed under the terms of the &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0-standalone.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;GNU GPL v3&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;GF2 Graphical User Interface - Version 2.0&lt;br/&gt;Copyright © 2018-2019 Samuel Lourenço&lt;/p&gt;&lt;p&gt;This program is distributed under the terms of the &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0-standalone.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;GNU GPL v3&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignJustify|Qt::AlignTop</set>

diff --git a/src/gf2-gui.pro b/src/gf2-gui.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += core gui xml
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -14,12 +14,12 @@ TEMPLATE = app
 
 SOURCES += main.cpp\
         mainwindow.cpp \
-    about.cpp \
-    serial.cpp
+    serial.cpp \
+    about.cpp
 
 HEADERS  += mainwindow.h \
-    about.h \
-    serial.h
+    serial.h \
+    about.h
 
 FORMS    += mainwindow.ui \
     about.ui \

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,5 @@
-/* GF2 GUI - Version 1.0 for Debian Linux
-   Copyright (c) 2018 Samuel Lourenço
+/* GF2 GUI - Version 2.0 for Debian Linux
+   Copyright (c) 2018-2019 Samuel Lourenço
 
    This 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