aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-12-02 13:36:19 +0100
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-12-02 13:36:19 +0100
commitd3207b6fa8283cdd15bfa89b222880cf20524c35 (patch)
tree772e2b7576c307550b7cdf58c4127eda049bb9fc
parent834e14e57f3c163bc898e6a89ce467d850ee4ea2 (diff)
[Qt] coin-control features GUI cleanup 3
- remove style sheets from ui files and use Qt attributes instead - make some more strings untranslatable, to make life for translators easier - split up long tooltips an rework the texts a little
-rw-r--r--src/qt/coincontroldialog.cpp25
-rw-r--r--src/qt/forms/coincontroldialog.ui63
-rw-r--r--src/qt/forms/sendcoinsdialog.ui62
3 files changed, 108 insertions, 42 deletions
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 4ecc040bfb..14e5b07133 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -590,7 +590,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee)); // After Fee
l5->setText(((nBytes > 0) ? "~" : "") + QString::number(nBytes)); // Bytes
l6->setText(sPriorityLabel); // Priority
- l7->setText((fLowOutput ? (fDust ? tr("DUST") : tr("yes")) : tr("no"))); // Low Output / Dust
+ l7->setText((fLowOutput ? (fDust ? tr("Dust") : tr("yes")) : tr("no"))); // Low Output / Dust
l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange)); // Change
// turn labels "red"
@@ -600,10 +600,25 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
l8->setStyleSheet((nChange > 0 && nChange < CENT) ? "color:red;" : ""); // Change < 0.01BTC
// tool tips
- l5->setToolTip(tr("This label turns red, if the transaction size is bigger than 1000 bytes.\n\n This means a fee of at least %1 per kb is required.\n\n Can vary +/- 1 Byte per input.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
- l6->setToolTip(tr("Transactions with higher priority get more likely into a block.\n\nThis label turns red, if the priority is smaller than \"medium\".\n\n This means a fee of at least %1 per kb is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
- l7->setToolTip(tr("This label turns red, if any recipient receives an amount smaller than %1.\n\n This means a fee of at least %2 is required. \n\n Amounts below 0.546 times the minimum relay fee are shown as DUST.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
- l8->setToolTip(tr("This label turns red, if the change is smaller than %1.\n\n This means a fee of at least %2 is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)).arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)));
+ QString toolTip1 = tr("This label turns red, if the transaction size is greater than 1000 bytes.") + "<br /><br />";
+ toolTip1 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)) + "<br /><br />";
+ toolTip1 += tr("Can vary +/- 1 byte per input.");
+
+ QString toolTip2 = tr("Transactions with higher priority are more likely to get included into a block.") + "<br /><br />";
+ toolTip2 += tr("This label turns red, if the priority is smaller than \"medium\"") + "<br /><br />";
+ toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee));
+
+ QString toolTip3 = tr("This label turns red, if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)) + "<br /><br />";
+ toolTip3 += tr("This means a fee of at least %1 is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee)) + "<br /><br />";
+ toolTip3 += tr("Amounts below 0.546 times the minimum relay fee are shown as dust.");
+
+ QString toolTip4 = tr("This label turns red, if the change is smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CENT)) + "<br /><br />";
+ toolTip4 += tr("This means a fee of at least %1 is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CTransaction::nMinTxFee));
+
+ l5->setToolTip(toolTip1);
+ l6->setToolTip(toolTip2);
+ l7->setToolTip(toolTip3);
+ l8->setToolTip(toolTip4);
dialog->findChild<QLabel *>("labelCoinControlBytesText") ->setToolTip(l5->toolTip());
dialog->findChild<QLabel *>("labelCoinControlPriorityText") ->setToolTip(l6->toolTip());
dialog->findChild<QLabel *>("labelCoinControlLowOutputText")->setToolTip(l7->toolTip());
diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui
index 055dd1f98d..e4faa312d4 100644
--- a/src/qt/forms/coincontroldialog.ui
+++ b/src/qt/forms/coincontroldialog.ui
@@ -38,8 +38,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlQuantityText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Quantity:</string>
@@ -64,8 +67,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlBytesText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Bytes:</string>
@@ -106,8 +112,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAmountText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Amount:</string>
@@ -132,8 +141,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlPriorityText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Priority:</string>
@@ -148,6 +160,9 @@
<property name="contextMenuPolicy">
<enum>Qt::ActionsContextMenu</enum>
</property>
+ <property name="text">
+ <string notr="true">medium</string>
+ </property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
@@ -171,8 +186,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlFeeText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Fee:</string>
@@ -200,8 +218,11 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Low Output:</string>
@@ -220,7 +241,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
- <string>no</string>
+ <string notr="true">no</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -245,8 +266,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAfterFeeText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>After Fee:</string>
@@ -274,8 +298,11 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Change:</string>
@@ -377,7 +404,7 @@
<item>
<widget class="QLabel" name="labelLocked">
<property name="text">
- <string>(1 locked)</string>
+ <string notr="true">(1 locked)</string>
</property>
</widget>
</item>
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index ad4aa52900..db8271b016 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -215,8 +215,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlQuantityText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Quantity:</string>
@@ -247,8 +250,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlBytesText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Bytes:</string>
@@ -292,8 +298,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAmountText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Amount:</string>
@@ -321,8 +330,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlPriorityText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Priority:</string>
@@ -338,7 +350,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
- <string>medium</string>
+ <string notr="true">medium</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -366,8 +378,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlFeeText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Fee:</string>
@@ -395,8 +410,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlLowOutputText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Low Output:</string>
@@ -412,7 +430,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
- <string>no</string>
+ <string notr="true">no</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -440,8 +458,11 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAfterFeeText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>After Fee:</string>
@@ -469,8 +490,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlChangeText">
- <property name="styleSheet">
- <string notr="true">font-weight:bold;</string>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
<string>Change:</string>
@@ -693,7 +717,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
- <string>123.456 BTC</string>
+ <string notr="true">123.456 BTC</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>