qt: MyTreeView: use enum.auto() in Columns enum

electrum/gui/qt/address_list.py

@@ -23,6 +23,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import enum
 from enum import IntEnum
 
 from PyQt5.QtCore import Qt, QPersistentModelIndex, QModelIndex
@@ -70,13 +71,13 @@ class AddressTypeFilter(IntEnum):
 
 class AddressList(MyTreeView):
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        TYPE = 0
+        TYPE = enum.auto()
-        ADDRESS = 1
+        ADDRESS = enum.auto()
-        LABEL = 2
+        LABEL = enum.auto()
-        COIN_BALANCE = 3
+        COIN_BALANCE = enum.auto()
-        FIAT_BALANCE = 4
+        FIAT_BALANCE = enum.auto()
-        NUM_TXS = 5
+        NUM_TXS = enum.auto()
 
     filter_columns = [Columns.TYPE, Columns.ADDRESS, Columns.LABEL, Columns.COIN_BALANCE]
 

electrum/gui/qt/channels_list.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import traceback
-from enum import IntEnum
+import enum
 from typing import Sequence, Optional, Dict
 from abc import abstractmethod, ABC
 
@@ -33,15 +33,15 @@ class ChannelsList(MyTreeView):
     update_single_row = QtCore.pyqtSignal(Abstract_Wallet, AbstractChannel)
     gossip_db_loaded = QtCore.pyqtSignal()
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        FEATURES = 0
+        FEATURES = enum.auto()
-        SHORT_CHANID = 1
+        SHORT_CHANID = enum.auto()
-        NODE_ALIAS = 2
+        NODE_ALIAS = enum.auto()
-        CAPACITY = 3
+        CAPACITY = enum.auto()
-        LOCAL_BALANCE = 4
+        LOCAL_BALANCE = enum.auto()
-        REMOTE_BALANCE = 5
+        REMOTE_BALANCE = enum.auto()
-        CHANNEL_STATUS = 6
+        CHANNEL_STATUS = enum.auto()
-        LONG_CHANID = 7
+        LONG_CHANID = enum.auto()
 
     headers = {
         Columns.SHORT_CHANID: _('Short Channel ID'),

electrum/gui/qt/contact_list.py

@@ -23,7 +23,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from enum import IntEnum
+import enum
 
 from PyQt5.QtGui import QStandardItemModel, QStandardItem
 from PyQt5.QtCore import Qt, QPersistentModelIndex, QModelIndex
@@ -39,9 +39,9 @@ from .util import MyTreeView, webopen
 
 class ContactList(MyTreeView):
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        NAME = 0
+        NAME = enum.auto()
-        ADDRESS = 1
+        ADDRESS = enum.auto()
 
     headers = {
         Columns.NAME: _('Name'),

electrum/gui/qt/invoice_list.py

@@ -23,7 +23,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from enum import IntEnum
+import enum
 from typing import Sequence, TYPE_CHECKING
 
 from PyQt5.QtCore import Qt, QItemSelectionModel
@@ -53,11 +53,11 @@ ROLE_SORT_ORDER = Qt.UserRole + 2
 class InvoiceList(MyTreeView):
     key_role = ROLE_REQUEST_ID
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        DATE = 0
+        DATE = enum.auto()
-        DESCRIPTION = 1
+        DESCRIPTION = enum.auto()
-        AMOUNT = 2
+        AMOUNT = enum.auto()
-        STATUS = 3
+        STATUS = enum.auto()
 
     headers = {
         Columns.DATE: _('Date'),

electrum/gui/qt/request_list.py

@@ -23,7 +23,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from enum import IntEnum
+import enum
 from typing import Optional, TYPE_CHECKING
 
 from PyQt5.QtGui import QStandardItemModel, QStandardItem
@@ -50,13 +50,13 @@ ROLE_SORT_ORDER = Qt.UserRole + 2
 class RequestList(MyTreeView):
     key_role = ROLE_KEY
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        DATE = 0
+        DATE = enum.auto()
-        DESCRIPTION = 1
+        DESCRIPTION = enum.auto()
-        AMOUNT = 2
+        AMOUNT = enum.auto()
-        STATUS = 3
+        STATUS = enum.auto()
-        ADDRESS = 4
+        ADDRESS = enum.auto()
-        LN_RHASH = 5
+        LN_RHASH = enum.auto()
 
     headers = {
         Columns.DATE: _('Date'),

electrum/gui/qt/util.py

@@ -1,4 +1,5 @@
 import asyncio
+import enum
 import os.path
 import time
 import sys
@@ -617,6 +618,12 @@ class MyTreeView(QTreeView):
 
     filter_columns: Iterable[int]
 
+    class BaseColumnsEnum(enum.IntEnum):
+        @staticmethod
+        def _generate_next_value_(name: str, start: int, count: int, last_values):
+            # this is overridden to get a 0-based counter
+            return count
+
     def __init__(self, parent: 'ElectrumWindow', create_menu, *,
                  stretch_column=None, editable_columns=None):
         super().__init__(parent)

electrum/gui/qt/utxo_list.py

@@ -24,7 +24,7 @@
 # SOFTWARE.
 
 from typing import Optional, List, Dict, Sequence, Set
-from enum import IntEnum
+import enum
 import copy
 
 from PyQt5.QtCore import Qt
@@ -44,12 +44,12 @@ class UTXOList(MyTreeView):
     _spend_set: Set[str]  # coins selected by the user to spend from
     _utxo_dict: Dict[str, PartialTxInput]  # coin name -> coin
 
-    class Columns(IntEnum):
+    class Columns(MyTreeView.BaseColumnsEnum):
-        OUTPOINT = 0
+        OUTPOINT = enum.auto()
-        ADDRESS = 1
+        ADDRESS = enum.auto()
-        LABEL = 2
+        LABEL = enum.auto()
-        AMOUNT = 3
+        AMOUNT = enum.auto()
-        PARENTS = 4
+        PARENTS = enum.auto()
 
     headers = {
         Columns.OUTPOINT: _('Output point'),