finish merge

1 files changed, 34 insertions, 0 deletions

diff --git a/client/settingsmenu.h b/client/settingsmenu.h
new file mode 100644
index 0000000..881906d
--- /dev/null
+++ b/client/settingsmenu.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <QDialog>
+
+#include <QMessageBox>
+//#include <QtSql>
+//#include <QSqlDatabase>
+
+
+namespace Ui {
+class SettingsMenu;
+}
+
+class SettingsMenu : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit SettingsMenu(QWidget *parent = nullptr);
+    ~SettingsMenu();
+
+private slots:
+
+    void on_pushButton_cancel_clicked();
+
+    void on_pushButton_login_clicked();
+
+private:
+    Ui::SettingsMenu *ui;
+
+    QString _dbName = "";
+    QString _dbip = "";
+    QString _ESPip = "";
+};