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
2476ff42
Commit
2476ff42
authored
Jun 25, 2018
by
Chupligin Sergey
Committed by
Sergey Chupligin
Jun 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ProgressBar] Add indication of indeterminate progresspar
parent
bfa881bc
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
51 additions
and
65 deletions
+51
-65
ProgressBarPage.qml
examples/touch/content/ProgressBarPage.qml
+2
-21
controls.pro
src/controls/controls.pro
+1
-0
ProgressBar.qml
src/controls/qml/ProgressBar.qml
+7
-0
qmldir
src/controls/qml/qmldir
+1
-2
GrooveStyle.qml
src/styles/qml/GrooveStyle.qml
+0
-37
ProgressBarStyle.qml
src/styles/qml/ProgressBarStyle.qml
+40
-4
styles.pro
src/styles/styles.pro
+0
-1
No files found.
examples/touch/content/ProgressBarPage.qml
View file @
2476ff42
...
@@ -82,28 +82,9 @@ Page {
...
@@ -82,28 +82,9 @@ Page {
ProgressBar
{
ProgressBar
{
anchors.margins
:
20
anchors.margins
:
20
style
:
touchStyl
e
indeterminate
:
tru
e
value
:
1
value
:
0.85
width
:
400
width
:
400
}
}
}
}
Component
{
id
:
touchStyle
ProgressBarStyle
{
panel
:
Rectangle
{
implicitHeight
:
15
implicitWidth
:
400
color
:
"
#444
"
opacity
:
0.8
Rectangle
{
antialiasing
:
true
radius
:
1
color
:
"
#468bb7
"
height
:
parent
.
height
width
:
parent
.
width
*
control
.
value
/
control
.
maximumValue
}
}
}
}
}
}
src/controls/controls.pro
View file @
2476ff42
...
@@ -15,6 +15,7 @@ QML_FILES += \
...
@@ -15,6 +15,7 @@ QML_FILES += \
qml
/
Checkbox
.
qml
\
qml
/
Checkbox
.
qml
\
qml
/
ButtonRow
.
qml
\
qml
/
ButtonRow
.
qml
\
qml
/
Header
.
qml
\
qml
/
Header
.
qml
\
qml
/
ProgressBar
.
qml
\
qml
/
HeaderToolsLayout
.
qml
\
qml
/
HeaderToolsLayout
.
qml
\
qml
/
Slider
.
qml
\
qml
/
Slider
.
qml
\
qml
/
ListView
.
qml
\
qml
/
ListView
.
qml
\
...
...
src/controls/qml/ProgressBar.qml
0 → 100644
View file @
2476ff42
import
QtQuick
2.6
import
QtQuick
.
Controls
1.0
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
ProgressBar
{
style
:
ProgressBarStyle
{}
}
src/controls/qml/qmldir
View file @
2476ff42
...
@@ -29,6 +29,7 @@ DatePicker 1.0 DatePicker.qml
...
@@ -29,6 +29,7 @@ DatePicker 1.0 DatePicker.qml
TimePicker 1.0 TimePicker.qml
TimePicker 1.0 TimePicker.qml
ScrollDecorator 1.0 ScrollDecorator.qml
ScrollDecorator 1.0 ScrollDecorator.qml
TextField 1.0 TextField.qml
TextField 1.0 TextField.qml
ProgressBar 1.0 ProgressBar.qml
# MIRRORED CONTROLS:
# MIRRORED CONTROLS:
# These are the controls that we take directly from official QQC.
# These are the controls that we take directly from official QQC.
...
@@ -41,11 +42,9 @@ TextField 1.0 TextField.qml
...
@@ -41,11 +42,9 @@ TextField 1.0 TextField.qml
ComboBox 1.0 ../ComboBox.qml
ComboBox 1.0 ../ComboBox.qml
GroupBox 1.0 ../GroupBox.qml
GroupBox 1.0 ../GroupBox.qml
MenuBar 1.0 ../MenuBar.qml
MenuBar 1.0 ../MenuBar.qml
Menu 1.0 ../Menu.qml
Menu 1.0 ../Menu.qml
StackView 1.0 ../StackView.qml
StackView 1.0 ../StackView.qml
ProgressBar 1.0 ../ProgressBar.qml
RadioButton 1.0 ../RadioButton.qml
RadioButton 1.0 ../RadioButton.qml
ScrollView 1.0 ../ScrollView.qml
ScrollView 1.0 ../ScrollView.qml
SpinBox 1.0 ../SpinBox.qml
SpinBox 1.0 ../SpinBox.qml
...
...
src/styles/qml/GrooveStyle.qml
deleted
100644 → 0
View file @
bfa881bc
/*
* Copyright (C) 2013 Simonas Leleiva <simonas.leleiva@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
import
QtQuick
2.6
import
QtQuick
.
Controls
.
Nemo
1.0
Component
{
Rectangle
{
implicitHeight
:
Theme
.
itemHeightSmall
/
2
implicitWidth
:
Theme
.
itemWidthLarge
+
Theme
.
itemWidthSmall
color
:
Theme
.
fillDarkColor
Rectangle
{
antialiasing
:
true
radius
:
1
color
:
Theme
.
accentColor
height
:
parent
.
height
width
:
parent
.
width
*
control
.
value
/
control
.
maximumValue
}
}
}
src/styles/qml/ProgressBarStyle.qml
View file @
2476ff42
/*
/*
* Copyright (C) 2013 Andrea Bernabei <and.bernabei@gmail.com>
* Copyright (C) 2013 Andrea Bernabei <and.bernabei@gmail.com>
* Copyright (C) 2018 Chupligin Sergey <neochapay@gmail.com>
*
*
* This library is free software; you can redistribute it and/or
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* modify it under the terms of the GNU Library General Public
...
@@ -18,12 +19,47 @@
...
@@ -18,12 +19,47 @@
*/
*/
import
QtQuick
2.6
import
QtQuick
2.6
import
QtQuick
.
Controls
.
Nemo
1.0
import
QtQuick
.
Controls
.
Styles
1.0
import
QtQuick
.
Controls
.
Styles
1.0
ProgressBarStyle
{
ProgressBarStyle
{
GrooveStyle
{
panel
:
Rectangle
{
id
:
grooveStyle
implicitHeight
:
Theme
.
itemHeightSmall
/
2
}
implicitWidth
:
Theme
.
itemWidthLarge
+
Theme
.
itemWidthSmall
color
:
Theme
.
fillDarkColor
Rectangle
{
antialiasing
:
true
radius
:
1
visible
:
!
control
.
indeterminate
color
:
control
.
indeterminate
?
"
transparent
"
:
Theme
.
accentColor
height
:
parent
.
height
width
:
parent
.
width
*
control
.
value
/
control
.
maximumValue
}
panel
:
grooveStyle
;
Item
{
anchors.fill
:
parent
anchors.margins
:
1
visible
:
control
.
indeterminate
clip
:
true
Row
{
Repeater
{
Rectangle
{
color
:
index
%
2
?
Theme
.
fillDarkColor
:
Theme
.
accentColor
width
:
Theme
.
itemHeightExtraSmall
/
3
height
:
control
.
height
*
2
rotation
:
40
y
:
-
control
.
height
/
2
}
model
:
control
.
width
/
Theme
.
itemHeightExtraSmall
*
3
+
4
}
XAnimator
on
x
{
from
:
-
(
Theme
.
itemHeightExtraSmall
/
3
*
2
)
;
to
:
0
loops
:
Animation
.
Infinite
running
:
control
.
indeterminate
}
}
}
}
}
}
src/styles/styles.pro
View file @
2476ff42
...
@@ -12,7 +12,6 @@ QML_FILES = \
...
@@ -12,7 +12,6 @@ QML_FILES = \
qml
/
CheckBoxStyle
.
qml
\
qml
/
CheckBoxStyle
.
qml
\
qml
/
ComboBoxStyle
.
qml
\
qml
/
ComboBoxStyle
.
qml
\
qml
/
FocusFrameStyle
.
qml
\
qml
/
FocusFrameStyle
.
qml
\
qml
/
GrooveStyle
.
qml
\
qml
/
GroupBoxStyle
.
qml
\
qml
/
GroupBoxStyle
.
qml
\
qml
/
MenuBarStyle
.
qml
\
qml
/
MenuBarStyle
.
qml
\
qml
/
MenuStyle
.
qml
\
qml
/
MenuStyle
.
qml
\
...
...
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