diff --git a/.gitignore b/.gitignore index fab7372..62fcabc 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ Thumbs.db *.dll *.exe +# Ignore build directory +build diff --git a/DLTRelais.pro b/DLTRelais.pro index 144c6bd..a24427e 100644 --- a/DLTRelais.pro +++ b/DLTRelais.pro @@ -11,7 +11,6 @@ CONFIG += c++11 SOURCES += \ dltminiserver.cpp \ dltrelais.cpp \ - infodialog.cpp \ main.cpp \ dialog.cpp \ settingsdialog.cpp @@ -20,13 +19,11 @@ HEADERS += \ dialog.h \ dltminiserver.h \ dltrelais.h \ - infodialog.h \ settingsdialog.h \ version.h FORMS += \ dialog.ui \ - infodialog.ui \ settingsdialog.ui TRANSLATIONS += \ diff --git a/dialog.ui b/dialog.ui index c3af2d9..7cfcf86 100644 --- a/dialog.ui +++ b/dialog.ui @@ -6,8 +6,8 @@ 0 0 - 409 - 440 + 466 + 435 @@ -16,6 +16,11 @@ 0 + + + Arial + + Dialog diff --git a/infodialog.cpp b/infodialog.cpp deleted file mode 100644 index dc975f1..0000000 --- a/infodialog.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "infodialog.h" -#include "ui_infodialog.h" - -InfoDialog::InfoDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::InfoDialog) -{ - ui->setupUi(this); -} - -InfoDialog::~InfoDialog() -{ - delete ui; -} diff --git a/infodialog.h b/infodialog.h deleted file mode 100644 index 0deba7a..0000000 --- a/infodialog.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef INFODIALOG_H -#define INFODIALOG_H - -#include - -namespace Ui { -class InfoDialog; -} - -class InfoDialog : public QDialog -{ - Q_OBJECT - -public: - explicit InfoDialog(QWidget *parent = nullptr); - ~InfoDialog(); - -private: - Ui::InfoDialog *ui; -}; - -#endif // INFODIALOG_H diff --git a/infodialog.ui b/infodialog.ui deleted file mode 100644 index abf6058..0000000 --- a/infodialog.ui +++ /dev/null @@ -1,78 +0,0 @@ - - - InfoDialog - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - - - (C) 2021 Alexander Wenzel - - - - - - - This SW is licensed under GPLv3. - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - InfoDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - InfoDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/settingsdialog.ui b/settingsdialog.ui index 6e04683..4772dc8 100644 --- a/settingsdialog.ui +++ b/settingsdialog.ui @@ -6,10 +6,15 @@ 0 0 - 481 - 428 + 342 + 279 + + + Arial + + Dialog