tMerge pull request #3158 from SomberNight/address_state_indices - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 911dc60681decfe9e0aeeb89727b8e3107bcf133 DIR parent 8deb57e600d56d61718891ab550ba235dc1d708d HTML Author: ThomasV <thomasv@electrum.org> Date: Tue, 31 Oct 2017 07:07:28 +0100 Merge pull request #3158 from SomberNight/address_state_indices fix AddressList: indices of address states Diffstat: M gui/qt/address_list.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- DIR diff --git a/gui/qt/address_list.py b/gui/qt/address_list.py t@@ -42,7 +42,7 @@ class AddressList(MyTreeWidget): self.show_used = 0 self.change_button = QComboBox(self) self.change_button.currentIndexChanged.connect(self.toggle_change) - for t in [_('Change'), _('Receiving')]: + for t in [_('Receiving'), _('Change')]: self.change_button.addItem(t) self.used_button = QComboBox(self) self.used_button.currentIndexChanged.connect(self.toggle_used) t@@ -85,11 +85,11 @@ class AddressList(MyTreeWidget): label = self.wallet.labels.get(address, '') c, u, x = self.wallet.get_addr_balance(address) balance = c + u + x - if self.show_used == 0 and (balance or is_used): + if self.show_used == 1 and (balance or is_used): continue - if self.show_used == 1 and balance == 0: + if self.show_used == 2 and balance == 0: continue - if self.show_used == 2 and not is_used: + if self.show_used == 3 and not is_used: continue balance_text = self.parent.format_amount(balance) fx = self.parent.fx