Skip to content
Snippets Groups Projects
Commit 0280dca7 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

newwizardwidget: add create SIP account Page 

Change-Id: I2b29023891075c63e398bd218a980e8d4f7bf71f
parent 2311f488
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
newwizardwidget.cpp
+ 90
− 35
View file @ 0280dca7
...@@ -169,6 +169,12 @@ NewWizardWidget::on_newAccountButton_clicked() ...@@ -169,6 +169,12 @@ NewWizardWidget::on_newAccountButton_clicked()
changePage(ui->createRingAccountPage); changePage(ui->createRingAccountPage);
} }
void
NewWizardWidget::on_newSIPAccountButton_clicked()
{
changePage(ui->createRingSIPAccountPage);
}
void NewWizardWidget::changePage(QWidget* toPage) void NewWizardWidget::changePage(QWidget* toPage)
{ {
if (toPage == ui->spinnerPage) { if (toPage == ui->spinnerPage) {
...@@ -194,6 +200,16 @@ void NewWizardWidget::changePage(QWidget* toPage) ...@@ -194,6 +200,16 @@ void NewWizardWidget::changePage(QWidget* toPage)
this, &NewWizardWidget::slotRegisteredNameFound); this, &NewWizardWidget::slotRegisteredNameFound);
validateWizardProgression(); validateWizardProgression();
ui->setAvatarWidget->startBooth(); ui->setAvatarWidget->startBooth();
} else if (toPage == ui->createRingSIPAccountPage) {
ui->SIPusernameEdit->clear();
ui->SIPpasswordEdit->clear();
ui->SIPservernameEdit->clear();
ui->SIPproxyEdit->clear();
ui->SIPfullNameEdit->setText(QString());
ui->SIPusernameEdit->setEnabled(true);
setNavBarVisibility(true);
ui->nextButton->setEnabled(true);
ui->setSIPAvatarWidget->startBooth();
} else if (toPage == ui->linkRingAccountPage) { } else if (toPage == ui->linkRingAccountPage) {
fileToImport_ = QString(""); fileToImport_ = QString("");
ui->fileImportBtn->setText(tr("(None)")); ui->fileImportBtn->setText(tr("(None)"));
...@@ -238,9 +254,12 @@ NewWizardWidget::on_nextButton_clicked() ...@@ -238,9 +254,12 @@ NewWizardWidget::on_nextButton_clicked()
if (curWidget == ui->createRingAccountPage) { if (curWidget == ui->createRingAccountPage) {
wizardMode_ = WizardMode::CREATE; wizardMode_ = WizardMode::CREATE;
processWizardInformations(); processWizardInformations();
} if (curWidget == ui->linkRingAccountPage) { } else if (curWidget == ui->linkRingAccountPage) {
wizardMode_ = WizardMode::IMPORT; wizardMode_ = WizardMode::IMPORT;
processWizardInformations(); processWizardInformations();
} else if (curWidget == ui->createRingSIPAccountPage) {
wizardMode_ = WizardMode::CREATESIP;
processWizardInformations();
} }
} }
...@@ -248,12 +267,13 @@ void ...@@ -248,12 +267,13 @@ void
NewWizardWidget::on_previousButton_clicked() NewWizardWidget::on_previousButton_clicked()
{ {
const QWidget* curWidget = ui->stackedWidget->currentWidget(); const QWidget* curWidget = ui->stackedWidget->currentWidget();
ui->setAvatarWidget->stopBooth(); if (curWidget == ui->createRingAccountPage) { ui->setAvatarWidget->stopBooth(); }
if (curWidget == ui->createRingSIPAccountPage) { ui->setSIPAvatarWidget->stopBooth(); }
disconnect(registeredNameFoundConnection_); disconnect(registeredNameFoundConnection_);
lookupStatusLabel_->hide(); lookupStatusLabel_->hide();
passwordStatusLabel_->hide(); passwordStatusLabel_->hide();
if (curWidget == ui->createRingAccountPage || if (curWidget == ui->createRingAccountPage ||
curWidget == ui->linkRingAccountPage) { curWidget == ui->linkRingAccountPage || curWidget == ui->createRingSIPAccountPage) {
changePage(ui->welcomePage); changePage(ui->welcomePage);
} }
} }
...@@ -379,49 +399,67 @@ NewWizardWidget::validateWizardProgression() ...@@ -379,49 +399,67 @@ NewWizardWidget::validateWizardProgression()
void void
NewWizardWidget::processWizardInformations() NewWizardWidget::processWizardInformations()
{ {
QString alias, password, archivePin; inputPara_.clear();
switch (wizardMode_) { switch (wizardMode_) {
case WizardMode::CREATE: case WizardMode::CREATE:
ui->progressLabel->setText(tr("Generating your Jami account...")); ui->progressLabel->setText(tr("Generating your Jami account..."));
alias = ui->fullNameEdit->text(); inputPara_["alias"] = ui->fullNameEdit->text();
password = ui->passwordEdit->text(); inputPara_["password"] = ui->passwordEdit->text();
ui->fullNameEdit->clear(); ui->fullNameEdit->clear();
ui->passwordEdit->clear(); ui->passwordEdit->clear();
ui->confirmPasswordEdit->clear(); ui->confirmPasswordEdit->clear();
break; break;
case WizardMode::IMPORT: case WizardMode::IMPORT:
ui->progressLabel->setText(tr("Importing account archive...")); ui->progressLabel->setText(tr("Importing account archive..."));
password = ui->importPasswordEdit->text(); inputPara_["password"] = ui->importPasswordEdit->text();
archivePin = ui->pinEdit->text(); inputPara_["archivePin"] = ui->pinEdit->text();
ui->pinEdit->clear(); ui->pinEdit->clear();
ui->importPasswordEdit->clear(); ui->importPasswordEdit->clear();
break; break;
case WizardMode::MIGRATE: case WizardMode::MIGRATE:
ui->progressLabel->setText(tr("Migrating your Jami account...")); ui->progressLabel->setText(tr("Migrating your Jami account..."));
break; break;
case WizardMode::CREATESIP:
ui->progressLabel->setText(tr("Generating your SIP account..."));
if (ui->SIPfullNameEdit->text().isEmpty()) { inputPara_["alias"] = "SIP"; }
else { inputPara_["alias"] = ui->SIPfullNameEdit->text(); }
inputPara_["hostname"] = ui->SIPservernameEdit->text();
inputPara_["username"] = ui->SIPusernameEdit->text();
inputPara_["password"] = ui->SIPpasswordEdit->text();
inputPara_["proxy"] = ui->SIPproxyEdit->text();
break;
} }
inputPara_["archivePath"] = fileToImport_;
if (inputPara_.find("archivePin") == inputPara_.end()) { inputPara_["archivePin"] = ""; }
changePage(ui->spinnerPage); changePage(ui->spinnerPage);
createRingAccount(alias, password, archivePin, fileToImport_); createAccount();
Utils::CreateStartupLink(); Utils::CreateStartupLink();
} }
void void
NewWizardWidget::createRingAccount(const QString &displayName, NewWizardWidget::createAccount()
const QString &password,
const QString &pin,
const QString &archivePath)
{ {
bool isRing = wizardMode_ == WizardMode::CREATE || wizardMode_ == WizardMode::IMPORT;
Utils::oneShotConnect(&LRCInstance::accountModel(), &lrc::api::NewAccountModel::accountAdded, Utils::oneShotConnect(&LRCInstance::accountModel(), &lrc::api::NewAccountModel::accountAdded,
[this](const std::string& accountId) { [this, isRing](const std::string& accountId) {
//set default ringtone //set default ringtone
auto confProps = LRCInstance::accountModel().getAccountConfig(accountId); auto confProps = LRCInstance::accountModel().getAccountConfig(accountId);
if (confProps.username.empty()) if (confProps.username.empty())
return; return;
confProps.Ringtone.ringtonePath = Utils::GetRingtonePath().toStdString(); confProps.Ringtone.ringtonePath = Utils::GetRingtonePath().toStdString();
if (!isRing) {
// set SIP details
confProps.hostname = inputPara_["hostname"].toStdString();
confProps.username = inputPara_["username"].toStdString();
confProps.password = inputPara_["password"].toStdString();
confProps.proxyServer = inputPara_["proxy"].toStdString();
}
LRCInstance::accountModel().setAccountConfig(accountId, confProps); LRCInstance::accountModel().setAccountConfig(accountId, confProps);
// RING SPECIFIC
if (isRing) {
connect(LRCInstance::editableAccountModel(), connect(LRCInstance::editableAccountModel(),
&lrc::api::NewAccountModel::nameRegistrationEnded, &lrc::api::NewAccountModel::nameRegistrationEnded,
[this] { [this] {
...@@ -435,7 +473,11 @@ NewWizardWidget::createRingAccount(const QString &displayName, ...@@ -435,7 +473,11 @@ NewWizardWidget::createRingAccount(const QString &displayName,
"", "",
registeredName_.toStdString() registeredName_.toStdString()
); );
if (ui->setAvatarWidget->hasAvatar()) { }
// END RING SPECIFIC
if (ui->setSIPAvatarWidget->hasAvatar() && wizardMode_ == WizardMode::CREATESIP) {
LRCInstance::setCurrAccAvatar(ui->setSIPAvatarWidget->getAvatarPixmap());
} else if (ui->setAvatarWidget->hasAvatar() && wizardMode_ == WizardMode::CREATE) {
LRCInstance::setCurrAccAvatar(ui->setAvatarWidget->getAvatarPixmap()); LRCInstance::setCurrAccAvatar(ui->setAvatarWidget->getAvatarPixmap());
} }
}); });
...@@ -452,14 +494,27 @@ NewWizardWidget::createRingAccount(const QString &displayName, ...@@ -452,14 +494,27 @@ NewWizardWidget::createRingAccount(const QString &displayName,
reportFailure(); reportFailure();
}); });
QtConcurrent::run( QtConcurrent::run(
[=] { [this, isRing] {
if (isRing) {
LRCInstance::accountModel().createNewAccount( LRCInstance::accountModel().createNewAccount(
lrc::api::profile::Type::RING, lrc::api::profile::Type::RING,
displayName.toStdString(), inputPara_["alias"].toStdString(),
archivePath.toStdString(), inputPara_["archivePath"].toStdString(),
password.toStdString(), inputPara_["password"].toStdString(),
pin.toStdString() inputPara_["archivePin"].toStdString()
);
} else {
LRCInstance::accountModel().createNewAccount(
lrc::api::profile::Type::SIP,
inputPara_["alias"].toStdString(),
inputPara_["archivePath"].toStdString(),
"",
"",
inputPara_["username"].toStdString()
); );
QThread::sleep(2);
emit NavigationRequested(ScreenEnum::CallScreen);
}
}); });
changePage(ui->spinnerPage); changePage(ui->spinnerPage);
repaint(); repaint();
......
newwizardwidget.h
+ 6
− 5
View file @ 0280dca7
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <QLabel> #include <QLabel>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <map>
#include "lrcinstance.h" #include "lrcinstance.h"
#include "navwidget.h" #include "navwidget.h"
...@@ -38,7 +39,7 @@ public: ...@@ -38,7 +39,7 @@ public:
using AccountInfo = Info; using AccountInfo = Info;
enum WizardMode { CREATE, IMPORT, MIGRATE }; enum WizardMode { CREATE, IMPORT, MIGRATE, CREATESIP };
private: private:
enum NameRegistrationUIState { BLANK, INVALID, TAKEN, FREE, SEARCHING }; enum NameRegistrationUIState { BLANK, INVALID, TAKEN, FREE, SEARCHING };
...@@ -55,6 +56,8 @@ public: ...@@ -55,6 +56,8 @@ public:
//UI Slots //UI Slots
private slots: private slots:
void on_newSIPAccountButton_clicked();
void on_existingPushButton_clicked(); void on_existingPushButton_clicked();
void on_newAccountButton_clicked(); void on_newAccountButton_clicked();
void on_nextButton_clicked(); void on_nextButton_clicked();
...@@ -90,15 +93,13 @@ private: ...@@ -90,15 +93,13 @@ private:
QMetaObject::Connection registeredNameFoundConnection_; QMetaObject::Connection registeredNameFoundConnection_;
QString fileToImport_; QString fileToImport_;
QLabel* passwordStatusLabel_; QLabel* passwordStatusLabel_;
std::map<std::string, QString> inputPara_;
void updateNameRegistrationUi(NameRegistrationUIState state); void updateNameRegistrationUi(NameRegistrationUIState state);
void changePage(QWidget* toPage); void changePage(QWidget* toPage);
void setNavBarVisibility(bool visible, bool back=false); void setNavBarVisibility(bool visible, bool back=false);
void validateWizardProgression(); void validateWizardProgression();
void createRingAccount(const QString &displayName = QString(), void createAccount();
const QString &password = QString(),
const QString &pin = QString(),
const QString &archivePath = QString());
void reportFailure(); void reportFailure();
void processWizardInformations(); void processWizardInformations();
}; };
newwizardwidget.ui
+ 780
− 10
View file @ 0280dca7
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="welcomePage"> <widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>17</width>
<height>60</height> <height>57</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -167,14 +167,20 @@ ...@@ -167,14 +167,20 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>17</width>
<height>20</height> <height>14</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="welcomeLogo"> <widget class="QLabel" name="welcomeLogo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName"> <property name="accessibleName">
<string>Welcome Logo</string> <string>Welcome Logo</string>
</property> </property>
...@@ -189,12 +195,12 @@ ...@@ -189,12 +195,12 @@
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>13</width>
<height>60</height> <height>57</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -278,6 +284,50 @@ ...@@ -278,6 +284,50 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="newSIPAccountButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>220</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>220</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Create Jami SIP account button</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
<string>Push button for Jami SIP account creation start trigger</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Create a SIP account</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_5"> <spacer name="verticalSpacer_5">
<property name="orientation"> <property name="orientation">
...@@ -285,8 +335,8 @@ ...@@ -285,8 +335,8 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>17</width>
<height>40</height> <height>65</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -1416,6 +1466,726 @@ instead of using your ID.</string> ...@@ -1416,6 +1466,726 @@ instead of using your ID.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="createRingSIPAccountPage">
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="SIPprofileSectionOuterWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="SIPprofileLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="SIPprofileSectionLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>15</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(63, 63, 63)</string>
</property>
<property name="text">
<string>Profile</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPprofileSectionInnerWidget" native="true">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="SIPverticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="SIPgridWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_100">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="PhotoboothWidget" name="setSIPAvatarWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_16">
<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>3</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPaccountSectionOuterWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_12">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="SIPfullNameWidget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="SIPfullNameEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="toolTip">
<string/>
</property>
<property name="placeholderText">
<string>Profile name</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_17">
<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>5</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="SIPaccountSectionLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(63, 63, 63)</string>
</property>
<property name="text">
<string>SIP Account</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPaccountSectionInnerWidget" native="true">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="topMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_8">
<property name="topMargin">
<number>0</number>
</property>
<property name="spacing">
<number>7</number>
</property>
<item row="0" column="0">
<widget class="QWidget" name="SIPverticalWidget1" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="SIPsignUpWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPusernameWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="SIPusernameLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="SIPservernameEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="toolTip">
<string>SIP Server edit</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="placeholderText">
<string>Server</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPproxyWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="SIPproxyLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="SIPproxyEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="toolTip">
<string>SIP proxy input</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
<string>SIP proxy text entry</string>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="placeholderText">
<string>Proxy</string>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPpassWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="SIPpassLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="SIPusernameEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="toolTip">
<string>SIP username input</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
<string>SIP Password text entry</string>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="placeholderText">
<string>Username</string>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="SIPconfPassWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="SIPconfirmPassLabel">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="SIPpasswordEdit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="toolTip">
<string>SIP Password text input</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
<string>SIP Password text input</string>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
<property name="placeholderText">
<string>Password</string>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="spinnerPage"> <widget class="QWidget" name="spinnerPage">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
......
stylesheet.css
+ 17
− 20
View file @ 0280dca7
...@@ -309,12 +309,11 @@ QDialog#DeleteAccountDialog { ...@@ -309,12 +309,11 @@ QDialog#DeleteAccountDialog {
QPushButton#nextButton, QPushButton#playButton, QPushButton#clearHistoryButton, QPushButton#doTransferButton, QPushButton#nextButton, QPushButton#playButton, QPushButton#clearHistoryButton, QPushButton#doTransferButton,
QPushButton#photoButton, QPushButton#photoButton,
QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton, QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previousButton, QPushButton#exportButton, QPushButton#newSIPAccountButton,
QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton, QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton,
QPushButton#errorPushButton, QPushButton#registerButton, QPushButton#acceptCRButton, QPushButton#discardCRButton, QPushButton#deleteCancelBtn, QPushButton#errorPushButton, QPushButton#registerButton, QPushButton#acceptCRButton, QPushButton#discardCRButton, QPushButton#deleteCancelBtn,
QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn, QPushButton#confirmChangeBtn, QPushButton#backButton { QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn, QPushButton#confirmChangeBtn, QPushButton#backButton {
background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #109ede, stop: 1.0 #2b5084);
stop: 0 #109ede, stop: 1.0 #2b5084);
border: 0px; border: 0px;
border-radius: 15px; border-radius: 15px;
height: 30px; height: 30px;
...@@ -324,7 +323,7 @@ QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn, ...@@ -324,7 +323,7 @@ QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn,
QPushButton#nextButton:disabled, QPushButton#playButton:disabled, QPushButton#clearHistoryButton:disabled, QPushButton#nextButton:disabled, QPushButton#playButton:disabled, QPushButton#clearHistoryButton:disabled,
QPushButton#doTransferButton:disabled, QPushButton#photoButton:disabled, QPushButton#doTransferButton:disabled, QPushButton#photoButton:disabled,
QPushButton#existingPushButton:disabled, QPushButton#newAccountButton:disabled, QPushButton#previousButton:disabled, QPushButton#existingPushButton:disabled, QPushButton#newAccountButton:disabled, QPushButton#previousButton:disabled, QPushButton#newSIPAccountButton:disabled,
QPushButton#exportButton:disabled, QPushButton#cancelAddButton:disabled, QPushButton#exportOnRingButton:disabled, QPushButton#exportButton:disabled, QPushButton#cancelAddButton:disabled, QPushButton#exportOnRingButton:disabled,
QPushButton#addDeviceButton:disabled, QPushButton#exportEndedOkButton:disabled, QPushButton#errorPushButton:disabled, QPushButton#addDeviceButton:disabled, QPushButton#exportEndedOkButton:disabled, QPushButton#errorPushButton:disabled,
QPushButton#registerButton:disabled, QPushButton#acceptCRButton:disabled, QPushButton#discardCRButton:disabled, QPushButton#registerButton:disabled, QPushButton#acceptCRButton:disabled, QPushButton#discardCRButton:disabled,
...@@ -344,14 +343,13 @@ QPushButton#cancelChangeBtn { ...@@ -344,14 +343,13 @@ QPushButton#cancelChangeBtn {
QPushButton#nextButton:hover, QPushButton#playButton:hover, QPushButton#clearHistoryButton:hover, QPushButton#nextButton:hover, QPushButton#playButton:hover, QPushButton#clearHistoryButton:hover,
QPushButton#doTransferButton:hover, QPushButton#photoButton:hover, QPushButton#doTransferButton:hover, QPushButton#photoButton:hover,
QPushButton#existingPushButton:hover, QPushButton#newAccountButton:hover, QPushButton#previousButton:hover, QPushButton#existingPushButton:hover, QPushButton#newAccountButton:hover, QPushButton#previousButton:hover, QPushButton#newSIPAccountButton:hover,
QPushButton#exportButton:hover, QPushButton#cancelAddButton:hover, QPushButton#exportOnRingButton:hover, QPushButton#exportButton:hover, QPushButton#cancelAddButton:hover, QPushButton#exportOnRingButton:hover,
QPushButton#addDeviceButton:hover, QPushButton#exportEndedOkButton:hover, QPushButton#errorPushButton:hover, QPushButton#addDeviceButton:hover, QPushButton#exportEndedOkButton:hover, QPushButton#errorPushButton:hover,
QPushButton#registerButton:hover, QPushButton#acceptCRButton:hover, QPushButton#discardCRButton:hover, QPushButton#registerButton:hover, QPushButton#acceptCRButton:hover, QPushButton#discardCRButton:hover,
QPushButton#deleteCancelBtn:hover, QPushButton#dhtImportBtn:hover, QPushButton#fileImportBtn:hover, QPushButton#deleteCancelBtn:hover, QPushButton#dhtImportBtn:hover, QPushButton#fileImportBtn:hover,
QPushButton#changePassBtn:hover, QPushButton#confirmChangeBtn:hover, QPushButton#backButton:hover { QPushButton#changePassBtn:hover, QPushButton#confirmChangeBtn:hover, QPushButton#backButton:hover {
background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #2b4b7e, stop: 1.0 #001d4d);
stop: 0 #2b4b7e, stop: 1.0 #001d4d);
color: white; color: white;
} }
...@@ -362,14 +360,13 @@ QPushButton#deleteButton:hover, QPushButton#deleteBanBtn:hover, QPushButton#canc ...@@ -362,14 +360,13 @@ QPushButton#deleteButton:hover, QPushButton#deleteBanBtn:hover, QPushButton#canc
QPushButton#nextButton:pressed, QPushButton#playButton:pressed, QPushButton#clearHistoryButton:pressed, QPushButton#nextButton:pressed, QPushButton#playButton:pressed, QPushButton#clearHistoryButton:pressed,
QPushButton#doTransferButton:pressed, QPushButton#photoButton:pressed, QPushButton#doTransferButton:pressed, QPushButton#photoButton:pressed,
QPushButton#existingPushButton:pressed, QPushButton#newAccountButton:pressed, QPushButton#previousButton:pressed, QPushButton#existingPushButton:pressed, QPushButton#newAccountButton:pressed, QPushButton#previousButton:pressed, QPushButton#newSIPAccountButton:pressed,
QPushButton#exportButton:pressed, QPushButton#cancelAddButton:pressed, QPushButton#exportOnRingButton:pressed, QPushButton#exportButton:pressed, QPushButton#cancelAddButton:pressed, QPushButton#exportOnRingButton:pressed,
QPushButton#addDeviceButton:pressed, QPushButton#exportEndedOkButton:pressed, QPushButton#errorPushButton:pressed, QPushButton#addDeviceButton:pressed, QPushButton#exportEndedOkButton:pressed, QPushButton#errorPushButton:pressed,
QPushButton#registerButton:pressed, QPushButton#acceptCRButton:pressed, QPushButton#discardCRButton:pressed, QPushButton#registerButton:pressed, QPushButton#acceptCRButton:pressed, QPushButton#discardCRButton:pressed,
QPushButton#deleteCancelBtn:pressed, QPushButton#dhtImportBtn:pressed, QPushButton#fileImportBtn:pressed, QPushButton#deleteCancelBtn:pressed, QPushButton#dhtImportBtn:pressed, QPushButton#fileImportBtn:pressed,
QPushButton#changePassBtn:pressed, QPushButton#confirmChangeBtn:pressed, QPushButton#backButton:pressed { QPushButton#changePassBtn:pressed, QPushButton#confirmChangeBtn:pressed, QPushButton#backButton:pressed {
background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #043161, stop: 1.0 #00113f);
stop: 0 #043161, stop: 1.0 #00113f);
color: white; color: white;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment