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
b4d6b34c
Commit
b4d6b34c
authored
Nov 13, 2013
by
Simonas Leleiva
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12 from SfietKonstantin/spinner
[feature] Added spinner
parents
b89cab6c
ba635695
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
547 additions
and
10 deletions
+547
-10
SpinnerPage.qml
examples/touch/content/SpinnerPage.qml
+56
-0
main.qml
examples/touch/main.qml
+4
-0
resources.qrc
examples/touch/resources.qrc
+1
-0
touch.pro
examples/touch/touch.pro
+2
-1
Spinner.qml
src/controls/Spinner.qml
+203
-0
controls.pro
src/controls/controls.pro
+2
-1
qmldir
src/controls/qmldir
+1
-0
nemotheme.cpp
src/styles/autogenerated/nemotheme.cpp
+25
-0
nemotheme.h
src/styles/autogenerated/nemotheme.h
+4
-0
nemothemespinner.cpp
src/styles/autogenerated/nemothemespinner.cpp
+124
-0
nemothemespinner.h
src/styles/autogenerated/nemothemespinner.h
+73
-0
qquicknemostyleextensionplugin.cpp
src/styles/qquicknemostyleextensionplugin.cpp
+2
-0
styles.pro
src/styles/styles.pro
+4
-2
glacier.json
src/styles/themes/glacier.json
+4
-0
components.json
tools/themehelper/components.json
+42
-6
No files found.
examples/touch/content/SpinnerPage.qml
0 → 100644
View file @
b4d6b34c
/****************************************************************************************
**
** Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** * Neither the name of the author nor the
** names of its contributors may be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
****************************************************************************************/
import
QtQuick
2.1
import
QtQuick
.
Controls
1.0
//needed for the Stack attached property
import
QtQuick
.
Controls
.
Nemo
1.0
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
Page
{
id
:
root
tools
:
ToolBarLayoutExample
{
title
:
"
Spinner
"
}
Column
{
spacing
:
40
anchors.centerIn
:
parent
Button
{
text
:
"
Toggle spinner
"
onClicked
:
spinner
.
enabled
=
!
spinner
.
enabled
}
Spinner
{
id
:
spinner
}
}
}
examples/touch/main.qml
View file @
b4d6b34c
...
@@ -87,6 +87,10 @@ ApplicationWindow {
...
@@ -87,6 +87,10 @@ ApplicationWindow {
title
:
"
TextInput
"
title
:
"
TextInput
"
page
:
"
content/TextInputPage.qml
"
page
:
"
content/TextInputPage.qml
"
}
}
ListElement
{
title
:
"
Spinner
"
page
:
"
content/SpinnerPage.qml
"
}
}
}
...
...
examples/touch/resources.qrc
View file @
b4d6b34c
...
@@ -17,5 +17,6 @@
...
@@ -17,5 +17,6 @@
<file>images/toolbar.png</file>
<file>images/toolbar.png</file>
<file>content/LiveCoding.qml</file>
<file>content/LiveCoding.qml</file>
<file>content/ToolBarLayoutExample.qml</file>
<file>content/ToolBarLayoutExample.qml</file>
<file>content/SpinnerPage.qml</file>
</qresource>
</qresource>
</RCC>
</RCC>
examples/touch/touch.pro
View file @
b4d6b34c
...
@@ -18,7 +18,8 @@ OTHER_FILES += \
...
@@ -18,7 +18,8 @@ OTHER_FILES += \
content
/
TabBarPage
.
qml
\
content
/
TabBarPage
.
qml
\
content
/
TextInputPage
.
qml
\
content
/
TextInputPage
.
qml
\
content
/
LiveCoding
.
qml
\
content
/
LiveCoding
.
qml
\
content
/
ToolBarLayoutExample
.
qml
content
/
ToolBarLayoutExample
.
qml
\
content
/
SpinnerPage
.
qml
RESOURCES
+=
\
RESOURCES
+=
\
resources
.
qrc
resources
.
qrc
...
...
src/controls/Spinner.qml
0 → 100644
View file @
b4d6b34c
/****************************************************************************************
**
** Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** * Neither the name of the author nor the
** names of its contributors may be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
****************************************************************************************/
import
QtQuick
2.1
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
Item
{
id
:
container
// anchors.centerIn: parent
width
:
2
*
Theme
.
spinner
.
radius
+
Theme
.
spinner
.
horizontalSpacing
height
:
2
*
Theme
.
spinner
.
radius
+
Theme
.
spinner
.
verticalSpacing
// visible: enabled
states
:
[
State
{
name
:
"
enabled
"
;
when
:
enabled
}
]
transitions
:
[
Transition
{
from
:
""
to
:
"
enabled
"
SequentialAnimation
{
NumberAnimation
{
targets
:
[
circle0
,
circle1
,
circle2
,
circle3
]
property
:
"
opacity
"
to
:
1
duration
:
Theme
.
spinner
.
initialStateDuration
}
PropertyAction
{
target
:
animations
;
property
:
"
running
"
;
value
:
true
}
}
},
Transition
{
from
:
"
enabled
"
to
:
""
SequentialAnimation
{
PropertyAction
{
target
:
animations
;
property
:
"
running
"
;
value
:
false
}
PropertyAnimation
{
targets
:
[
circle0
,
circle1
,
circle2
,
circle3
]
property
:
"
color
"
;
to
:
Theme
.
spinner
.
primaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
NumberAnimation
{
targets
:
[
circle0
,
circle1
,
circle2
,
circle3
]
property
:
"
opacity
"
to
:
0
duration
:
Theme
.
spinner
.
initialStateDuration
}
}
}
]
MouseArea
{
anchors.fill
:
parent
onClicked
:
animation
.
start
()
}
Item
{
id
:
innerRect
anchors.centerIn
:
parent
width
:
Theme
.
spinner
.
radius
+
Theme
.
spinner
.
horizontalSpacing
height
:
Theme
.
spinner
.
radius
+
Theme
.
spinner
.
verticalSpacing
}
Rectangle
{
id
:
circle0
opacity
:
0
anchors.horizontalCenter
:
innerRect
.
left
anchors.verticalCenter
:
innerRect
.
top
width
:
Theme
.
spinner
.
radius
height
:
Theme
.
spinner
.
radius
radius
:
Theme
.
spinner
.
radius
/
2
color
:
Theme
.
spinner
.
primaryColor
}
Rectangle
{
id
:
circle1
opacity
:
0
anchors.horizontalCenter
:
innerRect
.
right
anchors.verticalCenter
:
innerRect
.
top
width
:
Theme
.
spinner
.
radius
height
:
Theme
.
spinner
.
radius
radius
:
Theme
.
spinner
.
radius
/
2
color
:
Theme
.
spinner
.
primaryColor
}
Rectangle
{
id
:
circle2
opacity
:
0
anchors.horizontalCenter
:
innerRect
.
right
anchors.verticalCenter
:
innerRect
.
bottom
width
:
Theme
.
spinner
.
radius
height
:
Theme
.
spinner
.
radius
radius
:
Theme
.
spinner
.
radius
/
2
color
:
Theme
.
spinner
.
primaryColor
}
Rectangle
{
id
:
circle3
opacity
:
0
anchors.horizontalCenter
:
innerRect
.
left
anchors.verticalCenter
:
innerRect
.
bottom
width
:
Theme
.
spinner
.
radius
height
:
Theme
.
spinner
.
radius
radius
:
Theme
.
spinner
.
radius
/
2
color
:
Theme
.
spinner
.
primaryColor
}
SequentialAnimation
{
id
:
animations
loops
:
Animation
.
Infinite
ParallelAnimation
{
onRunningChanged
:
console
.
debug
(
running
)
PropertyAnimation
{
target
:
circle0
property
:
"
color
"
to
:
Theme
.
spinner
.
secondaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
PropertyAnimation
{
target
:
circle3
property
:
"
color
"
to
:
Theme
.
spinner
.
primaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
}
ParallelAnimation
{
PropertyAnimation
{
target
:
circle1
property
:
"
color
"
to
:
Theme
.
spinner
.
secondaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
PropertyAnimation
{
target
:
circle0
property
:
"
color
"
to
:
Theme
.
spinner
.
primaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
}
ParallelAnimation
{
PropertyAnimation
{
target
:
circle2
property
:
"
color
"
to
:
Theme
.
spinner
.
secondaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
PropertyAnimation
{
target
:
circle1
property
:
"
color
"
to
:
Theme
.
spinner
.
primaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
}
ParallelAnimation
{
PropertyAnimation
{
target
:
circle3
property
:
"
color
"
to
:
Theme
.
spinner
.
secondaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
PropertyAnimation
{
target
:
circle2
property
:
"
color
"
to
:
Theme
.
spinner
.
primaryColor
duration
:
Theme
.
spinner
.
transitionDuration
}
}
}
}
src/controls/controls.pro
View file @
b4d6b34c
...
@@ -9,7 +9,8 @@ THEME_IMPORT_PATH = QtQuick/Controls/Styles/Nemo/themes
...
@@ -9,7 +9,8 @@ THEME_IMPORT_PATH = QtQuick/Controls/Styles/Nemo/themes
QML_FILES
+=
\
QML_FILES
+=
\
Button
.
qml
\
Button
.
qml
\
ApplicationWindow
.
qml
\
ApplicationWindow
.
qml
\
Page
.
qml
Page
.
qml
\
Spinner
.
qml
OTHER_FILES
+=
qmldir
\
OTHER_FILES
+=
qmldir
\
$$
QML_FILES
$$
QML_FILES
...
...
src/controls/qmldir
View file @
b4d6b34c
...
@@ -11,6 +11,7 @@ plugin nemocontrolsplugin
...
@@ -11,6 +11,7 @@ plugin nemocontrolsplugin
Button 1.0 Button.qml
Button 1.0 Button.qml
ApplicationWindow 1.0 ApplicationWindow.qml
ApplicationWindow 1.0 ApplicationWindow.qml
Page 1.0 Page.qml
Page 1.0 Page.qml
Spinner 1.0 Spinner.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.
...
...
src/styles/autogenerated/nemotheme.cpp
View file @
b4d6b34c
...
@@ -45,6 +45,7 @@ NemoTheme::NemoTheme(QObject *parent)
...
@@ -45,6 +45,7 @@ NemoTheme::NemoTheme(QObject *parent)
,
m_toolBar
(
new
NemoThemeToolBar
(
this
))
,
m_toolBar
(
new
NemoThemeToolBar
(
this
))
,
m_window
(
new
NemoThemeWindow
(
this
))
,
m_window
(
new
NemoThemeWindow
(
this
))
,
m_page
(
new
NemoThemePage
(
this
))
,
m_page
(
new
NemoThemePage
(
this
))
,
m_spinner
(
new
NemoThemeSpinner
(
this
))
{
{
loadFromFile
(
GLACIER_THEME
);
loadFromFile
(
GLACIER_THEME
);
int
id
=
QFontDatabase
::
addApplicationFont
(
"/usr/share/fonts/google-opensans/OpenSans-Regular.ttf"
);
int
id
=
QFontDatabase
::
addApplicationFont
(
"/usr/share/fonts/google-opensans/OpenSans-Regular.ttf"
);
...
@@ -117,6 +118,11 @@ NemoThemePage * NemoTheme::page() const
...
@@ -117,6 +118,11 @@ NemoThemePage * NemoTheme::page() const
return
m_page
;
return
m_page
;
}
}
NemoThemeSpinner
*
NemoTheme
::
spinner
()
const
{
return
m_spinner
;
}
QString
NemoTheme
::
fontFamily
()
const
QString
NemoTheme
::
fontFamily
()
const
{
{
return
m_fontFamily
;
return
m_fontFamily
;
...
@@ -343,4 +349,23 @@ void NemoTheme::loadFromFile(const QString &fileName)
...
@@ -343,4 +349,23 @@ void NemoTheme::loadFromFile(const QString &fileName)
if
(
stylesPageDimmer
.
contains
(
"endPosition"
))
{
if
(
stylesPageDimmer
.
contains
(
"endPosition"
))
{
m_page
->
dimmer
()
->
setEndPosition
(
jsonToDouble
(
stylesPage
.
value
(
"dimmer"
),
defines
));
m_page
->
dimmer
()
->
setEndPosition
(
jsonToDouble
(
stylesPage
.
value
(
"dimmer"
),
defines
));
}
}
// Setting properties for spinner
QJsonObject
stylesSpinner
=
styles
.
value
(
"spinner"
).
toObject
();
if
(
stylesSpinner
.
contains
(
"radius"
))
{
m_spinner
->
setRadius
(
jsonToInt
(
styles
.
value
(
"spinner"
),
defines
));
}
m_spinner
->
setPrimaryColor
(
jsonToColor
(
jsonValue
(
stylesSpinner
,
"primaryColor"
,
"spinner"
),
defines
));
m_spinner
->
setSecondaryColor
(
jsonToColor
(
jsonValue
(
stylesSpinner
,
"secondaryColor"
,
"spinner"
),
defines
));
if
(
stylesSpinner
.
contains
(
"horizontalSpacing"
))
{
m_spinner
->
setHorizontalSpacing
(
jsonToInt
(
styles
.
value
(
"spinner"
),
defines
));
}
if
(
stylesSpinner
.
contains
(
"verticalSpacing"
))
{
m_spinner
->
setVerticalSpacing
(
jsonToInt
(
styles
.
value
(
"spinner"
),
defines
));
}
if
(
stylesSpinner
.
contains
(
"initialStateDuration"
))
{
m_spinner
->
setInitialStateDuration
(
jsonToInt
(
styles
.
value
(
"spinner"
),
defines
));
}
if
(
stylesSpinner
.
contains
(
"transitionDuration"
))
{
m_spinner
->
setTransitionDuration
(
jsonToInt
(
styles
.
value
(
"spinner"
),
defines
));
}
}
}
src/styles/autogenerated/nemotheme.h
View file @
b4d6b34c
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include "nemothemetoolbar.h"
#include "nemothemetoolbar.h"
#include "nemothemewindow.h"
#include "nemothemewindow.h"
#include "nemothemepage.h"
#include "nemothemepage.h"
#include "nemothemespinner.h"
class
NemoTheme
:
public
QObject
class
NemoTheme
:
public
QObject
{
{
...
@@ -44,6 +45,7 @@ class NemoTheme: public QObject
...
@@ -44,6 +45,7 @@ class NemoTheme: public QObject
Q_PROPERTY
(
NemoThemeToolBar
*
toolBar
READ
toolBar
CONSTANT
)
Q_PROPERTY
(
NemoThemeToolBar
*
toolBar
READ
toolBar
CONSTANT
)
Q_PROPERTY
(
NemoThemeWindow
*
window
READ
window
CONSTANT
)
Q_PROPERTY
(
NemoThemeWindow
*
window
READ
window
CONSTANT
)
Q_PROPERTY
(
NemoThemePage
*
page
READ
page
CONSTANT
)
Q_PROPERTY
(
NemoThemePage
*
page
READ
page
CONSTANT
)
Q_PROPERTY
(
NemoThemeSpinner
*
spinner
READ
spinner
CONSTANT
)
Q_PROPERTY
(
QString
fontFamily
READ
fontFamily
CONSTANT
)
Q_PROPERTY
(
QString
fontFamily
READ
fontFamily
CONSTANT
)
public:
public:
explicit
NemoTheme
(
QObject
*
parent
=
0
);
explicit
NemoTheme
(
QObject
*
parent
=
0
);
...
@@ -58,6 +60,7 @@ public:
...
@@ -58,6 +60,7 @@ public:
NemoThemeToolBar
*
toolBar
()
const
;
NemoThemeToolBar
*
toolBar
()
const
;
NemoThemeWindow
*
window
()
const
;
NemoThemeWindow
*
window
()
const
;
NemoThemePage
*
page
()
const
;
NemoThemePage
*
page
()
const
;
NemoThemeSpinner
*
spinner
()
const
;
QString
fontFamily
()
const
;
QString
fontFamily
()
const
;
public
Q_SLOTS
:
public
Q_SLOTS
:
void
loadFromFile
(
const
QString
&
fileName
);
void
loadFromFile
(
const
QString
&
fileName
);
...
@@ -74,6 +77,7 @@ private:
...
@@ -74,6 +77,7 @@ private:
NemoThemeToolBar
*
m_toolBar
;
NemoThemeToolBar
*
m_toolBar
;
NemoThemeWindow
*
m_window
;
NemoThemeWindow
*
m_window
;
NemoThemePage
*
m_page
;
NemoThemePage
*
m_page
;
NemoThemeSpinner
*
m_spinner
;
QString
m_fontFamily
;
QString
m_fontFamily
;
};
};
...
...
src/styles/autogenerated/nemothemespinner.cpp
0 → 100644
View file @
b4d6b34c
/*
* Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
*
* 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.
*/
// This class is autogenerated using themehelper.py
// Any modification done in this file will be overridden
#include "nemothemespinner.h"
NemoThemeSpinner
::
NemoThemeSpinner
(
QObject
*
parent
)
:
QObject
(
parent
)
,
m_radius
(
32
)
,
m_horizontalSpacing
(
15
)
,
m_verticalSpacing
(
15
)
,
m_initialStateDuration
(
1500
)
,
m_transitionDuration
(
500
)
{
}
int
NemoThemeSpinner
::
radius
()
const
{
return
m_radius
;
}
void
NemoThemeSpinner
::
setRadius
(
int
radius
)
{
if
(
m_radius
!=
radius
)
{
m_radius
=
radius
;
emit
radiusChanged
();
}
}
QColor
NemoThemeSpinner
::
primaryColor
()
const
{
return
m_primaryColor
;
}
void
NemoThemeSpinner
::
setPrimaryColor
(
const
QColor
&
primaryColor
)
{
if
(
m_primaryColor
!=
primaryColor
)
{
m_primaryColor
=
primaryColor
;
emit
primaryColorChanged
();
}
}
QColor
NemoThemeSpinner
::
secondaryColor
()
const
{
return
m_secondaryColor
;
}
void
NemoThemeSpinner
::
setSecondaryColor
(
const
QColor
&
secondaryColor
)
{
if
(
m_secondaryColor
!=
secondaryColor
)
{
m_secondaryColor
=
secondaryColor
;
emit
secondaryColorChanged
();
}
}
int
NemoThemeSpinner
::
horizontalSpacing
()
const
{
return
m_horizontalSpacing
;
}
void
NemoThemeSpinner
::
setHorizontalSpacing
(
int
horizontalSpacing
)
{
if
(
m_horizontalSpacing
!=
horizontalSpacing
)
{
m_horizontalSpacing
=
horizontalSpacing
;
emit
horizontalSpacingChanged
();
}
}
int
NemoThemeSpinner
::
verticalSpacing
()
const
{
return
m_verticalSpacing
;
}
void
NemoThemeSpinner
::
setVerticalSpacing
(
int
verticalSpacing
)
{
if
(
m_verticalSpacing
!=
verticalSpacing
)
{
m_verticalSpacing
=
verticalSpacing
;
emit
verticalSpacingChanged
();
}
}
int
NemoThemeSpinner
::
initialStateDuration
()
const
{
return
m_initialStateDuration
;
}
void
NemoThemeSpinner
::
setInitialStateDuration
(
int
initialStateDuration
)
{
if
(
m_initialStateDuration
!=
initialStateDuration
)
{
m_initialStateDuration
=
initialStateDuration
;
emit
initialStateDurationChanged
();
}
}
int
NemoThemeSpinner
::
transitionDuration
()
const
{
return
m_transitionDuration
;
}
void
NemoThemeSpinner
::
setTransitionDuration
(
int
transitionDuration
)
{
if
(
m_transitionDuration
!=
transitionDuration
)
{
m_transitionDuration
=
transitionDuration
;
emit
transitionDurationChanged
();
}
}
src/styles/autogenerated/nemothemespinner.h
0 → 100644
View file @
b4d6b34c
/*
* Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
*
* 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.
*/
// This class is autogenerated using themehelper.py
// Any modification done in this file will be overridden
#ifndef NEMOTHEMESPINNER_H
#define NEMOTHEMESPINNER_H
#include <QtCore/QObject>
#include <QtGui/QColor>
class
NemoThemeSpinner
:
public
QObject
{
Q_OBJECT
Q_PROPERTY
(
int
radius
READ
radius
NOTIFY
radiusChanged
)
Q_PROPERTY
(
QColor
primaryColor
READ
primaryColor
NOTIFY
primaryColorChanged
)
Q_PROPERTY
(
QColor
secondaryColor
READ
secondaryColor
NOTIFY
secondaryColorChanged
)
Q_PROPERTY
(
int
horizontalSpacing
READ
horizontalSpacing
NOTIFY
horizontalSpacingChanged
)
Q_PROPERTY
(
int
verticalSpacing
READ
verticalSpacing
NOTIFY
verticalSpacingChanged
)
Q_PROPERTY
(
int
initialStateDuration
READ
initialStateDuration
NOTIFY
initialStateDurationChanged
)
Q_PROPERTY
(
int
transitionDuration
READ
transitionDuration
NOTIFY
transitionDurationChanged
)
public:
explicit
NemoThemeSpinner
(
QObject
*
parent
=
0
);
int
radius
()
const
;
void
setRadius
(
int
radius
);
QColor
primaryColor
()
const
;
void
setPrimaryColor
(
const
QColor
&
primaryColor
);
QColor
secondaryColor
()
const
;
void
setSecondaryColor
(
const
QColor
&
secondaryColor
);
int
horizontalSpacing
()
const
;
void
setHorizontalSpacing
(
int
horizontalSpacing
);
int
verticalSpacing
()
const
;
void
setVerticalSpacing
(
int
verticalSpacing
);
int
initialStateDuration
()
const
;
void
setInitialStateDuration
(
int
initialStateDuration
);
int
transitionDuration
()
const
;
void
setTransitionDuration
(
int
transitionDuration
);
Q_SIGNALS:
void
radiusChanged
();
void
primaryColorChanged
();
void
secondaryColorChanged
();
void
horizontalSpacingChanged
();
void
verticalSpacingChanged
();
void
initialStateDurationChanged
();
void
transitionDurationChanged
();
private:
int
m_radius
;
QColor
m_primaryColor
;
QColor
m_secondaryColor
;
int
m_horizontalSpacing
;
int
m_verticalSpacing
;
int
m_initialStateDuration
;
int
m_transitionDuration
;
};
#endif //NEMOTHEMESPINNER_H
src/styles/qquicknemostyleextensionplugin.cpp
View file @
b4d6b34c
...
@@ -49,6 +49,8 @@ void QQuickNemoStyleExtensionPlugin::registerTypes(const char *uri)
...
@@ -49,6 +49,8 @@ void QQuickNemoStyleExtensionPlugin::registerTypes(const char *uri)
qmlRegisterUncreatableType
<
NemoThemeWindow
>
(
uri
,
1
,
0
,
"NemoThemeWindow"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemeWindow
>
(
uri
,
1
,
0
,
"NemoThemeWindow"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemePage
>
(
uri
,
1
,
0
,
"NemoThemePage"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemePage
>
(
uri
,
1
,
0
,
"NemoThemePage"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemePageDimmer
>
(
uri
,
1
,
0
,
"NemoThemePageDimmer"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemePageDimmer
>
(
uri
,
1
,
0
,
"NemoThemePageDimmer"
,
reason
);
qmlRegisterUncreatableType
<
NemoThemeSpinner
>
(
uri
,
1
,
0
,
"NemoThemeSpinner"
,
reason
);
qmlRegisterSingletonType
<
QObject
>
(
uri
,
1
,
0
,
"Theme"
,
nemo_theme_provider
);
qmlRegisterSingletonType
<
QObject
>
(
uri
,
1
,
0
,
"Theme"
,
nemo_theme_provider
);
}
}
...
...
src/styles/styles.pro
View file @
b4d6b34c
...
@@ -88,7 +88,8 @@ HEADERS += \
...
@@ -88,7 +88,8 @@ HEADERS += \
autogenerated/nemothemetoolbar.h \
autogenerated/nemothemetoolbar.h \
autogenerated/nemothemewindow.h \
autogenerated/nemothemewindow.h \
autogenerated/nemothemepage.h \
autogenerated/nemothemepage.h \
autogenerated/nemothemepagedimmer.h
autogenerated/nemothemepagedimmer.h \
autogenerated/nemothemespinner.h
SOURCES += \
SOURCES += \
qquicknemostyleextensionplugin.cpp \
qquicknemostyleextensionplugin.cpp \
...
@@ -102,7 +103,8 @@ SOURCES += \
...
@@ -102,7 +103,8 @@ SOURCES += \
autogenerated/nemothemetoolbar.cpp \
autogenerated/nemothemetoolbar.cpp \
autogenerated/nemothemewindow.cpp \
autogenerated/nemothemewindow.cpp \
autogenerated/nemothemepage.cpp \
autogenerated/nemothemepage.cpp \
autogenerated/nemothemepagedimmer.cpp
autogenerated/nemothemepagedimmer.cpp \
autogenerated/nemothemespinner.cpp
INSTALLS += target images qmlfiles themes
INSTALLS += target images qmlfiles themes
...
...
src/styles/themes/glacier.json
View file @
b4d6b34c
...
@@ -50,6 +50,10 @@
...
@@ -50,6 +50,10 @@
"startColor"
:
"black"
,
"startColor"
:
"black"
,
"endColor"
:
"transparent"
"endColor"
:
"transparent"
}
}
},
"spinner"
:
{
"primaryColor"
:
"#ffffff"
,
"secondaryColor"
:
"#0091e5"
}
}
}
}
}
}
tools/themehelper/components.json
View file @
b4d6b34c
...
@@ -75,12 +75,6 @@
...
@@ -75,12 +75,6 @@
}
}
]
]
},
},
{
{
"name"
:
"ButtonPressedGradient"
,
"name"
:
"ButtonPressedGradient"
,
"properties"
:
[
"properties"
:
[
...
@@ -169,6 +163,44 @@
...
@@ -169,6 +163,44 @@
"default"
:
1.0
"default"
:
1.0
}
}
]
]
},
{
"name"
:
"Spinner"
,
"properties"
:
[
{
"name"
:
"radius"
,
"type"
:
"int"
,
"default"
:
32
},
{
"name"
:
"primaryColor"
,
"type"
:
"QColor"
},
{
"name"
:
"secondaryColor"
,
"type"
:
"QColor"
},
{
"name"
:
"horizontalSpacing"
,
"type"
:
"int"
,
"default"
:
15
},
{
"name"
:
"verticalSpacing"
,
"type"
:
"int"
,
"default"
:
15
},
{
"name"
:
"initialStateDuration"
,
"type"
:
"int"
,
"default"
:
1500
},
{
"name"
:
"transitionDuration"
,
"type"
:
"int"
,
"default"
:
500
}
]
}
}
],
],
"properties"
:
[
"properties"
:
[
...
@@ -199,6 +231,10 @@
...
@@ -199,6 +231,10 @@
{
{
"name"
:
"page"
,
"name"
:
"page"
,
"object"
:
"Page"
"object"
:
"Page"
},
{
"name"
:
"spinner"
,
"object"
:
"Spinner"
}
}
],
],
"font"
:
"/usr/share/fonts/google-opensans/OpenSans-Regular.ttf"
"font"
:
"/usr/share/fonts/google-opensans/OpenSans-Regular.ttf"
...
...
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