diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 418511ee6..8777eda63 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -63,7 +63,7 @@ MainWindow::MainWindow( QWidget *parent ) ui->version->setText(QStringLiteral("%1%2").arg(tr("Ver. "), Application::applicationVersion())); connect(ui->version, &QPushButton::clicked, this, [this] {showSettings(SettingsDialog::DiagnosticsSettings);}); - ui->coatOfArms->load(QStringLiteral(":/images/Logo_small.svg")); + ui->logoIcon->load(QStringLiteral(":/images/Logo_small.svg")); ui->pageButtonGroup->setId(ui->signature, Pages::SignIntro); ui->pageButtonGroup->setId(ui->crypto, Pages::CryptoIntro); ui->pageButtonGroup->setId(ui->myEid, Pages::MyEid); diff --git a/client/MainWindow.ui b/client/MainWindow.ui index 68bedf5d5..480ccb97c 100644 --- a/client/MainWindow.ui +++ b/client/MainWindow.ui @@ -78,22 +78,60 @@ font-weight: 400; - - - - 5 - 11 - 80 - 32 - + + #label { +color: #FFFFFF; +font-family: Roboto, Helvetica; +font-size: 9px; +font-weight: 700; +} + + + + 6 + + + 8 - - Qt::TabFocus + + 15 - - DigiDoc + + 8 - + + 15 + + + + + + 28 + 22 + + + + + 28 + 22 + + + + Qt::TabFocus + + + DigiDoc + + + + + + + DigiDoc4 + + + + @@ -128,6 +166,17 @@ color: #BFD3E8; font-family: Roboto, Helvetica; font-size: 10px; text-decoration: underline; +} +#help, #settings { +padding: 9px 0px 9px 16px; +border-radius: 4px; +color: #FFFFFF; +font-family: Roboto, Helvetica; +font-size: 12px; +font-weight: 700; +} +#version { +color: #BFD3E8; } @@ -279,6 +328,54 @@ text-decoration: underline; + + + + PointingHandCursor + + + Help + + + + :/images/icon_Abi.svg + + + + + 12 + 12 + + + + Qt::ToolButtonTextBesideIcon + + + + + + + PointingHandCursor + + + Settings + + + + :/images/icon_Seaded.svg + + + + + 12 + 12 + + + + Qt::ToolButtonTextBesideIcon + + + @@ -321,23 +418,6 @@ text-decoration: underline; 54 - - #help, #settings { -padding: 9px 8px; -border-radius: 4px; -color: #2F70B6; -font-family: Roboto, Helvetica; -font-size: 12px; -font-weight: 700; -} -#help:hover, #settings:hover, -#help:focus, #settings:focus { -background-color: #EAF1F8; -} -#help:pressed, #settings:pressed { -background-color: #BFD3E8; -} - 0 @@ -412,64 +492,6 @@ background-color: #BFD3E8; - - - - 8 - - - - - PointingHandCursor - - - Qt::RightToLeft - - - Help - - - - :/images/icon_Abi.svg - - - - - 14 - 14 - - - - Qt::ToolButtonTextBesideIcon - - - - - - - PointingHandCursor - - - Settings - - - - :/images/icon_Seaded.svg - - - - - 14 - 14 - - - - Qt::ToolButtonTextBesideIcon - - - - - diff --git a/client/images/Logo_small.svg b/client/images/Logo_small.svg index 768799a72..e006d0328 100644 --- a/client/images/Logo_small.svg +++ b/client/images/Logo_small.svg @@ -1,45 +1,8 @@ - - Logo - Väike - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/client/images/icon_Abi.svg b/client/images/icon_Abi.svg index e0aeba459..55c135386 100644 --- a/client/images/icon_Abi.svg +++ b/client/images/icon_Abi.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/client/images/icon_Seaded.svg b/client/images/icon_Seaded.svg index 8b578038b..5d0ca526a 100644 --- a/client/images/icon_Seaded.svg +++ b/client/images/icon_Seaded.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file