From 96326a8a28c5070fe0fb441f3f8a6dbc5fecf851 Mon Sep 17 00:00:00 2001
From: Daniil Neizvestniy <danylo.nevidomiy@yandex.ru>
Date: Thu, 6 Jan 2022 18:12:38 +0300
Subject: [PATCH] Anastasia's card ui fully merge

---
 PasswordManager/mainwindow.cpp | 15 ++++++++++++++-
 PasswordManager/mainwindow.h   |  4 ++--
 PasswordManager/mainwindow.ui  |  8 ++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/PasswordManager/mainwindow.cpp b/PasswordManager/mainwindow.cpp
index 7ae0494..30e63ab 100644
--- a/PasswordManager/mainwindow.cpp
+++ b/PasswordManager/mainwindow.cpp
@@ -375,7 +375,7 @@ void MainWindow::on_pushButton_4_clicked()
     ui->lineEdit_password->setText(password);
     ui->lineEdit_url->setText(r->getURL());
     ui->lineEdit_note->setText(r->getNote());
-    ui->stackedWidget->setCurrentIndex(2);
+    ui->stackedWidget->setCurrentIndex(3);
 
 }
 
@@ -397,3 +397,16 @@ void MainWindow::on_pushButton_13_clicked()
     std::cout << "addc" << std::endl;
     addc.show();
 }
+
+
+void MainWindow::on_PW_Button_clicked()
+{
+    ui->stackedWidget->setCurrentIndex(0);
+}
+
+
+void MainWindow::on_CardButton_clicked()
+{
+    ui->stackedWidget->setCurrentIndex(1);
+}
+
diff --git a/PasswordManager/mainwindow.h b/PasswordManager/mainwindow.h
index 93a3889..5aef2f0 100644
--- a/PasswordManager/mainwindow.h
+++ b/PasswordManager/mainwindow.h
@@ -93,9 +93,9 @@ private slots:
 //    void on_editSaveButton_clicked();
     void on_pushButton_4_clicked();
     void on_pushButton_6_clicked();
-    void on_pushButton_3_clicked();
-    void on_addButton_3_clicked();
     void on_addCard_clicked();
     void on_pushButton_13_clicked();
+    void on_PW_Button_clicked();
+    void on_CardButton_clicked();
 };
 #endif // MAINWINDOW_H
diff --git a/PasswordManager/mainwindow.ui b/PasswordManager/mainwindow.ui
index c86a25e..3ac9674 100644
--- a/PasswordManager/mainwindow.ui
+++ b/PasswordManager/mainwindow.ui
@@ -31,7 +31,7 @@
      <bool>false</bool>
     </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>0</number>
     </property>
     <widget class="QWidget" name="page">
      <widget class="QTableView" name="tableViewRecords">
@@ -99,7 +99,7 @@
        </property>
       </widget>
      </widget>
-     <widget class="QPushButton" name="pushButton_2">
+     <widget class="QPushButton" name="CardButton">
       <property name="geometry">
        <rect>
         <x>700</x>
@@ -179,7 +179,7 @@
        </property>
       </widget>
      </widget>
-     <widget class="QPushButton" name="pushButton_3">
+     <widget class="QPushButton" name="PW_Button">
       <property name="geometry">
        <rect>
         <x>700</x>
@@ -766,7 +766,7 @@
      <x>0</x>
      <y>0</y>
      <width>804</width>
-     <height>22</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu">