summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <annejan@noprotocol.com>2015-09-24 22:50:20 +0200
committerAnne Jan Brouwer <annejan@noprotocol.com>2015-09-24 22:50:20 +0200
commit01e696e45a97d5571092d3ba7412491889d809b1 (patch)
treeee49396b108bfc7786daf4417665eda313b64907
parentb182bcb699ed4ad6043f35715d1d713d3a1180d6 (diff)
Version 1.0.2 and set default passwordChars if missingv1.0.2
-rw-r--r--mainwindow.cpp15
-rw-r--r--qtpass.iss2
-rw-r--r--qtpass.pro2
3 files changed, 11 insertions, 8 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d9ab8420..2f45b296 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -267,13 +267,16 @@ bool MainWindow::checkConfig() {
} else {
usePwgen = false;
}
- } /*else {
- QStringList ver = version.split(".");
- qDebug() << ver;
- if (ver[0] == "0" && ver[1] == "8") {
- // upgrade to 0.9
+ } else {
+// QStringList ver = version.split(".");
+// qDebug() << ver;
+// if (ver[0] == "0" && ver[1] == "8") {
+// // upgrade to 0.9
+// }
+ if (passwordChars.isEmpty()) {
+ passwordChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890~!@#$%^&*()_-+={}[]|:;<>,.?";
}
- }*/
+ }
settings.setValue("version", VERSION);
if (Util::checkConfig(passStore, passExecutable, gpgExecutable)) {
diff --git a/qtpass.iss b/qtpass.iss
index 0229fbc5..dc3357d9 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.1"
+#define MyAppVersion "1.0.2"
#define MyAppPublisher "IJhack"
#define MyAppURL "http://qtpass.org/"
#define MyAppExeName "qtpass.exe"
diff --git a/qtpass.pro b/qtpass.pro
index 4b396d70..50d43503 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -19,7 +19,7 @@ macx {
}
TEMPLATE = app
-VERSION = 1.0.1
+VERSION = 1.0.2
SOURCES += main.cpp\
mainwindow.cpp \