From b8c8714bb663edc8d2d7d21852a6cf787e57c434 Mon Sep 17 00:00:00 2001 From: inso <insomniak.fr@gmaiL.com> Date: Wed, 10 Aug 2016 08:23:14 +0200 Subject: [PATCH] Some fixes in tables --- src/sakia/gui/network/view.py | 1 + src/sakia/gui/txhistory/controller.py | 2 +- src/sakia/gui/txhistory/model.py | 3 +++ src/sakia/gui/txhistory/view.py | 11 +++++------ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/sakia/gui/network/view.py b/src/sakia/gui/network/view.py index 1c03ac66..f956145b 100644 --- a/src/sakia/gui/network/view.py +++ b/src/sakia/gui/network/view.py @@ -28,6 +28,7 @@ class NetworkView(QWidget, Ui_NetworkWidget): self.table_network.resizeColumnsToContents() model.modelAboutToBeReset.connect(lambda: self.table_network.setEnabled(False)) model.modelReset.connect(lambda: self.table_network.setEnabled(True)) + model.modelReset.connect(self.table_network.resizeColumnsToContents) def manual_nodes_refresh(self): self.button_manual_refresh.setEnabled(False) diff --git a/src/sakia/gui/txhistory/controller.py b/src/sakia/gui/txhistory/controller.py index fcf33cf0..8e528b16 100644 --- a/src/sakia/gui/txhistory/controller.py +++ b/src/sakia/gui/txhistory/controller.py @@ -76,7 +76,7 @@ class TxHistoryController(ComponentController): localized_amount = await self.model.received_amount(received_list) text = self.tr("Received {amount} from {number} transfers").format(amount=localized_amount, number=len(received_list)) - if self.app.preferences['notifications']: + if self.model.notifications(): toast.display(self.tr("New transactions received"), text) @once_at_a_time diff --git a/src/sakia/gui/txhistory/model.py b/src/sakia/gui/txhistory/model.py index b7666644..9c37c41e 100644 --- a/src/sakia/gui/txhistory/model.py +++ b/src/sakia/gui/txhistory/model.py @@ -135,3 +135,6 @@ class TxHistoryModel(ComponentModel): @property def table_model(self): return self._proxy + + def notifications(self): + return self.app.preferences['notifications'] \ No newline at end of file diff --git a/src/sakia/gui/txhistory/view.py b/src/sakia/gui/txhistory/view.py index 44c69085..c1049f34 100644 --- a/src/sakia/gui/txhistory/view.py +++ b/src/sakia/gui/txhistory/view.py @@ -1,5 +1,5 @@ from PyQt5.QtWidgets import QWidget, QAbstractItemView, QHeaderView -from PyQt5.QtCore import QDateTime, QEvent +from PyQt5.QtCore import QDateTime, QEvent, Qt from .txhistory_uic import Ui_TxHistoryWidget @@ -14,11 +14,6 @@ class TxHistoryView(QWidget, Ui_TxHistoryWidget): self.busy_balance.hide() self.progressbar.hide() - self.table_history.setSelectionBehavior(QAbstractItemView.SelectRows) - self.table_history.setSortingEnabled(True) - self.table_history.horizontalHeader().setSectionResizeMode(QHeaderView.Interactive) - self.table_history.resizeColumnsToContents() - def get_time_frame(self): """ Get the time frame of date filters @@ -33,8 +28,12 @@ class TxHistoryView(QWidget, Ui_TxHistoryWidget): :return: """ self.table_history.setModel(model) + self.table_history.setSelectionBehavior(QAbstractItemView.SelectRows) + self.table_history.setSortingEnabled(True) + self.table_history.horizontalHeader().setSectionResizeMode(QHeaderView.Interactive) model.modelAboutToBeReset.connect(lambda: self.table_history.setEnabled(False)) model.modelReset.connect(lambda: self.table_history.setEnabled(True)) + model.modelReset.connect(self.table_history.resizeColumnsToContents) async def set_minimum_maximum_datetime(self, minimum, maximum): """ -- GitLab