diff --git a/res/ui/transfer.ui b/res/ui/transfer.ui index e26418f64b9e25df12a4394e111d00665cfb4371..04a1d75cc9e23bc5efb99474a3bc7fad1d1075b0 100644 --- a/res/ui/transfer.ui +++ b/res/ui/transfer.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>399</width> - <height>402</height> + <height>409</height> </rect> </property> <property name="windowTitle"> @@ -143,6 +143,9 @@ <property name="suffix"> <string> UD</string> </property> + <property name="decimals"> + <number>6</number> + </property> <property name="maximum"> <double>9999999.000000000000000</double> </property> diff --git a/src/cutecoin/gui/informations_tab.py b/src/cutecoin/gui/informations_tab.py index 1f8fd399c46f03c5da67dd3d9e1d4e21fb8533ba..63d7746ae1dda867e8fa6d9e3e1455d1a4eebb1a 100644 --- a/src/cutecoin/gui/informations_tab.py +++ b/src/cutecoin/gui/informations_tab.py @@ -55,12 +55,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): localized_monetary_mass = QLocale().toString(round(self.get_referential_value(block['monetaryMass']))) localized_mass_per_member = QLocale().toString(round(self.get_referential_value(block['monetaryMass'] / block['membersCount']))) else: - localized_ud = QLocale().toString(ud, 'f', 2) + localized_ud = QLocale().toString(ud, 'f', 6) localized_monetary_mass = QLocale().toString( - round(self.get_referential_value(block['monetaryMass'])), 'f', 2 + round(self.get_referential_value(block['monetaryMass'])), 'f', 6 ) localized_mass_per_member = QLocale().toString( - round(self.get_referential_value(block['monetaryMass'] / block['membersCount']), 'f', 2) + round(self.get_referential_value(block['monetaryMass'] / block['membersCount']), 'f', 6) ) # set infos in label diff --git a/src/cutecoin/gui/transactions_tab.py b/src/cutecoin/gui/transactions_tab.py index 96f1d0b553b9a142beceb0e74cce8f75732e474a..514cff55eaa1825da9eb7c08cb6925b8441b3a51 100644 --- a/src/cutecoin/gui/transactions_tab.py +++ b/src/cutecoin/gui/transactions_tab.py @@ -79,11 +79,11 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): else: localized_deposits = QLocale().toString( - self.app.current_account.units_to_ref(proxy.deposits, self.community), 'f', 2) + self.app.current_account.units_to_ref(proxy.deposits, self.community), 'f', 6) localized_payments = QLocale().toString( - self.app.current_account.units_to_ref(proxy.payments, self.community), 'f', 2) + self.app.current_account.units_to_ref(proxy.payments, self.community), 'f', 6) localized_balance = QLocale().toString( - self.app.current_account.units_to_diff_ref(balance, self.community), 'f', 2) + self.app.current_account.units_to_diff_ref(balance, self.community), 'f', 6) self.label_deposit.setText(self.tr("Deposits: {:} {:}").format( localized_deposits, diff --git a/src/cutecoin/gui/transfer.py b/src/cutecoin/gui/transfer.py index e88ef53defd877378adf1daff2f4ff7afec4a242..2600560685b249349a14429a6e9697cea8067659 100644 --- a/src/cutecoin/gui/transfer.py +++ b/src/cutecoin/gui/transfer.py @@ -4,14 +4,12 @@ Created on 2 févr. 2014 @author: inso ''' from PyQt5.QtWidgets import QDialog, QMessageBox, QApplication -from PyQt5.QtCore import QRegExp, Qt +from PyQt5.QtCore import QRegExp, Qt, QLocale from PyQt5.QtGui import QRegExpValidator from ..tools.exceptions import NotEnoughMoneyError, NoPeerAvailable from ..gen_resources.transfer_uic import Ui_TransferMoneyDialog -import logging - class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): @@ -125,6 +123,10 @@ Please try again later""")) amount = self.wallet.value(self.community) ref_amount = self.account.units_to_ref(amount, self.community) ref_name = self.account.ref_name(self.community.currency) + if isinstance(ref_amount, int): + ref_amount = QLocale().toString(ref_amount) + else: + ref_amount = QLocale().toString(ref_amount, 'f', 6) self.label_total.setText("{0} {1}".format(ref_amount, ref_name)) self.spinbox_amount.setSuffix(" " + self.community.currency) self.spinbox_amount.setValue(0) @@ -138,6 +140,10 @@ Please try again later""")) amount = self.wallet.value(self.community) ref_amount = self.account.units_to_ref(amount, self.community) ref_name = self.account.ref_name(self.community.currency) + if isinstance(ref_amount, int): + ref_amount = QLocale().toString(ref_amount) + else: + ref_amount = QLocale().toString(ref_amount, 'f', 6) self.label_total.setText("{0} {1}".format(ref_amount, ref_name)) self.spinbox_amount.setValue(0) amount = self.wallet.value(self.community) diff --git a/src/cutecoin/gui/wallets_tab.py b/src/cutecoin/gui/wallets_tab.py index 817a37cf6e5d3150f978bcfe442e521397af280f..36575d8f5f671049ba9ed7b9f12a83d57365a664 100644 --- a/src/cutecoin/gui/wallets_tab.py +++ b/src/cutecoin/gui/wallets_tab.py @@ -94,12 +94,12 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab): if isinstance(amount, int): localized_amount = QLocale().toString(self.get_referential_value(amount)) else: - localized_amount = QLocale().toString(self.get_referential_value(amount), 'f', 2) + localized_amount = QLocale().toString(self.get_referential_value(amount), 'f', 6) if isinstance(maximum, int): localized_maximum = QLocale().toString(self.get_referential_value(maximum)) else: - localized_maximum = QLocale().toString(self.get_referential_value(maximum), 'f', 2) + localized_maximum = QLocale().toString(self.get_referential_value(maximum), 'f', 6) logging.debug( self.tr("{:} {:} in [{:.2f} - {:}] {:}")) # set infos in label diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py index a2182fa9eaa1c23273580dd5293c95d4a6a1084a..3f1456ebb14b029b67e861d36eb674ef48f6c22d 100644 --- a/src/cutecoin/models/txhistory.py +++ b/src/cutecoin/models/txhistory.py @@ -104,7 +104,7 @@ class TxFilterProxyModel(QSortFilterProxyModel): if isinstance(amount_ref, int): return QLocale().toString(amount_ref) else: - return QLocale().toString(amount_ref, 'f', 2) + return QLocale().toString(amount_ref, 'f', 6) if role == Qt.FontRole: font = QFont() diff --git a/src/cutecoin/models/wallets.py b/src/cutecoin/models/wallets.py index a25d871153c998dbfd344e56c2aaefde98d58019..493a841860fbc5df068011745b26107da53077be 100644 --- a/src/cutecoin/models/wallets.py +++ b/src/cutecoin/models/wallets.py @@ -42,7 +42,7 @@ class WalletsFilterProxyModel(QSortFilterProxyModel): if isinstance(amount_ref, int): return QLocale().toString(amount_ref) else: - return QLocale().toString(amount_ref, 'f', 2) + return QLocale().toString(amount_ref, 'f', 6) if role == Qt.TextAlignmentRole: if source_index.column() == self.sourceModel().columns_types.index('amount'):