diff options
author | Ettore Dreucci <ettore.dreucci@gmail.com> | 2018-05-08 11:10:04 +0200 |
---|---|---|
committer | Ettore Dreucci <ettore.dreucci@gmail.com> | 2018-05-09 12:13:49 +0200 |
commit | 76de9091116b0e988f2dd826edcb7e85098938c6 (patch) | |
tree | d890032013f89bac41262c22679c8897bab7f78b | |
parent | cd10e786998907ab10006718c584105674a6c2d8 (diff) |
OTP button calls external pass otp -c
Signed-off-by: Ettore Dreucci <ettore.dreucci@gmail.com>
-rw-r--r-- | src/imitatepass.cpp | 2 | ||||
-rw-r--r-- | src/imitatepass.h | 2 | ||||
-rw-r--r-- | src/mainwindow.cpp | 11 | ||||
-rw-r--r-- | src/mainwindow.h | 4 | ||||
-rw-r--r-- | src/mainwindow.ui | 4 | ||||
-rw-r--r-- | src/pass.cpp | 2 | ||||
-rw-r--r-- | src/pass.h | 3 | ||||
-rw-r--r-- | src/realpass.cpp | 2 | ||||
-rw-r--r-- | src/realpass.h | 2 |
9 files changed, 17 insertions, 15 deletions
diff --git a/src/imitatepass.cpp b/src/imitatepass.cpp index 883b12a2..ec7bfe06 100644 --- a/src/imitatepass.cpp +++ b/src/imitatepass.cpp @@ -50,7 +50,7 @@ void ImitatePass::Show(QString file) { executeGpg(PASS_SHOW, args); } -void ImitatePass::OTPShow(QString file) { +void ImitatePass::OtpShow(QString file) { } diff --git a/src/imitatepass.h b/src/imitatepass.h index e33c4996..7247739a 100644 --- a/src/imitatepass.h +++ b/src/imitatepass.h @@ -51,7 +51,7 @@ public: virtual void GitPull_b() Q_DECL_OVERRIDE; virtual void GitPush() Q_DECL_OVERRIDE; virtual void Show(QString file) Q_DECL_OVERRIDE; - virtual void OTPShow(QString file) Q_DECL_OVERRIDE; + virtual void OtpShow(QString file) Q_DECL_OVERRIDE; virtual void Insert(QString file, QString value, bool overwrite = false) Q_DECL_OVERRIDE; virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ffe85b9e..123c164d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -105,7 +105,7 @@ void MainWindow::initToolBarButtons() { connect(ui->actionConfig, SIGNAL(triggered()), this, SLOT(onConfig())); //if (check if pass otp is installed) - connect(ui->actionOTP, SIGNAL(triggered()), this, SLOT(onOTP())); + connect(ui->actionOtp, SIGNAL(triggered()), this, SLOT(onOtp())); ui->actionAddPassword->setIcon( QIcon::fromTheme("document-new", QIcon(":/icons/document-new.svg"))); @@ -921,10 +921,9 @@ void MainWindow::onDelete() { /** * @brief MainWindow::onOTP try and generate (selected) OTP code. */ -void MainWindow::onOTP() { +void MainWindow::onOtp() { QString file = getFile(ui->treeView->currentIndex(), true); - generateOTP(file); - QTextStream(stdout) << "OTP" << endl; + generateOtp(file); } /** @@ -1290,11 +1289,11 @@ void MainWindow::editPassword(const QString &file) { * @brief Mainwindow::generateOTP read OTP url and generate an OTP code * via pass otp, then copies the code to the clipboard. */ -void MainWindow::generateOTP(const QString &file) { +void MainWindow::generateOtp(const QString &file) { if (!file.isEmpty()) { if (QtPassSettings::isUseGit() && QtPassSettings::isAutoPull()) onUpdate(true); - QtPassSettings::getPass()->OTPShow(file); + QtPassSettings::getPass()->OtpShow(file); } } diff --git a/src/mainwindow.h b/src/mainwindow.h index db6152fb..ba9f21a3 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -63,7 +63,7 @@ private slots: void addFolder(); void onEdit(); void onDelete(); - void onOTP(); + void onOtp(); void onPush(); void onUpdate(bool block = false); void onUsers(); @@ -82,7 +82,7 @@ private slots: void showBrowserContextMenu(const QPoint &pos); void openFolder(); void editPassword(const QString &); - void generateOTP(const QString &); + void generateOtp(const QString &); void focusInput(); void copyTextToClipboard(const QString &text); void copyPasswordFromTreeview(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 3507b283..431fd94e 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -319,7 +319,7 @@ p, li { white-space: pre-wrap; } <addaction name="separator"/> <addaction name="actionEdit"/> <addaction name="actionDelete"/> - <addaction name="actionOTP"/> + <addaction name="actionOtp"/> <addaction name="separator"/> <addaction name="actionPush"/> <addaction name="actionUpdate"/> @@ -362,7 +362,7 @@ p, li { white-space: pre-wrap; } <string>Delete</string> </property> </action> - <action name="actionOTP"> + <action name="actionOtp"> <property name="text"> <string>OTP</string> </property> diff --git a/src/pass.cpp b/src/pass.cpp index 99216c54..2f261fba 100644 --- a/src/pass.cpp +++ b/src/pass.cpp @@ -181,6 +181,8 @@ void Pass::finished(int id, int exitCode, const QString &out, case PASS_SHOW: emit finishedShow(out); break; + case PASS_OTP_SHOW: + emit finishedOtpShow(out); case PASS_INSERT: emit finishedInsert(out, err); break; @@ -43,7 +43,7 @@ public: virtual void GitPull_b() = 0; virtual void GitPush() = 0; virtual void Show(QString file) = 0; - virtual void OTPShow(QString file) = 0; + virtual void OtpShow(QString file) = 0; virtual void Insert(QString file, QString value, bool force) = 0; virtual void Remove(QString file, bool isDir) = 0; virtual void Move(const QString srcDir, const QString dest, @@ -88,6 +88,7 @@ signals: void finishedGitPull(const QString &, const QString &); void finishedGitPush(const QString &, const QString &); void finishedShow(const QString &); + void finishedOtpShow(const QString &); void finishedInsert(const QString &, const QString &); void finishedRemove(const QString &, const QString &); void finishedInit(const QString &, const QString &); diff --git a/src/realpass.cpp b/src/realpass.cpp index 7446d73f..55d00993 100644 --- a/src/realpass.cpp +++ b/src/realpass.cpp @@ -44,7 +44,7 @@ void RealPass::Show(QString file) { executePass(PASS_SHOW, {"show", file}, "", true); } -void RealPass::OTPShow(QString file) { +void RealPass::OtpShow(QString file) { executePass(PASS_OTP_SHOW, {"otp", "-c", file}, "", true); } diff --git a/src/realpass.h b/src/realpass.h index 76dc7d2e..53d01ee4 100644 --- a/src/realpass.h +++ b/src/realpass.h @@ -20,7 +20,7 @@ public: virtual void GitPull_b() Q_DECL_OVERRIDE; virtual void GitPush() Q_DECL_OVERRIDE; virtual void Show(QString file) Q_DECL_OVERRIDE; - virtual void OTPShow(QString file) Q_DECL_OVERRIDE; + virtual void OtpShow(QString file) Q_DECL_OVERRIDE; virtual void Insert(QString file, QString value, bool overwrite = false) Q_DECL_OVERRIDE; virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE; |