Skip to content

Commit a15d750

Browse files
author
Yunusemre Şentürk
committed
Add pardus otf and update welcome screens
Signed-off-by: Yunusemre Şentürk <[email protected]>
1 parent 93ed3f3 commit a15d750

9 files changed

+85
-157
lines changed

Pardus-Regular.otf

30 KB
Binary file not shown.

file.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<RCC>
22
<qresource prefix="/">
33
<file>qtquickcontrols2.conf</file>
4+
<file>Pardus-Regular.otf</file>
45
</qresource>
56
</RCC>

images.qrc

-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@
2727
<file>images/icon.svg</file>
2828
<file>images/back.svg</file>
2929
<file>images/front.svg</file>
30-
<file>images/splash.svg</file>
3130
</qresource>
3231
</RCC>

images/splash.svg

-145
This file was deleted.

ui/ApplicationList.qml

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ GridView {
99
cellWidth: applicationList.width / 5
1010
cellHeight: applicationList.cellWidth * 3 / 5
1111
visible: true
12-
interactive: count > 15 ? true : false
12+
interactive: count > 15 ? true : false
13+
1314
anchors {
1415
fill: parent
15-
16-
1716
}
1817
model: applicationModel
1918

ui/Home.qml

+4-2
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,14 @@ Pane {
102102
}
103103
smooth: true
104104
text: qsTr("welcome")
105+
105106
Material.foreground: "#fafafa"
106107
verticalAlignment: Text.AlignVCenter
107108
horizontalAlignment: Text.AlignHCenter
108109
font.capitalization: Font.Capitalize
109-
font.bold: true
110-
font.pointSize: 32
110+
font.pointSize: 42
111+
font.letterSpacing: 3
112+
font.family: pardusFont.name
111113
}
112114
}
113115

ui/InfoDialog.qml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.0
44

55
Popup {
66
id: dialog
7-
width: parent.width / 3
7+
width: parent.width / 3 - 48
88
height: popupOutputHeader.height + popupOutput.height + 36
99
modal: true
1010
closePolicy: Popup.CloseOnPressOutside
@@ -46,6 +46,7 @@ Popup {
4646
verticalCenter: parent.verticalCenter
4747
}
4848
Material.foreground: "#fafafa"
49+
horizontalAlignment: Text.AlignHCenter
4950
fontSizeMode: Text.HorizontalFit
5051
wrapMode: Text.WordWrap
5152
verticalAlignment: Text.AlignVCenter

ui/SplashScreen.qml

+14-5
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,26 @@ Pane {
4747
}
4848
onOpacityChanged: {
4949
if(opacity === 1.0) {
50-
bottomImage.opacity = 1.0
50+
appNameLabel.opacity = 1.0
5151
}
5252
}
5353
}
5454

55-
Image {
56-
id: bottomImage
55+
Label {
56+
id: appNameLabel
57+
text: main.title
58+
smooth: false
59+
verticalAlignment: Text.AlignVCenter
60+
horizontalAlignment: Text.AlignHCenter
61+
Material.foreground: "#ffcb08"
62+
font.pointSize: 42
63+
font.capitalization: Font.Capitalize
64+
font.family: pardusFont.name
65+
5766
anchors.horizontalCenter: parent.horizontalCenter
5867
anchors.top: parent.verticalCenter
5968
anchors.topMargin: 12
60-
source: "qrc:/images/splash.svg"
69+
6170
opacity: 0.0
6271
Behavior on opacity {
6372
NumberAnimation {
@@ -71,7 +80,7 @@ Pane {
7180
id: splashLabel
7281
font.pointSize: 12
7382
anchors{
74-
top: bottomImage.bottom
83+
top: appNameLabel.bottom
7584
topMargin: 12
7685
horizontalCenter: parent.horizontalCenter
7786
}

ui/main.qml

+62
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import QtQuick 2.7
22
import QtQuick.Controls 2.0
33
import QtQuick.Window 2.0
44
import QtQuick.Controls.Material 2.0
5+
import QtGraphicalEffects 1.0
56
import ps.helper 1.0
67

78

@@ -206,6 +207,12 @@ ApplicationWindow {
206207
id: searchBar
207208
}
208209

210+
FontLoader {
211+
id: pardusFont
212+
name: "Pardus"
213+
source: "qrc:/Pardus-Regular.otf"
214+
}
215+
209216
Helper {
210217
id: helper
211218
onProcessingFinished: {
@@ -329,6 +336,61 @@ ApplicationWindow {
329336
Page {
330337
width: swipeView.width
331338
height: swipeView.height
339+
background: Rectangle {
340+
color: "transparent"
341+
Item {
342+
id: categoryLabelContainer
343+
width: 200
344+
height: 60
345+
anchors {
346+
bottom: parent.bottom
347+
horizontalCenter: parent.horizontalCenter
348+
}
349+
350+
Rectangle {
351+
color: "#3c3c3c"
352+
radius: 3
353+
clip: true
354+
visible: (category !== qsTr("settings") && category !== qsTr("home") && category !== qsTr("all"))
355+
width: parent.width - innerShadow.radius
356+
height: parent.height - innerShadow.radius
357+
anchors {
358+
horizontalCenter: parent.horizontalCenter
359+
verticalCenter: parent.verticalCenter
360+
//verticalCenterOffset: 4
361+
}
362+
Label {
363+
id: categoryLabel
364+
text: category
365+
smooth: false
366+
verticalAlignment: Text.AlignVCenter
367+
horizontalAlignment: Text.AlignHCenter
368+
Material.foreground: "#ffcb08"
369+
font.pointSize: 32
370+
font.capitalization: Font.Capitalize
371+
font.family: pardusFont.name
372+
anchors.centerIn: parent
373+
374+
375+
}
376+
}
377+
}
378+
379+
InnerShadow {
380+
id: innerShadow
381+
anchors.fill: categoryLabelContainer
382+
cached: true
383+
visible: true
384+
smooth: true
385+
radius: 8
386+
samples: 17
387+
horizontalOffset: 0
388+
verticalOffset: 0
389+
color: "#ff000000"
390+
source: categoryLabelContainer
391+
}
392+
}
393+
332394
ApplicationList {
333395
id: applicationListPage
334396
}

0 commit comments

Comments
 (0)