diff --git a/client/dialogs/FirstRun.cpp b/client/dialogs/FirstRun.cpp index 13d89e79d..bb3edb12c 100644 --- a/client/dialogs/FirstRun.cpp +++ b/client/dialogs/FirstRun.cpp @@ -22,11 +22,9 @@ #include "Settings.h" -#include +#include #include -#include - FirstRun::FirstRun(QWidget *parent) : QDialog(parent) , ui(new Ui::FirstRun) @@ -34,64 +32,42 @@ FirstRun::FirstRun(QWidget *parent) ui->setupUi(this); setWindowFlag(Qt::FramelessWindowHint); setAttribute(Qt::WA_DeleteOnClose); - setFixedSize( size() ); - setCursor(Qt::OpenHandCursor); + setFixedSize(size()); if(parent) move(parent->geometry().center() - geometry().center()); - // Page 1: language - ui->lang->addItem(QStringLiteral("Eesti keel")); - ui->lang->addItem(QStringLiteral("English")); - ui->lang->setCurrentIndex(Settings::LANGUAGE == QLatin1String("en") ? 1 : 0); - - connect(ui->lang, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) { - switch(index) - { - case 1: emit langChanged(QStringLiteral("en")); break; - default: emit langChanged(QStringLiteral("et")); break; - } + ui->langEn->setChecked(Settings::LANGUAGE == QLatin1String("en")); + ui->langEt->setChecked(!ui->langEn->isChecked()); + ui->pageGroup->setId(ui->navIntro, Intro); + ui->pageGroup->setId(ui->navSign, Signing); + ui->pageGroup->setId(ui->navCrypto, Encryption); + ui->pageGroup->setId(ui->navEid, MyEid); + connect(ui->langGroup, qOverload(&QButtonGroup::buttonClicked), this, + [this](QAbstractButton *button) { + emit langChanged(button == ui->langEn ? QStringLiteral("en") : QStringLiteral("et")); ui->retranslateUi(this); loadImages(); + setView(ui->pageGroup->button(ui->stack->currentIndex())); }); ui->coatOfArms->load(QStringLiteral(":/images/Logo_Suur.svg")); ui->leaves->load(QStringLiteral(":/images/vapilehed.svg")); ui->structureFunds->load(QStringLiteral(":/images/Struktuurifondid.svg")); - ui->signWidget->load(QStringLiteral(":/images/icon_Allkiri_hover.svg")); - ui->cryptoWidget->load(QStringLiteral(":/images/icon_Krypto_hover.svg")); - ui->eidWidget->load(QStringLiteral(":/images/icon_Minu_eID_hover.svg")); - ui->signOne->load(QStringLiteral(":/images/intro_one.svg")); - ui->signTwo->load(QStringLiteral(":/images/intro_two.svg")); - ui->signThree->load(QStringLiteral(":/images/intro_three.svg")); - ui->cryptoOne->load(QStringLiteral(":/images/intro_one.svg")); - ui->cryptoTwo->load(QStringLiteral(":/images/intro_two.svg")); - ui->cryptoThree->load(QStringLiteral(":/images/intro_three.svg")); - - connect(ui->buttonGroup, QOverload::of(&QButtonGroup::buttonClicked), this, [this](QAbstractButton *b){ - if(b == ui->continueBtn) - ui->stack->setCurrentIndex(Intro); - if(b == ui->introViewSigning || - b == ui->cryptoGotoSigning || - b == ui->eidGotoSigning) - ui->stack->setCurrentIndex(Signing); - if(b == ui->introViewEncryption || - b == ui->signNext || - b == ui->signGotoEncryption || - b == ui->eidGotoEncryption) - ui->stack->setCurrentIndex(Encryption); - if(b == ui->introViewEid || - b == ui->cryptoNext || - b == ui->signGotoEid || - b == ui->cryptoGotoEid) - ui->stack->setCurrentIndex(MyEid); - if(b == ui->introSkip || - b == ui->signSkip || - b == ui->cryptoSkip || - b == ui->eidEnter) + ui->signWidget->load(QStringLiteral(":/images/intro_sign.svg")); + ui->cryptoWidget->load(QStringLiteral(":/images/intro_crypto.svg")); + ui->eidWidget->load(QStringLiteral(":/images/intro_myeid.svg")); + connect(ui->pageGroup, qOverload(&QButtonGroup::buttonClicked), + this, &FirstRun::setView); + connect(ui->btnSkip, &QPushButton::clicked, this, &FirstRun::close); + connect(ui->btnNext, &QPushButton::clicked, this, [this] { + if(ui->stack->currentIndex() == MyEid) close(); + else + setView(ui->pageGroup->button(ui->stack->currentIndex() + 1)); }); loadImages(); + setView(nullptr); } FirstRun::~FirstRun() @@ -99,26 +75,6 @@ FirstRun::~FirstRun() delete ui; } -void FirstRun::keyPressEvent(QKeyEvent *event) -{ - auto next = ui->stack->currentIndex(); - switch(event->key()) - { - case Qt::Key_Left: - next = std::max(ui->stack->currentIndex() - 1, Language); - break; - case Qt::Key_Right: - next = std::min(ui->stack->currentIndex() + 1, MyEid); - break; - default: - QDialog::keyPressEvent(event); - break; - } - - if(next != ui->stack->currentIndex()) - ui->stack->setCurrentIndex(next); -} - void FirstRun::loadImages() { QString lang = Settings::LANGUAGE; @@ -134,3 +90,18 @@ void FirstRun::loadImages() loadPixmap(QStringLiteral("intro_eid-manage"), ui->eidImage1); loadPixmap(QStringLiteral("intro_eid-info"), ui->eidImage3); } + +void FirstRun::setView(QAbstractButton *button) +{ + const auto view = button ? View(ui->pageGroup->id(button)) : Language; + ui->stack->setCurrentIndex(view); + ui->navPane->setVisible(view != Language); + if(button) + button->setChecked(true); + + ui->btnNext->setText(view == MyEid ? tr("Enter the application") : + view == Language ? tr("Continue") : tr("View next intro")); + ui->btnSkip->setText(tr("Close introduction")); + ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2") + .arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE))); +} diff --git a/client/dialogs/FirstRun.h b/client/dialogs/FirstRun.h index 2d2299a86..fe5093755 100644 --- a/client/dialogs/FirstRun.h +++ b/client/dialogs/FirstRun.h @@ -21,6 +21,8 @@ #include +class QAbstractButton; + namespace Ui { class FirstRun; } @@ -37,7 +39,6 @@ class FirstRun final: public QDialog void langChanged(const QString& lang); private: - void keyPressEvent(QKeyEvent *event) final; void loadImages(); enum View @@ -49,6 +50,7 @@ class FirstRun final: public QDialog MyEid }; + void setView(QAbstractButton *button); + Ui::FirstRun *ui; }; - diff --git a/client/dialogs/FirstRun.ui b/client/dialogs/FirstRun.ui index 7718e35fd..34bbe8b04 100644 --- a/client/dialogs/FirstRun.ui +++ b/client/dialogs/FirstRun.ui @@ -10,7 +10,22 @@ 600 - + + + 1024 + 600 + + + + + 1024 + 600 + + + + #FirstRun { background-color: #FFFFFF; } + + 0 @@ -23,1390 +38,1616 @@ 0 - - + + 0 + + + - QToolButton { -border: none; -border-radius: 5px; -background-color: #F4F5F6; -width: 10px; -height: 10px; -} -#signGotoSigning, #cryptoGotoEncryption, #eidGotoEid { -background-color: #B9D9EB; + #navPane { +border-right: 1px solid #E7EAEF; } -QPushButton { -padding: 9px 12px; -border-radius: 4px; -color: #ffffff; -background-color: #2F70B6; +#navTitle { +padding: 0px 22px 16px 22px; font-family: Roboto, Helvetica; -font-size: 12px; +font-size: 18px; font-weight: 700; +color: #003168; } -QPushButton:hover, QPushButton:focus { -background-color: #2B66A6; -} -QPushButton:pressed { -background-color: #215081; -} -#introSkip, #signSkip, #cryptoSkip { -background-color: none; -color: #2F70B6; +QRadioButton { +font-family: Roboto, Helvetica; +font-size: 14px; +color: #203E8A; +border: none; +padding: 11px 24px; } -#introSkip:hover, #signSkip:hover, #cryptoSkip:hover, -#introSkip:focus, #signSkip:focus, #cryptoSkip:focus { -background-color: #EAF1F8; +QRadioButton::indicator { +width: 0px; +height: 0px; +background-color: transparent; +selection-background-color: transparent; +color: transparent; +selection-color: transparent; } -#introSkip:pressed, #signSkip:pressed, #cryptoSkip:pressed { +QRadioButton:checked { background-color: #BFD3E8; -} -QLabel { +} + + + + 0 + + + 0 + + + 24 + + + 0 + + + 0 + + + + + Qt::TabFocus + + + Initial introduction + + + Qt::AlignCenter + + + + + + + PointingHandCursor + + + 1. About the DigiDoc application + + + true + + + pageGroup + + + + + + + PointingHandCursor + + + 2. Signing + + + pageGroup + + + + + + + PointingHandCursor + + + 3. Encryption + + + pageGroup + + + + + + + PointingHandCursor + + + 4. Managing your eIDs + + + pageGroup + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + QLabel { font-family: Roboto, Helvetica; font-size: 14px; -color: #353739; +color: #07142A; } #title, #welcome, #introTitle, #signTitle, #cryptoTitle, #eidTitle { -font-size: 20px; +font-size: 18px; font-weight: 700; -color: #041E42; +color: #003168; } #introLabelSign, #introLabelCrypto, #introLabelEid, #signLabel1, #signLabel2, #signLabel3, #cryptoLabel1, #cryptoLabel2, #cryptoLabel3, #eidLabel1, #eidLabel3 { -font-size: 18px; -color: #041E42; -} - - - 0 - - - - #langPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } - - - - - 412 - 417 - 201 - 35 - - - - - 201 - 35 - - - - - 201 - 35 - - - - PointingHandCursor - - - QComboBox { -padding: 0px 14px; -border: 1px solid #C4CBD8; -border-radius: 4px; -background-color: #FFFFFF; -color: #07142A; -font-size: 16px; -} -QComboBox QWidget#popup { -background-color: transparent; +font-weight: 700; +color: #003168; } -QComboBox QWidget#content { -border: 1px solid #C4CBD8; +#signImage1, #signImage2, #signImage3, +#cryptoImage1, #cryptoImage2, #cryptoImage3, +#eidImage1, #eidImage3, +#signCard, #cryptoCard, #eidCard { +border: 1px solid #E7EAEF; border-radius: 4px; -background-color: #FFFFFF; } -QComboBox QPushButton { -margin: 3px; -padding: 0px 12px 0px 4px; -border: 0px; +#signOne, #signTwo, #signThree, +#cryptoOne, #cryptoTwo, #cryptoThree, +#eidOne, #eidTwo { +background-color: #EAF1F8; +border: none; +border-radius: 16px; +color: #003168; +} +QRadioButton { +font-family: Roboto, Helvetica; +font-size: 14px; color: #07142A; -background-color: #FFFFFF; -text-align: left; -font-weight: normal; -font-size: 16px; -qproperty-iconSize: 14px 9px; -qproperty-layoutDirection: RightToLeft; +spacing: 8px; +border: 2px solid transparent; +border-radius: 4px; } -QComboBox QPushButton#selected { -qproperty-icon: url(:/images/arrow_up.svg); +QRadioButton::indicator { +width: 16px; +height: 16px; } -QComboBox QPushButton:hover#selected, QComboBox QPushButton:focus#selected { -qproperty-icon: url(:/images/arrow_up_white.svg); +QRadioButton::indicator:unchecked { +image: url(:/images/icon_radio.svg); } -QComboBox::drop-down { -background-color: #FFFFFF; -width: 25px; +QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus { +image: url(:/images/icon_radio_active.svg); } -QComboBox::down-arrow { -image: url(:/images/arrow_down.svg); +QRadioButton::indicator:checked { +image: url(:/images/icon_radio_check.svg); } -QComboBox::down-arrow:on { -top: 1px; -left: 1px; +QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus { +image: url(:/images/icon_radio_check_active.svg); } - - - 2 - - - 2 - - - - - - 412 - 458 - 200 - 30 - - - - PointingHandCursor - - - Continue - - - buttonGroup - - - - - - 0 - 0 - 1024 - 343 - - - - - - - 440 - 40 - 144 - 144 - - - - - - - 470 - 198 - 86 - 24 - - - - Qt::TabFocus - - - DigiDoc - - - Qt::AlignCenter - - - - - - 210 - 276 - 620 - 24 - - - - Qt::TabFocus - - - Welcome to the Estonian eID application DigiDoc! - - - Qt::AlignCenter - - - - - - 262 - 320 - 500 - 40 - - - - Qt::TabFocus - - - line-height: 16px; - - - DigiDoc is created for managing Estonian eIDs and is the official digital signing and encryption application. - - - Qt::AlignHCenter|Qt::AlignTop - - - true - - - - - - 262 - 392 - 500 - 16 - - - - Vali suhtluskeel / Select language: - - - Qt::AlignCenter - - - lang - - - - - - 883 - 509 - 111 - 61 - - - - - + + + 0 + + - #introPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } + #langPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } - + + + 0 + - 20 + 14 - 20 + 73 - 20 + 14 - 20 + 18 - - 20 - - - - - Qt::TabFocus - - - The DigiDoc application allows you to: - - - Qt::AlignCenter - - - - - + + - 150 - 110 + 87 + 96 - 150 - 110 + 87 + 96 - - - - - 106 - 117 - + + + + Qt::Vertical - + + QSizePolicy::Fixed + + - 106 - 117 + 20 + 16 - + - - + + - 138 - 97 + 200 + 24 - 138 - 97 + 200 + 24 - - - - Qt::TabFocus - Sign documents + DIGIDOC 4 Qt::AlignCenter - - - - Qt::TabFocus + + + + Qt::Vertical - - Encrypt documents + + QSizePolicy::Fixed - - Qt::AlignCenter + + + 20 + 54 + - + - - + + + + + 620 + 24 + + + + + 620 + 24 + + Qt::TabFocus - Manage your eID-s + Welcome to the Estonian eID application DigiDoc! Qt::AlignCenter - - - - Qt::TabFocus - - - DigiDoc Client can be used to sign digitally with ID-card, mobile-ID and Smart-ID, check the validity of digital signatures and open and save documents inside the signature container. + + + + Qt::Vertical - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + QSizePolicy::Fixed - - true + + + 20 + 20 + - + - - - - Qt::TabFocus - - - DigiDoc Client can also be used to encrypt data and decrypt the previously encrypted data. For encryption the program uses the authentication certificate of the ID-card. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + 500 + 40 + - - true + + + 500 + 40 + - - - - Qt::TabFocus + + line-height: 16px; + - Manage your ID-card’s PIN/PUK codes and check personal data. + DigiDoc is created for managing Estonian eIDs and is the official digital signing and encryption application. - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignHCenter|Qt::AlignTop true - - - - PointingHandCursor - - - View introduction + + + + Qt::Vertical - - buttonGroup - - - - - - - PointingHandCursor + + QSizePolicy::Fixed - - View introduction + + + 20 + 32 + - - buttonGroup - - + - - - - PointingHandCursor + + + + + 500 + 20 + + + + + 500 + 20 + - View introduction + Vali suhtluskeel / Select language - - buttonGroup - - - - - - - PointingHandCursor + + Qt::AlignCenter - - Skip introductions + + langEt - - buttonGroup - - - + + Qt::Vertical - QSizePolicy::Preferred + QSizePolicy::Fixed 20 - 40 + 8 + + + + + 16 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + PointingHandCursor + + + Eesti keel + + + true + + + langGroup + + + + + + + PointingHandCursor + + + English + + + langGroup + + + + + + + + + + + 125 + 74 + + + + + 125 + 74 + + + + - - - - #signPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } - - - - - 260 - 50 - 500 - 24 - - - - Qt::TabFocus - - - How to sign document digitally? - - - Qt::AlignCenter - - - - - - 363 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_sign-sign_en.png - - - true - - - - - - 30 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_sign-select_en.png - - - true - - - - - - 696 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_sign-pin_en.png - - - true - - - + - 363 - 500 - 298 - 32 + 0 + 0 + 1024 + 343 - - PointingHandCursor - - - View next intro - - - buttonGroup - - - - - 363 - 537 - 298 - 32 - - - - PointingHandCursor - - - Skip introductions + + + + + 32 - - buttonGroup - - - - - - 492 - 575 - 10 - 10 - + + 24 - - PointingHandCursor + + 32 - - Go to signing intro + + 24 - - buttonGroup - - - - - - 522 - 575 - 10 - 10 - + + 24 - - PointingHandCursor + + 16 - - Go to EID intro + + + + Qt::TabFocus + + + The DigiDoc application allows you to: + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + + + + + 120 + 120 + + + + + 120 + 120 + + + + + + + + + + + Qt::TabFocus + + + Sign documents + + + + + + + Qt::TabFocus + + + DigiDoc Client can be used to sign digitally with ID-card, mobile-ID and Smart-ID, check the validity of digital signatures and open and save documents inside the signature container. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + + + + + 120 + 120 + + + + + 120 + 120 + + + + + + + + + + + Qt::TabFocus + + + Encrypt documents + + + + + + + Qt::TabFocus + + + DigiDoc Client can also be used to encrypt data and decrypt the previously encrypted data. For encryption the program uses the authentication certificate of the ID-card. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + + + + + 120 + 120 + + + + + 120 + 120 + + + + + + + + + + + Qt::TabFocus + + + Manage your eID-s + + + + + + + Qt::TabFocus + + + Manage your ID-card’s PIN/PUK codes and check personal data. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 32 - - buttonGroup - - - - - - 507 - 575 - 10 - 10 - + + 24 - - PointingHandCursor + + 32 - - Go to encryption intro + + 24 - - buttonGroup - - - - - - 29 - 339 - 32 - 32 - + + 24 - - - - - 362 - 339 - 32 - 32 - + + 16 - - - - - 695 - 339 - 32 - 32 - - - - - - - 70 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Select file - - - - - - 403 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Choose the signing method - - - - - - 30 - 386 - 298 - 150 - - - - Qt::TabFocus - - - To sign the file, drag it from your computer to the DigiDoc application or click the "... or load a file from disk" button. You can drag or select multiple files at a time. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 363 - 386 - 298 - 110 - - - - Qt::TabFocus - - - Once the files have been selected, check them and choose whether you want to sign with ID-card, mobile-ID or Smart-ID. You can also save the container without signing. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 736 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Enter PIN2 - - - - - - 696 - 386 - 298 - 150 - - - - Qt::TabFocus - - - By entering the PIN2 code, you will have signed the document with digital signature that by law is equal to the signature signed by hand. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - #cryptoPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } - - - - - 492 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to signing intro - - - buttonGroup - - - - - - 522 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to EID intro - - - buttonGroup - - - - - - 507 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to encryption intro - - - buttonGroup - - - - - - 29 - 339 - 32 - 32 - - - - - - - 362 - 339 - 32 - 32 - - - - - - - 695 - 339 - 32 - 32 - - - - - - - 70 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Select file - - - - - - 403 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Add recipients - - - - - - 30 - 386 - 298 - 160 - - - - Qt::TabFocus - - - A recipient must be selected in order to encrypt data. Drag the file to be encrypted from your computer to the DigiDoc application or select a file from the disk. You can drag or select multiple files at a time. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 363 - 386 - 298 - 110 - - - - Qt::TabFocus - - - Select people who can open the container. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 736 - 345 - 258 - 21 - - - - Qt::TabFocus - - - Encrypt - - - - - - 696 - 386 - 298 - 140 - - - - Qt::TabFocus - - - Click the "Encrypt" button and the file is now encrypted. You now have the option to open the location of the container or forward the file by e-mail. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 363 - 537 - 298 - 32 - - - - PointingHandCursor - - - Skip introductions - - - buttonGroup - - - - - - 363 - 500 - 298 - 32 - - - - PointingHandCursor - - - View next intro - - - buttonGroup - - - - - - 270 - 50 - 500 - 24 - - - - Qt::TabFocus - - - How to encrypt documents? - - - Qt::AlignCenter - - - - - - 696 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_crypto-encrypt_en.png - - - true - - - - - - 30 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_crypto-select_en.png - - - true - - - - - - 363 - 104 - 298 - 216 - - - - border: 1px solid #8E969D; -border-radius: 3px; - - - :/images/intro_crypto-recipient_en.png - - - true - - - - - - #eidPage { background: qradialgradient(cx:0.5, cy:0.5, radius: 1, fx:0.5, fy:1, stop:0 white, stop:0.59 white, stop:1 #B9D9EB) } - - - - - 492 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to signing intro - - - buttonGroup - - - - - - 507 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to encryption intro - - - buttonGroup - - - - - - 522 - 575 - 10 - 10 - - - - PointingHandCursor - - - Go to EID intro - - - buttonGroup - - - - - - 138 - 345 - 300 - 21 - - - - Qt::TabFocus - - - Manage PIN and PUK codes - - - - - - 588 - 345 - 280 - 21 - - - - Qt::TabFocus - - - Check personal data - - - - - - 138 - 386 - 298 - 150 - - - - Qt::TabFocus - - - Under "My eID", you will find the option to modify your PIN1, PIN2 and PUK, and the details of the certificates. Here you can also unlock the PUK code of your blocked PIN. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 588 - 386 - 298 - 140 - - - - Qt::TabFocus - - - "My eID" also provides a good overview of the status and contact information of the ID card inserted in the card reader. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - 363 - 500 - 298 - 32 - - - - PointingHandCursor - - - Enter the application - - - buttonGroup - - - - - - 220 - 50 - 600 - 24 - + + + + Qt::TabFocus + + + How to sign document digitally? + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_sign-select_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 1 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Select file + + + + + + + + + Qt::TabFocus + + + To sign the file, drag it from your computer to the DigiDoc application or click the "... or load a file from disk" button. You can drag or select multiple files at a time. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_sign-sign_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 2 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Choose the signing method + + + true + + + + + + + + + Qt::TabFocus + + + Once the files have been selected, check them and choose whether you want to sign with ID-card, mobile-ID or Smart-ID. You can also save the container without signing. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_sign-pin_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 3 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Enter PIN2 + + + + + + + + + Qt::TabFocus + + + By entering the PIN2 code, you will have signed the document with digital signature that by law is equal to the signature signed by hand. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 32 - - Qt::TabFocus + + 24 - - How to manage your electronic identities? + + 32 - - Qt::AlignCenter + + 24 - - - - - 588 - 104 - 298 - 216 - + + 24 - - border: 1px solid #8E969D; -border-radius: 3px; + + 16 - - :/images/intro_eid-info_en.png + + + + Qt::TabFocus + + + How to encrypt documents? + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_crypto-select_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 1 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Select file + + + + + + + + + Qt::TabFocus + + + A recipient must be selected in order to encrypt data. Drag the file to be encrypted from your computer to the DigiDoc application or select a file from the disk. You can drag or select multiple files at a time. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_crypto-recipient_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 2 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Add recipients + + + + + + + + + Qt::TabFocus + + + Select people who can open the container. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_crypto-encrypt_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 3 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Encrypt + + + + + + + + + Qt::TabFocus + + + Click the "Encrypt" button and the file is now encrypted. You now have the option to open the location of the container or forward the file by e-mail. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 32 - - true + + 24 - - - - - 138 - 104 - 298 - 216 - + + 32 - - border: 1px solid #8E969D; -border-radius: 3px; + + 24 - - :/images/intro_eid-manage_en.png + + 24 - - true + + 16 - + + + + Qt::TabFocus + + + How to manage your electronic identities? + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_eid-manage_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 1 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Manage PIN and PUK codes + + + true + + + + + + + + + Qt::TabFocus + + + Under "My eID", you will find the option to modify your PIN1, PIN2 and PUK, and the details of the certificates. Here you can also unlock the PUK code of your blocked PIN. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 174 + + + + + 16777215 + 174 + + + + :/images/intro_eid-info_en.png + + + true + + + + + + + 8 + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Qt::TabFocus + + + 2 + + + Qt::AlignCenter + + + + + + + Qt::TabFocus + + + Check personal data + + + + + + + + + Qt::TabFocus + + + "My eID" also provides a good overview of the status and contact information of the ID card inserted in the card reader. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 0 + 48 + + + + + 16777215 + 48 + + + + #navigationArea { +border-top: 1px solid #E7EAEF; +background-color: #F3F5F7; +} +QLabel { +font-family: Roboto, Helvetica; +font-size: 14px; +color: #353739; +} +QPushButton { +padding: 10px 12px; +border-radius: 4px; +color: #2F70B6; +font-family: Roboto, Helvetica; +font-size: 12px; +font-weight: 700; +} +QPushButton:hover, QPushButton:focus { +background-color: #EAF1F8; +} +QPushButton:pressed { +background-color: #BFD3E8; +} +QPushButton:default { +color: #ffffff; +background-color: #2F70B6; +} +QPushButton:default:hover, QPushButton:default:focus { +background-color: #2B66A6; +} +QPushButton:default:pressed { +background-color: #215081; +} + + + + 16 + + + 24 + + + 0 + + + 24 + + + 0 + + + + + Qt::TabFocus + + + DigiDoc4 4.0.1.0, released 01.02.2024 + + + + + + + PointingHandCursor + + + Close introduction + + + + + + + PointingHandCursor + + + Continue + + + true + + + + + + - - ComboBox - QComboBox -
widgets/ComboBox.h
- QSvgWidget QWidget @@ -1414,62 +1655,12 @@ border-radius: 3px; 1 - - title - welcome - intro - lang - continueBtn - introTitle - introLabelSign - introIntroSign - introViewSigning - introLabelCrypto - introIntroCrypto - introViewEncryption - introLabelEid - introIntroEid - introViewEid - introSkip - signTitle - signLabel1 - signText1 - signLabel2 - signText2 - signLabel3 - signText3 - signNext - signSkip - signGotoSigning - signGotoEncryption - signGotoEid - cryptoTitle - cryptoLabel1 - cryptoText1 - cryptoLabel2 - cryptoText2 - cryptoLabel3 - cryptoText3 - cryptoNext - cryptoSkip - cryptoGotoSigning - cryptoGotoEncryption - cryptoGotoEid - eidTitle - eidLabel1 - eidText1 - eidLabel3 - eidText3 - eidEnter - eidGotoSigning - eidGotoEncryption - eidGotoEid - - + + diff --git a/client/images/Logo_Suur.svg b/client/images/Logo_Suur.svg index 04e30e84c..18c131c94 100644 --- a/client/images/Logo_Suur.svg +++ b/client/images/Logo_Suur.svg @@ -1,74 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/client/images/images.qrc b/client/images/images.qrc index 667f1a4e9..e391c5e9e 100644 --- a/client/images/images.qrc +++ b/client/images/images.qrc @@ -1,84 +1,84 @@ - - accordion_arrow_down.svg - accordion_arrow_right.svg - arrow_down.svg - arrow_down_selected.svg - arrow_up.svg - arrow_up_white.svg - bg_lovid.svg - digidoc_128.png - Icon.svg - icon_Abi.svg - icon_ajatempel.svg - icon_alert_error.svg - icon_alert_warning.svg - icon_alert_large_error.svg - icon_alert_large_warning.svg - icon_Allkiri_hover.svg - icon_Allkiri_small.svg - icon_Allkiri.svg - icon_arrow_left.svg - icon_checkbox.svg - icon_checkbox_active.svg - icon_checkbox_disabled.svg - icon_checkbox_hover.svg - icon_checkbox_check.svg - icon_checkbox_check_active.svg - icon_checkbox_check_disabled.svg - icon_checkbox_check_hover.svg - icon_digitempel.svg - icon_download.svg - icon_download_clicked.svg - icon_download_hover.svg - icon_Edit.svg - icon_error.svg - icon_help.svg - icon_IDkaart_red.svg - icon_IDkaart_green.svg - icon_info.svg - icon_info_main.svg - icon_Krypto_hover.svg - icon_Krypto_small.svg - icon_Krypto.svg - icon_link.svg - icon_Minu_eID_hover.svg - icon_Minu_eID.svg - icon_radio.svg - icon_radio_active.svg - icon_radio_disabled.svg - icon_radio_hover.svg - icon_radio_check.svg - icon_radio_check_active.svg - icon_radio_check_disabled.svg - icon_radio_check_hover.svg - icon_remove.svg - icon_remove_clicked.svg - icon_remove_hover.svg - icon_Seaded.svg - intro_crypto-select_en.png - intro_crypto-select_et.png - intro_crypto-recipient_en.png - intro_crypto-recipient_et.png - intro_crypto-encrypt_en.png - intro_crypto-encrypt_et.png - intro_eid-manage_en.png - intro_eid-manage_et.png - intro_eid-info_en.png - intro_eid-info_et.png - intro_one.svg - intro_sign-pin_en.png - intro_sign-pin_et.png - intro_sign-select_en.png - intro_sign-select_et.png - intro_sign-sign_en.png - intro_sign-sign_et.png - intro_three.svg - intro_two.svg - Logo_small.svg - Logo_Suur.svg - Struktuurifondid.svg - vapilehed.svg - wait.svg - + + accordion_arrow_down.svg + accordion_arrow_right.svg + arrow_down.svg + arrow_down_selected.svg + arrow_up.svg + arrow_up_white.svg + bg_lovid.svg + digidoc_128.png + Icon.svg + icon_Abi.svg + icon_ajatempel.svg + icon_alert_error.svg + icon_alert_warning.svg + icon_alert_large_error.svg + icon_alert_large_warning.svg + icon_Allkiri_hover.svg + icon_Allkiri_small.svg + icon_Allkiri.svg + icon_arrow_left.svg + icon_checkbox.svg + icon_checkbox_active.svg + icon_checkbox_disabled.svg + icon_checkbox_hover.svg + icon_checkbox_check.svg + icon_checkbox_check_active.svg + icon_checkbox_check_disabled.svg + icon_checkbox_check_hover.svg + icon_digitempel.svg + icon_download.svg + icon_download_clicked.svg + icon_download_hover.svg + icon_Edit.svg + icon_error.svg + icon_help.svg + icon_IDkaart_red.svg + icon_IDkaart_green.svg + icon_info.svg + icon_info_main.svg + icon_Krypto_hover.svg + icon_Krypto_small.svg + icon_Krypto.svg + icon_link.svg + icon_Minu_eID_hover.svg + icon_Minu_eID.svg + icon_radio.svg + icon_radio_active.svg + icon_radio_disabled.svg + icon_radio_hover.svg + icon_radio_check.svg + icon_radio_check_active.svg + icon_radio_check_disabled.svg + icon_radio_check_hover.svg + icon_remove.svg + icon_remove_clicked.svg + icon_remove_hover.svg + icon_Seaded.svg + intro_crypto.svg + intro_crypto-select_en.png + intro_crypto-select_et.png + intro_crypto-recipient_en.png + intro_crypto-recipient_et.png + intro_crypto-encrypt_en.png + intro_crypto-encrypt_et.png + intro_eid-manage_en.png + intro_eid-manage_et.png + intro_eid-info_en.png + intro_eid-info_et.png + intro_myeid.svg + intro_sign.svg + intro_sign-pin_en.png + intro_sign-pin_et.png + intro_sign-select_en.png + intro_sign-select_et.png + intro_sign-sign_en.png + intro_sign-sign_et.png + Logo_small.svg + Logo_Suur.svg + Struktuurifondid.svg + vapilehed.svg + wait.svg + diff --git a/client/images/intro_crypto.svg b/client/images/intro_crypto.svg new file mode 100644 index 000000000..2b1e00ff7 --- /dev/null +++ b/client/images/intro_crypto.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/images/intro_myeid.svg b/client/images/intro_myeid.svg new file mode 100644 index 000000000..961abf7f0 --- /dev/null +++ b/client/images/intro_myeid.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/images/intro_one.svg b/client/images/intro_one.svg deleted file mode 100644 index 3e869b868..000000000 --- a/client/images/intro_one.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - image/svg+xml - - Untitled.svg - - - - - Untitled.svg - - - - - - - diff --git a/client/images/intro_sign.svg b/client/images/intro_sign.svg new file mode 100644 index 000000000..592170dd1 --- /dev/null +++ b/client/images/intro_sign.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/images/intro_three.svg b/client/images/intro_three.svg deleted file mode 100644 index 0c5580883..000000000 --- a/client/images/intro_three.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - image/svg+xml - - Untitled.svg - - - - - Untitled.svg - - - - - - - diff --git a/client/images/intro_two.svg b/client/images/intro_two.svg deleted file mode 100644 index ef399b005..000000000 --- a/client/images/intro_two.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - image/svg+xml - - Untitled.svg - - - - - Untitled.svg - - - - - - - diff --git a/client/translations/en.ts b/client/translations/en.ts index e0ee8edf5..ae7a436a5 100644 --- a/client/translations/en.ts +++ b/client/translations/en.ts @@ -1127,6 +1127,34 @@ "My eID" also provides a good overview of the status and contact information of the ID card inserted in the card reader. "My eID" also provides a good overview of the status and contact information of the ID card inserted in the card reader. + + Initial introduction + Initial introduction + + + 1. About the DigiDoc application + 1. About the DigiDoc application + + + 2. Signing + 2. Signing + + + 3. Encryption + 3. Encryption + + + 4. Managing your eIDs + 4. Managing your eIDs + + + Close introduction + Close introduction + + + DigiDoc4 version %1, released %2 + DigiDoc4 version %1, released %2 + InfoStack diff --git a/client/translations/et.ts b/client/translations/et.ts index b8052a14a..b6cc5b2c4 100644 --- a/client/translations/et.ts +++ b/client/translations/et.ts @@ -1097,7 +1097,7 @@ Continue - Edasi + Jätka View introduction @@ -1105,7 +1105,7 @@ View next intro - Vaata järgmist tutvustust + Järgmine tutvustus Enter the application @@ -1127,6 +1127,34 @@ "My eID" also provides a good overview of the status and contact information of the ID card inserted in the card reader. "Minu eID" annab ka hea ülevaate kaardilugejasse sisestatud ID-kaardi staatusest ja kontaktandmetest. + + Initial introduction + Esmane tutvustus + + + 1. About the DigiDoc application + 1. DigiDoc rakendusest + + + 2. Signing + 2. Allkirjastamine + + + 3. Encryption + 3. Krüpteerimine + + + 4. Managing your eIDs + 4. Oma eID-de haldus + + + Close introduction + Sulge tutvustus + + + DigiDoc4 version %1, released %2 + DigiDoc4 versioon %1, avalikustatud %2 + InfoStack