Skip to content

Update layout to new UI guidelines #422

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: warning
Choose a base branch
from
Open

Update layout to new UI guidelines #422

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
9 changes: 5 additions & 4 deletions src/ui/certificatewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// We use two separate widgets, CertificateWidget and CertificateButton, for accessibility, to
// support screen readers.

CertificateWidgetInfo::CertificateWidgetInfo(QWidget* self) :
CertificateWidgetInfo::CertificateWidgetInfo(QWidget* self, int contentMargin) :
icon(new QLabel(self)), info(new QLabel(self)), issuer(new QLabel(self)),
status(new QLabel(self))
{
Expand All @@ -47,7 +47,7 @@ CertificateWidgetInfo::CertificateWidgetInfo(QWidget* self) :
status->setTextFormat(Qt::PlainText);
status->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
auto* layout = new QGridLayout(self);
layout->setContentsMargins(16, 16, 16, 16);
layout->setContentsMargins(contentMargin, contentMargin, contentMargin, contentMargin);
layout->setHorizontalSpacing(16);
layout->setVerticalSpacing(2);
layout->addWidget(icon, 0, 0, 3, 1, Qt::AlignVCenter);
Expand Down Expand Up @@ -103,7 +103,8 @@ void CertificateWidgetInfo::languageChange()
setCertificateInfo(certAndPinInfo);
}

CertificateWidget::CertificateWidget(QWidget* parent) : QWidget(parent), CertificateWidgetInfo(this)
CertificateWidget::CertificateWidget(QWidget* parent) :
QWidget(parent), CertificateWidgetInfo(this, 0)
{
info->setFocusPolicy(Qt::TabFocus);
}
Expand All @@ -119,7 +120,7 @@ void CertificateWidget::paintEvent(QPaintEvent* /*event*/)

CertificateButton::CertificateButton(const EidCertificateAndPinInfo& cardCertPinInfo,
QWidget* parent) :
QAbstractButton(parent), CertificateWidgetInfo(this)
QAbstractButton(parent), CertificateWidgetInfo(this, 16)
{
setCheckable(true);
setAutoExclusive(true);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/certificatewidget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CertificateWidgetInfo
void languageChange();

protected:
explicit CertificateWidgetInfo(QWidget* self);
CertificateWidgetInfo(QWidget* self, int contentMargin);
Q_DISABLE_COPY_MOVE(CertificateWidgetInfo)

std::tuple<QString, QString, QString, QString> certData() const;
Expand Down
41 changes: 21 additions & 20 deletions src/ui/dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>550</width>
<width>500</width>
<height>512</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>550</width>
<width>500</width>
<height>0</height>
</size>
</property>
Expand Down Expand Up @@ -70,11 +70,11 @@ padding: 8px;
CertificateButton, CertificateWidget {
border: 1px solid transparent;
border-radius: 4px;
min-height: 70px;
}
CertificateButton {
background-color: white;
border-color: #E7EAEF;
min-height: 70px;
}
CertificateButton:disabled {
background-color: #F3F5F7;
Expand Down Expand Up @@ -132,7 +132,7 @@ border-radius: 2px;
}
#waitingPageTitleLabel, #messagePageTitleLabel, #selectCertificatePageTitleLabel, #pinInputPageTitleLabel, #aboutPageLabel {
color: #003168;
font-size: 32px;
font-size: 20px;
font-weight: bold;
}
#selectCertificateDescriptionLabel, #pinInputDescriptionLabel {
Expand Down Expand Up @@ -196,6 +196,7 @@ background-color: transparent;
font-family: Roboto, Helvetica;
font-size: 14px;
font-weight: 400;
padding: 0px;
}</string>
</property>
<layout class="QVBoxLayout" name="WebEidDialogOuterLayout">
Expand Down Expand Up @@ -280,19 +281,19 @@ font-weight: 400;
<widget class="QWidget" name="dialogContent" native="true">
<layout class="QVBoxLayout" name="WebEidDialogLayout">
<property name="spacing">
<number>30</number>
<number>40</number>
</property>
<property name="leftMargin">
<number>20</number>
<number>40</number>
</property>
<property name="topMargin">
<number>25</number>
<number>32</number>
</property>
<property name="rightMargin">
<number>20</number>
<number>40</number>
</property>
<property name="bottomMargin">
<number>20</number>
<number>32</number>
</property>
<item>
<widget class="QStackedWidget" name="pageStack">
Expand All @@ -302,7 +303,7 @@ font-weight: 400;
<widget class="QWidget" name="waitingPage">
<layout class="QVBoxLayout" name="waitingPageLayout">
<property name="spacing">
<number>20</number>
<number>40</number>
</property>
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -373,7 +374,7 @@ font-weight: 400;
<widget class="QWidget" name="messagePage">
<layout class="QVBoxLayout" name="messagePageLayout">
<property name="spacing">
<number>20</number>
<number>40</number>
</property>
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -403,7 +404,7 @@ font-weight: 400;
<item>
<layout class="QHBoxLayout" name="messageInfoLayout" stretch="0,1">
<property name="spacing">
<number>10</number>
<number>16</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="cardChipIcon">
Expand Down Expand Up @@ -501,7 +502,7 @@ font-weight: 400;
<widget class="QWidget" name="selectCertificatePage">
<layout class="QVBoxLayout" name="selectCertificatePageLayout">
<property name="spacing">
<number>20</number>
<number>40</number>
</property>
<property name="leftMargin">
<number>0</number>
Expand All @@ -528,14 +529,14 @@ font-weight: 400;
<item>
<layout class="QVBoxLayout" name="selectCertificateLabelLayout">
<property name="spacing">
<number>10</number>
<number>8</number>
</property>
<item>
<widget class="QLabel" name="selectCertificateDescriptionLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
<height>0</height>
</size>
</property>
<property name="focusPolicy">
Expand Down Expand Up @@ -567,7 +568,7 @@ font-weight: 400;
<item>
<layout class="QVBoxLayout" name="selectCertificateInfo">
<property name="spacing">
<number>6</number>
<number>16</number>
</property>
</layout>
</item>
Expand All @@ -576,7 +577,7 @@ font-weight: 400;
<widget class="QWidget" name="pinInputPage">
<layout class="QVBoxLayout" name="pinInputPageLayout">
<property name="spacing">
<number>20</number>
<number>40</number>
</property>
<property name="leftMargin">
<number>0</number>
Expand All @@ -603,7 +604,7 @@ font-weight: 400;
<item>
<layout class="QVBoxLayout" name="pinInputLabelLayout">
<property name="spacing">
<number>10</number>
<number>8</number>
</property>
<item>
<widget class="QLabel" name="pinInputDescriptionLabel">
Expand Down Expand Up @@ -666,7 +667,7 @@ font-weight: 400;
<item>
<layout class="QVBoxLayout" name="pinLayout">
<property name="spacing">
<number>6</number>
<number>8</number>
</property>
<item>
<widget class="QLabel" name="pinTitleLabel">
Expand Down Expand Up @@ -853,7 +854,7 @@ font-weight: 400;
<item>
<layout class="QHBoxLayout" name="buttonLayout">
<property name="spacing">
<number>6</number>
<number>8</number>
</property>
<item>
<widget class="QPushButton" name="cancelButton">
Expand Down
8 changes: 4 additions & 4 deletions src/ui/languageselect.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>616</width>
<width>576</width>
<height>444</height>
</rect>
</property>
Expand Down Expand Up @@ -72,13 +72,13 @@ background-color: #215081;
<enum>QLayout::SetFixedSize</enum>
</property>
<property name="leftMargin">
<number>40</number>
<number>32</number>
</property>
<property name="topMargin">
<number>32</number>
</property>
<property name="rightMargin">
<number>40</number>
<number>32</number>
</property>
<property name="bottomMargin">
<number>32</number>
Expand All @@ -93,7 +93,7 @@ background-color: #215081;
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>536</width>
<width>512</width>
<height>0</height>
</size>
</property>
Expand Down
29 changes: 26 additions & 3 deletions src/ui/webeiddialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,34 @@ bool WebEidDialog::event(QEvent* event)
emit languageChange();
resizeHeight();
break;
case QEvent::Resize:
case QEvent::Resize: {
ui->dialogContent->layout()->activate();
ui->langButton->move(width() - ui->langButton->width() - 20,
ui->pageStack->mapTo(this, QPoint(0, 0)).y() - 20);
QWidget* title = nullptr;
switch (Page(ui->pageStack->currentIndex())) {
case Page::WAITING:
title = ui->waitingPageTitleLabel;
break;
case Page::ALERT:
title = ui->messagePageTitleLabel;
break;
case Page::SELECT_CERTIFICATE:
title = ui->selectCertificatePageTitleLabel;
break;
case Page::PIN_INPUT:
title = ui->pinInputPageTitleLabel;
break;
case Page::ABOUT:
title = ui->aboutPageLabel;
break;
}
if (title) {
const QPoint titlePosition = title->mapTo(this, QPoint(0, 0));
ui->langButton->move(width() - ui->langButton->width() - 40,
titlePosition.y()
+ (title->height() - ui->langButton->height()) / 2);
}
break;
}
default:
break;
}
Expand Down
Loading