Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NemoBluredImage item #84

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
e94432c
Pro file changes
locusf Oct 11, 2017
a0f27bf
Add in support for Qt virtual keyboard.
locusf Oct 15, 2017
04942fe
[Controls] Add forgotten (c)
Oct 16, 2017
addf8cb
[Header] Quick fix to make header work with Qt5.9
Oct 16, 2017
363c8ab
[Keyboard] Add keyboard to clipped area
Oct 19, 2017
3f1279d
[QtKeyboard] Nemo style
Nov 4, 2017
3db84cb
[Fix] Fix spec
Nov 29, 2017
d9b7d06
[Packaging] Fix qml file paths
Apr 3, 2019
14a5c42
Merge remote-tracking branch 'eekkelund/Qt59'
neochapay Jun 12, 2020
7919a85
[packaging] Add requires to qt5-qtvirtualkeyboard
neochapay Jun 12, 2020
8954970
[ListItems] Fixup warnings in ListViewItemWithActions.qml
neochapay Jun 15, 2020
80b5991
[sizing] Allow force set dpi over env
neochapay Jun 26, 2020
5d95638
[packaging] Adjust packaging for Fedora
rinigus Sep 11, 2020
3c8deb7
Drop direct library requires
rinigus Oct 5, 2020
86d65d0
[controls] Fix behavor desktop mode
neochapay Feb 2, 2021
1f11e63
[ToolButtonStyle] Fixup warnings
neochapay Feb 12, 2021
4c31c76
[ApplicationWindow] Fixup warning
neochapay Feb 12, 2021
3f6fa4e
[Header] Fixup warning
neochapay Feb 12, 2021
5d205cc
Merge pull request #2 from nemomobile-ux/desktopmode
neochapay Feb 12, 2021
30781b7
[controls] Fixup import on new Qt
neochapay Mar 1, 2021
3918c26
[controls] Fixup warnings
neochapay Mar 23, 2021
6ddde7a
[ImageProvider] Trying return image from hicolor theme
neochapay Apr 1, 2021
eb33c00
[controls] Fixup warnings on new Qt
neochapay Apr 1, 2021
bee1f9d
Fixup warnings
neochapay Apr 2, 2021
7c0e090
[NemoIcon] Allow to disable colorize icon
neochapay Feb 12, 2021
96aad9b
is it a binding loop?
jmlich Jun 2, 2021
6ea210e
The themes are in different path
jmlich Jun 2, 2021
da8d43a
Merge pull request #3 from jmlich/master
neochapay Jun 7, 2021
62ddde9
Don't use Qt virtual keyboard
neochapay Jun 11, 2021
28bc59c
Merge pull request #4 from nemomobile-ux/remove_vkeyboard
neochapay Jun 15, 2021
95ddeae
Fix content size on keyboard open
neochapay Jul 9, 2021
d89da57
Fixup live theme changing
neochapay Jul 18, 2021
e25e21c
Don't use useSpecSlider into desktopMode
neochapay Jul 18, 2021
12d446a
Fixup load theme on startup
neochapay Jul 18, 2021
09b5e0d
[SliderStyle] Fixup warning
neochapay Jul 18, 2021
d90d562
[examples] Show current theme
neochapay Jul 18, 2021
cdc3e3b
enable orange theme
jmlich Jul 18, 2021
f8f4003
[CheckBoxStyle] fixup warnings
neochapay Jul 18, 2021
2746c30
Update copyright
neochapay Jul 18, 2021
965ed2e
Merge remote-tracking branch 'upstream/master'
jmlich Jul 18, 2021
d5dc8e6
Dont use QtQuick.Layouts
neochapay Jul 18, 2021
b57f515
[NemoIcon] Add property color
neochapay Jul 18, 2021
b55640d
[ToolButton] Add property active
neochapay Jul 18, 2021
2bf729c
[examples] Add status notify icon page
neochapay Jul 26, 2021
d68da6f
[examples] Add atention icon button
neochapay Jul 27, 2021
e6cdc19
[examples] l10n
neochapay Jul 27, 2021
a5cf93f
Merge pull request #5 from jmlich/master
neochapay Jul 29, 2021
1d013ba
[DatePicker] Rework and cleanup datepicker and calendarmodel
neochapay Aug 3, 2021
4f260f3
[RingIndicator] add ringindicator
neochapay Feb 25, 2021
c395eff
[TimePicker] Move to ringIndicator
neochapay Aug 3, 2021
8707e06
update ListView with some icons and ActionButtons area width
jmlich Aug 4, 2021
352523a
check if each icon could be displayed separately, fix some warngings
jmlich Aug 5, 2021
518f282
Add NemoBluredImage item
neochapay Sep 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 158 additions & 0 deletions examples/touch/content/BlurredImagePage.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
/*
* Copyright (C) 2021 Chupligin Sergey (NeoChapay) <[email protected]>
*
* 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 1.0 //needed for the Stack attached property
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0

Page {
id: root

headerTools: HeaderToolsLayout {
showBackButton: false;
title: qsTr("Blurred page")
}



ScrollDecorator{
flickable: mainContent
}


Flickable{
id: mainContent
width: parent.width
height: parent.height

contentHeight: contentColumn.height+Theme.itemHeightExtraLarge

Column {
id: contentColumn
spacing: Theme.itemSpacingLarge*2
width: parent.width

anchors{
top: parent.top
topMargin: Theme.itemSpacingLarge
left: parent.left
leftMargin: Theme.itemSpacingLarge
}

NemoBlurredImage{
id: blurred
width: parent.width - Theme.itemSpacingLarge*2
height: root.height/3

source: "/usr/share/glacier-components/images/example.jpg"
}

Label {
text: qsTr("Select dim color")
}

Row{
width: parent.width - Theme.itemSpacingLarge*2
height: Theme.itemHeightExtraLarge

Rectangle{
width: parent.width/3
height: parent.height
color: "red"
Label{
anchors.fill: parent
text: "Red"
}

MouseArea{
anchors.fill: parent
onClicked: blurred.dimColor = "red"
}
}


Rectangle{
width: parent.width/3
height: parent.height
color: "black"
Label{
anchors.fill: parent
text: "Black"
}

MouseArea{
anchors.fill: parent
onClicked: blurred.dimColor = "black"
}
}

Rectangle{
width: parent.width/3
height: parent.height
color: "white"
Label{
anchors.fill: parent
text: "White"
color: "black"
}

MouseArea{
anchors.fill: parent
onClicked: blurred.dimColor = "white"
}
}
}

Label {
text: qsTr("Blur radius")
}

Slider {
id: radiusSlider
anchors.margins: 20
minimumValue: 0
maximumValue: 100
value: blurred.radius
width: parent.width - Theme.itemSpacingLarge*2
onValueChanged: {
blurred.radius = radiusSlider.value
}
}


Label {
text: qsTr("Opacity")
}

Slider {
id: opacitySlider
anchors.margins: 20
value: blurred.opacity
minimumValue: 0
maximumValue: 1
width: parent.width - Theme.itemSpacingLarge*2
onValueChanged: {
blurred.opacity = opacitySlider.value
}
}
}
}
}

17 changes: 14 additions & 3 deletions examples/touch/content/ButtonPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
** Copyright (C) 2021 Chupligin Sergey <[email protected]>
**
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
**
Expand Down Expand Up @@ -46,7 +47,10 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: false; title: "Buttons (portrait only, no back arrow)" }
headerTools: HeaderToolsLayout {
showBackButton: false;
title: qsTr("Buttons (portrait only, no back arrow)")
}
allowedOrientations: Qt.PortraitOrientation

Column {
Expand All @@ -57,8 +61,15 @@ Page {
property bool isGlacier: true
anchors.margins: 20
text: isGlacier ? "Set Ugly Theme" : "Set Nice Theme"
onClicked: isGlacier ? Theme.loadTheme("ugly")
: Theme.loadTheme("glacier")
onClicked: {
if (isGlacier ) {
Theme.loadTheme("/usr/lib/qt/qml/QtQuick/Controls/Styles/Nemo/themes/glacier_orange.json")
} else {
Theme.loadTheme("/usr/lib/qt/qml/QtQuick/Controls/Styles/Nemo/themes/glacier_black.json")
}
isGlacier = !isGlacier;
}

}

Button {
Expand Down
10 changes: 7 additions & 3 deletions examples/touch/content/ButtonRowPage.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/****************************************************************************************
**
** Copyright (C) 2014 Aleksi Suomalainen <[email protected]>
** Copyright (C) 2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -37,7 +38,10 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: "Button row (Landscape only)" }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Button row (Landscape only)")
}
allowedOrientations: Qt.LandscapeOrientation

Column {
Expand Down Expand Up @@ -69,14 +73,14 @@ Page {
Connections {
target: row
onCurrentIndexChanged: {
selector.text = "Selected " + buttonModel.get(row.currentIndex).name
selector.text = qsTr("Selected") + " " + buttonModel.get(row.currentIndex).name
}
}

Label {
id: selector
anchors.horizontalCenter: parent.horizontalCenter
text: "Nothing selected"
text: qsTr("Nothing selected")
}
ButtonRow {
id: row2
Expand Down
6 changes: 5 additions & 1 deletion examples/touch/content/CheckboxPage.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/****************************************************************************************
**
** Copyright (C) 2013 Aleksi Suomalainen <[email protected]>
** Copyright (C) 2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -37,7 +38,10 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: qsTr("Switch") }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Switch")
}

Column {
spacing: 40
Expand Down
14 changes: 11 additions & 3 deletions examples/touch/content/DatePickerPage.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************************
**
** Copyright (C) 2017 Chupligin Sergey <[email protected]>
** Copyright (C) 2017-2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -37,12 +37,20 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: "Date Picker" }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Date Picker")
}

Column {
spacing: 40
spacing: Theme.itemSpacingSmall

width: parent.width
DatePicker{
id: datePicker
onDateSelect: {
currentDate = date
}
}
}
}
7 changes: 5 additions & 2 deletions examples/touch/content/DialogsPage.qml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************************
**
** Copyright (C) 2014 Aleksi Suomalainen <[email protected]>
** Copyright (C) 2017 Chupligin Sergey <[email protected]>
** Copyright (C) 2017-2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -40,7 +40,10 @@ import Nemo.Dialogs 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: qsTr("Query dialog example") }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Query dialog example")
}

Image {
id: bgImage
Expand Down
6 changes: 5 additions & 1 deletion examples/touch/content/IconPage.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/****************************************************************************************
**
** Copyright (C) 2017 Eetu Kahelin
** Copyright (C) 2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -37,7 +38,10 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: "Icon example" }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Icons")
}
allowedOrientations: Qt.PortraitOrientation | Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation | Qt.InvertedPortraitOrientation

Column {
Expand Down
9 changes: 7 additions & 2 deletions examples/touch/content/LabelPage.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/****************************************************************************************
**
** Copyright (C) 2013 Aleksi Suomalainen <[email protected]>
** Copyright (C) 2021 Chupligin Sergey <[email protected]>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
Expand Down Expand Up @@ -37,14 +38,18 @@ import QtQuick.Controls.Styles.Nemo 1.0
Page {
id: root

headerTools: HeaderToolsLayout { showBackButton: true; title: "Label" }
headerTools: HeaderToolsLayout {
showBackButton: true;
title: qsTr("Label")
}

allowedOrientations: Qt.PortraitOrientation | Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation | Qt.InvertedPortraitOrientation

Column {
spacing: 40
anchors.centerIn: parent
Label {
text: "Test label"
text: qsTr("Test label")
}
}
}
Loading