From 17e8b48902e02974b96080ae3b1fc21afb6b8c61 Mon Sep 17 00:00:00 2001
From: Daniil <danylo.nevidomiy@ukr.net>
Date: Fri, 24 Dec 2021 16:58:36 +0300
Subject: [PATCH] Merge finished

---
 PasswordManager/genpass.cpp    |  3 +++
 PasswordManager/mainwindow.cpp | 17 +++++++++++++++++
 PasswordManager/manager.cpp    |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/PasswordManager/genpass.cpp b/PasswordManager/genpass.cpp
index 0b866e9..8404ba1 100644
--- a/PasswordManager/genpass.cpp
+++ b/PasswordManager/genpass.cpp
@@ -57,7 +57,10 @@ void GenPass::on_lineEdit_cursorPositionChanged(int arg1, int arg2)
 {
 
 }
+void GenPass::on_horizontalSlider_actionTriggered(int action)
+{
 
+}
 QString GenPass::NewRandPassword(){
    QString npasw;
     QVector<char> rands;
diff --git a/PasswordManager/mainwindow.cpp b/PasswordManager/mainwindow.cpp
index 6423a3b..85c81b9 100644
--- a/PasswordManager/mainwindow.cpp
+++ b/PasswordManager/mainwindow.cpp
@@ -125,3 +125,20 @@ void MainWindow::on_action_7_triggered()
 
 }
 
+
+void MainWindow::on_pushButton_2_clicked()
+{
+
+}
+void MainWindow::on_actionExit_triggered()
+{
+    QCoreApplication::quit();
+
+}
+void MainWindow::on_actionblakc_triggered()
+{
+
+}
+
+
+
diff --git a/PasswordManager/manager.cpp b/PasswordManager/manager.cpp
index a430f87..f0875a4 100644
--- a/PasswordManager/manager.cpp
+++ b/PasswordManager/manager.cpp
@@ -49,8 +49,8 @@ void Manager::deleteRecord()
 {
 //    if (ui->spinBoxID->text().isEmpty())
 //        return;
-
-    QString id = ui->spinBoxID->text();
+    QString id = "zzz";
+//    QString id = ui->spinBoxID->text();
 
     query->clear();