diff --git a/Passgen.pro b/Passgen.pro index 617aff0..ba1cff5 100644 --- a/Passgen.pro +++ b/Passgen.pro @@ -26,11 +26,13 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp\ boss.cpp \ pcore.cpp \ - conmenu.cpp + conmenu.cpp \ + login.cpp HEADERS += boss.h \ pcore.h \ - conmenu.h + conmenu.h \ + login.h DISTFILES += \ README.md diff --git a/Passgen.pro.user b/Passgen.pro.user index afd529b..6c87fff 100644 --- a/Passgen.pro.user +++ b/Passgen.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -54,7 +54,9 @@ ProjectExplorer.Project.PluginSettings - + + + ProjectExplorer.Project.Target.0 @@ -62,7 +64,7 @@ Desktop Qt 5.7.1 MSVC2015_64bit Desktop Qt 5.7.1 MSVC2015_64bit qt.57.win64_msvc2015_64_kit - 1 + 0 0 0 diff --git a/conmenu.cpp b/conmenu.cpp index 8b06a33..7a4743e 100644 --- a/conmenu.cpp +++ b/conmenu.cpp @@ -1,4 +1,5 @@ #include "conmenu.h" +#include "login.h" #include #include #include @@ -21,6 +22,9 @@ conmenu::conmenu() core->addPass(tr("domain"),tr("lUserName"),tr("infa(url, path, other desc)"),tr("pass(2r3tgwe454hb3f4)"));//временая костыля //инициализация класса входа и отображения окна + logcore = new login(); + //login.createLogIn(); + logcore->createLogIn(); boss->addLayout(cont); boss->addStretch(); diff --git a/conmenu.h b/conmenu.h index 11d9655..ef86a8f 100644 --- a/conmenu.h +++ b/conmenu.h @@ -7,6 +7,7 @@ class QBoxLayout; class QHBoxLayout; +class login; class conmenu : public QDialog { @@ -15,6 +16,8 @@ class conmenu : public QDialog public: conmenu(); ~conmenu(); +private: + login *logcore; protected: PCore *core; QHBoxLayout *cont; diff --git a/login.cpp b/login.cpp new file mode 100644 index 0000000..6a4c357 --- /dev/null +++ b/login.cpp @@ -0,0 +1,94 @@ +#include "login.h" +#include +#include +#include +#include +#include + +login::login() +{ + +} + +login::~login() +{ + +} + +void login::createLogIn() +{ + lform = new QWidget(this); + lform->setMinimumHeight(470); + + QHBoxLayout *bb = new QHBoxLayout(lform); + bb->setMargin(0); + bb->addStretch();//left padding + + QWidget *form = new QWidget(lform); + + QVBoxLayout *linesl = new QVBoxLayout(form); + linesl->setMargin(0); + linesl->addStretch();//upper padding + + QLabel *llogin = new QLabel("Username:", form);//login + linesl->addWidget(llogin); + QLineEdit *elogin = new QLineEdit(form); + linesl->addWidget(elogin); + + QLabel *lpas = new QLabel("Password:", form); + linesl->addWidget(lpas); + QLineEdit *epas = new QLineEdit(form); + epas->setEchoMode(QLineEdit::Password); + linesl->addWidget(epas); + + linesl->addSpacing(20); + + QHBoxLayout *fcontr = new QHBoxLayout(form); + fcontr->addStretch(); + QVBoxLayout *lr = new QVBoxLayout(form); + QPushButton *blogin = new QPushButton("LogIn", form); + blogin->setCursor(Qt::PointingHandCursor); + blogin->setStyleSheet("QPushButton{" + "border: 1px solid #000; height: 30px; width: 70px;" + "}" + "QPushButton:hover{" + "border: 1px solid #0000aa;" + "}"); + connect(blogin, SIGNAL(clicked(bool)), this, SLOT(slogin())); + lr->addWidget(blogin); + + QPushButton *lreg = new QPushButton("New account", form); + lreg->setCursor(Qt::PointingHandCursor); + lreg->setStyleSheet("QPushButton{" + "text-decoration: underline;" + "border: none;" + "}" + "QPushButton:hover{" + "color: #0000aa;" + "}"); + connect(lreg, SIGNAL(clicked(bool)), this, SLOT(newacc())); + lr->addWidget(lreg); + + fcontr->addLayout(lr); + fcontr->addStretch(); + linesl->addLayout(fcontr); + + linesl->addStretch();//bottom padding + + form->setLayout(linesl); + bb->addWidget(form); + + bb->addStretch();//right padding + lform->setLayout(bb); + cont->addWidget(lform); +} + +void login::slogin() +{ + qDebug()<<"login"; +} + +void login::newacc() +{ + qDebug()<<"registration"; +} diff --git a/login.h b/login.h new file mode 100644 index 0000000..10030a8 --- /dev/null +++ b/login.h @@ -0,0 +1,20 @@ +#ifndef LOGIN_H +#define LOGIN_H + +#include "conmenu.h" + + +class login : public conmenu +{ +public: + login(); + ~login(); + void createLogIn(); +private: + QWidget *lform; +private slots: + void slogin(); + void newacc(); +}; + +#endif // LOGIN_H