Skip to content
Snippets Groups Projects
Commit 08a152d5 authored by Vincent Texier's avatar Vincent Texier
Browse files

Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/cutecoin/gui/informations_tab.py
parents abad19a0 927690b4
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>label</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
...@@ -27,6 +30,9 @@ ...@@ -27,6 +30,9 @@
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget> </widget>
</item> </item>
<item> <item>
......
...@@ -53,7 +53,7 @@ class Application(QObject): ...@@ -53,7 +53,7 @@ class Application(QObject):
self._network_manager.finished.connect(self.read_available_version) self._network_manager.finished.connect(self.read_available_version)
self.preferences = {'account': "", self.preferences = {'account': "",
'lang': 'en_GB', 'lang': 'en_GB',
'ref': 'Units' 'ref': 0
} }
self.load() self.load()
...@@ -409,7 +409,7 @@ class Application(QObject): ...@@ -409,7 +409,7 @@ class Application(QObject):
latest = None latest = None
releases = reply.readAll().data().decode('utf-8') releases = reply.readAll().data().decode('utf-8')
logging.debug(releases) logging.debug(releases)
if reply.error == QNetworkReply.NoError: if reply.error() == QNetworkReply.NoError:
for r in json.loads(releases): for r in json.loads(releases):
if not latest: if not latest:
latest = r latest = r
......
...@@ -147,9 +147,9 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -147,9 +147,9 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
""").format( """).format(
self.tr('{:2.0%} / {:} days').format(params['c'], params['dt'] / 86400), self.tr('{:2.0%} / {:} days').format(params['c'], params['dt'] / 86400),
self.tr('Fundamental growth (c) / Delta time (dt)'), self.tr('Fundamental growth (c) / Delta time (dt)'),
self.tr('UD(t+1) = MAX { UD(t) ; c * M(t) / N(t) }'), self.tr('UD(t+1) = MAX { UD(t) ; c × M(t) / N(t) }'),
self.tr('Universal Dividend (formula)'), self.tr('Universal Dividend (formula)'),
self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}').format( self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} × {:} {:} / {:} }}').format(
localized_ud_t1, localized_ud_t1,
localized_ud, localized_ud,
self.get_referential_diff_name(), self.get_referential_diff_name(),
......
...@@ -237,13 +237,17 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -237,13 +237,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
version_url = "" version_url = ""
if not latest[0]: if not latest[0]:
version_info = self.tr("Latest release : {version}") \ version_info = self.tr("Latest release : {version}") \
.format(version='.'.join(latest[1])) .format(version=latest[1])
version_url = latest[2] version_url = latest[2]
new_version_text = self.tr(""" new_version_text = """
<p><b>{version_info}</b></p> <p><b>{version_info}</b></p>
<p><a href="{version_url}">Download link</a></p> <p><a href="{version_url}">{link_text}</a></p>
""").format(version_info=version_info, version_url=version_url) """.format(version_info=version_info,
version_url=version_url,
link_text=self.tr("Download link"))
else:
new_version_text = ""
text = self.tr(""" text = self.tr("""
<h1>Cutecoin</h1> <h1>Cutecoin</h1>
...@@ -353,6 +357,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -353,6 +357,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.combo_referential.setEnabled(True) self.combo_referential.setEnabled(True)
self.combo_referential.blockSignals(False) self.combo_referential.blockSignals(False)
logging.debug(self.app.preferences)
self.combo_referential.setCurrentIndex(self.app.preferences['ref']) self.combo_referential.setCurrentIndex(self.app.preferences['ref'])
self.menu_account.setEnabled(True) self.menu_account.setEnabled(True)
self.action_configure_parameters.setEnabled(True) self.action_configure_parameters.setEnabled(True)
......
...@@ -7,6 +7,7 @@ Created on 11 mai 2015 ...@@ -7,6 +7,7 @@ Created on 11 mai 2015
from PyQt5.QtCore import QCoreApplication from PyQt5.QtCore import QCoreApplication
from ..core.account import Account from ..core.account import Account
from . import toast
from PyQt5.QtWidgets import QDialog from PyQt5.QtWidgets import QDialog
from ..gen_resources.preferences_uic import Ui_PreferencesDialog from ..gen_resources.preferences_uic import Ui_PreferencesDialog
...@@ -41,6 +42,8 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog): ...@@ -41,6 +42,8 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog):
'lang': self.combo_language.currentText(), 'lang': self.combo_language.currentText(),
'ref': self.combo_referential.currentIndex()} 'ref': self.combo_referential.currentIndex()}
self.app.save_preferences(pref) self.app.save_preferences(pref)
toast.display(self.tr("Preferences"),
self.tr("A restart is needed to apply your new preferences."))
super().accept() super().accept()
def reject(self): def reject(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment