From c1b05990e8215c849caab637f0e0a7e9c81698b1 Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Sat, 14 Feb 2015 16:33:04 +0100
Subject: [PATCH] Fixed #70 exception on membership expiration alert
Open a messagebox for better alerting user
---
src/cutecoin/gui/currency_tab.py | 17 +++++++++++------
src/cutecoin/gui/mainwindow.py | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/cutecoin/gui/currency_tab.py b/src/cutecoin/gui/currency_tab.py
index 7d3546b3..6a2e2ec9 100644
--- a/src/cutecoin/gui/currency_tab.py
+++ b/src/cutecoin/gui/currency_tab.py
@@ -176,16 +176,21 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget):
join_date = self.community.get_block(join_block).mediantime
parameters = self.community.get_parameters()
expiration_date = join_date + parameters['sigValidity']
- current_time = QDateTime().currentDateTime()
+ current_time = time.time()
sig_validity = self.community.get_parameters()['sigValidity']
warning_expiration_time = int(sig_validity / 3)
- will_expire_soon = (current_time > expiration_date*1000 - warning_expiration_time*1000)
+ will_expire_soon = (current_time > expiration_date - warning_expiration_time)
+ text = "Connected : Block {0}".format(block_number['number'])
+ self.status_label.setText(text)
- text = "Connected : Block {0}".format(block_number)
if will_expire_soon:
- days = QDateTime().currentDateTime().daysTo(QDateTime(expiration_date*1000))
- text += " - Warning : Membership expiration in {0}".format(days)
- self.status_label.setText(text)
+ days = QDateTime().currentDateTime().daysTo(QDateTime.fromTime_t(expiration_date))
+ QMessageBox.warning(
+ self,
+ "Membership expiration",
+ "Warning : Membership expiration in {0} days".format(days),
+ QMessageBox.Ok
+ )
def refresh_wallets(self):
if self.app.current_account:
diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py
index 10bf7bc0..69081ad6 100644
--- a/src/cutecoin/gui/mainwindow.py
+++ b/src/cutecoin/gui/mainwindow.py
@@ -80,7 +80,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.label_time = QLabel("", self)
- self.statusbar.addPermanentWidget(self.status_label)
+ self.statusbar.addPermanentWidget(self.status_label, 1)
self.statusbar.addPermanentWidget(self.label_time)
self.statusbar.addPermanentWidget(self.combo_referential)
self.update_time()
--
GitLab