Merge branch 'master'

Conflicts: localization/localization_ar_MA.ts localization/localization_cs_CZ.ts localization/localization_de_DE.ts localization/localization_de_LU.ts localization/localization_el_GR.ts localization/localization_en_GB.ts localization/localization_en_US.ts localization/localization_es_ES.ts localization/localization_fr_BE.ts localization/localization_fr_FR.ts localization/localization_fr_LU.ts localization/localization_gl_ES.ts localization/localization_he_IL.ts localization/localization_hu_HU.ts localization/localization_it_IT.ts localization/localization_lb_LU.ts localization/localization_nl_BE.ts localization/localization_nl_NL.ts localization/localization_pl_PL.ts localization/localization_ru_RU.ts localization/localization_sv_SE.ts localization/localization_zh_CN.ts mainwindow.cpp realpass.h
IJHack · Dec 14, 2016 · 8a0cba9 · 8a0cba9
2 parents 881a11b + 641598e
commit 8a0cba9
Show file tree

Hide file tree

Showing 27 changed files with 1,434 additions and 1,827 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@
 
 **Merged pull requests:**
 
+- this if evaluetes ervery time to true [\#255](https://github.com/IJHack/QtPass/pull/255) ([YoshiMan](https://github.com/YoshiMan))
+- executeing pass show before editpassword dialog shows up [\#254](https://github.com/IJHack/QtPass/pull/254) ([YoshiMan](https://github.com/YoshiMan))
 - Minor fix for file names and git push [\#251](https://github.com/IJHack/QtPass/pull/251) ([tezeb](https://github.com/tezeb))
 - Process management refactoring part 2 [\#249](https://github.com/IJHack/QtPass/pull/249) ([tezeb](https://github.com/tezeb))
 

diff --git a/executor.cpp b/executor.cpp
@@ -140,9 +140,9 @@ int Executor::executeBlocking(QString app, const QStringList &args,
     QTextCodec *codec = QTextCodec::codecForLocale();
     QString pout = codec->toUnicode(internal.readAllStandardOutput());
     QString perr = codec->toUnicode(internal.readAllStandardError());
-    if (process_out != nullptr)
+    if (process_out != Q_NULLPTR)
       *process_out = pout;
-    if (process_err != nullptr)
+    if (process_err != Q_NULLPTR)
       *process_err = perr;
     emit finished(internal.exitCode(), pout, perr);
     return internal.exitCode();

diff --git a/executor.h b/executor.h
@@ -74,11 +74,12 @@ class Executor : public QObject {
                bool readStdout = false, bool readStderr = true);
 
   int executeBlocking(QString app, const QStringList &args,
-                      QString input = QString(), QString *process_out = nullptr,
-                      QString *process_err = nullptr);
+                      QString input = QString(),
+                      QString *process_out = Q_NULLPTR,
+                      QString *process_err = Q_NULLPTR);
 
   int executeBlocking(QString app, const QStringList &args,
-                      QString *process_out, QString *process_err = nullptr);
+                      QString *process_out, QString *process_err = Q_NULLPTR);
 
   void setEnvironment(const QStringList &env);
 private slots:

diff --git a/imitatepass.cpp b/imitatepass.cpp
@@ -1,6 +1,5 @@
 #include "imitatepass.h"
 #include "debughelper.h"
-#include "mainwindow.h"
 #include "qtpasssettings.h"
 
 /**
@@ -212,7 +211,7 @@ bool ImitatePass::removeDir(const QString &dirName) {
 }
 
 /**
- * @brief MainWindow::reencryptPath reencrypt all files under the chosen
+ * @brief ImitatePass::reencryptPath reencrypt all files under the chosen
  * directory
  *
  * This is stil quite experimental..

diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts
diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts
diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts
diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts
diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts
diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts
diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts
diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts
diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts
diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts
diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts
diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts
diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts
diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts
diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts
diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts
diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts
diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts
diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts
diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts
diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts
diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -751,7 +751,7 @@ void MainWindow::processErrorExit(const QString &p_error) {
 void MainWindow::clearClipboard() {
   QClipboard *clipboard = QApplication::clipboard();
   QString clippedText = clipboard->text();
-  if (clippedText == clippedText) {
+  if (clippedText == this->clippedText) {
     clipboard->clear();
     ui->statusBar->showMessage(tr("Clipboard cleared"), 2000);
   } else {
@@ -920,6 +920,7 @@ QModelIndex MainWindow::firstFile(QModelIndex parentIndex) {
  * @param isNew insert (not update)
  */
 void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false) {
+  pass->Show_b(file);
   if (!isNew && lastDecrypt.isEmpty()) {
     // warn?
     return;