From 188256f31c95af05ca20b88a445b2c8bde57355b Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Fri, 19 May 2017 08:57:57 +0200
Subject: [PATCH] Display page from 1 instead of 0
---
src/sakia/gui/navigation/txhistory/sql_adapter.py | 2 +-
src/sakia/gui/navigation/txhistory/table_model.py | 2 +-
src/sakia/gui/navigation/txhistory/txhistory.ui | 7 -------
src/sakia/gui/navigation/txhistory/view.py | 4 +++-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/sakia/gui/navigation/txhistory/sql_adapter.py b/src/sakia/gui/navigation/txhistory/sql_adapter.py
index 46b79114..ae8630ef 100644
--- a/src/sakia/gui/navigation/txhistory/sql_adapter.py
+++ b/src/sakia/gui/navigation/txhistory/sql_adapter.py
@@ -130,5 +130,5 @@ FROM (
"""
count = self._transfers_and_dividends_count(currency, pubkey, ts_from, ts_to)
return int(count / PAGE_LENGTH)
-
+
diff --git a/src/sakia/gui/navigation/txhistory/table_model.py b/src/sakia/gui/navigation/txhistory/table_model.py
index 3c8ef2c5..d8a8d0dc 100644
--- a/src/sakia/gui/navigation/txhistory/table_model.py
+++ b/src/sakia/gui/navigation/txhistory/table_model.py
@@ -82,7 +82,7 @@ class HistoryTableModel(QAbstractTableModel):
self.init_transfers()
def set_current_page(self, page):
- self.current_page = page
+ self.current_page = page - 1
self.init_transfers()
def pages(self):
diff --git a/src/sakia/gui/navigation/txhistory/txhistory.ui b/src/sakia/gui/navigation/txhistory/txhistory.ui
index 35efb755..a903b359 100644
--- a/src/sakia/gui/navigation/txhistory/txhistory.ui
+++ b/src/sakia/gui/navigation/txhistory/txhistory.ui
@@ -187,13 +187,6 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Page :</string>
- </property>
- </widget>
- </item>
<item>
<widget class="QSpinBox" name="spin_page"/>
</item>
diff --git a/src/sakia/gui/navigation/txhistory/view.py b/src/sakia/gui/navigation/txhistory/view.py
index 5a4fa990..eae64a59 100644
--- a/src/sakia/gui/navigation/txhistory/view.py
+++ b/src/sakia/gui/navigation/txhistory/view.py
@@ -16,6 +16,7 @@ class TxHistoryView(QWidget, Ui_TxHistoryWidget):
self.setupUi(self)
self.stacked_widget.insertWidget(1, transfer_view)
self.button_send.clicked.connect(lambda c: self.stacked_widget.setCurrentWidget(self.transfer_view))
+ self.spin_page.setMinimum(1)
def get_time_frame(self):
"""
@@ -53,7 +54,8 @@ class TxHistoryView(QWidget, Ui_TxHistoryWidget):
self.date_to.setMaximumDateTime(maximum)
def set_max_pages(self, pages):
- self.spin_page.setMaximum(pages)
+ self.spin_page.setSuffix(self.tr(" / {:} pages").format(pages + 1))
+ self.spin_page.setMaximum(pages + 1)
def set_balance(self, balance):
"""
--
GitLab