Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qtquickcontrols-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
qtquickcontrols-nemo
Commits
e6061b65
Commit
e6061b65
authored
May 29, 2017
by
Chupligin Sergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[examples] Fix selectRoller page
parent
5584bd4a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
SelectRollerPage.qml
examples/touch/content/SelectRollerPage.qml
+3
-9
main.qml
examples/touch/main.qml
+2
-2
resources.qrc
examples/touch/resources.qrc
+1
-0
touch.pro
examples/touch/touch.pro
+2
-1
No files found.
examples/touch/content/SelectRollerPage.qml
View file @
e6061b65
...
@@ -11,8 +11,10 @@ Page {
...
@@ -11,8 +11,10 @@ Page {
Column
{
Column
{
spacing
:
40
spacing
:
40
width
:
parent
.
width
anchors
{
anchors
{
fill
:
parent
;
top
:
parent
.
top
topMargin
:
40
}
}
ListModel
{
ListModel
{
...
@@ -37,10 +39,6 @@ Page {
...
@@ -37,10 +39,6 @@ Page {
GlacierRoller
{
GlacierRoller
{
id
:
simpleRoller
id
:
simpleRoller
width
:
parent
.
width
width
:
parent
.
width
anchors
{
top
:
parent
.
top
topMargin
:
40
}
clip
:
true
clip
:
true
model
:
animalsModel
model
:
animalsModel
...
@@ -59,10 +57,6 @@ Page {
...
@@ -59,10 +57,6 @@ Page {
GlacierRoller
{
GlacierRoller
{
id
:
simpleRoller2
id
:
simpleRoller2
width
:
parent
.
width
width
:
parent
.
width
anchors
{
top
:
simpleRoller
.
bottom
topMargin
:
40
}
clip
:
true
clip
:
true
model
:
animalsModel
model
:
animalsModel
...
...
examples/touch/main.qml
View file @
e6061b65
...
@@ -219,8 +219,8 @@ ApplicationWindow {
...
@@ -219,8 +219,8 @@ ApplicationWindow {
model
:
pageModel
model
:
pageModel
anchors.fill
:
parent
anchors.fill
:
parent
clip
:
true
clip
:
true
delegate
:
AndroidDelegate
{
delegate
:
ListViewItemWithActions
{
text
:
title
label
:
title
onClicked
:
pageItem
.
Stack
.
view
.
push
(
Qt
.
resolvedUrl
(
page
))
onClicked
:
pageItem
.
Stack
.
view
.
push
(
Qt
.
resolvedUrl
(
page
))
}
}
}
}
...
...
examples/touch/resources.qrc
View file @
e6061b65
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<file>content/SliderPage.qml</file>
<file>content/SliderPage.qml</file>
<file>content/TabBarPage.qml</file>
<file>content/TabBarPage.qml</file>
<file>content/TextInputPage.qml</file>
<file>content/TextInputPage.qml</file>
<file>content/SelectRollerPage.qml</file>
<file>images/button_default.png</file>
<file>images/button_default.png</file>
<file>images/button_pressed.png</file>
<file>images/button_pressed.png</file>
<file>images/navigation_next_item.png</file>
<file>images/navigation_next_item.png</file>
...
...
examples/touch/touch.pro
View file @
e6061b65
...
@@ -22,7 +22,8 @@ OTHER_FILES += \
...
@@ -22,7 +22,8 @@ OTHER_FILES += \
content
/
LabelPage
.
qml
\
content
/
LabelPage
.
qml
\
content
/
CheckboxPage
.
qml
\
content
/
CheckboxPage
.
qml
\
content
/
ButtonRowPage
.
qml
\
content
/
ButtonRowPage
.
qml
\
content
/
QueryDialogPage
.
qml
content
/
QueryDialogPage
.
qml
\
content
/
SelectRollerPage
.
qml
RESOURCES
+=
\
RESOURCES
+=
\
resources
.
qrc
resources
.
qrc
...
...
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