Skip to content

Move Settings/Help buttons and adjust logo #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move Settings/Help buttons and adjust logo #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
198 changes: 110 additions & 88 deletions client/MainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,60 @@ font-weight: 400;
</property>
<item row="0" column="0">
<widget class="QWidget" name="logo" native="true">
<widget class="QSvgWidget" name="coatOfArms" native="true">
<property name="geometry">
<rect>
<x>5</x>
<y>11</y>
<width>80</width>
<height>32</height>
</rect>
<property name="styleSheet">
<string notr="true">#label {
color: #FFFFFF;
font-family: Roboto, Helvetica;
font-size: 9px;
font-weight: 700;
}</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>8</number>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
<property name="topMargin">
<number>15</number>
</property>
<property name="accessibleName">
<string notr="true">DigiDoc</string>
<property name="rightMargin">
<number>8</number>
</property>
</widget>
<property name="bottomMargin">
<number>15</number>
</property>
<item>
<widget class="QSvgWidget" name="logoIcon" native="true">
<property name="minimumSize">
<size>
<width>28</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>28</width>
<height>22</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="accessibleName">
<string notr="true">DigiDoc</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string notr="true">DigiDoc4</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" rowspan="2">
Expand Down Expand Up @@ -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;
}</string>
</property>
<layout class="QVBoxLayout" name="navBarLayout">
Expand Down Expand Up @@ -279,6 +328,54 @@ text-decoration: underline;
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="help">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>Help</string>
</property>
<property name="icon">
<iconset>
<normalon>:/images/icon_Abi.svg</normalon>
</iconset>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="settings">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>Settings</string>
</property>
<property name="icon">
<iconset>
<normalon>:/images/icon_Seaded.svg</normalon>
</iconset>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="version">
<property name="minimumSize">
Expand Down Expand Up @@ -321,23 +418,6 @@ text-decoration: underline;
<height>54</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">#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;
}</string>
</property>
<layout class="QHBoxLayout" name="topBarLayout">
<property name="spacing">
<number>0</number>
Expand Down Expand Up @@ -412,64 +492,6 @@ background-color: #BFD3E8;
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="tbButtonWidgetLayout">
<property name="spacing">
<number>8</number>
</property>
<item>
<widget class="QToolButton" name="help">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Help</string>
</property>
<property name="icon">
<iconset>
<normalon>:/images/icon_Abi.svg</normalon>
</iconset>
</property>
<property name="iconSize">
<size>
<width>14</width>
<height>14</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="settings">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>Settings</string>
</property>
<property name="icon">
<iconset>
<normalon>:/images/icon_Seaded.svg</normalon>
</iconset>
</property>
<property name="iconSize">
<size>
<width>14</width>
<height>14</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down
Loading