sub

mceme · Jun 23, 2019 · 09747de · 09747de
1 parent 9967b7b
commit 09747de
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui
@@ -49,7 +49,7 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>100</width>
+         <width>120</width>
          <height>16777215</height>
         </size>
        </property>

diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
@@ -275,7 +275,7 @@ SendCoinsRecipient SendCoinsEntry::getValue()
     recipient.label = ui->addAsLabel->text();
     recipient.imgbase64 = ui->Imgbase64Edit->text();
     if(ui->Imgbase64Edit->text().size()>0 && !fileselected){ //message
-    recipient.imgbase64 ="message:"+ ui->Imgbase64Edit->text();
+    recipient.imgbase64 ="m:"+ ui->Imgbase64Edit->text();
     }
     recipient.amount = ui->payAmount->value();
     recipient.message = ui->messageTextLabel->text();

diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
@@ -53,11 +53,13 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
 
 
 
-    if(encodestr.size()>5)
+    if(encodestr.size()>2)
          	{
-    	std::string ismessage = encodestr.substr(0, 8);
 
-    	if(ismessage.c_str() != "message:"){
+    	std::string ismessage = encodestr.substr(0, 2);
+
+    	if(ismessage != "m:")
+    	{
 
     	ui->DownloadButton->setVisible(true);
 
@@ -103,7 +105,7 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
      		  else if(delctype==1){
 		ui->graphicsView->setVisible(true);
      		              ui->graphicsView->setGeometry(QRect(0, 0, 400, 250));
-     		     		  ui->graphicsView->show();
+
 
      		 QLabel *gif_anim = new QLabel();
  		 gif_anim->setGeometry(0, 0, 400, 250);
@@ -117,7 +119,7 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
      		 QGraphicsProxyWidget *proxy = scene->addWidget(gif_anim);
                   scene->addWidget(gif_anim);
      		              ui->graphicsView->setScene( scene );
-
+     		             ui->graphicsView->show();
      		       }
     		   /* Start Document */
      		  else if (delctype==2)
@@ -143,19 +145,11 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
      	}
     	else { //message
 
-    		QGraphicsTextItem * io = new QGraphicsTextItem;
-    		io->setPos(150,70);
-    		io->setPlainText(encodestr.c_str());
-    		 QGraphicsScene* scene = new QGraphicsScene(QRect(0, 0, 400, 250));
-
-    		scene->addItem(io);
-
-    		    		  ui->graphicsView->setScene( scene );
-    		                  ui->graphicsView->setVisible(true);
-    		                  ui->graphicsView->setGeometry(QRect(0, 0, 400, 250));
-    		    		  ui->graphicsView->show();
-
+    		 ui->DownloadButton->setVisible(false);
+    		 desc = desc + "<br><b><b>"+encodestr.c_str();
+    		 ui->detailText->setHtml(desc);
     	}
+
       }
 }
 

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
@@ -165,7 +165,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     QAction *copyAddressAction = new QAction(tr("Copy address"), this);
     QAction *copyLabelAction = new QAction(tr("Copy label"), this);
     QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
-    QAction *copyImgbase64Action = new QAction(tr("Copy imgbase64"), this);
+    QAction *copyImgbase64Action = new QAction(tr("Copy img"), this);
     QAction *copyTxIDAction = new QAction(tr("Copy transaction ID"), this);
     QAction *copyTxHexAction = new QAction(tr("Copy raw transaction"), this);
     QAction *copyTxPlainText = new QAction(tr("Copy full transaction details"), this);