summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-08-03 13:53:17 +0200
committerAnne Jan Brouwer <annejan@noprotocol.com>2015-08-03 13:53:17 +0200
commit4fd43b2ed8957c0a428f302db91076cdcbb8e6c3 (patch)
tree134ec591538b9ae106bc1702973a4b7cfffd83d5
parent7f2d7b28931ef37cbf0ee778549d2f2c85344aa1 (diff)
git init now also for non-pass people
-rw-r--r--README.md2
-rw-r--r--dialog.cpp1
-rw-r--r--mainwindow.cpp6
-rw-r--r--qtpass.iss2
-rw-r--r--qtpass.pro2
5 files changed, 8 insertions, 5 deletions
diff --git a/README.md b/README.md
index 8d6632d1..052ee7b4 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Known issues
Planned features
----------------
* Templates (username, url etc) in Add / Edit screen (configurable templates)
-* PLugins based on field name, plugins follow same format as password files
+* Plugins based on field name, plugins follow same format as password files
* Re-encryption after users-change (optional of course)
* Colour coding folders (possibly disabling folders you can't decrypt)
* WebDAV (configuration) support
diff --git a/dialog.cpp b/dialog.cpp
index 3ed78c73..9345181e 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -511,7 +511,6 @@ void Dialog::wizard()
tr("Would you like to create a password-store at %1?").arg(passStore),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
QDir().mkdir(passStore);
-
if(useGit()) {
mainWindow->executePassGitInit();
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ad85ba6d..ff504121 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -548,7 +548,11 @@ void MainWindow::executePass(QString args, QString input) {
void MainWindow::executePassGitInit() {
qDebug() << "Pass git init called";
- executePass("git init");
+ if (usePass) {
+ executePass("git init");
+ } else {
+ executeWrapper("git", "init \"" + passStore + '"');
+ }
}
/**
diff --git a/qtpass.iss b/qtpass.iss
index 15249b68..0229fbc5 100644
--- a/qtpass.iss
+++ b/qtpass.iss
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "QtPass"
-#define MyAppVersion "1.0.0"
+#define MyAppVersion "1.0.1"
#define MyAppPublisher "IJhack"
#define MyAppURL "http://qtpass.org/"
#define MyAppExeName "qtpass.exe"
diff --git a/qtpass.pro b/qtpass.pro
index 67be65b2..d2098fd2 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -18,7 +18,7 @@ macx {
}
TEMPLATE = app
-VERSION = 1.0.0
+VERSION = 1.0.1
SOURCES += main.cpp\
mainwindow.cpp \