diff --git a/src/sakia/gui/navigation/txhistory/sql_adapter.py b/src/sakia/gui/navigation/txhistory/sql_adapter.py index 46b79114efe0704faa2421ca9e0382a589fb6b7a..ae8630ef81d944bff1e8d4cedae414ff218a8040 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 3c8ef2c5ce0b72b24cfbe496cd65f5f64f395985..d8a8d0dcb80e72983e6cf61fecba8d52a75131e1 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 35efb75571bdb48d686d73eb3896d220348c4029..a903b359cc826053cc55efdc8a587d73183111d5 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 5a4fa9903c41faa851f997a0c1203bb24c8ebad9..eae64a5961fbaf0ae04889ebea8567ab20cfe957 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): """