Commit 46556cdd authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk

newwizardwidget: rework account creation

+ Add Connect to Account Manager option
+ Separate import from backup/device

Change-Id: I2f1b4148cb1793407dce1020baa142e4e225b16f
parent 7be4c628
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/></svg>
\ No newline at end of file
This diff is collapsed.
......@@ -41,7 +41,7 @@ public:
using AccountInfo = Info;
enum WizardMode { CREATE, IMPORT, MIGRATE, CREATESIP };
enum WizardMode { CREATE, IMPORT, MIGRATE, CREATESIP, CONNECTMANAGER };
private:
enum NameRegistrationUIState { BLANK, INVALID, TAKEN, FREE, SEARCHING };
......@@ -62,10 +62,15 @@ public slots:
private slots:
void on_newSIPAccountButton_clicked();
void on_existingPushButton_clicked();
void on_showAdvancedButton_clicked();
void on_fromDeviceButton_clicked();
void on_newAccountButton_clicked();
void on_connectAccountManagerButton_clicked();
void on_fromBackupButton_clicked();
void on_nextButton_clicked();
void on_previousButton_clicked();
void on_pinInfoBtn_clicked();
void on_backupInfoBtn_clicked();
void on_passwordEdit_textChanged(const QString& arg1);
private slots:
......@@ -102,6 +107,7 @@ private:
void setNavBarVisibility(bool visible, bool back=false);
void validateWizardProgression();
void createAccount();
void connectToAccountManager();
void reportFailure();
void processWizardInformations();
};
This diff is collapsed.
......@@ -18,6 +18,7 @@
<file>images/spike.png</file>
<file>images/waiting.gif</file>
<file>images/icons/ic_add_black_18dp_2x.png</file>
<file>images/icons/info-24px.svg</file>
<file>images/icons/ic_arrow_back_24px.svg</file>
<file>images/icons/ic_arrow_back_white_24dp.png</file>
<file>images/icons/ic_arrow_drop_down_black_9dp_2x.png</file>
......
......@@ -12,6 +12,10 @@ QPushButton {
color: rgb(32, 32, 32);
}
QPushButton#pinInfoBtn, QPushButton#backupInfoBtn {
background: transparent;
}
QPushButton#takePhotoButton, QPushButton#importButton {
background-color: rgb(242, 242, 242);
border-radius: 5px;
......@@ -290,7 +294,7 @@ QDialog#DeleteAccountDialog {
QPushButton#nextButton, QPushButton#playButton, QPushButton#clearHistoryButton, QPushButton#doTransferButton,
QPushButton#photoButton,
QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton, QPushButton#newSIPAccountButton,
QPushButton#fromDeviceButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton, QPushButton#newSIPAccountButton, QPushButton#fromBackupButton, QPushButton#connectAccountManagerButton,
QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton,
QPushButton#errorPushButton, QPushButton#registerButton, QPushButton#acceptCRButton, QPushButton#discardCRButton, QPushButton#deleteCancelBtn,
QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn, QPushButton#confirmChangeBtn, QPushButton#backButton {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment