import gui progress

Author: sinev-valentine

Diff for: keychain_linux/passentry_cmd/pass_entry_term.cpp

@@ -216,7 +216,7 @@ std::wstring  pass_entry_term::input_password(const KeySym * map, int socket)
     char name[256] = "Unknown";
     bool first_key = true;
     auto gui = polling(socket);
-    ChangeKbProperty(dev_info, kbd_atom, device_enabled_prop, dev_cnt, 0);
+  //  ChangeKbProperty(dev_info, kbd_atom, device_enabled_prop, dev_cnt, 0);
 
     capslock = keyState(XK_Caps_Lock);
     numlock = keyState(XK_Num_Lock);
@@ -257,7 +257,7 @@ std::wstring  pass_entry_term::input_password(const KeySym * map, int socket)
                             if ( ev[1].code <= 255)
                             {
                                 kbd_id = fd_list[id];
-                                if (ioctl(kbd_id, EVIOCGRAB, 1) != 0) throw std::runtime_error("cannot get exclusive access to keyboard");
+                                //if (ioctl(kbd_id, EVIOCGRAB, 1) != 0) throw std::runtime_error("cannot get exclusive access to keyboard");
                                 break;
                             }
                         }

Diff for: keychain_linux/passentry_gui/include/PasswordEnterElement.h

@@ -26,15 +26,17 @@ class PasswordEnterElement : public QWidget
 	void checkFinishedEnterance();
 	void setFocusOnConfirm();
 	bool validConfirm();
+	PasswordLineEdit *value = Q_NULLPTR;
 
 signals:
 	void finishEnterPassword();
 	void changePassword();
 
+
 private:
 	//Ui::SecureWindowElement ui;
 	QLabel *label = Q_NULLPTR;
-	PasswordLineEdit *value = Q_NULLPTR;
+
 	QLabel *description;
 	QLabel *labelConfirm = Q_NULLPTR;
 	QLabel *confirmDescription;

Diff for: keychain_linux/passentry_gui/include/cmd.hpp

@@ -26,7 +26,7 @@ namespace  slave {
     struct cmd_base {
         cmd_base(cmds cmd_) : cmd(cmd_) {};
         cmds cmd;
-        virtual void operator()(Widget* w, const fc_light::variant&) const = 0;
+        virtual void operator()(keychain_gui_win&, const fc_light::variant&) const = 0;
         virtual ~cmd_base() {};
     };
     struct cmd_list_singletone

Diff for: keychain_linux/passentry_gui/include/keychain_gui_win.h

@@ -40,7 +40,8 @@ class keychain_gui_win : public QDialog
 
 	keychain_gui_win(Transaction &transaction, QWidget *parent = Q_NULLPTR);
 	PopupWindow * popupWindow;
-
+    void refresh(Transaction&);
+    PasswordEnterElement * password;
 private:
 	QString mExpertValue;
 
@@ -55,7 +56,7 @@ class keychain_gui_win : public QDialog
 	QLabel * descriptionLabel = Q_NULLPTR;
 	LockIcon * lockIcon = Q_NULLPTR;
 	KeychainWidget * element = Q_NULLPTR;
-	PasswordEnterElement * password;
+
 	KeychainServiceExchange * serviceExchange =NULL;
 
 private:

Diff for: keychain_linux/passentry_gui/include/widget.hpp

@@ -7,18 +7,20 @@
 #include <QLabel>
 #include <QThread>
 #include "polling.hpp"
+#include "keychain_gui_win.h"
 
 class Widget : public QWidget
 {
     Q_OBJECT
     QThread pollingThread;
 public:
-    Widget(QWidget *parent = 0);
+    Widget(keychain_gui_win&, QWidget *parent = 0);
     ~Widget();
 private:
     void closeEvent(QCloseEvent *);
     void parse(const std::string);
     bool passClearOnExit;
+    keychain_gui_win& gui;
 public slots:
     void found_pass();
     void send(std::string);

Diff for: keychain_linux/passentry_gui/src/PasswordEnterElement.cpp

@@ -13,9 +13,9 @@ PasswordEnterElement::PasswordEnterElement(bool passwordCreate, QWidget * parent
 
 	value = new PasswordLineEdit(this);
 	value->setText("");
-	value->setStyleSheet(passPhraseStyle);
-	value->setEchoMode(QLineEdit::Password);
-	value->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
+	//value->setStyleSheet(passPhraseStyle);
+	//value->setEchoMode(QLineEdit::Password);
+	//value->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
 	value->setFocus();
 	pCreatePassword = false;
 	if (passwordCreate) {

Diff for: keychain_linux/passentry_gui/src/cmd.cpp

@@ -2,8 +2,6 @@
 // Created by user on 23.06.18.
 //
 #include "cmd.hpp"
-#include "Transaction.h"
-#include "keychain_gui_win.h"
 
 Q_DECLARE_METATYPE(std::string)
 
@@ -14,7 +12,7 @@ namespace slave
     struct cmd : cmd_base {
         cmd() : cmd_base(cmd_) {};
         virtual ~cmd() {};
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
             throw std::runtime_error("operation is not implemented");
         };
         using params_t = void;
@@ -27,13 +25,13 @@ namespace slave
         virtual ~cmd() {};
         struct params {std::string rawtrx;};
         using params_t = params;
-        virtual void operator()(Widget * w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
-               // w->pte->setText(QString(a.rawtrx.c_str()));
-                QString  value(a.rawtrx.c_str());
-                Transaction trans(value);
-                keychain_gui_win w(trans);
+                QString  trx(a.rawtrx.c_str());
+                Transaction trans(trx);
+                w.refresh(trans);
+                w.show();
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
@@ -45,8 +43,11 @@ namespace slave
         cmd() : cmd_base(cmds::close) {};
         virtual ~cmd() {};
         using params_t = void;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
-            try { w->close(); }
+        virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
+            try
+            {
+             //   w->close();
+            }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
         };
@@ -58,7 +59,7 @@ namespace slave
         virtual ~cmd() {};
         struct params { bool caps, num, shift; };
         using params_t = params;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
                 //a.caps  ? w->caps->setText("caps: on")   : w->caps->setText("caps: off");
@@ -76,10 +77,10 @@ namespace slave
         virtual ~cmd() {};
         struct params {int len;};
         using params_t = params;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
-               // w->ple->setText(QString (a.len, '*'));
+                w.password->value->setText(QString (a.len, '*'));
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}