FixedAdding #1

Merged
danylo_nevidomiy merged 33 commits from FixedAdding into main 2025-02-12 21:46:46 +03:00
16 changed files with 463 additions and 247 deletions
Showing only changes of commit 6a5335c38f - Show all commits

View File

@ -16,60 +16,63 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR}Sql REQUIRED)
set(PROJECT_SOURCES
main.cpp
mainwindow.cpp
mainwindow.h
mainwindow.ui
record.h
record.cpp
cryptographer.h
cryptographer.cpp
# logindialog.cpp
# logindialog.h
#window.ui
genpass.cpp
genpass.h
genpass.ui
adddialog.cpp
adddialog.h
adddialog.ui
del.cpp
del.h
del.ui
main.cpp
mainwindow.cpp
mainwindow.h
mainwindow.ui
record.h
record.cpp
cryptographer.h
cryptographer.cpp
# logindialog.cpp
# logindialog.h
#window.ui
genpass.cpp
genpass.h
genpass.ui
adddialog.cpp
adddialog.h
adddialog.ui
del.cpp
del.h
del.ui
about.cpp
about.h
about.ui
hello.cpp
hello.h
hello.ui
addc.h
addc.cpp
addc.ui
card.h
card.cpp
)
about.cpp
about.h
about.ui
hello.cpp
hello.h
hello.ui
addc.h
addc.cpp
addc.ui
card.h
card.cpp
deletecarddialog.h
deletecarddialog.cpp
deletecarddialog.ui
)
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(PasswordManager
MANUAL_FINALIZATION
${PROJECT_SOURCES}
)
# Define target properties for Android with Qt 6 as:
# set_property(TARGET PasswordManager APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
)
# Define target properties for Android with Qt 6 as:
# set_property(TARGET PasswordManager APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
else()
if(ANDROID)
add_library(PasswordManager SHARED
${PROJECT_SOURCES}
)
# Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
)
# Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else()
add_executable(PasswordManager
${PROJECT_SOURCES}
)
)
endif()
endif()
@ -79,7 +82,7 @@ set_target_properties(PasswordManager PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
)
)
if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(PasswordManager)

View File

@ -9,7 +9,8 @@ AddDialog::AddDialog(QWidget *parent) :
ui(new Ui::AddDialog)
{
ui->setupUi(this);
setWindowTitle("New record");
setWindowTitle("Новая запись");
ui->pushButton->setIcon(QIcon("/home/daniil/passmanOLD/password_manager/PasswordManager/resource/refresh-arrow_icon-icons.com_73442.png"));
}
AddDialog::~AddDialog()

View File

@ -17,7 +17,7 @@
<property name="geometry">
<rect>
<x>220</x>
<y>280</y>
<y>320</y>
<width>89</width>
<height>25</height>
</rect>
@ -30,14 +30,21 @@
<property name="geometry">
<rect>
<x>30</x>
<y>30</y>
<y>50</y>
<width>461</width>
<height>241</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="4" column="1">
<widget class="QLineEdit" name="createURL"/>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Имя пользователя</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="createPassword"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
@ -46,19 +53,8 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="nameLine"/>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>../../QtFiles/resurse/edit_copy_icon_124983.png</normaloff>../../QtFiles/resurse/edit_copy_icon_124983.png</iconset>
</property>
</widget>
<item row="1" column="1">
<widget class="QLineEdit" name="usernameLine"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
@ -67,27 +63,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Имя пользователя</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Название</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Примечания</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
@ -95,8 +70,28 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="createPassword"/>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Название</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="createURL"/>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="nameLine"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Примечания</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="noteLine"/>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton">
@ -109,14 +104,21 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="usernameLine"/>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="noteLine"/>
</item>
</layout>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>220</x>
<y>20</y>
<width>121</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Новая запись</string>
</property>
</widget>
</widget>
<resources/>
<connections/>

View File

@ -7,7 +7,7 @@ Del::Del(QWidget *parent) :
ui(new Ui::Del)
{
ui->setupUi(this);
setWindowTitle("Delete?");
setWindowTitle("Подтверждение удаления");
}
Del::~Del()

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<height>180</height>
</rect>
</property>
<property name="windowTitle">
@ -17,7 +17,7 @@
<property name="geometry">
<rect>
<x>240</x>
<y>230</y>
<y>130</y>
<width>89</width>
<height>25</height>
</rect>
@ -30,7 +30,7 @@
<property name="geometry">
<rect>
<x>70</x>
<y>230</y>
<y>130</y>
<width>89</width>
<height>25</height>
</rect>
@ -43,14 +43,13 @@
<property name="geometry">
<rect>
<x>40</x>
<y>40</y>
<y>10</y>
<width>371</width>
<height>111</height>
</rect>
</property>
<property name="text">
<string>Вы уверены, что хотите удалить эту запись?
P.S. Пути назад не будет.</string>
<string>Вы уверены, что хотите удалить эту запись?</string>
</property>
</widget>
</widget>

View File

@ -0,0 +1,20 @@
#include "deletecarddialog.h"
#include "ui_deletecarddialog.h"
DeleteCardDialog::DeleteCardDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::DeleteCardDialog)
{
ui->setupUi(this);
}
DeleteCardDialog::~DeleteCardDialog()
{
delete ui;
}
void DeleteCardDialog::on_buttonBox_accepted()
{
emit trueDelete();
}

View File

@ -0,0 +1,26 @@
#ifndef DELETECARDDIALOG_H
#define DELETECARDDIALOG_H
#include <QDialog>
namespace Ui {
class DeleteCardDialog;
}
class DeleteCardDialog : public QDialog
{
Q_OBJECT
public:
explicit DeleteCardDialog(QWidget *parent = nullptr);
~DeleteCardDialog();
signals:
void trueDelete();
private slots:
void on_buttonBox_accepted();
private:
Ui::DeleteCardDialog *ui;
};
#endif // DELETECARDDIALOG_H

View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DeleteCardDialog</class>
<widget class="QDialog" name="DeleteCardDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>180</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>30</x>
<y>110</y>
<width>341</width>
<height>61</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>30</x>
<y>30</y>
<width>371</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string>Вы уверены, что хотите удалить данные этой карты?</string>
</property>
</widget>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>DeleteCardDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>DeleteCardDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

View File

@ -14,9 +14,12 @@ GenPass::GenPass(QWidget *parent) :
ui(new Ui::GenPass)
{
ui->setupUi(this);
setWindowTitle("Generating new password");
setWindowTitle("Генерация пароля");
ui->lineEdit->setText("здесь будет пароль");
ui->lineEdit->setStyleSheet("color: blue;");
ui->pushButton_3->setIcon(QIcon("/home/daniil/passman1/password_manager/PasswordManager/resource/view_show_icon_124811.png"));
ui->ReFresher->setIcon(QIcon("/home/daniil/passmanOLD/password_manager/PasswordManager/resource/refresh-arrow_icon-icons.com_73442.png"));
ui->Copy->setIcon(QIcon("/home/daniil/passmanOLD/password_manager/PasswordManager/resource/edit_copy_icon_124983.png"));
}

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>495</width>
<height>392</height>
<width>420</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
@ -16,21 +16,21 @@
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>110</x>
<y>70</y>
<x>50</x>
<y>40</y>
<width>67</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>пароль</string>
<string>Пароль</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit">
<property name="geometry">
<rect>
<x>110</x>
<y>100</y>
<x>50</x>
<y>70</y>
<width>191</width>
<height>25</height>
</rect>
@ -42,21 +42,21 @@
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>110</x>
<y>190</y>
<x>50</x>
<y>120</y>
<width>67</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>длина</string>
<string>Длина</string>
</property>
</widget>
<widget class="QLineEdit" name="SizeL">
<property name="geometry">
<rect>
<x>190</x>
<y>190</y>
<x>130</x>
<y>120</y>
<width>31</width>
<height>25</height>
</rect>
@ -68,21 +68,21 @@
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>110</x>
<y>240</y>
<x>50</x>
<y>170</y>
<width>67</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>символы</string>
<string>Символы</string>
</property>
</widget>
<widget class="QCheckBox" name="BL">
<property name="geometry">
<rect>
<x>190</x>
<y>240</y>
<x>130</x>
<y>170</y>
<width>51</width>
<height>23</height>
</rect>
@ -94,8 +94,8 @@
<widget class="QCheckBox" name="SL">
<property name="geometry">
<rect>
<x>250</x>
<y>240</y>
<x>190</x>
<y>170</y>
<width>51</width>
<height>23</height>
</rect>
@ -107,8 +107,8 @@
<widget class="QCheckBox" name="N">
<property name="geometry">
<rect>
<x>310</x>
<y>240</y>
<x>250</x>
<y>170</y>
<width>51</width>
<height>23</height>
</rect>
@ -120,8 +120,8 @@
<widget class="QCheckBox" name="S">
<property name="geometry">
<rect>
<x>360</x>
<y>240</y>
<x>300</x>
<y>170</y>
<width>51</width>
<height>23</height>
</rect>
@ -133,8 +133,8 @@
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>320</x>
<y>300</y>
<x>260</x>
<y>230</y>
<width>61</width>
<height>25</height>
</rect>
@ -146,8 +146,8 @@
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>170</x>
<y>300</y>
<x>110</x>
<y>230</y>
<width>89</width>
<height>25</height>
</rect>
@ -159,8 +159,8 @@
<widget class="QPushButton" name="pushButton_3">
<property name="geometry">
<rect>
<x>300</x>
<y>100</y>
<x>240</x>
<y>70</y>
<width>31</width>
<height>25</height>
</rect>
@ -179,8 +179,8 @@
<widget class="QPushButton" name="ReFresher">
<property name="geometry">
<rect>
<x>350</x>
<y>100</y>
<x>290</x>
<y>70</y>
<width>31</width>
<height>25</height>
</rect>
@ -193,8 +193,8 @@
<widget class="QPushButton" name="Copy">
<property name="geometry">
<rect>
<x>400</x>
<y>100</y>
<x>340</x>
<y>70</y>
<width>31</width>
<height>25</height>
</rect>

View File

@ -13,9 +13,12 @@ Hello::Hello(QWidget *parent) :
ui(new Ui::Hello)
{
ui->setupUi(this);
// manager = new Manager();
// dial.manager = manager;
// manager = new Manager();
// dial.manager = manager;
this->setFixedSize(422,300);
setWindowTitle("Вход");
ui->passwordLine->setEchoMode(QLineEdit::Password);
ui->echoModButton->setIcon(QIcon("/home/daniil/passman1/password_manager/PasswordManager/resource/view_show_icon_124811.png"));
}
@ -39,7 +42,7 @@ void Hello::on_okButton_clicked()
{
QString dbLogin;
if(!ui->lineEdit->text().isEmpty()){
dbLogin = ui->lineEdit->text();
dbLogin = ui->lineEdit->text();
}
else
{
@ -67,7 +70,7 @@ void Hello::on_createOkButton_clicked()
qDebug() << "creating db";
QString dbLogin;
if(!ui->lineEdit_3->text().isEmpty()){
dbLogin = ui->lineEdit_3->text();
dbLogin = ui->lineEdit_3->text();
}
else
{
@ -77,13 +80,26 @@ void Hello::on_createOkButton_clicked()
{
if(mainwindow.initAppWithDatabaseFile(dbLogin, ui->newPasswordLine1->text(), true))
{
mainwindow.show();
QWidget::close() ;
mainwindow.show();
QWidget::close() ;
}
}else
{
// std::cout << "passwords not equals : " << ui->newPasswordLine1->text().toStdString() << "!=" << ui->newPasswordLine2->text().toStdString() << std::endl;
// std::cout << "passwords not equals : " << ui->newPasswordLine1->text().toStdString() << "!=" << ui->newPasswordLine2->text().toStdString() << std::endl;
}
}
void Hello::on_echoModButton_clicked()
{
if( ui->passwordLine->echoMode()==QLineEdit::Password){
ui->passwordLine->setEchoMode(QLineEdit::Normal);
ui->echoModButton->setIcon(QIcon("/home/daniil/passman1/password_manager/PasswordManager/resource/view_hide_icon_124813.png"));
}
else if(ui->passwordLine->echoMode() == QLineEdit::Normal){
ui->passwordLine->setEchoMode(QLineEdit::Password);
ui->echoModButton->setIcon(QIcon("/home/daniil/passman1/password_manager/PasswordManager/resource/view_show_icon_124811.png"));
}
}

View File

@ -27,6 +27,8 @@ private slots:
void on_createOkButton_clicked();
void on_echoModButton_clicked();
private:
Ui::Hello *ui;
MainWindow mainwindow;

View File

@ -75,7 +75,7 @@
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>150</x>
<x>170</x>
<y>30</y>
<width>67</width>
<height>17</height>
@ -89,7 +89,7 @@
<property name="geometry">
<rect>
<x>220</x>
<y>210</y>
<y>220</y>
<width>141</width>
<height>25</height>
</rect>
@ -102,7 +102,7 @@
<property name="geometry">
<rect>
<x>40</x>
<y>210</y>
<y>220</y>
<width>151</width>
<height>25</height>
</rect>
@ -111,12 +111,25 @@
<string>Создать</string>
</property>
</widget>
<widget class="QPushButton" name="echoModButton">
<property name="geometry">
<rect>
<x>340</x>
<y>140</y>
<width>25</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="page_2">
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>130</x>
<x>150</x>
<y>30</y>
<width>121</width>
<height>17</height>
@ -198,9 +211,9 @@
<widget class="QPushButton" name="createOkButton">
<property name="geometry">
<rect>
<x>230</x>
<x>220</x>
<y>220</y>
<width>121</width>
<width>141</width>
<height>25</height>
</rect>
</property>
@ -211,9 +224,9 @@
<widget class="QPushButton" name="pushButton_6">
<property name="geometry">
<rect>
<x>70</x>
<x>40</x>
<y>220</y>
<width>121</width>
<width>151</width>
<height>25</height>
</rect>
</property>

View File

@ -19,12 +19,15 @@ MainWindow::MainWindow(QWidget *parent)
{
ui->setupUi(this);
this->setFixedSize(800,600);
setWindowTitle("Менеджер паролей");
// manager = new Manager();
dial = new AddDialog();
del = new Del();
addc = new AddC();
deleteCardDial = new DeleteCardDialog();
connect(dial,SIGNAL(sendText(Record*)),this,SLOT(addRecordSlot(Record*)));
connect(del, SIGNAL(trueDelete()), this, SLOT(acceptDelete()));
connect(del, SIGNAL(trueDelete()), this, SLOT(acceptRecordDelete()));
connect(deleteCardDial, SIGNAL(trueDelete()), this, SLOT(acceptCardDelete()));
connect(addc, SIGNAL(sendCard(Card*)), this, SLOT(addCardSlot(Card*)));
crypto = new SimpleCrypt(Q_UINT64_C(0x0c2ad4a4acb9f023));
// createModel();
@ -51,12 +54,12 @@ void MainWindow::createRecordsModel()
ui->tableViewRecords->setModel(recordsModel); // соединение модели и ее табличного представления в форме.
recordsModel->setHeaderData(0, Qt::Horizontal, tr("number"));
recordsModel->setHeaderData(1, Qt::Horizontal, tr("name"));
recordsModel->setHeaderData(2, Qt::Horizontal, tr("username"));
recordsModel->setHeaderData(3, Qt::Horizontal, tr("password"));
recordsModel->setHeaderData(1, Qt::Horizontal, tr("Название"));
recordsModel->setHeaderData(2, Qt::Horizontal, tr("Имя"));
recordsModel->setHeaderData(3, Qt::Horizontal, tr("Пароль"));
recordsModel->setHeaderData(4, Qt::Horizontal, tr("URL"));
recordsModel->setHeaderData(5, Qt::Horizontal, tr("note"));
recordsModel->setHeaderData(6, Qt::Horizontal, tr("time"));
recordsModel->setHeaderData(5, Qt::Horizontal, tr("Заметка"));
recordsModel->setHeaderData(6, Qt::Horizontal, tr("Дата"));
recordsModel->setHeaderData(7, Qt::Horizontal, tr("status"));
ui->tableViewRecords->horizontalHeader()->hideSection(0);
ui->tableViewRecords->horizontalHeader()->hideSection(3);
@ -338,15 +341,15 @@ void MainWindow::createCardsModel()
ui->tableViewCards->setModel(cardsModel); // соединение модели и ее табличного представления в форме.
cardsModel->setHeaderData(0, Qt::Horizontal, tr("id"));
cardsModel->setHeaderData(1, Qt::Horizontal, tr("title"));
cardsModel->setHeaderData(2, Qt::Horizontal, tr("number"));
cardsModel->setHeaderData(3, Qt::Horizontal, tr("name"));
cardsModel->setHeaderData(4, Qt::Horizontal, tr("month"));
cardsModel->setHeaderData(5, Qt::Horizontal, tr("year"));
cardsModel->setHeaderData(1, Qt::Horizontal, tr("Название"));
cardsModel->setHeaderData(2, Qt::Horizontal, tr("Номер"));
cardsModel->setHeaderData(3, Qt::Horizontal, tr("Имя"));
cardsModel->setHeaderData(4, Qt::Horizontal, tr("Месяц"));
cardsModel->setHeaderData(5, Qt::Horizontal, tr("Год"));
cardsModel->setHeaderData(6, Qt::Horizontal, tr("CVV"));
cardsModel->setHeaderData(7, Qt::Horizontal, tr("PIN"));
cardsModel->setHeaderData(8, Qt::Horizontal, tr("note"));
cardsModel->setHeaderData(9, Qt::Horizontal, tr("time"));
cardsModel->setHeaderData(8, Qt::Horizontal, tr("Заметка"));
cardsModel->setHeaderData(9, Qt::Horizontal, tr("Дата"));
cardsModel->setHeaderData(10, Qt::Horizontal, tr("status"));
ui->tableViewCards->horizontalHeader()->hideSection(0);
ui->tableViewCards->horizontalHeader()->hideSection(2);
@ -559,7 +562,7 @@ void MainWindow::on_deleteButton_clicked()
void MainWindow::on_pushButton_5_clicked()
{
ui->stackedWidget->setCurrentIndex(0);
ui->stackedWidget->setCurrentIndex(2);
}
@ -657,11 +660,15 @@ void MainWindow::addCardSlot(Card *r)
// model->select();
//}
void MainWindow::acceptDelete()
void MainWindow::acceptRecordDelete()
{
deleteRecord();
}
void MainWindow::acceptCardDelete()
{
deleteCard();
}
//void MainWindow::on_editSaveButton_clicked()
//{
@ -768,7 +775,8 @@ void MainWindow::on_pushButton_12_clicked()
void MainWindow::on_deleteButton_3_clicked()
{
deleteCard();
deleteCardDial->show();
//deleteCard();
}

View File

@ -13,6 +13,7 @@
#include"addc.h"
#include"card.h"
#include"record.h"
#include"deletecarddialog.h"
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
@ -61,6 +62,7 @@ private:
QSqlTableModel *directoriesModel;
Del* del;
DeleteCardDialog* deleteCardDial;
// AddSt addst;
static const QString fileDialogFilterString;
static constexpr char* checkpoint = "checkpoint";
@ -92,7 +94,8 @@ private slots:
void addCardSlot(Card *r);
//слот принимающий текст из LineEdit
// void openDBSlot(QString path);
void acceptDelete();
void acceptRecordDelete();
void acceptCardDelete();
void on_pushButton_clicked();
// void on_pushButton_2_clicked();

View File

@ -38,13 +38,13 @@
<property name="geometry">
<rect>
<x>530</x>
<y>450</y>
<y>460</y>
<width>101</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Ок</string>
<string>Сохранить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_7">
@ -63,9 +63,9 @@
<widget class="QWidget" name="gridLayoutWidget_2">
<property name="geometry">
<rect>
<x>130</x>
<x>170</x>
<y>80</y>
<width>591</width>
<width>461</width>
<height>341</height>
</rect>
</property>
@ -125,14 +125,14 @@
<widget class="QLabel" name="label_record_editing">
<property name="geometry">
<rect>
<x>370</x>
<x>280</x>
<y>30</y>
<width>171</width>
<height>18</height>
<width>261</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Редактирование записи</string>
<string>Просмотр / редактирование записи</string>
</property>
</widget>
</widget>
@ -140,14 +140,14 @@
<widget class="QLabel" name="label_14">
<property name="geometry">
<rect>
<x>280</x>
<x>240</x>
<y>30</y>
<width>181</width>
<height>17</height>
<width>291</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Редактирование записи</string>
<string>Просмотр / Редактирование данных карты</string>
</property>
</widget>
<widget class="QListView" name="listView">
@ -163,9 +163,9 @@
<widget class="QLineEdit" name="NumberLine">
<property name="geometry">
<rect>
<x>102</x>
<x>90</x>
<y>170</y>
<width>261</width>
<width>271</width>
<height>25</height>
</rect>
</property>
@ -173,9 +173,9 @@
<widget class="QLineEdit" name="NameLine">
<property name="geometry">
<rect>
<x>110</x>
<x>90</x>
<y>280</y>
<width>113</width>
<width>131</width>
<height>25</height>
</rect>
</property>
@ -208,9 +208,9 @@
<widget class="QWidget" name="gridLayoutWidget_4">
<property name="geometry">
<rect>
<x>480</x>
<x>470</x>
<y>170</y>
<width>261</width>
<width>281</width>
<height>161</height>
</rect>
</property>
@ -251,7 +251,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>note</string>
<string>Примечание</string>
</property>
</widget>
</item>
@ -262,20 +262,20 @@
<rect>
<x>100</x>
<y>140</y>
<width>67</width>
<width>91</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Номер</string>
<string>Номер карты</string>
</property>
</widget>
<widget class="QLabel" name="label_27">
<property name="geometry">
<rect>
<x>270</x>
<x>280</x>
<y>280</y>
<width>41</width>
<width>31</width>
<height>31</height>
</rect>
</property>
@ -286,14 +286,14 @@
<widget class="QPushButton" name="cardEditOkButton">
<property name="geometry">
<rect>
<x>550</x>
<x>539</x>
<y>470</y>
<width>80</width>
<width>91</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>Ok</string>
<string>Сохранить</string>
</property>
</widget>
<widget class="QPushButton" name="cardEditCancelButton">
@ -306,7 +306,20 @@
</rect>
</property>
<property name="text">
<string>Cancel</string>
<string>Отмена</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>90</x>
<y>250</y>
<width>111</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>Имя держателя</string>
</property>
</widget>
</widget>
@ -324,14 +337,14 @@
<widget class="QPushButton" name="CardButton">
<property name="geometry">
<rect>
<x>470</x>
<x>440</x>
<y>0</y>
<width>51</width>
<height>31</height>
<width>110</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Card</string>
<string>Карты</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_7">
@ -339,8 +352,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>31</height>
<width>310</width>
<height>30</height>
</rect>
</property>
</widget>
@ -350,10 +363,10 @@
</property>
<property name="geometry">
<rect>
<x>-1</x>
<x>0</x>
<y>30</y>
<width>551</width>
<height>461</height>
<width>550</width>
<height>460</height>
</rect>
</property>
</widget>
@ -362,7 +375,7 @@
<rect>
<x>0</x>
<y>500</y>
<width>561</width>
<width>551</width>
<height>31</height>
</rect>
</property>
@ -374,12 +387,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>161</width>
<width>141</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Add</string>
<string>Добавить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_4">
@ -392,20 +405,33 @@
</rect>
</property>
<property name="text">
<string>Watch</string>
<string>Просмотреть</string>
</property>
</widget>
<widget class="QPushButton" name="deleteButton">
<property name="geometry">
<rect>
<x>160</x>
<x>140</x>
<y>0</y>
<width>241</width>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Delete</string>
<string>Удалить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_8">
<property name="geometry">
<rect>
<x>270</x>
<y>0</y>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Переместить</string>
</property>
</widget>
</widget>
@ -414,8 +440,8 @@
<rect>
<x>310</x>
<y>0</y>
<width>101</width>
<height>31</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="text">
@ -427,10 +453,10 @@
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>308</x>
<x>310</x>
<y>0</y>
<width>101</width>
<height>31</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="text">
@ -442,7 +468,7 @@
<rect>
<x>0</x>
<y>500</y>
<width>561</width>
<width>551</width>
<height>31</height>
</rect>
</property>
@ -454,38 +480,51 @@
<rect>
<x>0</x>
<y>0</y>
<width>151</width>
<width>141</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_12">
<property name="geometry">
<rect>
<x>390</x>
<y>0</y>
<width>161</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Edit</string>
<string>Добавить</string>
</property>
</widget>
<widget class="QPushButton" name="deleteButton_3">
<property name="geometry">
<rect>
<x>150</x>
<x>140</x>
<y>0</y>
<width>241</width>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Delete</string>
<string>Удалить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_9">
<property name="geometry">
<rect>
<x>270</x>
<y>0</y>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Переместить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_12">
<property name="geometry">
<rect>
<x>400</x>
<y>0</y>
<width>151</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Просмотреть</string>
</property>
</widget>
</widget>
@ -497,22 +536,22 @@
<rect>
<x>0</x>
<y>30</y>
<width>551</width>
<height>461</height>
<width>550</width>
<height>460</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="PW_Button">
<property name="geometry">
<rect>
<x>460</x>
<x>440</x>
<y>0</y>
<width>51</width>
<height>31</height>
<width>110</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>PW</string>
<string>Учётн.записи</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_6">
@ -520,8 +559,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>31</height>
<width>310</width>
<height>30</height>
</rect>
</property>
</widget>
@ -532,8 +571,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>201</width>
<height>491</height>
<width>200</width>
<height>490</height>
</rect>
</property>
</widget>
@ -559,7 +598,7 @@
</rect>
</property>
<property name="text">
<string>Add</string>
<string>Добавить</string>
</property>
</widget>
<widget class="QPushButton" name="deleteDirectoryButton">
@ -572,7 +611,7 @@
</rect>
</property>
<property name="text">
<string>Delete</string>
<string>Удалить</string>
</property>
</widget>
</widget>
@ -591,14 +630,14 @@
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>90</x>
<x>80</x>
<y>0</y>
<width>41</width>
<width>90</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>GP</string>
<string>Генерация</string>
</property>
<property name="icon">
<iconset>
@ -614,14 +653,14 @@
<widget class="QPushButton" name="pushButton_5">
<property name="geometry">
<rect>
<x>30</x>
<x>10</x>
<y>0</y>
<width>40</width>
<width>60</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>home</string>
<string>Домой</string>
</property>
<property name="icon">
<iconset>