Merge finished

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;

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()
+{
+
+}
+
+
+

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();