[Qt] Fix thin space in URI

cozz · cozz · commit 027dcdc792e0 · 2014-07-20T04:17:02.000+02:00
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -225,7 +225,7 @@ void CoinControlDialog::showMenu(const QPoint &point)
 // context menu action: copy amount
 void CoinControlDialog::copyAmount()
 {
-    GUIUtil::setClipboard(contextMenuItem->text(COLUMN_AMOUNT));
+    GUIUtil::setClipboard(BitcoinUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));
 }
 
 // context menu action: copy label
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -187,7 +187,7 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
 
     if (info.amount)
     {
-        ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount));
+        ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount, false, BitcoinUnits::separatorNever));
         paramCount++;
     }
 
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
@@ -79,10 +79,17 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons
         case Amount:
             if (rec->recipient.amount == 0 && role == Qt::DisplayRole)
                 return tr("(no amount)");
+            else if (role == Qt::EditRole)
+                return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever);
             else
                 return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);
         }
     }
+    else if (role == Qt::TextAlignmentRole)
+    {
+        if (index.column() == Amount)
+            return (int)(Qt::AlignRight|Qt::AlignVCenter);
+    }
     return QVariant();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ void CoinControlDialog::showMenu(const QPoint &point)`
`225`	`225`	`// context menu action: copy amount`
`226`	`226`	`void CoinControlDialog::copyAmount()`
`227`	`227`	`{`
`228`		`- GUIUtil::setClipboard(contextMenuItem->text(COLUMN_AMOUNT));`
	`228`	`+ GUIUtil::setClipboard(BitcoinUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`// context menu action: copy label`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)`
`187`	`187`
`188`	`188`	`if (info.amount)`
`189`	`189`	`{`
`190`		`- ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount));`
	`190`	`+ ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::BTC, info.amount, false, BitcoinUnits::separatorNever));`
`191`	`191`	`paramCount++;`
`192`	`192`	`}`
`193`	`193`
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,17 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons`
`79`	`79`	`case Amount:`
`80`	`80`	`if (rec->recipient.amount == 0 && role == Qt::DisplayRole)`
`81`	`81`	`return tr("(no amount)");`
	`82`	`+ else if (role == Qt::EditRole)`
	`83`	`+ return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever);`
`82`	`84`	`else`
`83`	`85`	`return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);`
`84`	`86`	`}`
`85`	`87`	`}`
	`88`	`+ else if (role == Qt::TextAlignmentRole)`
	`89`	`+ {`
	`90`	`+ if (index.column() == Amount)`
	`91`	`+ return (int)(Qt::AlignRight\|Qt::AlignVCenter);`
	`92`	`+ }`
`86`	`93`	`return QVariant();`
`87`	`94`	`}`
`88`	`95`