task update

Author: sinev-valentine

keychain_linux/passentry_gui/include/cmd.hpp

@@ -13,7 +13,7 @@
 #include <boost/hana/range.hpp>
 #include <boost/hana/for_each.hpp>
 #include <boost/hana/size.hpp>
-#include "keychain_gui_win.h"
+#include "widget.hpp"
 
 namespace  slave {
     enum struct cmds {unknown = 0, rawtrx, close, modify, length, last }; // to gui
@@ -26,7 +26,7 @@ namespace  slave {
     struct cmd_base {
         cmd_base(cmds cmd_) : cmd(cmd_) {};
         cmds cmd;
-        virtual void operator()(keychain_gui_win* w, const fc_light::variant&) const = 0;
+        virtual void operator()(Widget* w, const fc_light::variant&) const = 0;
         virtual ~cmd_base() {};
     };
     struct cmd_list_singletone

keychain_linux/passentry_gui/include/keychain_gui_win.h

@@ -25,8 +25,6 @@
 #include "KeychainWarningMessage.h"
 #include "RawHashWidget.h"
 
-#include <QThread>
-#include "polling.hpp"
 
 using namespace keychain_app;
 using secmod_commands::secmod_parser_f;
@@ -39,9 +37,8 @@ class keychain_gui_win : public QDialog
 	Ui::keychain_gui_winClass ui;
 
 public:
-	QThread pollingThread;
+
 	keychain_gui_win(Transaction &transaction, QWidget *parent = Q_NULLPTR);
-	~keychain_gui_win();
 	PopupWindow * popupWindow;
 
 private:
@@ -61,11 +58,9 @@ class keychain_gui_win : public QDialog
 	PasswordEnterElement * password;
 	KeychainServiceExchange * serviceExchange =NULL;
 
-	bool passClearOnExit;
 private:
 	void _roundCorners();
 	void _disableSignButton();
-	void parse(const std::string);
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;
@@ -79,10 +74,4 @@ public slots:
 	void transaction_sign();
 	void cancel_sign();
 	void set_sign_focus();
-
-	void found_pass();
-	void send(std::string);
-signals:
-	void poll();
-
 };

keychain_linux/passentry_gui/src/widget.hpp__ renamed to keychain_linux/passentry_gui/include/widget.hpp

@@ -15,11 +15,7 @@ class Widget : public QWidget
 public:
     Widget(QWidget *parent = 0);
     ~Widget();
-    QLineEdit *ple;
-    QTextEdit *pte;
-    QLabel *caps, *num, *shift;
 private:
-    void interior();
     void closeEvent(QCloseEvent *);
     void parse(const std::string);
     bool passClearOnExit;

keychain_linux/passentry_gui/src/cmd.cpp

@@ -2,6 +2,9 @@
 // Created by user on 23.06.18.
 //
 #include "cmd.hpp"
+#include "Transaction.h"
+#include "keychain_gui_win.h"
+
 Q_DECLARE_METATYPE(std::string)
 
 namespace hana = boost::hana;
@@ -11,7 +14,7 @@ namespace slave
     struct cmd : cmd_base {
         cmd() : cmd_base(cmd_) {};
         virtual ~cmd() {};
-        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
+        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
             throw std::runtime_error("operation is not implemented");
         };
         using params_t = void;
@@ -24,10 +27,13 @@ namespace slave
         virtual ~cmd() {};
         struct params {std::string rawtrx;};
         using params_t = params;
-        virtual void operator()(keychain_gui_win * w, const fc_light::variant& v) const override {
+        virtual void operator()(Widget * 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);
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
@@ -39,7 +45,7 @@ namespace slave
         cmd() : cmd_base(cmds::close) {};
         virtual ~cmd() {};
         using params_t = void;
-        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
+        virtual void operator()(Widget* 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());}
@@ -52,7 +58,7 @@ namespace slave
         virtual ~cmd() {};
         struct params { bool caps, num, shift; };
         using params_t = params;
-        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
+        virtual void operator()(Widget* 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");
@@ -70,7 +76,7 @@ namespace slave
         virtual ~cmd() {};
         struct params {int len;};
         using params_t = params;
-        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
+        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
                // w->ple->setText(QString (a.len, '*'));

keychain_linux/passentry_gui/src/keychain_gui_win.cpp

@@ -1,14 +1,5 @@
 #include "keychain_gui_win.h"
 
-#include <fc_light/io/json.hpp>
-#include "cmd.hpp"
-
-#include <fc_light/reflect/reflect.hpp>
-#include <fc_light/variant.hpp>
-
-Q_DECLARE_METATYPE(std::string)
-int id1 = qRegisterMetaType<std::string>();
-
 keychain_gui_win::keychain_gui_win(Transaction &transaction, QWidget *parent)
 	: QDialog(parent)
 {
@@ -171,20 +162,6 @@ keychain_gui_win::keychain_gui_win(Transaction &transaction, QWidget *parent)
 	connect(password, &PasswordEnterElement::finishEnterPassword, this, &keychain_gui_win::transaction_sign);
 	if (transaction.isCreatePassword())
 		connect(password, &PasswordEnterElement::changePassword, this, &keychain_gui_win::_disableSignButton);
-
-	Polling *polling = new Polling;
-	polling->moveToThread(&pollingThread);
-	connect(&pollingThread, &QThread::finished, polling, &QObject::deleteLater);
-
-	connect(this,    &keychain_gui_win::poll,  polling, &Polling::Select, Qt::QueuedConnection);
-	connect(polling, &Polling::poll, polling, &Polling::Select, Qt::QueuedConnection);
-	connect(polling, &Polling::rx, this, &keychain_gui_win::parse);
-	connect(polling, &Polling::err, this, &keychain_gui_win::close);
-
-	pollingThread.start();
-	passClearOnExit = true;
-	emit keychain_gui_win::poll();
-
 }
 
 void keychain_gui_win::transaction_sign() {
@@ -268,45 +245,11 @@ void keychain_gui_win::keyPressEvent(QKeyEvent *event)
 	}
 }
 
-void keychain_gui_win::parse(const std::string s)
-{
-	auto a = fc_light::json::from_string(s);
-	using namespace slave;
-	try {
-		auto cmd = a.as<slave::cmd_common>();
-		auto cmd_map = slave::cmd_list_singletone::instance();
-		auto p_func = cmd_map[cmd.cmd];
-		(*p_func)(this, cmd.params);
-	}
-	catch (const std::exception &e) {throw std::runtime_error(e.what());}
-	catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
-}
-
 
 void keychain_gui_win::closeEvent(QCloseEvent * event)
 {
-//	passClearOnExit ?
-//	send(fc_light::json::to_string(fc_light::variant( master::cmd<( master::cmds::cancel)>().base))) :
-//	send(fc_light::json::to_string(fc_light::variant( master::cmd<( master::cmds::ok)>().base)));
-//	event->accept();
 	serviceExchange->EncodeCancel();
 	this->close();
 }
 
-void keychain_gui_win::found_pass()
-{
-	passClearOnExit = false;
-}
-
-void keychain_gui_win::send(std::string a)
-{
-	if ( write(STDIN_FILENO, a.c_str(), a.length() ) != a.length() )
-		close();
-}
-
-keychain_gui_win::~keychain_gui_win()
-{
-	pollingThread.quit();
-	pollingThread.wait();
-}
 

keychain_linux/passentry_gui/src/main.cpp

@@ -1,30 +1,18 @@
-#include "keychain_gui_win.h"
-
-//#include "widget.hpp"
+#include "widget.hpp"
 #include <QApplication>
 #include <QDesktopWidget>
 #include <stdlib.h>
 #include <iostream>
 
-Q_DECLARE_METATYPE(std::string)
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-//    Widget w;
-
-    QString srcTrans;
-    Transaction trans(srcTrans);
-
-    keychain_gui_win w(trans);
-
-    const QRect sz = QApplication::desktop()->availableGeometry(&w);
-    w.resize(sz.width() / 6, sz.height() * 1 / 6);
-    w.move((sz.width() - w.width()) / 2,
-                (sz.height() - w.height()) / 2);
-
+    Widget w;
     w.show();
+    
    return a.exec();
+
 }
 
 

keychain_linux/passentry_gui/src/widget.cpp_ renamed to keychain_linux/passentry_gui/src/widget.cpp

@@ -17,8 +17,6 @@ int id = qRegisterMetaType<std::string>();
 Widget::Widget(QWidget *parent)
     :QWidget(parent)
 {
-    setWindowTitle(tr("Promt for password"));
-    interior();
 
     Polling *polling = new Polling;
     polling->moveToThread(&pollingThread);
@@ -40,56 +38,15 @@ Widget::~Widget()
     pollingThread.wait();
 }
 
-void Widget::interior()
-{
-    QGridLayout * grid = new QGridLayout(this);
-    {
-        QLabel *plb = new QLabel(tr("password"), this);
-        grid->addWidget(plb, 0, 0);
-    }
-
-    ple = new QLineEdit(this);
-    ple->setEchoMode(QLineEdit::Password);
-
-    grid->addWidget(ple, 0, 1, 1, 3);
-    {
-        QLabel *plb = new QLabel(tr("Raw Tx"), this);
-        grid->addWidget(plb, 1, 0);
-    }
-
-    pte = new QTextEdit(this);
-    grid->addWidget(pte, 1, 1, 1, 3);
-    pte->setText("");
-    pte->setReadOnly(true);
-
-    caps = new QLabel(tr(""), this);
-    grid->addWidget(caps, 2, 0);
-
-    num = new QLabel(tr(""), this);
-    grid->addWidget(num, 2, 1);
-
-    shift = new QLabel(tr(""), this);
-    grid->addWidget(shift, 2, 2);
-
-    {
-        QPushButton *plb = new QPushButton("Ok", this);
-        grid->addWidget(plb, 3, 1);
-        connect(plb, SIGNAL(clicked()), this, SLOT(found_pass()));
-        connect(plb, SIGNAL(clicked()), this, SLOT(close()));
-    }
-    {
-        QPushButton * ppb = new QPushButton("Cancel", this);
-        grid->addWidget(ppb, 3, 2);
-        connect(ppb, SIGNAL(clicked()), this, SLOT(close()));
-    }
-}
 
 void Widget::send(std::string a)
 {
     if ( write(STDIN_FILENO, a.c_str(), a.length() ) != a.length() )
         close();
 }
 
+
+
 void Widget::found_pass()
 {
   passClearOnExit = false;