Skip to content

Commit 2cdd409

Browse files
samueltaripinsamueltaripin
authored
Installer UI update (#61)
* new UI design patch * update release
1 parent 7f10547 commit 2cdd409

File tree

9 files changed

+4190
-17
lines changed

9 files changed

+4190
-17
lines changed

‎SPECS/calamares/arrow.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎SPECS/calamares/branding.desc‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ strings:
1515
welcomeExpandingLogo: false
1616

1717
images:
18-
# productLogo: "emt-logo.png"
19-
# productIcon: "emt-logo.png"
18+
productLogo: "product.svg"
2019
productWelcome: "emt-welcome.png"
2120

2221
# The slideshow is displayed during execution steps (e.g. when the
2322
# installer is actually writing to disk and doing other slow things).
2423
slideshow: "show.qml"
2524

2625
style:
27-
sidebarBackground: "#292F34"
28-
sidebarText: "#FFFFFF"
29-
sidebarTextSelect: "#292F34"
30-
sidebarTextHighlight: "#00A4EF"
31-
26+
SidebarBackground: "#F7F7F8"
27+
SidebarText: "#2B2C30"
28+
SidebarBackgroundCurrent: "#5400C0"
29+
SidebarTextCurrent: "#FFFFFF"

‎SPECS/calamares/calamares.signatures.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
3-
"emt-welcome.png": "b1b74705e6d677b5099126e061b264942d8457a3335af608ea2588486ab9df2b",
4-
"branding.desc": "f25e4f3d0061283b4a9c023db44458cd48f26330023429e4f36e867d50149baa",
3+
"emt-welcome.png": "2784750b96c9bdaf5e5ac5b8c10b42c5ae3d79c3b1f1fbb2e014ee9875f18913",
4+
"branding.desc": "aaa4338b2122d1de4478f5b6a8344735bb32776f01921e484eb0fee5ca28951a",
55
"calamares-3.3.1.tar.gz": "c5a6dd7d2fb7dc5d8a863f37f6f64782b88f79e341f7bf8504eb98dc31f714ef",
66
"calamares-auto_de.ts": "4a24d817979a83c3f08c163b05f5a4f34a992c1f798a12f3a6b50cde75a852d8",
77
"calamares-auto_fr.ts": "a65dd534637607533cd725aee3151f10f56b7f606b41fbd3ceeae13d61d8a98f",
@@ -12,6 +12,9 @@
1212
"calamares-welcome-3.0.2.tar.gz": "031ec9dfbf7f6c11c89fe06ac8d9c33c9a0ea0e62b6832bf17e1499d24826440",
1313
"settings.conf": "7bb9ae6634ce40013400163435fc62166a8d0fe0849c9dd0b729662971a06f51",
1414
"show.qml": "f1a75a7ee5f06dece6bbed103ef7e3a9886fb574f8a060e5a690bc28435d39fc",
15-
"stylesheet.qss": "9707878d63c9591fd83096d1650ada773bf5e85797fd3fbfc19555ef39ffa30a"
15+
"stylesheet.qss": "da47025a9b33a740ca907806d32ccc575e8eabbe418ce89dfe646146338be9c9",
16+
"arrow.svg": "dae6c503f0cc74340019c9db4a99844a895b1fa6161f01c331aaace2f5f70c55",
17+
"product.svg": "57641471917d622979ad40d96c42ca9181f527691fd9b79b2b61ef1c61bee5c7",
18+
"wait.png": "f260894113702d5f0737de5efc97e6f046231a64599ff0e01ad15bbc01ee00cd"
1619
}
1720
}

‎SPECS/calamares/calamares.spec‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Summary: Installer from a live CD/DVD/USB to disk
77
# https://github.com/calamares/calamares/issues/1051
88
Name: calamares
99
Version: 3.3.1
10-
Release: 10%{?dist}
10+
Release: 11%{?dist}
1111
License: GPLv3+
1212
Vendor: Intel Corporation
1313
Distribution: Edge Microvisor Toolkit
@@ -41,6 +41,9 @@ Source42: calamares-auto_de.ts
4141
Source43: calamares-auto_it.ts
4242
Source52: emt-welcome.png
4343
#Source53: emt-eula
44+
Source54: arrow.svg
45+
Source55: product.svg
46+
Source56: wait.png
4447
# adjust some default settings (default shipped .conf files)
4548
Patch0: Azure-Linux-Calamares-Conf-Patch-3.3.1.patch
4649
#Patch3: round-to-full-disk-size.patch
@@ -54,6 +57,7 @@ Patch4: serialize-read-access.patch
5457
Patch6: modules-set-OS-to-EdgeMicrovisorToolkit.patch
5558
Patch7: reword-welcome-screen.patch
5659
Patch8: change-completion-from-second-to-minute.patch
60+
Patch9: ui_redesign.patch
5761
# Compilation tools
5862
BuildRequires: cmake
5963
BuildRequires: extra-cmake-modules
@@ -142,6 +146,7 @@ done
142146

143147
# Apply custom license config
144148
#mv %{SOURCE20} src/modules/license/license.conf
149+
mv %{SOURCE56} data/images/wait.png
145150

146151
%patch -P 0 -p1
147152
#%patch3 -p1
@@ -150,6 +155,7 @@ done
150155
%patch -P 6 -p1
151156
%patch -P 7 -p1
152157
%patch -P 8 -p1
158+
%patch -P 9 -p1
153159

154160
%build
155161
%cmake_kf \
@@ -174,6 +180,8 @@ install -p -m 644 %{SOURCE22} %{buildroot}%{_datadir}/calamares/branding/EdgeMic
174180
install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/branding.desc
175181
install -p -m 644 %{SOURCE25} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/stylesheet.qss
176182
install -p -m 644 %{SOURCE52} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/emt-welcome.png
183+
install -p -m 644 %{SOURCE54} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/arrow.svg
184+
install -p -m 644 %{SOURCE55} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/product.svg
177185

178186
mkdir -p %{buildroot}%{_sysconfdir}/calamares
179187

@@ -194,6 +202,8 @@ install -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/settings.conf
194202
%{_bindir}/calamares
195203
%{_datadir}/applications/calamares.desktop
196204
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/emt-welcome.png
205+
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/arrow.svg
206+
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/product.svg
197207
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/branding.desc
198208
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/lang/
199209
%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/show.qml
@@ -223,19 +233,22 @@ install -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/settings.conf
223233
%{_libdir}/libcalamaresui.so
224234

225235
%changelog
236+
* Wed April 25 2025 Samuel Taripin <samuel.taripin@intel.com> - 3.3.1-11
237+
- UI redesign.
238+
226239
* Wed Mar 26 2025 Samuel Taripin <samuel.taripin@intel.com> - 3.3.1-10
227240
- change completion time format from seconds to minutes.
228241

229-
* Thu Mar 13 2024 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-9
242+
* Thu Mar 13 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-9
230243
- remove logo, update welcome picture and text.
231244

232-
* Wed Mar 12 2024 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-8
245+
* Wed Mar 12 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-8
233246
- update welcome image
234247

235-
* Tue Mar 4 2024 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-7
248+
* Tue Mar 4 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-7
236249
- remove EULA and custom license for ISO installer.
237250

238-
* Thu Feb 13 2024 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-6
251+
* Thu Feb 13 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 3.3.1-6
239252
- Update installer to match Edge Microvisor Toolkit.
240253

241254
* Wed Mar 20 2024 Sam Meluch <sammeluch@microsfot.com> - 3.3.1-5

‎SPECS/calamares/emt-welcome.png‎

-89.4 KB
Loading

‎SPECS/calamares/product.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎SPECS/calamares/stylesheet.qss‎

Lines changed: 127 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,131 @@
1+
QWidget {
2+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
3+
font-size: 14px;
4+
background-color: #FFFFFF;
5+
text-align: left;
6+
7+
}
8+
9+
QString {
10+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
11+
font-size: 14px;
12+
background-color: #2B2C30;
13+
text-align: left;
14+
}
15+
16+
QLineEdit {
17+
border: 0.5px solid #2B2C30;
18+
border-radius: 0px;
19+
padding: 2px 24px 2px 6px;
20+
background-color: white;
21+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
22+
font-size: 14px;
23+
}
24+
25+
QComboBox {
26+
border: 0.5px solid #2B2C30;
27+
border-radius: 0px;
28+
padding: 2px 24px 2px 6px;
29+
background-color: white;
30+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
31+
font-size: 14px;
32+
}
33+
34+
QComboBox:editable {
35+
background: white;
36+
}
37+
38+
QComboBox:!editable, QComboBox::drop-down:editable {
39+
background: white;
40+
}
41+
42+
QComboBox:!editable:on, QComboBox::drop-down:editable:on {
43+
background: #FFFFFF;
44+
}
45+
46+
QComboBox:on {
47+
padding-top: 3px;
48+
padding-left: 6px;
49+
}
50+
51+
QComboBox::drop-down {
52+
subcontrol-origin: padding;
53+
subcontrol-position: top right;
54+
width: 24px;
55+
border: none;
56+
background: white;
57+
}
58+
59+
QComboBox::down-arrow {
60+
image: url(/etc/calamares/branding/EdgeMicrovisorToolkit/arrow.svg);
61+
width: 24px;
62+
height: 24px;
63+
margin-right: 6px;
64+
}
65+
66+
QComboBox::down-arrow:on {
67+
top: 0px;
68+
left: 0px;
69+
}
70+
71+
QComboBox QAbstractItemView {
72+
selection-color: #2B2C30;
73+
background: #FFFFFF;
74+
outline: 0;
75+
}
76+
77+
QProgressBar {
78+
border: none;
79+
text-align: center;
80+
background-color: #E7E7EB;
81+
qproperty-textVisible: false;
82+
}
83+
84+
QProgressBar::chunk {
85+
background-color: #09857C;
86+
}
87+
88+
QListView {
89+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
90+
font-size: 14px;
91+
background-color: #F1F1F3;
92+
text-align: left;
93+
}
94+
195
QMessageBox, QDialog {
2-
background-color: ghostwhite;
96+
background-color: #FFFFFF; /* white background */
97+
border-width: 3px;
98+
border-style: outset;
99+
border-color: #5e5f61; /* Light gray border */
100+
border-radius: 0px; /* Rounded corners */
101+
padding: 10px; /* Add some padding for spacing */
102+
}
103+
104+
QPushButton {
105+
background-color: #FFFFFF; /* White background for buttons */
3106
border-width: 1px;
4107
border-style: solid;
5-
border-color: black;
108+
border-color: #008080; /* Teal border color */
109+
border-radius: 0px; /* Slightly rounded corners */
110+
padding: 5px 10px; /* Padding for buttons */
111+
color: #008080; /* Teal text color */
112+
font-weight: bold;
113+
}
114+
115+
QPushButton:hover {
116+
background-color: #008080; /* Teal background on hover */
117+
color: #FFFFFF; /* White text on hover */
118+
}
119+
120+
QPushButton:disabled {
121+
background-color: #E7E7EB;
122+
border-color: #E7E7EB;
123+
color: #B2B3B9;
124+
}
125+
126+
QLabel {
127+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
128+
font-size: 14px;
129+
background-color: #FFFFFF;
130+
text-align: left;
6131
}

0 commit comments

Comments
 (0)