Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
mobile Datovka
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
9
Issues
9
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Datovka projects
mobile Datovka
Commits
65bf3aff
Commit
65bf3aff
authored
Mar 10, 2017
by
Karel Slaný
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using a StackView for locking the application with PIN screen.
parent
5f6f2142
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
338 additions
and
167 deletions
+338
-167
qml/main.qml
qml/main.qml
+171
-148
qml/pages/PageAboutApp.qml
qml/pages/PageAboutApp.qml
+5
-0
qml/pages/PageAccountDetail.qml
qml/pages/PageAccountDetail.qml
+2
-0
qml/pages/PageAccountList.qml
qml/pages/PageAccountList.qml
+44
-6
qml/pages/PageMenuAccount.qml
qml/pages/PageMenuAccount.qml
+14
-2
qml/pages/PageMenuDatovkaSettings.qml
qml/pages/PageMenuDatovkaSettings.qml
+27
-5
qml/pages/PageMenuMessage.qml
qml/pages/PageMenuMessage.qml
+2
-0
qml/pages/PageMenuMessageDetail.qml
qml/pages/PageMenuMessageDetail.qml
+2
-0
qml/pages/PageMenuMessageList.qml
qml/pages/PageMenuMessageList.qml
+2
-0
qml/pages/PageMessageDetail.qml
qml/pages/PageMessageDetail.qml
+15
-2
qml/pages/PageMessageList.qml
qml/pages/PageMessageList.qml
+26
-3
qml/pages/PageSettingsAccount.qml
qml/pages/PageSettingsAccount.qml
+2
-0
qml/pages/PageSettingsGeneral.qml
qml/pages/PageSettingsGeneral.qml
+5
-0
qml/pages/PageSettingsPin.qml
qml/pages/PageSettingsPin.qml
+5
-0
qml/pages/PageSettingsStorage.qml
qml/pages/PageSettingsStorage.qml
+5
-0
qml/pages/PageSettingsSync.qml
qml/pages/PageSettingsSync.qml
+5
-0
qml/pages/PageZfoMessageDetail.qml
qml/pages/PageZfoMessageDetail.qml
+6
-1
No files found.
qml/main.qml
View file @
65bf3aff
This diff is collapsed.
Click to expand it.
qml/pages/PageAboutApp.qml
View file @
65bf3aff
...
...
@@ -28,6 +28,11 @@ Component {
id
:
aboutApp
Item
{
id
:
aboutLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
int
myWidht
:
aboutLayout
.
width
-
2
*
defaultMargin
Rectangle
{
id
:
header
...
...
qml/pages/PageAccountDetail.qml
View file @
65bf3aff
...
...
@@ -30,6 +30,8 @@ Component {
id
:
acntDetailPage
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
...
...
qml/pages/PageAccountList.qml
View file @
65bf3aff
...
...
@@ -38,6 +38,16 @@ Component {
id
:
pageAccountList
Item
{
id
:
mainPage
/* These properties must be set by caller. */
//property var pageView
//property var statusBar
/*
* TODO -- Is there a way how to pas the pageView as a property?
* This pageView property is not passed because the page is created
* within the StackView.
*/
Component.onCompleted
:
{
if
(
accountList
.
count
==
0
)
{
accountList
.
visible
=
false
...
...
@@ -62,7 +72,10 @@ Component {
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
pageView
.
push
(
pageAboutApp
,
StackView
.
Immediate
)
pageView
.
push
(
pageAboutApp
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -92,7 +105,10 @@ Component {
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
pageView
.
push
(
pageMenuDatovkaSettings
,
StackView
.
Immediate
)
pageView
.
push
(
pageMenuDatovkaSettings
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -108,7 +124,12 @@ Component {
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
pageView
.
push
(
pageSettingsAccount
,
{
"
acntName
"
:
""
,
"
userName
"
:
""
},
StackView
.
Immediate
)
pageView
.
push
(
pageSettingsAccount
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
""
,
"
userName
"
:
""
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -200,7 +221,12 @@ Component {
anchors.fill
:
parent
onClicked
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMenuAccount
,
{
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
},
StackView
.
Immediate
)
pageView
.
push
(
pageMenuAccount
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -282,7 +308,13 @@ Component {
anchors.fill
:
parent
onClicked
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMessageList
,
{
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
,
"
msgType
"
:
MessageType
.
TYPE_RECEIVED
},
StackView
.
Immediate
)
pageView
.
push
(
pageMessageList
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
,
"
msgType
"
:
MessageType
.
TYPE_RECEIVED
},
StackView
.
Immediate
)
}
}
Rectangle
{
...
...
@@ -344,7 +376,13 @@ Component {
anchors.fill
:
parent
onClicked
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMessageList
,
{
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
,
"
msgType
"
:
MessageType
.
TYPE_SENT
},
StackView
.
Immediate
)
pageView
.
push
(
pageMessageList
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
rAcntName
,
"
userName
"
:
rUserName
,
"
msgType
"
:
MessageType
.
TYPE_SENT
},
StackView
.
Immediate
)
}
}
Rectangle
{
...
...
qml/pages/PageMenuAccount.qml
View file @
65bf3aff
...
...
@@ -34,6 +34,8 @@ Component {
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
...
...
@@ -170,9 +172,19 @@ Component {
anchors.fill
:
parent
onClicked
:
{
if
(
index
==
0
)
{
pageView
.
replace
(
pageSettingsAccount
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
},
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsAccount
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
},
StackView
.
Immediate
)
}
else
if
(
index
==
1
)
{
pageView
.
replace
(
pageAccountDetail
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
},
StackView
.
Immediate
)
pageView
.
replace
(
pageAccountDetail
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
},
StackView
.
Immediate
)
}
else
if
(
index
==
2
)
{
files
.
deleteFileDb
(
userName
)
}
else
if
(
index
==
3
)
{
...
...
qml/pages/PageMenuDatovkaSettings.qml
View file @
65bf3aff
...
...
@@ -32,6 +32,11 @@ Component {
id
:
menuDatovkamainSettings
Item
{
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
int
myWidht
:
mainLayout
.
width
-
2
*
defaultMargin
Rectangle
{
id
:
header
...
...
@@ -157,15 +162,32 @@ Component {
anchors.fill
:
parent
onClicked
:
{
if
(
index
==
1
)
{
pageView
.
replace
(
pageSettingsAccount
,
{
"
acntName
"
:
""
,
"
userName
"
:
""
},
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsAccount
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
""
,
"
userName
"
:
""
},
StackView
.
Immediate
)
}
else
if
(
index
==
2
)
{
pageView
.
replace
(
pageSettingsGeneral
,
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsGeneral
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
else
if
(
index
==
3
)
{
pageView
.
replace
(
pageSettingsSync
,
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsSync
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
else
if
(
index
==
4
)
{
pageView
.
replace
(
pageSettingsStorage
,
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsStorage
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
else
if
(
index
==
5
)
{
pageView
.
replace
(
pageSettingsPin
,
StackView
.
Immediate
)
pageView
.
replace
(
pageSettingsPin
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
},
StackView
.
Immediate
)
}
else
{
pageView
.
pop
(
StackView
.
Immediate
)
}
...
...
qml/pages/PageMenuMessage.qml
View file @
65bf3aff
...
...
@@ -35,6 +35,8 @@ Component {
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
property
int
msgType
...
...
qml/pages/PageMenuMessageDetail.qml
View file @
65bf3aff
...
...
@@ -35,6 +35,8 @@ Component {
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
property
int
msgType
...
...
qml/pages/PageMenuMessageList.qml
View file @
65bf3aff
...
...
@@ -35,6 +35,8 @@ Component {
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
property
int
msgType
...
...
qml/pages/PageMessageDetail.qml
View file @
65bf3aff
...
...
@@ -35,6 +35,8 @@ Component {
id
:
msgDetailPage
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
property
int
msgType
...
...
@@ -126,7 +128,14 @@ Component {
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
pageView
.
push
(
pageMenuMessageDetail
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
msgId
},
StackView
.
Immediate
)
pageView
.
push
(
pageMenuMessageDetail
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
msgId
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -170,7 +179,11 @@ Component {
target
:
files
onPushNewMessageDeatilPage
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageZfoMessageDetail
,
{
"
zfoId
"
:
zfoId
},
StackView
.
Immediate
)
pageView
.
push
(
pageZfoMessageDetail
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
zfoId
"
:
zfoId
},
StackView
.
Immediate
)
}
}
}
...
...
qml/pages/PageMessageList.qml
View file @
65bf3aff
...
...
@@ -40,6 +40,8 @@ Component {
id
:
msgListPage
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
property
int
msgType
...
...
@@ -115,7 +117,13 @@ Component {
anchors.fill
:
parent
onClicked
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMenuMessageList
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
},
StackView
.
Immediate
)
pageView
.
push
(
pageMenuMessageList
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
},
StackView
.
Immediate
)
}
}
}
...
...
@@ -272,11 +280,26 @@ Component {
anchors.fill
:
parent
onClicked
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMessageDetail
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
rMsgId
},
StackView
.
Immediate
)
pageView
.
push
(
pageMessageDetail
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
rMsgId
},
StackView
.
Immediate
)
}
onPressAndHold
:
{
statusBar
.
visible
=
false
pageView
.
push
(
pageMenuMessage
,
{
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
rMsgId
,
"
canDeleteMsg
"
:
compareMsgDate
(
rDelivTime
)},
StackView
.
Immediate
)
pageView
.
push
(
pageMenuMessage
,
{
"
pageView
"
:
pageView
,
"
statusBar
"
:
statusBar
,
"
acntName
"
:
acntName
,
"
userName
"
:
userName
,
"
msgType
"
:
msgType
,
"
msgId
"
:
rMsgId
,
"
canDeleteMsg
"
:
compareMsgDate
(
rDelivTime
)
},
StackView
.
Immediate
)
}
}
Rectangle
{
...
...
qml/pages/PageSettingsAccount.qml
View file @
65bf3aff
...
...
@@ -31,6 +31,8 @@ Component {
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
acntName
property
string
userName
...
...
qml/pages/PageSettingsGeneral.qml
View file @
65bf3aff
...
...
@@ -28,6 +28,11 @@ Component {
id
:
settingsGeneral
Item
{
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
sectionName
:
"
general
"
Component.onCompleted
:
{
settings
.
loadSettings
(
sectionName
)
...
...
qml/pages/PageSettingsPin.qml
View file @
65bf3aff
...
...
@@ -29,6 +29,11 @@ Component {
id
:
settingsPin
Item
{
id
:
mainItem
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
Component.onCompleted
:
{
currentPIN
=
settings
.
pinValue
()
actionName
=
"
unspecified
"
/* Causes onChanged() to fire. */
...
...
qml/pages/PageSettingsStorage.qml
View file @
65bf3aff
...
...
@@ -29,6 +29,11 @@ Component {
id
:
settingsStorage
Item
{
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
sectionName
:
"
storage
"
Component.onCompleted
:
{
settings
.
loadSettings
(
sectionName
)
...
...
qml/pages/PageSettingsSync.qml
View file @
65bf3aff
...
...
@@ -28,6 +28,11 @@ Component {
id
:
settingsSync
Item
{
id
:
mainLayout
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
sectionName
:
"
sync
"
Component.onCompleted
:
{
settings
.
loadSettings
(
sectionName
)
...
...
qml/pages/PageZfoMessageDetail.qml
View file @
65bf3aff
...
...
@@ -30,8 +30,13 @@ Component {
id
:
pageZfoMessageDetail
Item
{
id
:
msgZfoDetailPage
/* These properties are set from cpp. */
/* These properties must be set by caller. */
property
var
pageView
property
var
statusBar
property
string
zfoId
/* These properties are set from cpp. */
property
string
eSubject
property
string
eBody
Rectangle
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment