Anton: change autotools stuff

Author: anton2920

Makefile.am

@@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CXXFLAGS = -fPIC -Wall -Wextra -std=c++11
 SUBDIRS = src doc man examples 
 
-EXTRA_DIST = autogen.sh src/qt/*.ui
+EXTRA_DIST = autogen.sh 

src/Makefile.am

@@ -1,9 +1,12 @@
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = $(ACLOCAL_FLAGS)
 
+$(shell ./scripts/db.sh)
+
 bin_PROGRAMS = ProTest
 
 ProTest_SOURCES = main.cpp
+
 if HAVE_QT
 ProTest_CPPFLAGS = $(CXXFLAGS) $(QT_CXXFLAGS) -Wall -Wextra -std=c++11
 ProTest_LDADD = libmainmenu.la libqt_cpp.la libdatabse.la libteacher.la libstudent.la
@@ -16,8 +19,9 @@ endif
 
 include_HEADERS = headers/tests_main_header.h headers/database.h headers/main_menu.h headers/sqlite3.h qt/dialog1.h \
 qt/mainwindow.h qt/mainwindow_teach.h build-qt-Desktop-Debug/ui_dialog1.h build-qt-Desktop-Debug/ui_mainwindow.h \
-build-qt-Desktop-Debug/ui_mainwindow_teach.h libs/libcrypt/include/tomcrypt_prng.h libs/libcrypt/include/tomcrypt_pkcs.h \
-build-qt-Desktop-Debug/moc_predefs.h headers/teacher_menu.h headers/student_menu.h headers/config.h
+build-qt-Desktop-Debug/ui_mainwindow_teach.h build-qt-Desktop-Debug/moc_predefs.h headers/teacher_menu.h \
+headers/student_menu.h headers/config.h qt/dialog2.h qt/dialog3.h qt/mainwindow_stud.h headers/sha256.h \
+build-qt-Desktop-Debug/ui_dialog2.h build-qt-Desktop-Debug/ui_dialog3.h build-qt-Desktop-Debug/ui_mainwindow_stud.h
 
 if HAVE_QT
 lib_LTLIBRARIES = libmainmenu.la libqt_cpp.la libdatabse.la libteacher.la libstudent.la
@@ -34,13 +38,16 @@ libmainmenu_la_CPPFLAGS = $(ProTest_CPPFLAGS)
 if HAVE_QT
 libqt_cpp_la_LDFLAGS = -version-info 0:0:0 $(QT_LIBS)
 libqt_cpp_la_SOURCES = qt/dialog1.cpp qt/mainwindow.cpp qt/mainwindow_teach.cpp qt/qt_main.cpp build-qt-Desktop-Debug/moc_dialog1.cpp \
-build-qt-Desktop-Debug/moc_mainwindow.cpp build-qt-Desktop-Debug/moc_mainwindow_teach.cpp
+build-qt-Desktop-Debug/moc_mainwindow.cpp build-qt-Desktop-Debug/moc_mainwindow_teach.cpp qt/dialog2.cpp qt/dialog3.cpp \
+qt/mainwindow_stud.cpp build-qt-Desktop-Debug/moc_dialog2.cpp build-qt-Desktop-Debug/moc_dialog3.cpp \
+build-qt-Desktop-Debug/moc_mainwindow_stud.cpp \
+qt/dialog1.ui qt/dialog2.ui qt/dialog3.ui qt/mainwindow.ui qt/mainwindow_teach.ui qt/mainwindow_stud.ui 
 libqt_cpp_la_CPPFLAGS = $(ProTest_CPPFLAGS)
 endif
 
 # libdatabse.la
 libdatabse_la_LDFLAGS = -version-info 0:0:0
-libdatabse_la_SOURCES = libs/db/database.cpp libs/db/sqlite3.c
+libdatabse_la_SOURCES = libs/db/database.cpp libs/db/sqlite3.c libs/db/sha256.cpp
 libdatabse_la_CPPFLAGS = $(ProTest_CPPFLAGS)
 
 # libteacher.la

src/build-qt-Desktop-Debug/ui_dialog1_copy.h

@@ -22,11 +22,11 @@ along with ProTest. If not, see <https://www.gnu.org/licenses/>.
 #define MAIN_HEADER_TEST
 
 /* Macros */
-#define QT_CREATOR (1)
+#define QT_CREATOR (0)
 #if (QT_CREATOR == 1)
 	#define PATH_TO_DB ("../db/data.sqlite")
 #else
-	#define PATH_TO_DB ("db/data.sqlite")
+	#define PATH_TO_DB ("/.local/share/ProTest/data.sqlite")
 #endif
 
 /* Types */

src/headers/tests_main_header.h

@@ -128,6 +128,7 @@ int main_menu(void) {
 
     /* Initializing variables */
     int func, junk, n = 0;
+    char *path;
 
     /* I/O flow */
     while (1) {
@@ -154,7 +155,9 @@ int main_menu(void) {
                 continue;
             }
 
-            if (db_open(PATH_TO_DB) == -1) {
+            path = secure_getenv("HOME");
+            strcat(path, PATH_TO_DB);
+            if (db_open(path) == -1) {
                 printf("| Error! Couldn't open database                              |\n");
                 continue;
             }

src/libs/main_menu.cpp

@@ -1,5 +1,5 @@
 #include "dialog2.h"
-#include "ui_dialog2.h"
+#include "../build-qt-Desktop-Debug/ui_dialog2.h"
 #include "../headers/tests_main_header.h"
 
 Dialog2::Dialog2(QWidget *parent) :

src/qt/dialog2.cpp

@@ -1,5 +1,5 @@
 #include "dialog3.h"
-#include "ui_dialog3.h"
+#include "../build-qt-Desktop-Debug/ui_dialog3.h"
 #include "mainwindow_stud.h"
 
 int tt = 0;

src/qt/dialog3.cpp

@@ -33,6 +33,7 @@ MainWindow::MainWindow(QWidget *parent) :
     /* Initializing variables */
     FILE *fp;
     QString login, pass;
+    char *path;
 
     /* I/O flow */
     if ((fp = fopen("remember.lp", "rb")) != nullptr) {
@@ -50,9 +51,17 @@ MainWindow::MainWindow(QWidget *parent) :
     }
 
     /* Database */
+#if (QT_CREATOR == 0)
+    path = secure_getenv("HOME");
+    strcat(path, PATH_TO_DB);
+    if (db_open(path) == -1) {
+        QMessageBox::critical(this, "Error!", "Couldn't open database. Program won't work!");
+    }
+#elif (QT_CREATOR == 1)
     if (db_open(PATH_TO_DB) == -1) {
         QMessageBox::critical(this, "Error!", "Couldn't open database. Program won't work!");
     }
+#endif
 }
 
 MainWindow::~MainWindow()

src/qt/mainwindow.cpp

@@ -1,5 +1,5 @@
 #include "mainwindow_stud.h"
-#include "ui_mainwindow_stud.h"
+#include "../build-qt-Desktop-Debug/ui_mainwindow_stud.h"
 #include "../headers/tests_main_header.h"
 #include "mainwindow.h"
 
@@ -599,3 +599,10 @@ void MainWindow_stud::on_MainWindow_stud_destroyed()
     /* Main part */
     db_close();
 }
+
+void MainWindow_stud::on_actionFinal_test_triggered()
+{
+
+    /* Main part */
+    final_test();
+}

src/qt/mainwindow_stud.cpp

@@ -98,6 +98,8 @@ private slots:
 
     void on_MainWindow_stud_destroyed();
 
+    void on_actionFinal_test_triggered();
+
 private:
     Ui::MainWindow_stud *ui;
     Dialog3 *dialog3;

src/qt/mainwindow_stud.h

@@ -0,0 +1 @@
+mkdir -p ${HOME}/.local/share/ProTest/ && cp -f ./db/data.sqlite ${HOME}/.local/share/ProTest/data.sqlite