qrencode and QR popup refactored

IJHack · Jan 24, 2020 · b33aead · b33aead
1 parent 652fd05
commit b33aead
Show file tree

Hide file tree

Showing 34 changed files with 676 additions and 3,926 deletions.
diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts
diff --git a/localization/localization_ca.ts b/localization/localization_ca.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_hr.ts b/localization/localization_hr.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_nb_NO.ts b/localization/localization_nb_NO.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_pt_PT.ts b/localization/localization_pt_PT.ts
diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts
diff --git a/localization/localization_sq_AL.ts b/localization/localization_sq_AL.ts
diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts
diff --git a/localization/localization_tr_TR.ts b/localization/localization_tr_TR.ts
diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
@@ -555,6 +555,8 @@ bool ConfigDialog::isQrencodeAvailable() {
   QProcess which;
   which.start("which", QStringList() << "qrencode");
   which.waitForFinished();
+  QtPassSettings::setQrencodeExecutable(
+      which.readAllStandardOutput().trimmed());
   return which.exitCode() == 0;
 #endif
 }

diff --git a/src/qtpass.cpp b/src/qtpass.cpp
@@ -5,6 +5,7 @@
 #include <QClipboard>
 #include <QLabel>
 #include <QPixmap>
+#include <QVBoxLayout>
 
 #ifndef Q_OS_WIN
 #include <QInputDialog>
@@ -409,8 +410,9 @@ void QtPass::copyTextToClipboard(const QString &text) {
  */
 void QtPass::showTextAsQRCode(const QString &text) {
   QProcess qrencode;
-  qrencode.start("/usr/bin/qrencode", QStringList() << "-o-"
-                                                    << "-tPNG");
+  qrencode.start(QtPassSettings::getQrencodeExecutable("/usr/bin/qrencode"),
+                 QStringList() << "-o-"
+                               << "-tPNG");
   qrencode.write(text.toUtf8());
   qrencode.closeWriteChannel();
   qrencode.waitForFinished();
@@ -423,9 +425,15 @@ void QtPass::showTextAsQRCode(const QString &text) {
     QPixmap image;
     image.loadFromData(output, "PNG");
 
-    QLabel *label = new QLabel();
-    label->setPixmap(image);
-    label->setScaledContents(true);
-    label->show();
+    QDialog *popup = new QDialog(0, Qt::Popup | Qt::FramelessWindowHint);
+    QVBoxLayout *layout = new QVBoxLayout;
+    QLabel *popupLabel = new QLabel();
+    layout->addWidget(popupLabel);
+    popupLabel->setPixmap(image);
+    popupLabel->setScaledContents(true);
+    popupLabel->show();
+    popup->setLayout(layout);
+    popup->move(QCursor::pos());
+    popup->exec();
   }
 }
diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
@@ -405,6 +405,16 @@ void QtPassSettings::setUseQrencode(const bool &useQrencode) {
   getInstance()->setValue(SettingsConstants::useQrencode, useQrencode);
 }
 
+QString QtPassSettings::getQrencodeExecutable(const QString &defaultValue) {
+  return getInstance()
+      ->value(SettingsConstants::qrencodeExecutable, defaultValue)
+      .toString();
+}
+void QtPassSettings::setQrencodeExecutable(const QString &qrencodeExecutable) {
+  getInstance()->setValue(SettingsConstants::qrencodeExecutable,
+                          qrencodeExecutable);
+}
+
 bool QtPassSettings::isUsePwgen(const bool &defaultValue) {
   return getInstance()
       ->value(SettingsConstants::usePwgen, defaultValue)

diff --git a/src/qtpasssettings.h b/src/qtpasssettings.h
@@ -147,6 +147,10 @@ class QtPassSettings : public QSettings {
   static bool isUseQrencode(const bool &defaultValue = QVariant().toBool());
   static void setUseQrencode(const bool &useQrencode);
 
+  static QString
+  getQrencodeExecutable(const QString &defaultValue = QVariant().toString());
+  static void setQrencodeExecutable(const QString &qrencodeExecutable);
+
   static bool isUsePwgen(const bool &defaultValue = QVariant().toBool());
   static void setUsePwgen(const bool &usePwgen);
 

diff --git a/src/settingsconstants.cpp b/src/settingsconstants.cpp
@@ -43,6 +43,7 @@ const QString SettingsConstants::groupProfiles = "profiles";
 const QString SettingsConstants::useGit = "useGit";
 const QString SettingsConstants::useOtp = "useOtp";
 const QString SettingsConstants::useQrencode = "useQrencode";
+const QString SettingsConstants::qrencodeExecutable = "qrencodeExecutable";
 const QString SettingsConstants::useClipboard = "useClipboard";
 const QString SettingsConstants::usePwgen = "usePwgen";
 const QString SettingsConstants::avoidCapitals = "avoidCapitals";

diff --git a/src/settingsconstants.h b/src/settingsconstants.h
@@ -42,6 +42,7 @@ class SettingsConstants {
   const static QString useGit;
   const static QString useOtp;
   const static QString useQrencode;
+  const static QString qrencodeExecutable;
   const static QString useClipboard;
   const static QString usePwgen;
   const static QString avoidCapitals;