Checkpoint before Anastasia`s merge
This commit is contained in:
parent
58d04899a0
commit
faaf43066e
@ -26,6 +26,9 @@ set(PROJECT_SOURCES
|
|||||||
record.cpp
|
record.cpp
|
||||||
cryptographer.h
|
cryptographer.h
|
||||||
cryptographer.cpp
|
cryptographer.cpp
|
||||||
|
# logindialog.cpp
|
||||||
|
# logindialog.h
|
||||||
|
window.ui
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||||
|
|||||||
@ -2,6 +2,12 @@
|
|||||||
#define CRYPTOGRAPHER_H
|
#define CRYPTOGRAPHER_H
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
#include <crypto++/aes.h>
|
||||||
|
#include <crypto++/modes.h>
|
||||||
|
#include <crypto++/filters.h>
|
||||||
|
#include <crypto++/hex.h>
|
||||||
|
#include <crypto++/sha.h>
|
||||||
|
#include <crypto++/md5.h>
|
||||||
|
|
||||||
|
|
||||||
class Cryptographer
|
class Cryptographer
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
#include <QStackedWidget>
|
||||||
|
|
||||||
const QString MainWindow::fileDialogFilterString = tr("SQLite Database Files (*.sqlite3 *.sqlite *.db *.db3 *.sl3 *.s3db *.sdb *.sqlite2 *.db2 *.sl2 *.s2db)");
|
const QString MainWindow::fileDialogFilterString = tr("SQLite Database Files (*.sqlite3 *.sqlite *.db *.db3 *.sl3 *.s3db *.sdb *.sqlite2 *.db2 *.sl2 *.s2db)");
|
||||||
|
|
||||||
@ -15,6 +16,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
, ui(new Ui::MainWindow)
|
, ui(new Ui::MainWindow)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
QStackedWidget *stackedWidget = new QStackedWidget(this);
|
||||||
|
// stackedWidget->addWidget(someWidget1);
|
||||||
manager = new Manager();
|
manager = new Manager();
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -46,6 +49,14 @@ void MainWindow::on_addButton_clicked()
|
|||||||
manager->putRecord(record);
|
manager->putRecord(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::on_editButton_clicked(){
|
||||||
|
std::cout << "edit" << std::endl;
|
||||||
|
QWidget *widget = new QWidget;
|
||||||
|
// Ui::MainWindow ui;
|
||||||
|
// ui.setupUi(widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
|
|||||||
@ -2,6 +2,8 @@
|
|||||||
#define MAINWINDOW_H
|
#define MAINWINDOW_H
|
||||||
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
#include <QStackedWidget>
|
||||||
|
|
||||||
#include "manager.h"
|
#include "manager.h"
|
||||||
|
|
||||||
|
|
||||||
@ -22,6 +24,8 @@ public:
|
|||||||
private:
|
private:
|
||||||
Manager* manager;
|
Manager* manager;
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
|
Ui::MainWindow *uui;
|
||||||
|
// QStackedWidget stackedWidget;
|
||||||
static const QString fileDialogFilterString;
|
static const QString fileDialogFilterString;
|
||||||
|
|
||||||
void initAppWithDatabaseFile(const QString &dbFileFullPath);
|
void initAppWithDatabaseFile(const QString &dbFileFullPath);
|
||||||
@ -31,6 +35,8 @@ private slots:
|
|||||||
|
|
||||||
void on_actionOpenDatabase_triggered();
|
void on_actionOpenDatabase_triggered();
|
||||||
void on_addButton_clicked();
|
void on_addButton_clicked();
|
||||||
|
void on_editButton_clicked();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user