separate AmountEdit and BTCAmountEdit classes, for exchange rate plugin

gui/qt/amountedit.py

@@ -13,6 +13,44 @@ class MyLineEdit(QLineEdit):
 
 class AmountEdit(MyLineEdit):
 
+    def __init__(self, base_unit, is_int = False, parent=None):
+        QLineEdit.__init__(self, parent)
+        self.base_unit = base_unit
+        self.textChanged.connect(self.numbify)
+        self.is_int = is_int
+        self.is_shortcut = False
+
+    def numbify(self):
+        text = unicode(self.text()).strip()
+        if text == '!':
+            self.is_shortcut = True
+        pos = self.cursorPosition()
+        chars = '0123456789'
+        if not self.is_int: chars +='.'
+        s = ''.join([i for i in text if i in chars])
+        if not self.is_int:
+            if '.' in s:
+                p = s.find('.')
+                s = s.replace('.','')
+                s = s[:p] + '.' + s[p:p+8]
+        self.setText(s)
+        self.setCursorPosition(pos)
+
+    def paintEvent(self, event):
+        QLineEdit.paintEvent(self, event)
+        if self.base_unit:
+             panel = QStyleOptionFrameV2()
+             self.initStyleOption(panel)
+             textRect = self.style().subElementRect(QStyle.SE_LineEditContents, panel, self)
+             textRect.adjust(2, 0, -10, 0)
+             painter = QPainter(self)
+             painter.setPen(self.palette().brush(QPalette.Disabled, QPalette.Text).color())
+             painter.drawText(textRect, Qt.AlignRight | Qt.AlignVCenter, self.base_unit())
+
+
+
+class BTCAmountEdit(AmountEdit):
+
     def __init__(self, decimal_point, is_int = False, parent=None):
         QLineEdit.__init__(self, parent)
         self.decimal_point = decimal_point
@@ -37,32 +75,3 @@ class AmountEdit(MyLineEdit):
         x = amount / Decimal(p)
         self.setText(str(x))
 
-    def paintEvent(self, event):
-        QLineEdit.paintEvent(self, event)
-        if self.decimal_point:
-             panel = QStyleOptionFrameV2()
-             self.initStyleOption(panel)
-             textRect = self.style().subElementRect(QStyle.SE_LineEditContents, panel, self)
-             textRect.adjust(2, 0, -10, 0)
-             painter = QPainter(self)
-             painter.setPen(self.palette().brush(QPalette.Disabled, QPalette.Text).color())
-             painter.drawText(textRect, Qt.AlignRight | Qt.AlignVCenter, self.base_unit())
-
-
-    def numbify(self):
-        text = unicode(self.text()).strip()
-        if text == '!':
-            self.is_shortcut = True
-        pos = self.cursorPosition()
-        chars = '0123456789'
-        if not self.is_int: chars +='.'
-        s = ''.join([i for i in text if i in chars])
-        if not self.is_int:
-            if '.' in s:
-                p = s.find('.')
-                s = s.replace('.','')
-                s = s[:p] + '.' + s[p:p+8]
-        self.setText(s)
-        self.setCursorPosition(pos)
-
-

gui/qt/main_window.py

@@ -44,7 +44,7 @@ from electrum import SimpleConfig, Wallet, WalletStorage
 
 from electrum import bmp, pyqrnative
 
-from amountedit import AmountEdit, MyLineEdit
+from amountedit import BTCAmountEdit, MyLineEdit
 from network_dialog import NetworkDialog
 from qrcodewidget import QRCodeWidget
 
@@ -648,7 +648,7 @@ class ElectrumWindow(QMainWindow):
         grid.setRowStretch(8, 1)
 
         from paytoedit import PayToEdit
-        self.amount_e = AmountEdit(self.get_decimal_point)
+        self.amount_e = BTCAmountEdit(self.get_decimal_point)
         self.payto_e = PayToEdit(self.amount_e)
         self.payto_help = HelpButton(_('Recipient of the funds.') + '\n\n' + _('You may enter a Bitcoin address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Bitcoin address)'))
         grid.addWidget(QLabel(_('Pay to')), 1, 0)
@@ -686,7 +686,7 @@ class ElectrumWindow(QMainWindow):
         grid.addWidget(self.amount_e, 4, 1, 1, 2)
         grid.addWidget(self.amount_help, 4, 3)
 
-        self.fee_e = AmountEdit(self.get_decimal_point)
+        self.fee_e = BTCAmountEdit(self.get_decimal_point)
         grid.addWidget(QLabel(_('Fee')), 5, 0)
         grid.addWidget(self.fee_e, 5, 1, 1, 2)
         grid.addWidget(HelpButton(
@@ -2256,7 +2256,7 @@ class ElectrumWindow(QMainWindow):
 
         fee_label = QLabel(_('Transaction fee') + ':')
         grid.addWidget(fee_label, 2, 0)
-        fee_e = AmountEdit(self.get_decimal_point)
+        fee_e = BTCAmountEdit(self.get_decimal_point)
         fee_e.setText(self.format_amount(self.wallet.fee).strip())
         grid.addWidget(fee_e, 2, 1)
         msg = _('Fee per kilobyte of transaction.') + ' ' \