From 50198a05274969acf13aa2d207cd926b4952d28a Mon Sep 17 00:00:00 2001
From: vtexier <vit@free.fr>
Date: Tue, 10 Mar 2020 13:16:51 +0100
Subject: [PATCH] [enh] propose new sakia account menu at first start instead
of create a new member account on the network
Change menu order to put pubkey mode in first
---
res/i18n/ts/cs.ts | 10 +++----
res/i18n/ts/de.ts | 10 +++----
res/i18n/ts/es.ts | 10 +++----
res/i18n/ts/fr.ts | 12 ++++----
res/i18n/ts/it.ts | 10 +++----
res/i18n/ts/pl.ts | 10 +++----
res/i18n/ts/pt.ts | 10 +++----
res/i18n/ts/ru.ts | 10 +++----
.../dialogs/connection_cfg/connection_cfg.ui | 30 +++++++++----------
src/sakia/gui/dialogs/connection_cfg/view.py | 2 +-
10 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/res/i18n/ts/cs.ts b/res/i18n/ts/cs.ts
index ad055477..16b1f275 100644
--- a/res/i18n/ts/cs.ts
+++ b/res/i18n/ts/cs.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/de.ts b/res/i18n/ts/de.ts
index 161cdfab..771f256f 100644
--- a/res/i18n/ts/de.ts
+++ b/res/i18n/ts/de.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/es.ts b/res/i18n/ts/es.ts
index cccaa3f0..36fdf2bb 100644
--- a/res/i18n/ts/es.ts
+++ b/res/i18n/ts/es.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/fr.ts b/res/i18n/ts/fr.ts
index a691416f..160eabfd 100644
--- a/res/i18n/ts/fr.ts
+++ b/res/i18n/ts/fr.ts
@@ -355,8 +355,8 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
- <translation>Nouveau compte sur le réseau {0}</translation>
+ <source>New sakia account on {0} network</source>
+ <translation>Nouveau compte sakia pour le réseau {0}</translation>
</message>
</context>
<context>
@@ -447,22 +447,22 @@
<translation>Paramètres du compte</translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation>Créer un nouveau compte membre</translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation>Ajouter un compte membre existant</translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation>Ajouter un portefeuille</translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation>Ajouter par une clé publique (rapide)</translation>
</message>
diff --git a/res/i18n/ts/it.ts b/res/i18n/ts/it.ts
index d955fac1..099e0eac 100644
--- a/res/i18n/ts/it.ts
+++ b/res/i18n/ts/it.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/pl.ts b/res/i18n/ts/pl.ts
index 33dfd705..4727bdad 100644
--- a/res/i18n/ts/pl.ts
+++ b/res/i18n/ts/pl.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/pt.ts b/res/i18n/ts/pt.ts
index ac364008..86e956e6 100644
--- a/res/i18n/ts/pt.ts
+++ b/res/i18n/ts/pt.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/res/i18n/ts/ru.ts b/res/i18n/ts/ru.ts
index 5830a233..df821798 100644
--- a/res/i18n/ts/ru.ts
+++ b/res/i18n/ts/ru.ts
@@ -354,7 +354,7 @@
</message>
<message>
<location filename="../../../src/sakia/gui/dialogs/connection_cfg/view.py" line="156"/>
- <source>New account on {0} network</source>
+ <source>New sakia account on {0} network</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -466,22 +466,22 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
<source>Create a new member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
<source>Add an existing member account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="240"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="239"/>
<source>Add a wallet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="241"/>
+ <location filename="../../../src/sakia/gui/dialogs/connection_cfg/connection_cfg_uic.py" line="238"/>
<source>Add using a public key (quick)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/sakia/gui/dialogs/connection_cfg/connection_cfg.ui b/src/sakia/gui/dialogs/connection_cfg/connection_cfg.ui
index 6acd676f..1f80aca1 100644
--- a/src/sakia/gui/dialogs/connection_cfg/connection_cfg.ui
+++ b/src/sakia/gui/dialogs/connection_cfg/connection_cfg.ui
@@ -20,7 +20,7 @@
<item>
<widget class="QStackedWidget" name="stacked_pages">
<property name="currentIndex">
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page_node">
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -30,13 +30,13 @@
<number>6</number>
</property>
<item>
- <widget class="QPushButton" name="button_register">
+ <widget class="QPushButton" name="button_pubkey">
<property name="text">
- <string>Create a new member account</string>
+ <string>Add using a public key (quick)</string>
</property>
<property name="icon">
<iconset resource="../../../../../res/icons/sakia.icons.qrc">
- <normaloff>:/icons/new_membership</normaloff>:/icons/new_membership</iconset>
+ <normaloff>:/icons/duniter_info_icon</normaloff>:/icons/duniter_info_icon</iconset>
</property>
<property name="iconSize">
<size>
@@ -47,47 +47,47 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="button_connect">
+ <widget class="QPushButton" name="button_wallet">
<property name="text">
- <string>Add an existing member account</string>
+ <string>Add a wallet</string>
</property>
<property name="icon">
<iconset resource="../../../../../res/icons/sakia.icons.qrc">
- <normaloff>:/icons/connect_icon</normaloff>:/icons/connect_icon</iconset>
+ <normaloff>:/icons/wallet_icon</normaloff>:/icons/wallet_icon</iconset>
</property>
<property name="iconSize">
<size>
- <width>32</width>
+ <width>50</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="button_wallet">
+ <widget class="QPushButton" name="button_connect">
<property name="text">
- <string>Add a wallet</string>
+ <string>Add an existing member account</string>
</property>
<property name="icon">
<iconset resource="../../../../../res/icons/sakia.icons.qrc">
- <normaloff>:/icons/wallet_icon</normaloff>:/icons/wallet_icon</iconset>
+ <normaloff>:/icons/connect_icon</normaloff>:/icons/connect_icon</iconset>
</property>
<property name="iconSize">
<size>
- <width>50</width>
+ <width>32</width>
<height>32</height>
</size>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="button_pubkey">
+ <widget class="QPushButton" name="button_register">
<property name="text">
- <string>Add using a public key (quick)</string>
+ <string>Create a new member account</string>
</property>
<property name="icon">
<iconset resource="../../../../../res/icons/sakia.icons.qrc">
- <normaloff>:/icons/duniter_info_icon</normaloff>:/icons/duniter_info_icon</iconset>
+ <normaloff>:/icons/new_membership</normaloff>:/icons/new_membership</iconset>
</property>
<property name="iconSize">
<size>
diff --git a/src/sakia/gui/dialogs/connection_cfg/view.py b/src/sakia/gui/dialogs/connection_cfg/view.py
index 4cf47f88..f568a810 100644
--- a/src/sakia/gui/dialogs/connection_cfg/view.py
+++ b/src/sakia/gui/dialogs/connection_cfg/view.py
@@ -155,7 +155,7 @@ class ConnectionConfigView(QDialog, Ui_ConnectionConfigurationDialog):
"""
self.setWindowTitle(
QCoreApplication.translate(
- "ConnectionConfigView", "New account on {0} network"
+ "ConnectionConfigView", "New sakia account on {0} network"
).format(ROOT_SERVERS[currency]["display"])
)
--
GitLab