Skip to content

Commit 3ad6e7b

Browse files
cppqtdevcppqtdev
authored
Merge pull request #6 from cppqtdev/development
Settings Window Implemented
2 parents 1927043 + 657d4ff commit 3ad6e7b

24 files changed

+1923
-54
lines changed

‎GameScreens/HomeScreen.qml‎

Lines changed: 750 additions & 8 deletions
Large diffs are not rendered by default.

‎GameScreens/ScreenPage.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import QtQuick 2.15
22
import QtQuick.Controls 2.5
3-
Item {
4-
anchors.fill: parent
3+
Flickable {
54
property var stack: StackView.view
65
StackView.visible: true
6+
ScrollIndicator.vertical: ScrollIndicator {}
77
}

‎Img/Basic/Smart-Home-Automation-System.jpg‎

88.3 KB
Loading

‎Img/Basic/home.png‎

5.1 MB
Loading

‎Img/Basic/undraw_programming_re_kg9v.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎ScreensComponents/TitleBar.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Item {
55
height: 40
66
width: parent.width
77
property int buttonWidthHeight: 30
8-
property int buttonRadius: 12
8+
property int buttonRadius: 6
99
signal homeClicked()
1010
signal settingsCliked()
1111
signal menuClicked()

‎Settings/AboutPage.qml‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
import QtQuick 2.15
2+
import QtQuick.Layouts 1.3
3+
import QtQuick.Controls 2.15
4+
import "../GameScreens"
5+
import "../common"
6+
import "../Settings"
7+
ScreenPage{
8+
id:root
9+
contentHeight: mainLayout.implicitHeight
10+
Pane {
11+
anchors.fill: parent
12+
leftPadding: 0
13+
topPadding: 0
14+
clip: true
15+
background: Rectangle{
16+
anchors.fill: parent
17+
color: "transparent"
18+
}
19+
20+
ColumnLayout{
21+
id: mainLayout
22+
anchors.left: parent.left
23+
anchors.right: parent.right
24+
spacing: 30
25+
26+
Rectangle{
27+
width: root.width
28+
height: 150
29+
color: "#35c9d5"
30+
Image {
31+
width: parent.width
32+
height: 150
33+
fillMode: Image.PreserveAspectFit
34+
source: "qrc:/Img/Basic/undraw_programming_re_kg9v.svg"
35+
anchors.fill: parent
36+
}
37+
}
38+
39+
Rectangle{
40+
Layout.fillWidth: true
41+
height: 150
42+
color: "transparent"
43+
Layout.leftMargin: 20
44+
Layout.rightMargin: 20
45+
radius: 12
46+
ColumnLayout{
47+
anchors.centerIn: parent
48+
Label {
49+
opacity: 0.60
50+
font.pointSize:18
51+
text:qsTr("Aksh Singh")
52+
font.weight: Font.Medium
53+
font.bold: true
54+
color: "black"
55+
Layout.alignment: Qt.AlignHCenter
56+
elide: Text.ElideRight
57+
}
58+
Label {
59+
opacity: 0.60
60+
font.pointSize:18
61+
text:qsTr("Embedded Software Engineer")
62+
font.weight: Font.Medium
63+
font.bold: true
64+
Layout.alignment: Qt.AlignHCenter
65+
color: "black"
66+
elide: Text.ElideRight
67+
}
68+
Label {
69+
opacity: 0.60
70+
font.pointSize:18
71+
text:qsTr("Hire Me : akshworkmail@gmail.com")
72+
font.weight: Font.Medium
73+
font.bold: true
74+
Layout.alignment: Qt.AlignHCenter
75+
color: "black"
76+
elide: Text.ElideRight
77+
}
78+
}
79+
}
80+
81+
Rectangle{
82+
Layout.fillWidth: true
83+
height: 150
84+
color: "#ffffff"
85+
border.width: 2
86+
border.color: "#e9e9e9"
87+
Layout.leftMargin: 20
88+
Layout.rightMargin: 20
89+
radius: 12
90+
ColumnLayout{
91+
anchors{
92+
left: parent.left
93+
leftMargin: 20
94+
verticalCenter: parent.verticalCenter
95+
}
96+
Label {
97+
opacity: 0.6
98+
font.pointSize: 10
99+
text:qsTr("Software Updated (%1)").arg("<a href='https://www.example.com'>Release Note</a>")
100+
font.weight: Font.Medium
101+
font.bold: true
102+
Layout.alignment: Qt.AlignLeft
103+
color: "black"
104+
elide: Text.ElideRight
105+
}
106+
107+
Label {
108+
opacity: 0.60
109+
font.pointSize:10
110+
text:qsTr("Software version (12.06.1885)")
111+
font.weight: Font.Medium
112+
font.bold: true
113+
Layout.alignment: Qt.AlignLeft
114+
color: "black"
115+
elide: Text.ElideRight
116+
}
117+
}
118+
119+
PrefsButton{
120+
121+
anchors{
122+
right: parent.right
123+
rightMargin: 20
124+
verticalCenter: parent.verticalCenter
125+
}
126+
127+
width: innerText.width + 40
128+
height: 38
129+
buttonText: "Check For Updated";
130+
innerText.color: "#0570eb"
131+
color: "transparent"
132+
hoverColor: "#0570eb"
133+
pressColor: "#0570eb"
134+
borderColor: "#0570eb"
135+
fontSize: 12
136+
borderWidth: 1
137+
borderRadius: 8
138+
onClicked: {
139+
}
140+
}
141+
}
142+
143+
Rectangle{
144+
Layout.fillWidth: true
145+
height: 150
146+
color: "transparent"
147+
Layout.leftMargin: 20
148+
Layout.rightMargin: 20
149+
radius: 12
150+
ColumnLayout{
151+
anchors{
152+
centerIn: parent
153+
}
154+
Label {
155+
opacity: 0.6
156+
font.pointSize: 10
157+
text:qsTr("@ 2023 1Password. All rights resered.")
158+
font.weight: Font.Medium
159+
font.bold: true
160+
Layout.alignment: Qt.AlignHCenter
161+
color: "black"
162+
elide: Text.ElideRight
163+
}
164+
Label {
165+
opacity: 0.87
166+
font.pointSize: 10
167+
text:qsTr("<a href='https://www.example.com'>Terms of Service</a>")
168+
font.weight: Font.Medium
169+
font.bold: true
170+
Layout.alignment: Qt.AlignHCenter
171+
color: "black"
172+
elide: Text.ElideRight
173+
}
174+
Label {
175+
opacity: 0.87
176+
font.pointSize: 10
177+
text:qsTr("<a href='https://www.example.com'>Privacy Policy</a>")
178+
font.weight: Font.Medium
179+
font.bold: true
180+
Layout.alignment: Qt.AlignHCenter
181+
color: "black"
182+
elide: Text.ElideRight
183+
}
184+
Label {
185+
opacity: 0.87
186+
font.pointSize: 10
187+
text:qsTr("<a href='https://www.example.com'>Credits & Ackonowledgements</a>")
188+
font.weight: Font.Medium
189+
font.bold: true
190+
Layout.alignment: Qt.AlignHCenter
191+
color: "black"
192+
elide: Text.ElideRight
193+
}
194+
}
195+
}
196+
197+
Item{
198+
Layout.fillWidth: true
199+
height: 10
200+
}
201+
}
202+
}
203+
}

‎Settings/AdvancedSettingsPage.qml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
import QtQuick 2.15
2+
import QtQuick.Layouts 1.3
3+
import QtQuick.Controls 2.15
4+
import "../GameScreens"
5+
import "../common"
6+
import "../Settings"
7+
ScreenPage{
8+
id:root
9+
contentHeight: mainLayout.implicitHeight
10+
Pane {
11+
anchors.fill: parent
12+
clip: true
13+
background: Rectangle{
14+
anchors.fill: parent
15+
color: "transparent"
16+
}
17+
18+
ColumnLayout{
19+
id: mainLayout
20+
anchors.left: parent.left
21+
anchors.right: parent.right
22+
spacing: 20
23+
24+
LablePrefsComboBox{
25+
label:qsTr("Release channel :")
26+
model: SideListModel{}
27+
}
28+
29+
Label {
30+
opacity: 0.87
31+
font.pointSize: 10
32+
text:qsTr("Betas and Nighlies are published more often. They include less-tested features and improvements.")
33+
font.weight: Font.Medium
34+
Layout.alignment: Qt.AlignLeft
35+
color: "black"
36+
elide: Text.ElideRight
37+
Layout.leftMargin: 10
38+
}
39+
40+
41+
PrefsCheckbox{
42+
text: qsTr("Install update automatically")
43+
}
44+
45+
LablePrefsComboBox{
46+
label:qsTr("Language :")
47+
model: SideListModel{}
48+
}
49+
50+
PrefsCheckboxLable{
51+
title: qsTr("Show debugging tools")
52+
description: qsTr("Extra menu option to copy item JSON and UUID.")
53+
}
54+
55+
PrefsCheckboxLable{
56+
title: qsTr("Show auto-saved web details")
57+
description: qsTr("These were auto-saved when item was created and are likely redundant.")
58+
}
59+
PrefsCheckboxLable{
60+
title: qsTr("Use Hardware Acceleration")
61+
description: qsTr("Turn this off if you're experiencing visual performace issue.")
62+
}
63+
PrefsCheckbox{
64+
text: qsTr("Keep item detail windows on top")
65+
}
66+
PrefsCheckboxLable{
67+
title: qsTr("Auto-detect network settings")
68+
description: qsTr("Turn this off if you have a proxy,but need to connect to a direct network connection.")
69+
}
70+
71+
PrefsButton{
72+
width: innerText.width + 40
73+
height: 38
74+
buttonText: "Send Diagnostics";
75+
innerText.color: "#0570eb"
76+
color: "transparent"
77+
hoverColor: "#0570eb"
78+
pressColor: "#0570eb"
79+
borderColor:"#0570eb"
80+
fontSize: 12
81+
borderWidth: 1
82+
borderRadius: 8
83+
onClicked: {
84+
}
85+
}
86+
Item{
87+
Layout.fillWidth: true
88+
height: 10
89+
}
90+
91+
}
92+
}
93+
}

0 commit comments

Comments
 (0)