diff --git a/qtpass.pro b/qtpass.pro index 25179b7fc..7d05eab88 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -27,8 +27,7 @@ SOURCES += main.cpp\ dialog.cpp \ storemodel.cpp \ util.cpp \ - usersdialog.cpp \ - wizarddialog.cpp + usersdialog.cpp HEADERS += mainwindow.h \ dialog.h \ @@ -39,8 +38,7 @@ HEADERS += mainwindow.h \ FORMS += mainwindow.ui \ dialog.ui \ - usersdialog.ui \ - wizarddialog.ui + usersdialog.ui *-g++* { QMAKE_CXXFLAGS += -std=c++11 diff --git a/util.cpp b/util.cpp index 9fa4ecc15..d2277635f 100644 --- a/util.cpp +++ b/util.cpp @@ -88,5 +88,5 @@ QString Util::findBinaryInPath(QString binary) bool Util::checkConfig(QString passStore, QString passExecutable, QString gpgExecutable) { - return !QFile(passStore).exists() || (!QFile(passExecutable).exists() && !QFile(gpgExecutable).exists()); + return !QFile(passStore + ".gpg-id").exists() || (!QFile(passExecutable).exists() && !QFile(gpgExecutable).exists()); } diff --git a/wizarddialog.cpp b/wizarddialog.cpp deleted file mode 100644 index 7839d51e8..000000000 --- a/wizarddialog.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "wizarddialog.h" -#include "ui_wizarddialog.h" - -WizardDialog::WizardDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::WizardDialog) -{ - ui->setupUi(this); -} - -WizardDialog::~WizardDialog() -{ - delete ui; -} diff --git a/wizarddialog.h b/wizarddialog.h deleted file mode 100644 index 21ba95ff9..000000000 --- a/wizarddialog.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef WIZARDDIALOG_H -#define WIZARDDIALOG_H - -#include - -namespace Ui { -class WizardDialog; -} - -class WizardDialog : public QDialog -{ - Q_OBJECT - -public: - explicit WizardDialog(QWidget *parent = 0); - ~WizardDialog(); - -private: - Ui::WizardDialog *ui; -}; - -#endif // WIZARDDIALOG_H diff --git a/wizarddialog.ui b/wizarddialog.ui deleted file mode 100644 index ba9469362..000000000 --- a/wizarddialog.ui +++ /dev/null @@ -1,89 +0,0 @@ - - - WizardDialog - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - - - 0 - - - - Executables - - - - - GPG - - - - - Password Store - - - - - - - - false - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - WizardDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - WizardDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - -