From 61ec64a3b4445b6988bca6e55c5697c7bf0b31a1 Mon Sep 17 00:00:00 2001
From: Olivier SOLDANO <olivier.soldano@savoirfairelinux.com>
Date: Thu, 20 Jul 2017 11:12:36 -0400
Subject: [PATCH] update about dialog and account wizard
add Hadrien as contributor and add welcome
over the Ring logo in first page of wizard.
Change-Id: I2b55f5f8b22c6520775d660ebe66c959057a9321
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
aboutdialog.cpp | 1 +
wizarddialog.ui | 65 +++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/aboutdialog.cpp b/aboutdialog.cpp
index 2a12de6..98f1e85 100644
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
@@ -49,6 +49,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Emmanuel Lepage-Vallée</p>"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Frédéric Guimont</p>"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Guillaume Roguez</p>"
+ "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Hadrien De Sousa</p>"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Julien Grossholtz</p>"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Kateryna Kostiuk</p>"
"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Loïc Siret</p>"
diff --git a/wizarddialog.ui b/wizarddialog.ui
index ea60ac4..80e67ac 100644
--- a/wizarddialog.ui
+++ b/wizarddialog.ui
@@ -35,6 +35,9 @@
</property>
<item>
<widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
<widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@@ -50,6 +53,45 @@
</property>
</spacer>
</item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QLabel" name="welcomeLabel">
+ <property name="font">
+ <font>
+ <pointsize>30</pointsize>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(63, 63, 63)</string>
+ </property>
+ <property name="text">
+ <string> Welcome to</string>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="indent">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_12">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QLabel" name="welcomeLogo">
<property name="text">
@@ -123,6 +165,9 @@
<pointsize>30</pointsize>
</font>
</property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(63, 63, 63)</string>
+ </property>
<property name="text">
<string>How to add a device</string>
</property>
@@ -134,13 +179,13 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p>
-<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
-<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
-<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
-<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></string>
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p>
+<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></string>
</property>
</widget>
</item>
@@ -155,6 +200,9 @@ p, li { white-space: pre-wrap; }
<pointsize>30</pointsize>
</font>
</property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(63, 63, 63)</string>
+ </property>
<property name="text">
<string>Create your profile</string>
</property>
@@ -293,6 +341,9 @@ p, li { white-space: pre-wrap; }
<pointsize>30</pointsize>
</font>
</property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(63, 63, 63)</string>
+ </property>
<property name="text">
<string>Create your account</string>
</property>
--
GitLab