Skip to content
Snippets Groups Projects
Commit 955b957b authored by Anthony Léonard's avatar Anthony Léonard
Browse files

Refactoring of wizard dialog for UI consistency and clarity 

The following changes have been made:
 - Many labels were changed for consistency between versions
 - Account creation is split between profile and account panels
 - Linking a device now show a little explanation on how to generate
   a PIN code

Change-Id: Ifdd832f36ada09c2d1ed61f35b670e8b94983c88
Tuleap: #1293
parent ea6d71b1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
stylesheet.css
+ 8
− 6
View file @ 955b957b
...@@ -285,7 +285,7 @@ QWidget#messagingPage{ ...@@ -285,7 +285,7 @@ QWidget#messagingPage{
background: rgb(242, 242, 242); background: rgb(242, 242, 242);
} }
QPushButton#wizardButton, QPushButton#playButton, QPushButton#clearHistoryButton, QPushButton#doTransferButton, QPushButton#nextButton, QPushButton#playButton, QPushButton#clearHistoryButton, QPushButton#doTransferButton,
QPushButton#checkUpdateButton, QPushButton#photoButton, QPushButton#takePhotoButton, QPushButton#importButton, QPushButton#checkUpdateButton, QPushButton#photoButton, QPushButton#takePhotoButton, QPushButton#importButton,
QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton, QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton,
QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton, QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton,
...@@ -296,7 +296,7 @@ QPushButton#errorPushButton, QPushButton#registerButton{ ...@@ -296,7 +296,7 @@ QPushButton#errorPushButton, QPushButton#registerButton{
font: 14px; font: 14px;
} }
QPushButton#wizardButton:hover, QPushButton#playButton:hover, QPushButton#clearHistoryButton:hover, QPushButton#nextButton:hover, QPushButton#playButton:hover, QPushButton#clearHistoryButton:hover,
QPushButton#checkUpdateButton:hover, QPushButton#doTransferButton:hover, QPushButton#photoButton:hover, QPushButton#checkUpdateButton:hover, QPushButton#doTransferButton:hover, QPushButton#photoButton:hover,
QPushButton#takePhotoButton:hover, QPushButton#importButton:hover, QPushButton#takePhotoButton:hover, QPushButton#importButton:hover,
QPushButton#existingPushButton:hover, QPushButton#newAccountButton:hover, QPushButton#previousButton:hover, QPushButton#existingPushButton:hover, QPushButton#newAccountButton:hover, QPushButton#previousButton:hover,
...@@ -306,7 +306,7 @@ QPushButton#registerButton:hover{ ...@@ -306,7 +306,7 @@ QPushButton#registerButton:hover{
background-color: #4dc6d6; background-color: #4dc6d6;
} }
QPushButton#wizardButton:pressed, QPushButton#playButton:pressed, QPushButton#clearHistoryButton:pressed, QPushButton#nextButton:pressed, QPushButton#playButton:pressed, QPushButton#clearHistoryButton:pressed,
QPushButton#checkUpdateButton:pressed, QPushButton#doTransferButton:pressed, QPushButton#photoButton:pressed, QPushButton#checkUpdateButton:pressed, QPushButton#doTransferButton:pressed, QPushButton#photoButton:pressed,
QPushButton#takePhotoButton:pressed, QPushButton#importButton:pressed, QPushButton#takePhotoButton:pressed, QPushButton#importButton:pressed,
QPushButton#existingPushButton:pressed, QPushButton#newAccountButton:pressed, QPushButton#previousButton:pressed, QPushButton#existingPushButton:pressed, QPushButton#newAccountButton:pressed, QPushButton#previousButton:pressed,
...@@ -316,7 +316,8 @@ QPushButton#registerButton:pressed{ ...@@ -316,7 +316,8 @@ QPushButton#registerButton:pressed{
background-color: #34acbd; background-color: #34acbd;
} }
QLineEdit#usernameEdit:enabled, QLineEdit#passwordEdit:enabled, QLineEdit#confirmPasswordEdit:enabled, QLineEdit#pinEdit:enabled{ QLineEdit#usernameEdit:enabled, QLineEdit#passwordEdit:enabled, QLineEdit#confirmPasswordEdit:enabled,
QLineEdit#pinEdit:enabled, QLineEdit#fullNameEdit:enabled{
border-color: rgb(0, 192, 212); border-color: rgb(0, 192, 212);
border-radius: 5px; border-radius: 5px;
border-width: 1px; border-width: 1px;
...@@ -324,7 +325,8 @@ QLineEdit#usernameEdit:enabled, QLineEdit#passwordEdit:enabled, QLineEdit#confir ...@@ -324,7 +325,8 @@ QLineEdit#usernameEdit:enabled, QLineEdit#passwordEdit:enabled, QLineEdit#confir
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
} }
QLineEdit#usernameEdit:disabled, QLineEdit#passwordEdit:disabled, QLineEdit#confirmPasswordEdit:disabled, QLineEdit#pinEdit:disabled{ QLineEdit#usernameEdit:disabled, QLineEdit#passwordEdit:disabled, QLineEdit#confirmPasswordEdit:disabled,
QLineEdit#pinEdit:disabled, QLineEdit#fullNameEdit:disabled{
border-color: rgb(159, 157, 154); border-color: rgb(159, 157, 154);
border-radius: 5px; border-radius: 5px;
border-width: 1px; border-width: 1px;
...@@ -542,7 +544,7 @@ QPushButton#upAudioButton, QPushButton#downAudioButton, QPushButton#upVideoButto ...@@ -542,7 +544,7 @@ QPushButton#upAudioButton, QPushButton#downAudioButton, QPushButton#upVideoButto
QPushButton#avatarButton:hover { QPushButton#avatarButton:hover {
border: 2px solid rgb(77, 77, 77); border: 2px solid rgb(77, 77, 77);
border-radius: 37px; border-radius: 50px;
} }
QWidget#leftPannel{ QWidget#leftPannel{
......
wizarddialog.cpp
+ 57
− 16
View file @ 955b957b
...@@ -45,27 +45,27 @@ WizardDialog::WizardDialog(WizardMode wizardMode, Account* toBeMigrated, QWidget ...@@ -45,27 +45,27 @@ WizardDialog::WizardDialog(WizardMode wizardMode, Account* toBeMigrated, QWidget
setWindowFlags(flags); setWindowFlags(flags);
QPixmap logo(":/images/logo-ring-standard-coul.png"); QPixmap logo(":/images/logo-ring-standard-coul.png");
ui->ringLogo->setPixmap(logo.scaledToHeight(65, Qt::SmoothTransformation));
ui->ringLogo->setAlignment(Qt::AlignHCenter);
ui->welcomeLogo->setPixmap(logo.scaledToHeight(65, Qt::SmoothTransformation)); ui->welcomeLogo->setPixmap(logo.scaledToHeight(65, Qt::SmoothTransformation));
ui->welcomeLogo->setAlignment(Qt::AlignHCenter); ui->welcomeLogo->setAlignment(Qt::AlignHCenter);
ui->usernameEdit->setText(Utils::GetCurrentUserName()); ui->fullNameEdit->setText(Utils::GetCurrentUserName());
movie_ = new QMovie(":/images/loading.gif"); movie_ = new QMovie(":/images/loading.gif");
ui->spinnerLabel->setMovie(movie_); ui->spinnerLabel->setMovie(movie_);
movie_->start(); movie_->start();
if (wizardMode_ == MIGRATION) { if (wizardMode_ == MIGRATION) {
ui->stackedWidget->setCurrentIndex(1); ui->stackedWidget->setCurrentWidget(ui->profilePage);
ui->usernameEdit->setEnabled(false); ui->usernameEdit->setEnabled(false);
ui->usernameEdit->setText(toBeMigrated->displayName()); ui->usernameEdit->setText(toBeMigrated->displayName());
ui->previousButton->hide(); ui->previousButton->hide();
ui->avatarButton->hide(); ui->avatarButton->hide();
ui->pinEdit->hide(); ui->pinEdit->hide();
ui->label->setText(tr("Your account needs to be migrated. Choose a password.")); ui->usernameLabel->setText(tr("Your account needs to be migrated. Choose a password."));
} } else
ui->navBarWidget->hide();
ui->searchingStateLabel->clear(); ui->searchingStateLabel->clear();
connect(&NameDirectory::instance(), SIGNAL(registeredNameFound(const Account*,NameDirectory::LookupStatus,const QString&,const QString&)), connect(&NameDirectory::instance(), SIGNAL(registeredNameFound(const Account*,NameDirectory::LookupStatus,const QString&,const QString&)),
this, SLOT(handle_registeredNameFound(const Account*,NameDirectory::LookupStatus,const QString&,const QString&))); this, SLOT(handle_registeredNameFound(const Account*,NameDirectory::LookupStatus,const QString&,const QString&)));
...@@ -97,9 +97,12 @@ WizardDialog::accept() ...@@ -97,9 +97,12 @@ WizardDialog::accept()
ui->confirmPasswordEdit->setStyleSheet("border-color: rgb(0, 192, 212);"); ui->confirmPasswordEdit->setStyleSheet("border-color: rgb(0, 192, 212);");
ui->pinEdit->setStyleSheet("border-color: rgb(0, 192, 212);"); ui->pinEdit->setStyleSheet("border-color: rgb(0, 192, 212);");
} }
if (wizardMode_ == MIGRATION)
ui->progressLabel->setText(tr("Migrating your Ring account..."));
else
ui->progressLabel->setText(tr("Generating your Ring account...")); ui->progressLabel->setText(tr("Generating your Ring account..."));
ui->stackedWidget->setCurrentIndex(2); ui->navBarWidget->hide();
ui->stackedWidget->setCurrentWidget(ui->spinnerPage);
auto profile = ProfileModel::instance().selectedProfile(); auto profile = ProfileModel::instance().selectedProfile();
...@@ -109,9 +112,9 @@ WizardDialog::accept() ...@@ -109,9 +112,9 @@ WizardDialog::accept()
if (account_ == nullptr) { if (account_ == nullptr) {
account_ = AccountModel::instance().add(ui->usernameEdit->text(), Account::Protocol::RING); account_ = AccountModel::instance().add(ui->usernameEdit->text(), Account::Protocol::RING);
if (not ui->usernameEdit->text().isEmpty()) { if (not ui->fullNameEdit->text().isEmpty()) {
account_->setDisplayName(ui->usernameEdit->text()); account_->setDisplayName(ui->fullNameEdit->text());
profile->person()->setFormattedName(ui->usernameEdit->text()); profile->person()->setFormattedName(ui->fullNameEdit->text());
} }
else { else {
profile->person()->setFormattedName(tr("Unknown")); profile->person()->setFormattedName(tr("Unknown"));
...@@ -208,11 +211,17 @@ WizardDialog::on_newAccountButton_clicked() ...@@ -208,11 +211,17 @@ WizardDialog::on_newAccountButton_clicked()
void void
WizardDialog::changePage(bool existingAccount) WizardDialog::changePage(bool existingAccount)
{ {
ui->stackedWidget->setCurrentIndex(1); if (existingAccount) { // If user want to add a device
ui->accountLabel->setText(tr("Add a device"));
ui->stackedWidget->setCurrentWidget(ui->explanationPage);
} else { // If user want to create a new account
ui->accountLabel->setText(tr("Create your account"));
ui->stackedWidget->setCurrentWidget(ui->profilePage);
}
ui->navBarWidget->show();
ui->avatarButton->setHidden(existingAccount); ui->avatarButton->setHidden(existingAccount);
ui->ringLogo->setHidden(existingAccount); ui->usernameLabel->setHidden(existingAccount);
ui->label->setHidden(existingAccount);
ui->usernameEdit->setHidden(existingAccount); ui->usernameEdit->setHidden(existingAccount);
ui->signUpCheckbox->setHidden(existingAccount); ui->signUpCheckbox->setHidden(existingAccount);
ui->signUpCheckbox->setChecked(!existingAccount); ui->signUpCheckbox->setChecked(!existingAccount);
...@@ -222,10 +231,42 @@ WizardDialog::changePage(bool existingAccount) ...@@ -222,10 +231,42 @@ WizardDialog::changePage(bool existingAccount)
ui->pinEdit->setVisible(existingAccount); ui->pinEdit->setVisible(existingAccount);
} }
void
WizardDialog::on_nextButton_clicked()
{
const QWidget* curWidget = ui->stackedWidget->currentWidget();
if (curWidget == ui->profilePage) {
ui->stackedWidget->setCurrentWidget(ui->accountPage);
}
else if (curWidget == ui->explanationPage) {
ui->stackedWidget->setCurrentWidget(ui->accountPage);
}
else if (curWidget == ui->accountPage) {
accept();
}
}
void void
WizardDialog::on_previousButton_clicked() WizardDialog::on_previousButton_clicked()
{ {
ui->stackedWidget->setCurrentIndex(0); const QWidget* curWidget = ui->stackedWidget->currentWidget();
if (curWidget == ui->profilePage) {
ui->navBarWidget->hide();
ui->stackedWidget->setCurrentWidget(ui->welcomePage);
}
else if (curWidget == ui->explanationPage) {
ui->navBarWidget->hide();
ui->stackedWidget->setCurrentWidget(ui->welcomePage);
}
else if (curWidget == ui->accountPage) {
if (ui->pinEdit->isVisible()) // If we are adding a device
ui->stackedWidget->setCurrentWidget(ui->explanationPage);
else // If we are creating a new account
ui->stackedWidget->setCurrentWidget(ui->profilePage);
}
ui->passwordEdit->setStyleSheet("border-color: rgb(0, 192, 212);"); ui->passwordEdit->setStyleSheet("border-color: rgb(0, 192, 212);");
ui->confirmPasswordEdit->setStyleSheet("border-color: rgb(0, 192, 212);"); ui->confirmPasswordEdit->setStyleSheet("border-color: rgb(0, 192, 212);");
ui->pinEdit->setStyleSheet("border-color: rgb(0, 192, 212);"); ui->pinEdit->setStyleSheet("border-color: rgb(0, 192, 212);");
......
wizarddialog.h
+ 1
− 0
View file @ 955b957b
...@@ -53,6 +53,7 @@ private slots: ...@@ -53,6 +53,7 @@ private slots:
void on_avatarButton_clicked(); void on_avatarButton_clicked();
void on_existingPushButton_clicked(); void on_existingPushButton_clicked();
void on_newAccountButton_clicked(); void on_newAccountButton_clicked();
void on_nextButton_clicked();
void on_previousButton_clicked(); void on_previousButton_clicked();
void on_passwordEdit_textChanged(const QString& arg1); void on_passwordEdit_textChanged(const QString& arg1);
......
wizarddialog.ui
+ 249
− 130
View file @ 955b957b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>500</width> <width>500</width>
<height>370</height> <height>500</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>500</width> <width>500</width>
<height>370</height> <height>500</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</property> </property>
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<widget class="QWidget" name="LoginPage"> <widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<spacer name="verticalSpacer_6"> <spacer name="verticalSpacer_6">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Link this device to an existing account</string> <string>Link this device to an account</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -114,46 +114,60 @@ ...@@ -114,46 +114,60 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="UserDataPage"> <widget class="QWidget" name="explanationPage">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item alignment="Qt::AlignHCenter">
<spacer name="verticalSpacer_4"> <widget class="QLabel" name="label">
<property name="orientation"> <property name="font">
<enum>Qt::Vertical</enum> <font>
<pointsize>30</pointsize>
</font>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>How to add a device</string>
<width>20</width>
<height>3</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="ringLogo"> <widget class="QTextBrowser" name="textBrowser">
<property name="sizePolicy"> <property name="html">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<horstretch>0</horstretch> &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
<verstretch>0</verstretch> p, li { white-space: pre-wrap; }
</sizepolicy> &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> </widget>
<string/> </item>
</layout>
</widget>
<widget class="QWidget" name="profilePage">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="profileLabel">
<property name="font">
<font>
<pointsize>30</pointsize>
</font>
</property> </property>
<property name="scaledContents"> <property name="text">
<bool>false</bool> <string>Create your profile</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>13</width> <width>0</width>
<height>4</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -168,14 +182,14 @@ ...@@ -168,14 +182,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>74</width> <width>100</width>
<height>74</height> <height>100</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>74</width> <width>100</width>
<height>74</height> <height>100</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
...@@ -187,8 +201,8 @@ ...@@ -187,8 +201,8 @@
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>74</width> <width>100</width>
<height>74</height> <height>100</height>
</size> </size>
</property> </property>
<property name="flat"> <property name="flat">
...@@ -197,7 +211,107 @@ ...@@ -197,7 +211,107 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label"> <spacer name="verticalSpacer_2">
<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>30</height>
</size>
</property>
</spacer>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="fullNameLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>17</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Enter your full name:</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLineEdit" name="fullNameEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="accountPage">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="accountLabel">
<property name="font">
<font>
<pointsize>30</pointsize>
</font>
</property>
<property name="text">
<string>Create your account</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="usernameLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>12</pointsize> <pointsize>12</pointsize>
...@@ -212,6 +326,9 @@ ...@@ -212,6 +326,9 @@
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>usernameEdit</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -248,9 +365,6 @@ ...@@ -248,9 +365,6 @@
<pointsize>11</pointsize> <pointsize>11</pointsize>
</font> </font>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="placeholderText"> <property name="placeholderText">
<string>Choose your username</string> <string>Choose your username</string>
</property> </property>
...@@ -280,7 +394,7 @@ ...@@ -280,7 +394,7 @@
<string>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</string> <string>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Register name publicly (experimental)</string> <string>Register public username (experimental)</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
...@@ -381,30 +495,87 @@ ...@@ -381,30 +495,87 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>13</width> <width>0</width>
<height>3</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout>
</widget>
<widget class="QWidget" name="spinnerPage">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>11</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="spinnerLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="ressources.qrc">:/images/loading.gif</pixmap>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <spacer name="verticalSpacer_11">
<property name="bottomMargin"> <property name="orientation">
<number>0</number> <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="progressLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Generating your Ring account...</string>
</property> </property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QWidget" name="navBarWidget" native="true">
<layout class="QHBoxLayout" name="_2">
<item> <item>
<widget class="QPushButton" name="previousButton"> <widget class="QPushButton" name="previousButton">
<property name="minimumSize"> <property name="minimumSize">
...@@ -432,13 +603,7 @@ ...@@ -432,13 +603,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="wizardButton"> <widget class="QPushButton" name="nextButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>85</width> <width>85</width>
...@@ -463,35 +628,6 @@ ...@@ -463,35 +628,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="spinnerPage">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="spinnerLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="ressources.qrc">:/images/loading.gif</pixmap>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="progressLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Generating your Ring account...</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -499,22 +635,5 @@ ...@@ -499,22 +635,5 @@
<resources> <resources>
<include location="ressources.qrc"/> <include location="ressources.qrc"/>
</resources> </resources>
<connections> <connections/>
<connection>
<sender>wizardButton</sender>
<signal>clicked()</signal>
<receiver>WizardDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>300</x>
<y>326</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
<y>175</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment