From d1662f12fbcc29e8f1253d03f09476624f907fe7 Mon Sep 17 00:00:00 2001 From: amazing-username Date: Thu, 8 Mar 2018 15:46:21 -0600 Subject: [PATCH] Continue working on requesting the user for a filename for a password --- MainWindow.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++++ MainWindow.h | 5 +++++ Password.h | 1 - SaveFile.cpp | 2 +- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 1667be0..69a4d68 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -15,6 +15,7 @@ MainWindow::MainWindow() QWidget* w = 0; ph = unique_ptr{new PasswordManagementWindow}; kh = unique_ptr{new KeyManagementWindow{w, mw, ph.get()}}; + sf = unique_ptr{new SaveFile}; setupMainWindow(); } @@ -91,17 +92,60 @@ void MainWindow::connections() QObject::connect(actionButton.get(), SIGNAL(clicked()), this, SLOT(encryptPassword())); QObject::connect(textForCryption.get(), SIGNAL(textChanged()), this, SLOT(activateButton())); } +void MainWindow::switchControlEnabling() +{ + if (controlsEnabled) + { + switchControls(!controlsEnabled); + controlsEnabled = false; + } + else + { + switchControls(!controlsEnabled); + controlsEnabled = true; + } +} +void MainWindow::switchControls(const bool enabled) +{ + textForCryption.get()->setEnabled(enabled); + selectionBox.get()->setEnabled(enabled); + actionButton.get()->setEnabled(enabled); + passwordManage.get()->setEnabled(enabled); +} +void MainWindow::requestFilename() +{ + std::cout<<"Start"<show(); + SaveFile* sfo = new SaveFile{}; + sfo->show(); + //sfo->quit(); + std::cout<<"End"<toPlainText()}, keyForEncryption{selectionBox.get()->currentText()}; auto passwordToEncryptString = passwordToEncrypt.toStdString(), keyForEncryptionString = FolderStructure::keyDirectory+keyForEncryption.toStdString(); + std::cout<<"Generated filename that contains encrypted password: "< pass{}; Key<> k; @@ -111,6 +155,7 @@ void MainWindow::encryptPassword() Encryption ec2{pass, k}; std::cout<<"Encrypted"<populatePass(); + */ } void MainWindow::keyManagementWindow() { kh.get()->show(); } void MainWindow::passwordManageWindow() { ph.get()->show(); } diff --git a/MainWindow.h b/MainWindow.h index 3967dc0..d3308da 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -37,6 +37,9 @@ private: void setupContentOfComboBox(); void createMenus(); void connections(); + void switchControlEnabling(); + void switchControls(const bool); + void requestFilename(); unique_ptr buttonLayout; @@ -55,7 +58,9 @@ private: unique_ptr kh; unique_ptr ph; + unique_ptr sf; string grabCryptionText(); + bool controlsEnabled{true}; }; #endif diff --git a/Password.h b/Password.h index 85cd4da..4b30557 100644 --- a/Password.h +++ b/Password.h @@ -83,5 +83,4 @@ bool Password::repetitive() } return false; } - #endif diff --git a/SaveFile.cpp b/SaveFile.cpp index 7f233e9..deb9c67 100644 --- a/SaveFile.cpp +++ b/SaveFile.cpp @@ -34,5 +34,5 @@ void SaveFile::connections() } void SaveFile::saveFileAs() { - + this->hide(); }