gui linux impl

Author: sinev-valentine

keychain_lib/include/keychain_lib/keychain_commands.hpp

@@ -589,7 +589,7 @@ struct keychain_command<command_te::create>: keychain_command_base
           pr_hex = to_hex(reinterpret_cast<const uint8_t *>(keys.secret().data()), 32);
 
           filename    = hash.hex().substr(0,16);
-          keyname       = params.keyname + "@"+ filename;
+          keyname       = params.keyname ;
           filename += ".json";
         }
           break;

keychain_linux/passentry_gui/include/keychain_gui_win.h

@@ -42,6 +42,10 @@ class keychain_gui_win : public QDialog
 	PopupWindow * popupWindow;
     void refresh(Transaction&);
     PasswordEnterElement * password;
+	void send(std::string);
+
+	bool send_msg;
+
 private:
 	QString mExpertValue;
 
@@ -58,10 +62,12 @@ class keychain_gui_win : public QDialog
 	KeychainWidget * element = Q_NULLPTR;
 
 	KeychainServiceExchange * serviceExchange =NULL;
+	bool passClearOnExit;
 
 private:
 	void _roundCorners();
 	void _disableSignButton();
+	//void closeEvent(QCloseEvent *);
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;
@@ -72,7 +78,8 @@ class keychain_gui_win : public QDialog
 	const int START_POSITION = 96;
 
 public slots:
-	void transaction_sign();
+	void found_pass();
 	void cancel_sign();
 	void set_sign_focus();
+
 };

keychain_linux/passentry_gui/include/widget.hpp

@@ -17,13 +17,9 @@ class Widget : public QWidget
     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);
 signals:
     void poll();
 };

keychain_linux/passentry_gui/src/BitcoinWidget.cpp

@@ -10,7 +10,7 @@ BitcoinWidget::BitcoinWidget(Transaction &transaction, QWidget * parent)
 	QString valueStyle("font:16px \"Segoe UI\";background:transparent;color:rgb(123,141,167)");
 
 	cryptoType = new SecureWindowElement(this);
-	cryptoType->SetLabelStyle("background-image:url(:/keychain_gui_win/btc_logo.png) no-repeat;background-size:contain;");
+	cryptoType->SetLabelStyle("background-image:url(:/keychain_gui_win/btc_logo.png) no-repeat;");
 	cryptoType->SetValueStyle("font:16px \"Segoe UI\";background:transparent;color:rgb(123,141,167);");
 	cryptoType->SetLabelAndValue("empty=Bitcoin");
 

keychain_linux/passentry_gui/src/EthereumWidget.cpp

@@ -9,7 +9,7 @@ EthereumWidget::EthereumWidget(Transaction &transaction, QWidget * parent)
 
 	QString valueStyle("font:16px \"Segoe UI\";background:transparent;color:rgb(123,141,167);");
 	QString labelStyle("font:16px \"Segoe UI\";background:transparent;");
-	cryptoType->SetLabelStyle("background-image:url(:/keychain_gui_win/bg_ephir.png) no-repeat;background-size:contain;");
+	cryptoType->SetLabelStyle("background-image:url(:/keychain_gui_win/bg_ephir.png) no-repeat;");
 	cryptoType->SetValueStyle(valueStyle);
 	cryptoType->SetLabelAndValue("empty=ethereum");
 

keychain_linux/passentry_gui/src/cmd.cpp

@@ -46,6 +46,7 @@ namespace slave
         virtual void operator()(keychain_gui_win& w, const fc_light::variant& v) const override {
             try
             {
+                w.send_msg = false;
                 w.close();
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}

keychain_linux/passentry_gui/src/keychain_gui_win.cpp

@@ -1,12 +1,14 @@
 #include "keychain_gui_win.h"
+#include "cmd.hpp"
 
 keychain_gui_win::keychain_gui_win(Transaction &transaction, QWidget *parent)
 	: QDialog(parent)
 {
     ui.setupUi(this);
     setWindowFlags(Qt::FramelessWindowHint);
     setFixedSize(600, 347);
-
+    passClearOnExit = true;
+    send_msg  = true;
 }
 
 void keychain_gui_win::refresh(Transaction& transaction)
@@ -161,25 +163,16 @@ void keychain_gui_win::refresh(Transaction& transaction)
     else
         lockIcon->move(width() - 55, 28);
     lockIcon->setMouseTracking(true);
-    this->connect(OKButton, &QPushButton::released, this, &keychain_gui_win::transaction_sign);
-    this->connect(CancelButton, &QPushButton::released, this, &keychain_gui_win::cancel_sign);
+    this->connect(OKButton, &QPushButton::released, this, &keychain_gui_win::found_pass);
+    this->connect(OKButton, &QPushButton::released, this, &keychain_gui_win::close);
+    this->connect(CancelButton, &QPushButton::released, this, &keychain_gui_win::close);
     _roundCorners();
     password->setValueFocus();
-    connect(password, &PasswordEnterElement::finishEnterPassword, this, &keychain_gui_win::transaction_sign);
+    //connect(password, &PasswordEnterElement::finishEnterPassword, this, &keychain_gui_win::transaction_sign);
     //if (transaction.isCreatePassword())
       //  connect(password, &PasswordEnterElement::changePassword, this, &keychain_gui_win::_disableSignButton);
 }
 
-void keychain_gui_win::transaction_sign() {
-	QString passPhrase("");
-	passPhrase = password->GetValue();
-	if (passPhrase.isEmpty()) {
-		serviceExchange->EncodeError(L"empty_password", 14);
-		return;
-	}
-	serviceExchange->EncodeSuccess(passPhrase.toStdWString(), passPhrase.length());
-	this->close();
-}
 
 void keychain_gui_win::cancel_sign() {
 	serviceExchange->EncodeCancel();
@@ -251,11 +244,41 @@ void keychain_gui_win::keyPressEvent(QKeyEvent *event)
 	}
 }
 
-
+/*
 void keychain_gui_win::closeEvent(QCloseEvent * event)
 {
 	serviceExchange->EncodeCancel();
 	this->close();
 }
+*/
 
+void keychain_gui_win::closeEvent(QCloseEvent *event)
+{
+    if (send_msg)
+    {
+        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();
+}
+
+
+void keychain_gui_win::found_pass() {
+    //QString passPhrase("");
+    //passPhrase = password->GetValue();
+    //if (passPhrase.isEmpty()) {
+    //	serviceExchange->EncodeError(L"empty_password", 14);
+    //	return;
+    //}
+    //serviceExchange->EncodeSuccess(passPhrase.toStdWString(), passPhrase.length());
+    passClearOnExit = false;
+    //this->close();
+}
+
+void keychain_gui_win::send(std::string a)
+{
+    if ( write(STDIN_FILENO, a.c_str(), a.length() ) != a.length() )
+        close();
+}

keychain_linux/passentry_gui/src/main.cpp

@@ -9,23 +9,10 @@
 #include <keychain_lib/keychain_logger.hpp>
 
 
-void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
-    auto log = logger_singletone::instance();
-
-    QByteArray localMsg = msg.toLocal8Bit();
-
-    BOOST_LOG_SEV(log.lg, info) << "Debug:" <<localMsg.constData()<< " " << context.file << " "
-    << context.line << " " << context.function;
-}
-
-
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
-    qInstallMessageHandler(myMessageOutput);
- //   w.show();
     QString  value("");
     Transaction trans(value);
     keychain_gui_win g(trans);

keychain_linux/passentry_gui/src/widget.cpp

@@ -28,8 +28,7 @@ Widget::Widget(keychain_gui_win& gui_, QWidget *parent)
     connect(polling, &Polling::err, this, &Widget::close);
 
     pollingThread.start();
-    passClearOnExit = true;
-    emit Widget::poll();
+        emit Widget::poll();
 }
 
 Widget::~Widget()
@@ -39,26 +38,6 @@ Widget::~Widget()
 }
 
 
-void Widget::send(std::string a)
-{
-    if ( write(STDIN_FILENO, a.c_str(), a.length() ) != a.length() )
-        close();
-}
-
-
-
-void Widget::found_pass()
-{
-  passClearOnExit = false;
-}
-
-void Widget::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();
-}
 
 void Widget::parse(const std::string s)
 {