git.iko.soy/unity8

on 00a39ec help sign in

fromc73a8d3

swap

to0 ahead, 16229 behind

compare

.bazaar/Makefilenew file+6

since splitsnapshots

unifiedsplit

@@ -0,0 +1,6 @@

1+install:

2+ mkdir -p ~/.bazaar/plugins

3+ cp plugins/* ~/.bazaar/plugins

4+

5+uninstall:

6+ rm ~/.bazaar/plugins/makecheck_unity_phablet.py*

.bazaar/plugins/makecheck_unity_phablet.pynew file+43

@@ -0,0 +1,43 @@

1+#!/usr/bin/python

2+# Copyright 2013 Canonical Ltd.

3+#

4+# This program is free software; you can redistribute it and/or modify

5+# it under the terms of the GNU Lesser General Public License as published by

6+# the Free Software Foundation; version 3.

7+#

8+# This program is distributed in the hope that it will be useful,

9+# but WITHOUT ANY WARRANTY; without even the implied warranty of

10+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+# GNU Lesser General Public License for more details.

12+#

13+# You should have received a copy of the GNU Lesser General Public License

14+# along with this program. If not, see <http://www.gnu.org/licenses/>.

15+

16+import os, subprocess

17+from bzrlib import branch, errors

18+from bzrlib.urlutils import dirname, local_path_from_url

19+

20+def execute_makecheck(local_branch, master_branch, old_revision_number, old_revision_id, future_revision_number, future_revision_id, tree_delta, future_tree):

21+ if not master_branch.basis_tree().has_filename("Shell.qml"):

22+ return

23+

24+ os.chdir(local_path_from_url(master_branch.base))

25+

26+ print "Executing 'make -C builddir test'.."

27+ os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"

28+ if (subprocess.call("make -C builddir test", shell=True) != 0):

29+

30+ print("\n\n*** Warning ***\n\nBasic tests failed. This commit will not pass continuous integration.")

31+

32+ branch = local_branch or master_branch

33+ revision = branch.repository.get_revision(future_revision_id)

34+ msg_file = open('message.txt', 'w')

35+ msg_file.write(revision.message)

36+ msg_file.close()

37+

38+ print("\n\nSaved commit message to $SRC_DIR/message.txt.")

39+ print("You can uncommit this revision, fix the tests and reuse your message running:\n\nbzr commit -F message.txt\n\n")

40+ elif os.path.isfile("message.txt"):

41+ os.remove("message.txt")

42+

43+branch.Branch.hooks.install_named_hook('pre_commit', execute_makecheck, 'make check pre-commit')

.bzr-builddeb/default.confnew file+2

@@ -0,0 +1,2 @@

1+[BUILDDEB]

2+split = True

.bzrignorenew file+10

@@ -0,0 +1,10 @@

1+# default build dir

2+/builddir

3+# QtCreator project files

4+/*.user

5+# Eclipse project files

6+/.project

7+/.cproject

8+/.settings

9+/.pydevproject

10+message.txt

.crossbuilder/post_deploydeleted−1

@@ -1 +0,0 @@

1−restart unity8

.gitignore−7

@@ -2,15 +2,8 @@

2/builddir

2/builddir

3# QtCreator project files

3# QtCreator project files

4/*.user

4/*.user

5−*.qmlc

6−*.jsc

7# Eclipse project files

5# Eclipse project files

8/.project

6/.project

9/.cproject

7/.cproject

10/.settings

8/.settings

11/.pydevproject

9/.pydevproject

12−# KDevelop project Files

13−/.kdev4/

14−/build/

15−/*.kdev4

16−.clickable/

.projectdeleted−17

@@ -1,17 +0,0 @@

1−<?xml version="1.0" encoding="UTF-8"?>

2−<projectDescription>

3− <name>Unity8</name>

4− <comment></comment>

5− <projects>

6− </projects>

7− <buildSpec>

8− <buildCommand>

9− <name>org.python.pydev.PyDevBuilder</name>

10− <arguments>

11− </arguments>

12− </buildCommand>

13− </buildSpec>

14− <natures>

15− <nature>org.python.pydev.pythonNature</nature>

16− </natures>

17−</projectDescription>

.pydevprojectdeleted−10

@@ -1,10 +0,0 @@

1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2−<?eclipse-pydev version="1.0"?><pydev_project>

3−<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">

4−<path>/Unity8/tests/autopilot</path>

5−<path>/Unity8/.bazaar</path>

6−<path>/Unity8/tests/whitespace</path>

7−</pydev_pathproperty>

8−<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>

9−<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

10−</pydev_project>

.settings/Autopilot List.launchdeleted−14

@@ -1,14 +0,0 @@

1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2−<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">

3−<stringAttribute key="bad_container_name" value="/Unity8/.pyd"/>

4−<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>

5−<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>

6−<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

7−<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

8−</listAttribute>

9−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>

10−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>

11−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="list unity8"/>

12−<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>

13−<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>

14−</launchConfiguration>

.settings/Autopilot Run.launchdeleted−14

@@ -1,14 +0,0 @@

1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2−<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">

3−<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>

4−<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>

5−<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

6−<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

7−<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

8−</listAttribute>

9−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>

10−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>

11−<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="run ${string_prompt:the test suite to run:unity8}"/>

12−<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>

13−<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>

14−</launchConfiguration>

data/51-unity8-greeter.conf → 51-unity8-greeter.confrenamed+1−1

@@ -1,2 +1,2 @@

1−[Seat:*]

1+[SeatDefaults]

2greeter-session=unity8-greeter

2greeter-session=unity8-greeter

ApplicationArguments.hnew file+49

@@ -0,0 +1,49 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authored by: Nick Dedekind <nick.dedekind@canonical.com>

17+ */

18+

19+

20+#ifndef APPLICATION_ARGUMENTS_H

21+#define APPLICATION_ARGUMENTS_H

22+

23+#include <QObject>

24+#include <QSize>

25+#include <QStringList>

26+

27+class ApplicationArguments : public QObject

28+{

29+ Q_OBJECT

30+public:

31+ ApplicationArguments(const QStringList& args) {

32+ if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {

33+ QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');

34+ if (geometryArg.size() == 2) {

35+ m_size.rwidth() = geometryArg.at(0).toInt();

36+ m_size.rheight() = geometryArg.at(1).toInt();

37+ }

38+ }

39+ }

40+

41+ Q_INVOKABLE bool hasGeometry() const { return m_size.isValid(); }

42+ Q_INVOKABLE int width() const { return m_size.width(); }

43+ Q_INVOKABLE int height() const { return m_size.height(); }

44+

45+private:

46+ QSize m_size;

47+};

48+

49+#endif // APPLICATION_ARGUMENTS_H

Applications/Application.qmlnew file+54

@@ -0,0 +1,54 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "applications.js" as ApplicationsModel

19+import Unity.Application 0.1

20+

21+/* This class is temporary. It is meant to be API compatible with qthybris' Application

22+ class.

23+ This class can be removed as soon as qthybris' Application is instantiable from QML

24+ and its 'desktopFile' property becomes writable.

25+ This also requires qthybris to be easily compilable on the desktop.

26+*/

27+QtObject {

28+ id: application

29+

30+ property string desktopFile

31+ property string name

32+ property string comment

33+ property string icon

34+ property string exec

35+ property string stage

36+ property bool fullscreen

37+

38+ onDesktopFileChanged: {

39+ var applicationData = ApplicationsModel.__availableApplications[desktopFile];

40+ if (applicationData) {

41+ application.name = applicationData.name;

42+ application.icon = applicationData.icon;

43+ application.exec = applicationData.exec;

44+ application.stage = applicationData.stage ? applicationData.stage : ApplicationInfo.MainStage;

45+ application.fullscreen = applicationData.fullscreen ? applicationData.fullscreen : false;

46+ } else {

47+ application.name = "";

48+ application.icon = "";

49+ application.exec = "";

50+ application.stage = "";

51+ application.fullscreen = false;

52+ }

53+ }

54+}

Applications/applications.jsnew file+115

@@ -0,0 +1,115 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+// mimic qtubuntu's Application.Stage enum

18+var MainStage = 0;

19+var SideStage = 1;

20+

21+var __availableApplications = {

22+ '/usr/share/applications/phone-app.desktop': {

23+ 'name': i18n.tr("Phone"),

24+ 'icon': 'phone-app',

25+ 'exec': '/usr/bin/phone-app',

26+ 'stage': SideStage

27+ },

28+ '/usr/share/applications/camera-app.desktop': {

29+ 'name': i18n.tr("Camera"),

30+ 'icon': 'camera',

31+ 'fullscreen': true,

32+ 'exec': '/usr/bin/camera-app --fullscreen'

33+ },

34+ '/usr/share/applications/gallery-app.desktop': {

35+ 'name': i18n.tr("Gallery"),

36+ 'icon': 'gallery',

37+ 'exec': '/usr/bin/gallery-app'

38+ },

39+ '/usr/share/applications/facebook-webapp.desktop': {

40+ 'name': i18n.tr("Facebook"),

41+ 'icon': 'facebook',

42+ 'exec': '/usr/bin/webbrowser-app --chromeless http://m.facebook.com',

43+ 'stage': SideStage

44+ },

45+ '/usr/share/applications/webbrowser-app.desktop': {

46+ 'name': i18n.tr("Browser"),

47+ 'icon': 'browser',

48+ 'exec': '/usr/bin/webbrowser-app'

49+ },

50+ '/usr/share/applications/twitter-webapp.desktop': {

51+ 'name': i18n.tr("Twitter"),

52+ 'icon': 'twitter',

53+ 'exec': '/usr/bin/webbrowser-app --chromeless http://www.twitter.com',

54+ 'stage': SideStage

55+ },

56+ '/usr/share/applications/gmail-webapp.desktop': {

57+ 'name': i18n.tr("GMail"),

58+ 'icon': 'gmail',

59+ 'exec': '/usr/bin/webbrowser-app --chromeless http://m.gmail.com'

60+ },

61+ '/usr/share/applications/ubuntu-weather-app.desktop': {

62+ 'name': i18n.tr("Weather"),

63+ 'icon': 'weather',

64+ 'exec': '/usr/bin/qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml',

65+ 'stage': SideStage

66+ },

67+ '/usr/share/applications/notes-app.desktop': {

68+ 'name': i18n.tr("Notepad"),

69+ 'icon': 'notepad',

70+ 'exec': '/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml',

71+ 'stage': SideStage

72+ },

73+ '/usr/share/applications/calendar-app.desktop': {

74+ 'name': i18n.tr("Calendar"),

75+ 'icon': 'calendar',

76+ 'exec': '/usr/bin/qmlscene /usr/share/calendar-app/calendar.qml',

77+ 'stage': SideStage

78+ },

79+ '/usr/share/applications/mediaplayer-app.desktop': {

80+ 'name': i18n.tr("Media Player"),

81+ 'icon': 'mediaplayer-app',

82+ 'fullscreen': true,

83+ 'exec': '/usr/bin/mediaplayer-app'

84+ },

85+ '/usr/share/applications/evernote.desktop': {

86+ 'name': i18n.tr("Evernote"),

87+ 'icon': 'evernote',

88+ 'exec': ''

89+ },

90+ '/usr/share/applications/map.desktop': {

91+ 'name': i18n.tr("Map"),

92+ 'icon': 'map',

93+ 'exec': ''

94+ },

95+ '/usr/share/applications/pinterest.desktop': {

96+ 'name': i18n.tr("Pinterest"),

97+ 'icon': 'pinterest',

98+ 'exec': ''

99+ },

100+ '/usr/share/applications/soundcloud.desktop': {

101+ 'name': i18n.tr("SoundCloud"),

102+ 'icon': 'soundcloud',

103+ 'exec': ''

104+ },

105+ '/usr/share/applications/wikipedia.desktop': {

106+ 'name': i18n.tr("Wikipedia"),

107+ 'icon': 'wikipedia',

108+ 'exec': ''

109+ },

110+ '/usr/share/applications/youtube.desktop': {

111+ 'name': i18n.tr("YouTube"),

112+ 'icon': 'youtube',

113+ 'exec': ''

114+ },

115+}

Bottombar/Bottombar.qmlnew file+162

@@ -0,0 +1,162 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../Components"

19+import "../Components/Math.js" as MathLocal

20+import Unity 0.1

21+import Unity.Application 0.1

22+import Ubuntu.Gestures 0.1

23+

24+Item {

25+ id: bottombar

26+

27+ // Whether there's an application on foreground (as opposed to have shell's Dash on foreground)

28+ property bool applicationIsOnForeground

29+

30+ property variant theHud

31+ property bool enabled: false

32+ property bool preventHiding: dragArea.dragging

33+ readonly property real bottomEdgeButtonCenterDistance: units.gu(34)

34+

35+ state: "hidden"

36+

37+ onStateChanged: {

38+ if (state == "hidden") {

39+ dismissTimer.stop()

40+ } else {

41+ dismissTimer.restart()

42+ }

43+ }

44+

45+ onPreventHidingChanged: {

46+ if (dismissTimer.running) {

47+ dismissTimer.restart();

48+ }

49+ }

50+

51+ Timer {

52+ id: dismissTimer

53+ interval: 5000

54+ onTriggered: {

55+ if (!bottombar.preventHiding) {

56+ bottombar.state = "hidden"

57+ } else {

58+ dismissTimer.restart()

59+ }

60+ }

61+ }

62+

63+ HudButton {

64+ id: hudButton

65+

66+ readonly property bool centeredHud: parent.width < units.gu(68) // Nexus 7 has 67 gu width

67+

68+ x: centeredHud ? parent.width / 2 - width / 2 : MathLocal.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)

69+ y: bottombar.height - bottomEdgeButtonCenterDistance - (height / 2) - bottomMargin

70+ z: 1

71+ visible: opacity != 0

72+

73+ mouseOver: {

74+ if (dragArea.status === DirectionalDragArea.Recognized) {

75+ var touchLocal = mapFromItem(dragArea, dragArea.touchX, dragArea.touchY)

76+ return touchLocal.x > 0 && touchLocal.x < width

77+ && touchLocal.y > 0 && touchLocal.y < height

78+ } else {

79+ return false

80+ }

81+ }

82+

83+ onClicked: theHud.show()

84+

85+ Behavior on bottomMargin {

86+ NumberAnimation{duration: hudButton.opacity < 0.01 ? 200 : 70; easing.type: Easing.OutQuart}

87+ }

88+

89+ Behavior on opacity {

90+ NumberAnimation{duration: 200; easing.type: Easing.OutCubic}

91+ }

92+ }

93+

94+ Connections {

95+ target: theHud

96+ onShownChanged: {

97+ bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown

98+ if (theHud.shown) {

99+ bottombar.state = "hidden"

100+ }

101+ }

102+ }

103+

104+ EdgeDragArea {

105+ id: dragArea

106+ width: parent.width

107+ height: distanceThreshold

108+ anchors.bottom: parent.bottom

109+

110+ distanceThreshold: units.gu(1)

111+ enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground

112+ direction: Direction.Upwards

113+

114+ property int previousStatus: -1

115+ property real touchStartX: -1

116+

117+ onStatusChanged: {

118+ if (status === DirectionalDragArea.WaitingForTouch) {

119+ if (previousStatus == DirectionalDragArea.Recognized) {

120+ if (hudButton.mouseOver) {

121+ hudButton.clicked()

122+ } else {

123+ bottombar.state = "hidden"

124+ }

125+ }

126+ } else if (status === DirectionalDragArea.Undecided) {

127+ if (!hudButton.centeredHud) {

128+ touchStartX = touchX

129+ }

130+ } else if (status === DirectionalDragArea.Recognized) {

131+ bottombar.state = "shown"

132+ }

133+ previousStatus = status

134+ }

135+ }

136+

137+ MouseArea {

138+ anchors.fill: parent

139+ enabled: bottombar.state == "shown"

140+ onPressed: {

141+ bottombar.state = "hidden"

142+ }

143+ }

144+

145+ InputFilterArea {

146+ anchors.fill: parent

147+ blockInput: (hudButton.opacity == 1)

148+ }

149+

150+ states: [

151+ State {

152+ name: "hidden"

153+ PropertyChanges { target: hudButton; opacity: 0}

154+ PropertyChanges { target: hudButton; bottomMargin: units.gu(-1)}

155+ },

156+ State {

157+ name: "shown"

158+ PropertyChanges { target: hudButton; opacity: 1}

159+ PropertyChanges { target: hudButton; bottomMargin: units.gu(0)}

160+ }

161+ ]

162+}

Bottombar/HudButton.qmlnew file+64

@@ -0,0 +1,64 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ id: item

22+

23+ property bool mouseOver

24+

25+ property int bottomMargin: units.gu(2)

26+

27+ signal clicked()

28+

29+ readonly property real scaleOnMouseOver: 1.2

30+

31+ width: hudButton.width * scaleOnMouseOver

32+ height: hudButton.height * scaleOnMouseOver

33+

34+ Item {

35+ id: hudButton

36+

37+ anchors.centerIn: parent

38+ height: units.gu(12)

39+ width: height

40+ opacity: item.mouseOver || abstractButton.pressed ? 1 : 0.7

41+ scale: item.mouseOver || abstractButton.pressed ? scaleOnMouseOver : 1

42+ Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

43+ Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

44+

45+ AbstractButton {

46+ id: abstractButton

47+ anchors.fill: parent

48+ style: Image {

49+ anchors.fill: parent

50+ source: "graphics/hud_invoke_button_active.png"

51+ }

52+

53+ onClicked: item.clicked()

54+ }

55+

56+ Image {

57+ width: units.gu(4)

58+ height: width

59+ source: "graphics/hud.png"

60+ anchors.centerIn: parent

61+ fillMode: Image.PreserveAspectFit

62+ }

63+ }

64+}

Bottombar/graphics/hud@20.pngnew file

Binary file not shown.

Bottombar/graphics/hud_invoke_button_active@20.pngnew file

Binary file not shown.

CMakeLists.txt+104−111

@@ -13,9 +13,8 @@ endif()

13

13

14set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

14set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

15

15

16−# Instruct CMake to run moc and rcc automatically when needed.

16+# Instruct CMake to run moc automatically when needed.

17set(CMAKE_AUTOMOC ON)

17set(CMAKE_AUTOMOC ON)

18−set(CMAKE_AUTORCC ON)

19

18

20# enable QML debugging

19# enable QML debugging

21string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

20string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

@@ -40,19 +39,6 @@ if(cmake_build_type_lower MATCHES coverage)

40 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

39 ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

41endif()

40endif()

42

41

43−find_package (ECM 1.7.0 QUIET NO_MODULE)

44−if (ECM_FOUND)

45− # Provides us with -DECM_ENABLE_SANITIZERS='X'

46− # Where X can be address, thread, memory, leak, undefined

47− include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")

48−endif()

49−

50−if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

51− if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")

52− set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )

53− endif()

54−endif()

55−

56# Make sure we have all the needed symbols

42# Make sure we have all the needed symbols

57set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")

43set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")

58set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")

44set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")

@@ -62,41 +48,11 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2

62 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

63

49

64include(FindPkgConfig)

50include(FindPkgConfig)

65−find_package(Qt5Core 5.6 REQUIRED)

51+find_package(Qt5Core)

66−find_package(Qt5Qml 5.6 REQUIRED)

52+find_package(Qt5Qml)

67−find_package(Qt5Quick 5.6 REQUIRED)

53+find_package(Qt5Quick)

68−find_package(Qt5Gui 5.6 REQUIRED)

54+find_package(Qt5Gui)

69−find_package(Qt5DBus 5.6 REQUIRED)

55+find_package(Qt5DBus)

70−find_package(Qt5Concurrent 5.6 REQUIRED)

71−find_package(Qt5Sql 5.6 REQUIRED)

72−find_package(Qt5Test 5.6 REQUIRED)

73−find_package(Qt5Svg 5.6 REQUIRED)

74−find_package(Qt5Network 5.6 REQUIRED)

75−find_package(Qt5Xml 5.6 REQUIRED)

76−

77−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)

78−pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

79−pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

80−pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

81−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)

82−pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

83−pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

84−pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)

85−pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

86−pkg_check_modules(QTDBUSTEST REQUIRED

87− libqtdbustest-1

88− libqtdbusmock-1

89− )

90−

91−### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them

92−find_path(UBUNTUGESTUREPRIV

93− NAMES UbuntuGestures/private/damper_p.h UbuntuGestures/private/ucswipearea_p.h UbuntuGestures/private/ucswipearea_p_p.h

94− PATHS ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

95− NO_DEFAULT_PATH)

96−if (${UBUNTUGESTUREPRIV} STREQUAL UBUNTUGESTUREPRIV-NOTFOUND)

97− message(FATAL_ERROR "UbuntuGestures private headers not found.")

98−endif()

99−# end of UbuntuGesture private headers check

100

56

101# Standard install paths

57# Standard install paths

102include(GNUInstallDirs)

58include(GNUInstallDirs)

@@ -104,22 +60,18 @@ include(GNUInstallDirs)

104set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

60set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

105set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

61set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

106

62

107−execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)

63+configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)

108−if(USS_PRIVATE_PLUGINDIR STREQUAL "")

109− message(FATAL_ERROR "Could not determine USS private plugin installation dir.")

110−endif()

111

64

112−execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)

65+pkg_check_modules(UNITY-MIR REQUIRED unity-mir)

113−if(SHELL_INSTALL_QML STREQUAL "")

114− message(FATAL_ERROR "Could not determine plugin installation dir.")

115−endif()

116

66

117−set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

67+include_directories(

68+ ${CMAKE_CURRENT_BINARY_DIR}

69+ ${CMAKE_CURRENT_SOURCE_DIR}

70+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

71+ ${UNITY-MIR_INCLUDE_DIRS}

72+ )

118

73

119−execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)

74+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

120−if(SHELL_PLUGINDIR STREQUAL "")

121− message(FATAL_ERROR "Could not determine plugin import dir.")

122−endif()

123

75

124set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")

76set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")

125

77

@@ -137,72 +89,113 @@ endif()

137# "signals" and "slots"

89# "signals" and "slots"

138add_definitions(-DQT_NO_KEYWORDS)

90add_definitions(-DQT_NO_KEYWORDS)

139

91

140−# Save a few container detach and conversions

92+# Tests

141−add_definitions(-DQT_STRICT_ITERATORS)

93+include(CTest)

142−

94+enable_testing()

143−# Use the fast string builder

144−add_definitions(-DQT_USE_QSTRINGBUILDER)

145

95

146# Autopilot tests

96# Autopilot tests

147include(autopilot)

97include(autopilot)

148declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

98declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

99+declare_autopilot_test(indicators_client unity8.indicators_client ${CMAKE_SOURCE_DIR}/tests/autopilot/)

149

100

150set(SHELL_APP unity8)

101set(SHELL_APP unity8)

151−set(INDICATORS_CLIENT_APP indicators-client)

152set(GREETER_APP unity8-greeter)

102set(GREETER_APP unity8-greeter)

153−set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

154

103

155−include_directories(

104+set(shell_app_HDRS

156− ${CMAKE_SOURCE_DIR}/include

105+ )

157− ${CMAKE_BINARY_DIR}/include

158− ${APPLICATION_API_INCLUDE_DIRS}

159−)

160−

161−# Quiet logger

162−set(QUIET_LOGGER OFF CACHE BOOL "Disable test output on stdout.")

163−if(NOT QUIET_LOGGER)

164− set(STDOUT_LOGGER "-o" "-,txt")

165−endif()

166

106

167−execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)

107+add_executable(${SHELL_APP}

168−if (NOT ARCH MATCHES "arm*")

108+ ${shellapplication_MOC_SRCS}

169− set(ENABLE_TOUCH_EMULATION true)

109+ ApplicationArguments.h

170− add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)

110+ main.cpp

111+ MouseTouchAdaptor.cpp

112+ )

113+add_executable(${GREETER_APP}

114+ ${greeterapplication_MOC_SRCS}

115+ ApplicationArguments.h

116+ main.cpp

117+ MouseTouchAdaptor.cpp

118+ )

119+

120+set_target_properties(${SHELL_APP} PROPERTIES

121+ COMPILE_DEFINITIONS "APP_NAME=\"Unity 8\";QML_FILE=\"Shell.qml\""

122+ )

123+set_target_properties(${GREETER_APP} PROPERTIES

124+ COMPILE_DEFINITIONS "APP_NAME=\"Unity 8 Greeter\";QML_FILE=\"GreeterShell.qml\""

125+ )

126+

127+qt5_use_modules(${SHELL_APP} Qml Quick Test)

128+qt5_use_modules(${GREETER_APP} Qml Quick Test)

171− pkg_check_modules(MOUSETOUCHADAPTOR_LIBS REQUIRED x11 xcb xi)

129+pkg_check_modules(XCB REQUIRED xcb)

172−else()

130+

173− set(ENABLE_TOUCH_EMULATION false)

131+if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")

174− message(STATUS "Touch emulation support disabled.")

132+ set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})

175endif()

133endif()

176

134

135+target_link_libraries(${SHELL_APP}

136+ ${Qt5Qml_LIBRARIES}

137+ ${Qt5Quick_LIBRARIES}

138+ ${XCB_LDFLAGS}

139+ ${CMAKE_DL_LIBS}

140+ )

141+target_link_libraries(${GREETER_APP}

142+ ${Qt5Qml_LIBRARIES}

143+ ${Qt5Quick_LIBRARIES}

144+ ${XCB_LDFLAGS}

145+ )

146+

147+# install binaries

148+install(TARGETS ${SHELL_APP} ${GREETER_APP}

149+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

150+ )

151+

152+# install top level qml and js files

153+file(GLOB QML_JS_FILES *.qml *.js)

154+

155+install(FILES ${QML_JS_FILES}

156+ DESTINATION ${SHELL_APP_DIR}

157+ )

158+

177# add subdirectories to build

159# add subdirectories to build

178−add_subdirectory(include)

160+add_subdirectory(tests)

161+add_subdirectory(plugins)

179add_subdirectory(src)

162add_subdirectory(src)

180−add_subdirectory(tools)

181−add_subdirectory(qml)

182

163

183−# Tests

164+# install subdirectories

184−set(NO_TESTS OFF CACHE BOOL "Disable tests.")

165+set(QML_DIRS

185−if (NOT NO_TESTS)

166+ Applications

186− include(CTest)

167+ Bottombar

187− enable_testing()

168+ Components

188− add_subdirectory(tests)

169+ Dash

189−else()

170+ graphics

190− message(STATUS "Tests disabled")

171+ Greeter

191−endif()

172+ Hud

173+ Panel

174+ Launcher

175+ SideStage

176+ Notifications

177+ )

192

178

193−add_subdirectory(plugins)

179+install(DIRECTORY ${QML_DIRS}

180+ DESTINATION ${SHELL_APP_DIR}

181+ )

194

182

195−#

183+# generate desktop file

196−# Data files

184+configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

197−#

185+configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)

198−add_subdirectory(data)

186+

187+# install desktop file

188+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

189+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

190+ )

191+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop

192+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters

193+ )

194+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/51-${GREETER_APP}.conf

195+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/lightdm/lightdm.conf.d

196+ )

199

197

200#

198#

201# Translation

199# Translation

202#

200#

203add_subdirectory(po)

201add_subdirectory(po)

204−

205−#

206−# Documentation

207−#

208−add_subdirectory(doc)

CODING+60−119

@@ -1,7 +1,7 @@

1Building Unity 8

1Building Unity 8

2================

2================

3

3

4−Only Ubuntu 14.04 (trusty) is supported as a developement environment.

4+Only Ubuntu 13.10 (saucy) is supported as a developement environment.

5

5

6download source

6download source

7---------------

7---------------

@@ -15,17 +15,23 @@ download source

15 $ bzr branch lp:unity8 ~/unity8/trunk

15 $ bzr branch lp:unity8 ~/unity8/trunk

16 $ cd ~/unity8/trunk

16 $ cd ~/unity8/trunk

17

17

18−install dependencies and build Unity 8

18+install dependencies

19--------------------

19--------------------

20+If its your first time, install build dependencies

20

21

21$ cd ~/unity8/trunk

22$ cd ~/unity8/trunk

22−$ ./build.sh

23+$ ./build --setup

23

24

25+ this will:

24− If its your first time, this will install the required dependencies to build and

26+ - install the required dependencies to build, as well as run on the desktop

27+ - it should also install unity-scope-home and unity-lens-application which

28+ are technically "recommends", not strict dependencies

29+

25− build it.

30+build Unity 8

31+-------------

26

32

27− You might want to also install unity-scope-home and unity-scope-click which

33+$ cd ~/unity8/trunk

28− are technically "recommends", not strict dependencies

34+$ ./build

29

35

30You may also rebuild with the -c for clean, which just deletes the build

36You may also rebuild with the -c for clean, which just deletes the build

31directory.

37directory.

@@ -37,21 +43,17 @@ Running Unity 8 on your desktop

37run the Unity 8 shell

43run the Unity 8 shell

38---------------------

44---------------------

39$ cd ~/unity8/trunk

45$ cd ~/unity8/trunk

40−$ cd builddir

46+$ ./run

41

47

42−Each component of unity8 can be ran independently for development and testing

48+Options can be passed to test the lock screen

43−For example:

49+$ ./run -p OR -k

44−$ make tryShell

45−$ make tryLauncher

46−$ make tryLockscreen

47

50

48−Check out the tests/qmltests/ directory for a list of things that can be ran.

51+-p is for pin lock, for which the default prompt answer is "1234"

52+-k is for keylock passphrase, for which the default prompt answer is "password"

49

53

50Notes

54Notes

51-----

55-----

52- to navigate, utilize the mouse left button as you would your finger

56- to navigate, utilize the mouse left button as you would your finger

53−- a three point drag (for side stage operations) can be performed by using

54− the Shift+Control+Alt (all together) keyboard modifiers while using the mouse.

55- to get the translations work, currently you have to do make install to

57- to get the translations work, currently you have to do make install to

56 put the *.mo files into correct structure. We'll look for a better solution

58 put the *.mo files into correct structure. We'll look for a better solution

57 later.

59 later.

@@ -66,15 +68,50 @@ Notes

66

68

67Running Unity 8 on devices

69Running Unity 8 on devices

68==========================

70==========================

71+- Ubuntu Touch builds are currently only available in 13.10 flavour

72+- supported hardware should match one of those listed here

73+ https://wiki.ubuntu.com/Touch/Devices#Running_fine

74+- follow the Ubuntu Touch install instructions for your chosen device

75+ https://wiki.ubuntu.com/Touch/Install

76+- make sure your device is connected to a network

77+- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one

78+ on the device yourself)

79+

80+$ cd ~/unity/trunk

81+$ ./run_on_device --setup

82+ this will:

83+ - install your public SSH key on the device

84+ - install the needed dependencies

69

85

70−Running unity8 on a device should be done using crossbuilder.

86+$ ./run_on_device

71−Go to

87+ this will:

72−* https://launchpad.net/crossbuilder and

88+ - rsync the code to the device

73−* https://wiki.ubuntu.com/Touch/Crossbuilder

89+ - build on the device

74−for more details on crossbuilder.

90+ - replace the running shell

91+

92+Options can be passed to test the lock screen

93+$ ./run_on_device -p OR -k

94+

95+-p is for pin lock, for which the default prompt answer is "1234"

96+-k is for keylock passphrase, for which the default prompt answer is "password"

97+

98+Notes

99+-----

100+- using adb over TCP has some advantages, Google will be of help here

101+ - NOTE: this is not yet available for flipped images

102+ - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`

103+ - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`

104+ - it's unsafe - anyone can connect to your device

105+ - with TCP the Nexus 10 doesn't drop the adb connection when locking

106+ the screen

107+- exporting ANDROID_SERIAL=$your_device_serial or

108+ ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

109+ multiple devices

110+- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device

111+ to not use adb forwarding - useful if you use multiple devices

112+- using Ninja (package ninja-build - run_on_device -s installs this now)

113+ will improve build times (especially in the nothing-to-build case)

75

114

76−unity8 will automatically restart on the phone once deployment

77−has finished due to post-build-steps set up in this repository.

78

115

79Coding guidelines

116Coding guidelines

80=================

117=================

@@ -90,99 +127,3 @@ Unity 8.

90If using VIM, make sure you install some syntax highlighting for QML, like

127If using VIM, make sure you install some syntax highlighting for QML, like

91https://github.com/peterhoeg/vim-qml

128https://github.com/peterhoeg/vim-qml

92

129

93−Running tests

94−=============

95−

96−Tests are run from the build directory (which will be ./builddir if you used

97−the ./build.sh script).

98−

99−To run the tests that do not require any graphical capability and therefore

100−are pretty fast run:

101−

102−$ make test

103−

104−or, alternatively:

105−

106−$ ctest

107−

108−To run all graphical tests, which can take a couple of minutes:

109−

110−$ make uitests

111−

112−To run the tests for a single component/class:

113−

114−$ make testComponentName

115−

116−So, for the DragHandle component that would be:

117−

118−$ make testDragHandle

119−

120−To run the tests for a single component/class under gdb (so you can catch SEGFAULTS)

121−

122−$ make gdbtestComponentName

123−

124−To run a single test function of a single component/class:

125−

126−$ make testComponentName FUNCTION="TestCaseName::functionName"

127−

128−To run a test application that allow you to manually test or to simply try out

129−a given component:

130−

131−$ make tryComponentName

132−

133−So to try out, for instance, the DragHandle component, you would do:

134−

135−$ make tryDragHandle

136−

137−NB: Manual test or interation doesn't make sense for all components or classes,

138−particularly the non-graphical ones. In such cases no "tryFoo" make target is

139−provided.

140−

141−Running autopilot tests

142−=======================

143−

144−Autopilot tests are run from the build directory (which will be ./builddir if you used

145−the ./build.sh script).

146−

147−$ make autopilot

148−

149−If you want you can also run tests individually, for that you need to install first,

150−otherwise the tests will run on the system-installed version

151−

152−$ make install

153−

154−To see the list of existing autopilot tests you can do

155−

156−$ PYTHONPATH=../tests/autopilot autopilot3 list unity8

157−

158−And then run a single test with

159−

160−$ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name

161−

162−or run them all with

163−

164−$ PYTHONPATH=../tests/autopilot autopilot3 run unity8

165−

166−Debugging techniques

167−====================

168−

169−Unity8 heavily uses Qt and with that Qt debugging techniques mostly apply in the

170−same fashion. There are, however, some additional unity8-specific notes:

171−

172−* Enable/disable Qt scenegraph visualizer on the fly:

173−

174− $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSceneGraphVisualizer <mode>

175−

176− This is equivalent to exporting QSG_VISUALIZE=<mode> before running unity8, except it does it on the

177− fly.

178−

179−* Toggle slow animations on the fly:

180−

181− $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetSlowAnimations <true|false>

182−

183−* Change logging filter rules on the fly:

184−

185− $ qdbus com.canonical.Unity8.Debugging /com/canonical/Unity8/Debugging SetLoggingFilterRules <filter>

186−

187− This is equivalent to exporting QT_LOGGING_RULES or defining them in QT_LOGGING_CONF, except it does

188− it on the fly.

Components/AnimationControllerWithSignals.qmlnew file+64

@@ -0,0 +1,64 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+AnimationController {

20+ signal animationCompletedAtBeginning()

21+ signal animationCompletedAtEnd()

22+ readonly property bool completed: progress == 1.0 || progress == 0.0

23+ property bool completing: false

24+

25+ function __completeAtBeginning() {

26+ completing = false;

27+ animationCompletedAtBeginning();

28+ }

29+

30+ function __completeAtEnd() {

31+ completing = false;

32+ animationCompletedAtEnd();

33+ }

34+

35+ function completeToBeginningWithSignal() {

36+ if (progress == 0.0) {

37+ __completeAtBeginning()

38+ } else {

39+ completing = true;

40+ completeToBeginning();

41+ }

42+ }

43+

44+ function completeToEndWithSignal() {

45+ if (progress == 1.0) {

46+ __completeAtEnd()

47+ } else {

48+ completing = true;

49+ completeToEnd();

50+ }

51+ }

52+

53+ onProgressChanged: {

54+ if (!completing) {

55+ return;

56+ }

57+

58+ if (progress == 0.0) {

59+ __completeAtBeginning()

60+ } else if (progress == 1.0) {

61+ __completeAtEnd()

62+ }

63+ }

64+}

Components/ApplicationManagerWrapper.qmlnew file+186

@@ -0,0 +1,186 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Unity.Application 0.1

19+

20+Item {

21+ id: applicationManager

22+

23+ property alias mainStageApplications: mainStageModel

24+ property alias sideStageApplications: sideStageModel

25+ property variant mainStageFocusedApplication: null

26+ property variant sideStageFocusedApplication: null

27+ property bool sideStageEnabled: true

28+ signal focusRequested(string desktopFile)

29+ property bool keyboardVisible: ApplicationManager.keyboardVisible

30+ property int keyboardHeight: ApplicationManager.keyboardHeight

31+

32+ property bool fake: ApplicationManager.fake ? ApplicationManager.fake : false

33+

34+ ApplicationsModelStageFiltered {

35+ id: mainStageModel

36+ stage: ApplicationInfo.MainStage

37+ }

38+

39+ ApplicationsModelStageFiltered {

40+ id: sideStageModel

41+ stage: ApplicationInfo.SideStage

42+ }

43+

44+ Connections {

45+ target: ApplicationManager

46+ onFocusedApplicationIdChanged: {

47+ var app = ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)

48+ if (!app) { //nothing at all focused, so clear all

49+ mainStageFocusedApplication = null;

50+ sideStageFocusedApplication = null;

51+ } else {

52+ if (app.stage == ApplicationInfo.MainStage) {

53+ mainStageFocusedApplication = app;

54+ // possible the side stage app being unfocused fired this signal, so check for it

55+ if (sideStageFocusedApplication && !sideStageFocusedApplication.focused)

56+ sideStageFocusedApplication = null;

57+ } else {

58+ sideStageFocusedApplication = app;

59+ // possible the main stage app being unfocused fired this signal, so check for it

60+ if (mainStageFocusedApplication && !mainStageFocusedApplication.focused)

61+ mainStageFocusedApplication = null;

62+ }

63+ }

64+ }

65+ }

66+

67+ function activateApplication(desktopFile, argument) {

68+ var appId;

69+

70+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

71+ // TODO: convert entire shell to use appId only.

72+ if (desktopFile.indexOf(".desktop") >= 0) {

73+ appId = desktopFileToAppId(desktopFile);

74+ } else {

75+ appId = desktopFile;

76+ }

77+

78+ var application = ApplicationManager.findApplication(appId);

79+ if (application !== null) {

80+ return application;

81+ }

82+

83+ var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;

84+

85+ if (argument) {

86+ return ApplicationManager.startApplication(appId, execFlags, [argument]);

87+ } else {

88+ return ApplicationManager.startApplication(appId, execFlags);

89+ }

90+ }

91+

92+ function stopApplication(application) {

93+ var appId;

94+

95+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

96+ // TODO: convert entire shell to use appId only.

97+ if (typeof application == "string") {

98+ appId = application;

99+ } else {

100+ appId = desktopFileToAppId(application.desktopFile);

101+ }

102+

103+ ApplicationManager.stopApplication(appId);

104+ }

105+

106+ function focusApplication(application) {

107+ if (application == null || application == undefined) {

108+ return;

109+ }

110+

111+ ApplicationManager.focusApplication(application.appId);

112+ }

113+

114+ function unfocusCurrentApplication() {

115+ ApplicationManager.unfocusCurrentApplication();

116+ }

117+

118+ function moveRunningApplicationStackPosition(from, to, stage) {

119+ if (from == to || from < 0 || to < 0) return;

120+

121+ if (stage == ApplicationInfo.SideStage) {

122+ sideStageModel.move(from, to);

123+ } else {

124+ mainStageModel.move(from, to);

125+ }

126+ }

127+

128+ function getApplicationFromDesktopFile(desktopFile, stage) {

129+ var appId;

130+

131+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

132+ // TODO: convert entire shell to use appId only.

133+ if (desktopFile.indexOf(".desktop") >= 0) {

134+ appId = desktopFileToAppId(desktopFile);

135+ } else {

136+ appId = desktopFile;

137+ }

138+

139+ for (var i = 0, len = ApplicationManager.count; i < len; i++ ) {

140+ var app = ApplicationManager.get(i);

141+

142+ // if stage not specified, return whichever app running on either stage

143+ if (app.appId == appId && (stage == undefined || app.stage == stage)) {

144+ return app;

145+ }

146+ }

147+ }

148+

149+ function desktopFileToAppId(desktopFile) {

150+ var right = desktopFile.lastIndexOf(".desktop");

151+ var left = desktopFile.lastIndexOf("/");

152+ if (left == -1 || right == -1 || left == right) {

153+ console.log("ApplicationManagerWrapper: unable to extract appId from '" + desktopFile + "'");

154+ return "";

155+ }

156+ return desktopFile.substring(left+1, right);

157+ }

158+

159+ Connections {

160+ target: ApplicationManager

161+ onFocusRequested: {

162+ // FIXME: hardcoded mapping from ApplicationManager.FavoriteApplications

163+ // enum to desktop files

164+ var desktopFile

165+ if (favoriteApplication == ApplicationManager.CameraApplication) {

166+ desktopFile = "/usr/share/applications/camera-app.desktop"

167+ } else if (favoriteApplication == ApplicationManager.GalleryApplication) {

168+ desktopFile = "/usr/share/applications/gallery-app.desktop"

169+ } else if (favoriteApplication == ApplicationManager.ShareApplication) {

170+ desktopFile = "/usr/share/applications/share-app.desktop"

171+ } else if (favoriteApplication == ApplicationManager.BrowserApplication) {

172+ desktopFile = "/usr/share/applications/webbrowser-app.desktop"

173+ } else if (favoriteApplication == ApplicationManager.PhoneApplication) {

174+ desktopFile = "/usr/share/applications/phone-app.desktop"

175+ } else if (favoriteApplication == ApplicationManager.DialerApplication) {

176+ desktopFile = "/usr/share/applications/dialer-app.desktop"

177+ } else if (favoriteApplication == ApplicationManager.MessagingApplication) {

178+ desktopFile = "/usr/share/applications/messaging-app.desktop"

179+ } else if (favoriteApplication == ApplicationManager.AddressbookApplication) {

180+ desktopFile = "/usr/share/applications/address-book-app.desktop"

181+ }

182+

183+ applicationManager.focusRequested(desktopFile);

184+ }

185+ }

186+}

Components/ApplicationScreenshot.qmlnew file+61

@@ -0,0 +1,61 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Application 0.1

20+

21+Item {

22+ id: applicationScreenshot

23+

24+ property var application: null

25+ property bool withBackground: false

26+ property bool ready: applicationImage.ready || withBackground

27+

28+ function setApplication(application) {

29+ applicationScreenshot.application = application

30+ }

31+

32+ function clearApplication() {

33+ applicationScreenshot.withBackground = false;

34+ applicationScreenshot.application = null

35+ applicationScreenshot.scheduleUpdate();

36+ }

37+

38+ function scheduleUpdate() {

39+ applicationImage.scheduleUpdate()

40+ }

41+

42+ function updateFromCache() {

43+ applicationImage.updateFromCache()

44+ }

45+

46+ Rectangle {

47+ id: background

48+ anchors.fill: parent

49+ color: "white" // FIXME should use normal background color of Suru theme

50+ visible: applicationScreenshot.withBackground

51+ }

52+

53+ ApplicationImage {

54+ id: applicationImage

55+ objectName: "screenshot image"

56+ width: applicationScreenshot.application ? parent.width : 0

57+ height: applicationScreenshot.application ? parent.height : 0

58+ visible: applicationScreenshot.application != null && ready

59+ source: ApplicationManager.findApplication((application) ? application.appId : "")

60+ }

61+}

Components/ApplicationsModelStageFiltered.qmlnew file+49

@@ -0,0 +1,49 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Utils 0.1

19+import Unity.Application 0.1

20+

21+SortFilterProxyModel {

22+ id: root

23+ property int stage

24+

25+ function get(index) {

26+ return model.get(mapRowToSource(index));

27+ }

28+

29+ function move(from, to) {

30+ var realFrom = mapRowToSource(from);

31+ if (realFrom == -1) {

32+ console.log("ERROR; invalid from=" + from + " index in move operation");

33+ return;

34+ }

35+ var realTo = mapRowToSource(to);

36+ if (realTo == -1) {

37+ // assuming wanting to move to end of list

38+ realTo = model.count - 1;

39+ }

40+

41+ if (realFrom == realTo) return;

42+ model.move(realFrom, realTo);

43+ }

44+

45+ model: ApplicationManager

46+ dynamicSortFilter: true

47+ filterRole: ApplicationManager.RoleStage

48+ filterRegExp: RegExp(stage)

49+}

tests/plugins/Ubuntu/Gestures/empty.qml → Components/BaseCarouselDelegate.qmlrenamed+5−4

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,9 +14,10 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Gestures 0.1

18+import Ubuntu.Components 0.1

19

19

20Item {

20Item {

21− width: 720; height: 720

21+ property bool explicitlyScaled

22+ property var model

22}

23}

Components/BasicShell.qmlnew file+78

@@ -0,0 +1,78 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Application 0.1

20+import "../Components"

21+import "../Components/Math.js" as MathLocal

22+

23+FocusScope {

24+ id: shell

25+

26+ // this is only here to select the width / height of the window if not running fullscreen

27+ property bool tablet: false

28+ width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)

29+ height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)

30+

31+ property real edgeSize: units.gu(2)

32+

33+ property url defaultBackground: shell.width >= units.gu(60) ? "../graphics/tablet_background.jpg" : "../graphics/phone_background.jpg"

34+ property url background

35+ property url backgroundSource

36+ property url backgroundFallbackSource

37+ property url backgroundFinal: (backgroundSource != undefined && backgroundSource != "") ? backgroundSource : (backgroundFallbackSource != undefined && backgroundFallbackSource != "") ? backgroundFallbackSource : shell.defaultBackground

38+ onBackgroundFinalChanged: shell.background = backgroundFinal

39+

40+ // This is a dummy image that is needed to determine if the picture url

41+ // in backgroundSettings points to a valid picture file.

42+ // We can't do this with the real background image because setting a

43+ // new source in onStatusChanged triggers a binding loop detection

44+ // inside Image, which causes it not to render even though a valid source

45+ // would be set. We don't mind about this image staying black and just

46+ // use it for verification to populate the source for the real

47+ // background image.

48+ Image {

49+ source: shell.background

50+ height: 0

51+ width: 0

52+ sourceSize.height: 0

53+ sourceSize.width: 0

54+ onStatusChanged: {

55+ if (status == Image.Error) {

56+ if (source != shell.defaultBackground) {

57+ shell.background = defaultBackground

58+ } else {

59+ // In case even our default background fails to load...

60+ shell.background = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#000'/></svg>"

61+ }

62+ }

63+ }

64+ }

65+

66+ OSKController {

67+ anchors.fill: parent // as needs to know the geometry of the shell

68+ }

69+

70+ VolumeControl {

71+ id: volumeControl

72+ }

73+

74+ Keys.onVolumeUpPressed: volumeControl.volumeUp()

75+ Keys.onVolumeDownPressed: volumeControl.volumeDown()

76+

77+ focus: true

78+}

Components/Carousel.qmlnew file+323

@@ -0,0 +1,323 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "carousel.js" as CarouselJS

20+

21+/*! The Carousel component presents the items of a model in a carousel view. It's similar to a

22+ cover flow. But it stops at it's boundaries (therefore no PathView is used).

23+ */

24+Item {

25+ id: carousel

26+

27+ clip: true // Don't leak horizontally to other dashes

28+

29+ /// The component to be used as delegate. This component has to be derived from BaseCarouselDelegate

30+ property Component itemComponent

31+ /// Model for the Carousel, which has to be a model usable by a ListView

32+ property alias model: listView.model

33+ /// A minimal width of a tile can be set here. Per default a best fit will be calculated

34+ property alias minimumTileWidth: listView.minimumTileWidth

35+ /// Sets the number of tiles that are visible

36+ property alias pathItemCount: listView.pathItemCount

37+ /// Aspect ratio of the tiles width/height

38+ property alias tileAspectRatio: listView.tileAspectRatio

39+ /// Used to cache some delegates for performance reasons. See the ListView documentation for details

40+ property alias cacheBuffer: listView.cacheBuffer

41+ /// Width of the "draw buffer" in pixel. The drawBuffer is an additional area at start/end where

42+ /// items drawn, even if it is not in the visible area.

43+ /// cacheBuffer controls only the to retain delegates outside the visible area (and is used on top of the drawBuffer)

44+ /// see https://bugreports.qt-project.org/browse/QTBUG-29173

45+ property int drawBuffer: width / pathItemCount // an "ok" value - but values used from the listView cause loops

46+ /// The selected item can be shown in a different size controlled by selectedItemScaleFactor

47+ property real selectedItemScaleFactor: 1.1

48+

49+ /// Emitted when the user clicked on an item

50+ /// @param index is the index of the clicked item

51+ /// @param delegateItem is the clicked component/delegate itself

52+ /// @param itemY is y of the clicked delegate

53+ signal clicked(int index, var delegateItem, real itemY)

54+

55+ /// Emitted when the user pressed and held on an item

56+ /// @param index is the index of the held item

57+ /// @param delegateItem is the held component/delegate itself

58+ /// @param itemY is y of the held delegate

59+ signal pressAndHold(int index, var delegateItem, real itemY)

60+

61+ implicitHeight: listView.tileHeight * selectedItemScaleFactor

62+

63+ /* Basic idea behind the carousel effect is to move the items of the delegates (compacting /stuffing them).

64+ One drawback is, that more delegates have to be drawn than usually. As some items are moved from the

65+ invisible to the visible area. Setting the cacheBuffer does not fix this.

66+ See https://bugreports.qt-project.org/browse/QTBUG-29173

67+ Therefore the ListView has negative left and right anchors margins, and in addition a header

68+ and footer item to compensate that.

69+

70+ The scaling of the items is controlled by the variable continuousIndex, described below. */

71+ ListView {

72+ id: listView

73+

74+ property real minimumTileWidth: 0

75+ property real newContentX: -1

76+ property real pathItemCount: referenceWidth / referenceTileWidth

77+ property real tileAspectRatio: 1

78+

79+ /* The positioning and scaling of the items in the carousel is based on the variable

80+ 'continuousIndex', a continuous real variable between [0, 'carousel.model.count'],

81+ roughly representing the index of the item that is prioritised over the others.

82+ 'continuousIndex' is not linear, but is weighted depending on if it is close

83+ to the beginning of the content (beginning phase), in the middle (middle phase)

84+ or at the end (end phase).

85+ Each tile is scaled and transformed in proportion to the difference between

86+ its own index and continuousIndex.

87+ To efficiently calculate continuousIndex, we have these values:

88+ - 'gapToMiddlePhase' gap in pixels between beginning and middle phase

89+ - 'gapToEndPhase' gap in pixels between middle and end phase

90+ - 'kGapEnd' constant used to calculate 'continuousIndex' in end phase

91+ - 'kMiddleIndex' constant used to calculate 'continuousIndex' in middle phase

92+ - 'kXBeginningEnd' constant used to calculate 'continuousIndex' in beginning and end phase

93+ - 'realContentWidth' the width of all the delegates only (without header/footer)

94+ - 'realContentX' the 'contentX' of the listview ignoring the 'drawBuffer'

95+ - 'realWidth' the 'width' of the listview, as it is used as component. */

96+

97+ readonly property real gapToMiddlePhase: Math.min(realWidth / 2 - tileWidth / 2, (realContentWidth - realWidth) / 2)

98+ readonly property real gapToEndPhase: realContentWidth - realWidth - gapToMiddlePhase

99+ readonly property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)

100+ readonly property real kMiddleIndex: (realWidth / 2) / tileWidth - 0.5

101+ readonly property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase

102+ readonly property real maximumItemTranslation: (listView.tileWidth * 3) / listView.scaleFactor

103+ readonly property real realContentWidth: contentWidth - 2 * carousel.drawBuffer

104+ readonly property real realContentX: contentX + carousel.drawBuffer

105+ readonly property real realPathItemCount: Math.min(realWidth / tileWidth, pathItemCount)

106+ readonly property real realWidth: carousel.width

107+ readonly property real referenceGapToMiddlePhase: realWidth / 2 - tileWidth / 2

108+ readonly property real referencePathItemCount: referenceWidth / referenceTileWidth

109+ readonly property real referenceWidth: 848

110+ readonly property real referenceTileWidth: 175

111+ readonly property real scaleFactor: tileWidth / referenceTileWidth

112+ readonly property real tileWidth: Math.max(realWidth / pathItemCount, minimumTileWidth)

113+ readonly property real tileHeight: tileWidth / tileAspectRatio

114+ readonly property real translationXViewFactor: 0.2 * (referenceGapToMiddlePhase / gapToMiddlePhase)

115+ readonly property real verticalMargin: (parent.height - tileHeight) / 2

116+ readonly property real visibleTilesScaleFactor: realPathItemCount / referencePathItemCount

117+

118+ anchors {

119+ fill: parent

120+ topMargin: verticalMargin

121+ bottomMargin: verticalMargin

122+ // extending the "drawing area"

123+ leftMargin: -carousel.drawBuffer

124+ rightMargin: -carousel.drawBuffer

125+ }

126+

127+ /* The header and footer help to "extend" the area, the listview draws items.

128+ This together with anchors.leftMargin and anchors.rightMargin. */

129+ header: Item {

130+ width: carousel.drawBuffer

131+ height: listView.tileHeight

132+ }

133+ footer: Item {

134+ width: carousel.drawBuffer

135+ height: listView.tileHeight

136+ }

137+

138+ boundsBehavior: Flickable.StopAtBounds

139+ cacheBuffer: carousel.cacheBuffer

140+ flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default

141+ maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default

142+ orientation: ListView.Horizontal

143+

144+ function itemClicked(index, delegateItem) {

145+ var x = CarouselJS.getXFromContinuousIndex(index,

146+ realWidth,

147+ realContentWidth,

148+ tileWidth,

149+ gapToMiddlePhase,

150+ gapToEndPhase,

151+ carousel.drawBuffer)

152+

153+ if (Math.abs(x - contentX) < 1) {

154+ /* We're clicking the selected item and

155+ we're in the neighbourhood of radius 1 pixel from it.

156+ Let's emit the clicked signal. */

157+ carousel.clicked(index, delegateItem, delegateItem.y)

158+ return

159+ }

160+

161+ stepAnimation.stop()

162+ newContentXAnimation.stop()

163+

164+ newContentX = x

165+ newContentXAnimation.start()

166+ }

167+

168+ function itemPressAndHold(index, delegateItem) {

169+ var x = CarouselJS.getXFromContinuousIndex(index,

170+ realWidth,

171+ realContentWidth,

172+ tileWidth,

173+ gapToMiddlePhase,

174+ gapToEndPhase,

175+ carousel.drawBuffer);

176+

177+ if (Math.abs(x - contentX) < 1) {

178+ /* We're pressAndHold the selected item and

179+ we're in the neighbourhood of radius 1 pixel from it.

180+ Let's emit the pressAndHold signal. */

181+ carousel.pressAndHold(index, delegateItem, delegateItem.y);

182+ return;

183+ }

184+

185+ stepAnimation.stop();

186+ newContentXAnimation.stop();

187+

188+ newContentX = x;

189+ newContentXAnimation.start();

190+ }

191+

192+ onMovementStarted: {

193+ stepAnimation.stop()

194+ newContentXAnimation.stop()

195+ newContentX = -1

196+ }

197+ onMovementEnded: {

198+ if (realContentX > 0 && realContentX < realContentWidth - realWidth)

199+ stepAnimation.start()

200+ }

201+

202+ SmoothedAnimation {

203+ id: stepAnimation

204+

205+ target: listView

206+ property: "contentX"

207+ to: CarouselJS.getXFromContinuousIndex(listView.selectedIndex,

208+ listView.realWidth,

209+ listView.realContentWidth,

210+ listView.tileWidth,

211+ listView.gapToMiddlePhase,

212+ listView.gapToEndPhase,

213+ carousel.drawBuffer)

214+ duration: 450

215+ velocity: 200

216+ easing.type: Easing.InOutQuad

217+ }

218+

219+ SequentialAnimation {

220+ id: newContentXAnimation

221+

222+ NumberAnimation {

223+ target: listView

224+ property: "contentX"

225+ from: listView.contentX

226+ to: listView.newContentX

227+ duration: 300

228+ easing.type: Easing.InOutQuad

229+ }

230+ ScriptAction {

231+ script: listView.newContentX = -1

232+ }

233+ }

234+

235+ readonly property int selectedIndex: Math.round(continuousIndex)

236+ readonly property real continuousIndex: CarouselJS.getContinuousIndex(listView.realContentX,

237+ listView.tileWidth,

238+ listView.gapToMiddlePhase,

239+ listView.gapToEndPhase,

240+ listView.kGapEnd,

241+ listView.kMiddleIndex,

242+ listView.kXBeginningEnd)

243+

244+ property real viewTranslation: CarouselJS.getViewTranslation(listView.realContentX,

245+ listView.tileWidth,

246+ listView.gapToMiddlePhase,

247+ listView.gapToEndPhase,

248+ listView.translationXViewFactor)

249+

250+ delegate: Loader {

251+ property bool explicitlyScaled: explicitScaleFactor == carousel.selectedItemScaleFactor

252+ property real explicitScaleFactor: explicitScale ? carousel.selectedItemScaleFactor : 1.0

253+ readonly property bool explicitScale: (!listView.moving ||

254+ listView.realContentX <= 0 ||

255+ listView.realContentX >= listView.realContentWidth - listView.realWidth) &&

256+ listView.newContentX < 0 &&

257+ index === listView.selectedIndex

258+ readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth

259+ readonly property real distance: listView.continuousIndex - index

260+ readonly property real itemTranslationScale: CarouselJS.getItemScale(0.5,

261+ (index + 0.5), // good approximation of scale while changing selected item

262+ listView.count,

263+ listView.visibleTilesScaleFactor)

264+ readonly property real itemScale: CarouselJS.getItemScale(distance,

265+ listView.continuousIndex,

266+ listView.count,

267+ listView.visibleTilesScaleFactor)

268+ readonly property real translationX: CarouselJS.getItemTranslation(index,

269+ listView.selectedIndex,

270+ distance,

271+ itemScale,

272+ itemTranslationScale,

273+ listView.maximumItemTranslation)

274+

275+ width: listView.tileWidth

276+ height: listView.tileHeight

277+ scale: itemScale * explicitScaleFactor

278+ sourceComponent: itemComponent

279+ z: cachedTiles - Math.abs(index - listView.selectedIndex)

280+

281+ transform: Translate {

282+ x: listView.viewTranslation + translationX * listView.scaleFactor

283+ }

284+

285+ Behavior on explicitScaleFactor {

286+ SequentialAnimation {

287+ ScriptAction {

288+ script: if (!explicitScale)

289+ explicitlyScaled = false

290+ }

291+ NumberAnimation {

292+ duration: explicitScaleFactor === 1.0 ? 250 : 150

293+ easing.type: Easing.InOutQuad

294+ }

295+ ScriptAction {

296+ script: if (explicitScale)

297+ explicitlyScaled = true

298+ }

299+ }

300+ }

301+

302+ onLoaded: {

303+ item.explicitlyScaled = Qt.binding(function() { return explicitlyScaled; })

304+ item.model = Qt.binding(function() { return model; })

305+ }

306+

307+ MouseArea {

308+ id: mouseArea

309+

310+ anchors.fill: parent

311+

312+ onClicked: {

313+ listView.itemClicked(index, item)

314+ }

315+

316+ onPressAndHold: {

317+ listView.itemPressAndHold(index, item)

318+ }

319+

320+ }

321+ }

322+ }

323+}

tests/mocks/QMenuModel/actionstateparser.cpp → Components/Circle.qmlrenamed+6−3

@@ -12,8 +12,11 @@

12 *

12 *

13 * You should have received a copy of the GNU General Public License

13 * You should have received a copy of the GNU General Public License

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors: Nick Dedekind <nick.dedekind@canonical.com>

17 */

15 */

18

16

19−#include "actionstateparser.h"

17+import QtQuick 2.0

18+

19+Rectangle {

20+ antialiasing: true

21+ radius: width / 2

22+ }

qml/Components/DragHandle.qml → Components/DragHandle.qmlrenamed+54−69

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2013,2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,9 +14,10 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19import Ubuntu.Gestures 0.1

19import Ubuntu.Gestures 0.1

20+import "Math.js" as MathLocal

20

21

21/*

22/*

22 Put a DragHandle inside a Showable to enable the user to drag it from that handle.

23 Put a DragHandle inside a Showable to enable the user to drag it from that handle.

@@ -38,13 +39,18 @@ import Ubuntu.Gestures 0.1

38 anchors.bottom: parent.bottom

39 anchors.bottom: parent.bottom

39 width: units.gu(2)

40 width: units.gu(2)

40

41

41− direction: SwipeArea::Leftwards

42+ direction: DirectionalDragArea::Leftwards

42 }

43 }

43 }

44 }

44

45

45 */

46 */

46−SwipeArea {

47+EdgeDragArea {

47 id: dragArea

48 id: dragArea

49+ objectName: "dragHandle"

50+

51+ // Disable gesture detection by default when hinting is used.

52+ // It doesn't make sense to have both.

53+ distanceThreshold: hintDisplacement > 0 ? 0 : units.gu(1.5)

48

54

49 property bool stretch: false

55 property bool stretch: false

50

56

@@ -60,27 +66,21 @@ SwipeArea {

60 }

66 }

61

67

62 property real hintDisplacement: 0

68 property real hintDisplacement: 0

63−

64− immediateRecognition: hintDisplacement > 0

65−

66− property var overrideStartValue: undefined

67 SmoothedAnimation {

69 SmoothedAnimation {

68 id: hintingAnimation

70 id: hintingAnimation

69 target: hintingAnimation

71 target: hintingAnimation

70− objectName: "hintingAnimation"

71 property: "targetValue"

72 property: "targetValue"

72 duration: 150

73 duration: 150

73 velocity: -1

74 velocity: -1

74−

75− to: d.incrementTargetProp ? d.startValue + hintDisplacement

75+ to: Direction.isPositive(direction) ? d.startValue + hintDisplacement

76− : d.startValue - hintDisplacement

76+ : d.startValue - hintDisplacement

77 property real targetValue

77 property real targetValue

78 onTargetValueChanged: {

78 onTargetValueChanged: {

79 if (!running) {

79 if (!running) {

80 return;

80 return;

81 }

81 }

82

82

83− if (d.incrementTargetProp) {

83+ if (Direction.isPositive(direction)) {

84 if (parent[d.targetProp] < targetValue) {

84 if (parent[d.targetProp] < targetValue) {

85 parent[d.targetProp] = targetValue;

85 parent[d.targetProp] = targetValue;

86 }

86 }

@@ -95,24 +95,12 @@ SwipeArea {

95 // Private stuff

95 // Private stuff

96 QtObject {

96 QtObject {

97 id: d

97 id: d

98−

98+ property var previousStatus: undefined

99− // Whether movement along the designated direction will increment the value of the target property

100− readonly property bool incrementTargetProp: (Direction.isPositive(direction) && !dragArea.stretch)

101− || (dragArea.stretch && !d.dragParent.shown)

102−

103 property real startValue

99 property real startValue

104− property real minValue: {

100+ property real minValue: Direction.isPositive(direction) ? startValue

105− if (direction == Direction.Horizontal) {

106− return startValue - maxTotalDragDistance;

107− } else if (incrementTargetProp) {

108− return startValue;

109− } else {

110− return startValue - maxTotalDragDistance;

101+ : startValue - maxTotalDragDistance

111− }

112− }

113−

114− property real maxValue: incrementTargetProp ? startValue + maxTotalDragDistance

102+ property real maxValue: Direction.isPositive(direction) ? startValue + maxTotalDragDistance

115− : startValue;

103+ : startValue

116

104

117 property var dragParent: dragArea.parent

105 property var dragParent: dragArea.parent

118

106

@@ -125,26 +113,26 @@ SwipeArea {

125 }

113 }

126 }

114 }

127

115

128− function limitMovement(distance) {

116+ function limitMovement(step) {

129− var targetValue = MathUtils.clamp(d.startValue + distance, minValue, maxValue);

117+ var targetValue = MathLocal.clamp(dragParent[targetProp] + step, minValue, maxValue);

130− var diff = targetValue - d.startValue;

118+ var step = targetValue - dragParent[targetProp];

131

119

132 if (hintDisplacement == 0) {

120 if (hintDisplacement == 0) {

133− return diff;

121+ return step;

134 }

122 }

135

123

136 // we should not go behind hintingAnimation's current value

124 // we should not go behind hintingAnimation's current value

137− if (d.incrementTargetProp) {

125+ if (Direction.isPositive(direction)) {

138− if (d.startValue + diff < hintingAnimation.targetValue) {

126+ if (dragParent[targetProp] + step < hintingAnimation.targetValue) {

139− diff = hintingAnimation.targetValue - d.startValue;

127+ step = hintingAnimation.targetValue - dragParent[targetProp];

140 }

128 }

141 } else {

129 } else {

142− if (d.startValue + diff > hintingAnimation.targetValue) {

130+ if (dragParent[targetProp] + step > hintingAnimation.targetValue) {

143− diff = hintingAnimation.targetValue - d.startValue;

131+ step = hintingAnimation.targetValue - dragParent[targetProp];

144 }

132 }

145 }

133 }

146

134

147− return diff;

135+ return step;

148 }

136 }

149

137

150 function onFinishedRecognizedGesture() {

138 function onFinishedRecognizedGesture() {

@@ -177,51 +165,48 @@ SwipeArea {

177 EdgeDragEvaluator {

165 EdgeDragEvaluator {

178 objectName: "edgeDragEvaluator"

166 objectName: "edgeDragEvaluator"

179 id: dragEvaluator

167 id: dragEvaluator

180− // Effectively convert distance into the drag position projected onto the gesture direction axis

168+ trackedPosition: sceneDistance

181− trackedPosition: Direction.isPositive(dragArea.direction) ? distance : -distance

182 maxDragDistance: maxTotalDragDistance

169 maxDragDistance: maxTotalDragDistance

183 direction: dragArea.direction

170 direction: dragArea.direction

184 }

171 }

185

172

186 onDistanceChanged: {

173 onDistanceChanged: {

187− if (dragging) {

174+ if (status === DirectionalDragArea.Recognized) {

188− if (!Direction.isPositive(direction))

175+ // don't go the whole distance in order to smooth out the movement

189− distance = -distance;

190−

191− if (dragArea.stretch &&

192− ((!Direction.isPositive(direction) && !d.dragParent.shown)

193− ||

194− (Direction.isPositive(direction) && d.dragParent.shown))

195− )

196− {

197− // This happens when you have a stretching showable being shown from the right or

198− // top edge (and consequently being hidden when dragged towards the right/top edge)

199− // In those situations, dimension expansion/retraction happens in the opposite

200− // sign of the axis direction

201− distance = -distance;

176+ var step = distance * 0.3;

202− }

177+

178+ step = d.limitMovement(step);

203

179

204− var toAdd = d.limitMovement(distance);

205− parent[d.targetProp] = d.startValue + toAdd;

180+ parent[d.targetProp] += step;

206 }

181 }

207 }

182 }

208

183

209 onDraggingChanged: {

184 onDraggingChanged: {

210 if (dragging) {

185 if (dragging) {

211− dragEvaluator.reset();

212− if (overrideStartValue !== undefined) {

213− d.startValue = overrideStartValue;

214− } else {

215− d.startValue = parent[d.targetProp];

216− }

217−

218 if (hintDisplacement > 0) {

186 if (hintDisplacement > 0) {

219 hintingAnimation.targetValue = d.startValue;

187 hintingAnimation.targetValue = d.startValue;

220 hintingAnimation.start();

188 hintingAnimation.start();

221 }

189 }

222 } else {

190 } else {

223 hintingAnimation.stop();

191 hintingAnimation.stop();

224− d.onFinishedRecognizedGesture();

225 }

192 }

226 }

193 }

194+

195+ onStatusChanged: {

196+ if (status === DirectionalDragArea.WaitingForTouch) {

197+ if (d.previousStatus === DirectionalDragArea.Recognized) {

198+ d.onFinishedRecognizedGesture();

199+ }

200+ d.startValue = parent[d.targetProp];

201+ }

202+

203+ if (d.previousStatus === DirectionalDragArea.WaitingForTouch ||

204+ d.previousStatus === undefined) {

205+ dragEvaluator.reset();

206+ d.startValue = parent[d.targetProp];

207+ }

208+

209+ d.previousStatus = status;

210+ }

211+

227}

212}

qml/Components/DraggingArea.qml → Components/DraggingArea.qmlrenamed+4−7

@@ -14,8 +14,9 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19+import "Math.js" as MathLocal

19

20

20MouseArea {

21MouseArea {

21 id: draggingArea

22 id: draggingArea

@@ -25,7 +26,7 @@ MouseArea {

25 property real dragVelocity: 0

26 property real dragVelocity: 0

26 property real dragValue: (orientation == Qt.Vertical ? (mouseY - __pressedPosition.y)

27 property real dragValue: (orientation == Qt.Vertical ? (mouseY - __pressedPosition.y)

27 : (mouseX - __pressedPosition.x))

28 : (mouseX - __pressedPosition.x))

28− property real lateralPosition: orientation == Qt.Horizontal ? MathUtils.clamp(mouseY, 0, height) : MathUtils.clamp(mouseX, 0, width)

29+ property real lateralPosition: orientation == Qt.Horizontal ? MathLocal.clamp(mouseY, 0, height) : MathLocal.clamp(mouseX, 0, width)

29 property point __pressedPosition: Qt.point(0, 0)

30 property point __pressedPosition: Qt.point(0, 0)

30 property var __dragEvents: []

31 property var __dragEvents: []

31 property bool clickValidated: true

32 property bool clickValidated: true

@@ -117,8 +118,4 @@ MouseArea {

117 dragging = false

118 dragging = false

118 __pressedPosition = Qt.point(mouse.x, mouse.y)

119 __pressedPosition = Qt.point(mouse.x, mouse.y)

119 }

120 }

120−

121− onCanceled: {

122− dragging = false

123− }

124}

121}

Components/EdgeDemo.qmlnew file+187

@@ -0,0 +1,187 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import AccountsService 0.1

18+import QtQuick 2.0

19+

20+Item {

21+ id: demo

22+

23+ property Item dash

24+ property Item launcher

25+ property Item indicators

26+ property Item underlay

27+

28+ property bool launcherEnabled: true

29+ property bool dashEnabled: true

30+ property bool panelEnabled: true

31+ property bool panelContentEnabled: true

32+

33+ property bool paused: false

34+

35+ onPausedChanged: {

36+ if (d.topEdgeDemo) d.topEdgeDemo.paused = paused

37+ if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused

38+ if (d.leftEdgeDemo) d.leftEdgeDemo.paused = paused

39+ if (d.finalEdgeDemo) d.finalEdgeDemo.paused = paused

40+ }

41+

42+ function hideEdgeDemoInShell() {

43+ AccountsService.demoEdges = false;

44+ stopDemo();

45+ }

46+

47+ function stopDemo() {

48+ launcherEnabled = true

49+ dashEnabled = true

50+ panelEnabled = true

51+ panelContentEnabled = true

52+ if (d.topEdgeDemo) d.topEdgeDemo.destroy()

53+ if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()

54+ if (d.leftEdgeDemo) d.leftEdgeDemo.destroy()

55+ if (d.finalEdgeDemo) d.finalEdgeDemo.destroy()

56+ }

57+

58+ function startDemo() {

59+ if (!d.overlay) {

60+ d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

61+ }

62+

63+ launcherEnabled = false;

64+ dashEnabled = false;

65+ panelEnabled = false;

66+ panelContentEnabled = false;

67+

68+ startTopEdgeDemo()

69+ }

70+

71+ QtObject {

72+ id: d

73+ property Component overlay

74+ property QtObject topEdgeDemo

75+ property QtObject bottomEdgeDemo

76+ property QtObject leftEdgeDemo

77+ property QtObject finalEdgeDemo

78+ property bool showEdgeDemo: AccountsService.demoEdges

79+

80+ onShowEdgeDemoChanged: {

81+ stopDemo()

82+ if (d.showEdgeDemo) {

83+ startDemo()

84+ }

85+ }

86+ }

87+

88+ function startTopEdgeDemo() {

89+ demo.panelEnabled = true;

90+ if (demo.dash && demo.underlay) {

91+ d.topEdgeDemo = d.overlay.createObject(demo.underlay, {

92+ "edge": "top",

93+ "title": i18n.tr("Top edge"),

94+ "text": i18n.tr("Try swiping from the top edge to access the indicators"),

95+ "anchors.fill": demo.dash,

96+ });

97+ }

98+ if (d.topEdgeDemo) {

99+ d.topEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

100+ } else {

101+ stopDemo();

102+ }

103+ }

104+

105+ Connections {

106+ target: demo.indicators

107+ onFullyOpenedChanged: {

108+ if (d.topEdgeDemo && d.topEdgeDemo.available && demo.indicators.fullyOpened) {

109+ d.topEdgeDemo.hideNow()

110+ startBottomEdgeDemo()

111+ }

112+ }

113+ }

114+

115+ function startBottomEdgeDemo() {

116+ if (demo.indicators) {

117+ d.bottomEdgeDemo = d.overlay.createObject(demo.indicators, {

118+ "edge": "bottom",

119+ "title": i18n.tr("Close"),

120+ "text": i18n.tr("Swipe up again to close the settings screen"),

121+ "anchors.fill": demo.indicators.content,

122+ });

123+ }

124+ if (d.bottomEdgeDemo) {

125+ d.bottomEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

126+ } else {

127+ stopDemo();

128+ }

129+ }

130+

131+ Connections {

132+ target: demo.indicators

133+ onPartiallyOpenedChanged: {

134+ if (d.bottomEdgeDemo && d.bottomEdgeDemo.available && !demo.indicators.partiallyOpened && !demo.indicators.fullyOpened) {

135+ d.bottomEdgeDemo.hideNow()

136+ startLeftEdgeDemo()

137+ }

138+ }

139+ }

140+

141+ function startLeftEdgeDemo() {

142+ demo.panelEnabled = false;

143+ demo.launcherEnabled = true;

144+ if (demo.dash && demo.underlay) {

145+ d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {

146+ "edge": "left",

147+ "title": i18n.tr("Left edge"),

148+ "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),

149+ "anchors.fill": demo.dash,

150+ });

151+ }

152+ if (d.leftEdgeDemo) {

153+ d.leftEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

154+ } else {

155+ stopDemo();

156+ }

157+ }

158+

159+ Connections {

160+ target: demo.launcher

161+ onStateChanged: {

162+ if (d.leftEdgeDemo && d.leftEdgeDemo.available && launcher.state == "visible") {

163+ d.leftEdgeDemo.hide()

164+ launcher.hide()

165+ startFinalEdgeDemo()

166+ }

167+ }

168+ }

169+

170+ function startFinalEdgeDemo() {

171+ demo.launcherEnabled = false;

172+ if (demo.dash && demo.underlay) {

173+ d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

174+ "edge": "none",

175+ "title": i18n.tr("Well done"),

176+ "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap anywhere to start"),

177+ "anchors.fill": demo.dash,

178+ "showSkip": false,

179+ });

180+ }

181+ if (d.finalEdgeDemo) {

182+ d.finalEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)

183+ } else {

184+ stopDemo();

185+ }

186+ }

187+}

Components/EdgeDemoOverlay.qmlnew file+264

@@ -0,0 +1,264 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import Powerd 0.1

18+import QtQuick 2.0

19+import QtGraphicalEffects 1.0

20+import Unity.Application 0.1

21+import Ubuntu.Components 0.1

22+

23+Showable {

24+ id: overlay

25+

26+ /*

27+ * Valid values are "left", "right", "top", "bottom", or "none".

28+ */

29+ property string edge: "top"

30+

31+ /*

32+ * This is the header displayed, like "Right edge".

33+ */

34+ property alias title: titleLabel.text

35+

36+ /*

37+ * This is the block of text displayed below the header.

38+ */

39+ property alias text: textLabel.text

40+

41+ /*

42+ * This is the text for the skip button.

43+ */

44+ property alias skipText: skipLabel.text

45+

46+ /*

47+ * This is the visible status of the skip button.

48+ */

49+ property alias showSkip: skipLabel.visible

50+

51+ /*

52+ * Whether this demo is running currently.

53+ */

54+ readonly property bool active: available && visible

55+

56+ /*

57+ * Whether animations are paused.

58+ */

59+ property alias paused: wholeAnimation.paused

60+

61+ /*

62+ * Whether animations are running.

63+ */

64+ readonly property alias running: wholeAnimation.running

65+

66+ signal skip()

67+

68+ function doSkip() {

69+ d.skipOnHide = true;

70+ hide();

71+ }

72+

73+ function hideNow() {

74+ overlay.visible = false;

75+ overlay.available = false;

76+ if (d.skipOnHide) {

77+ overlay.skip();

78+ }

79+ }

80+

81+ showAnimation: StandardAnimation {

82+ property: "opacity"

83+ to: 1

84+ onRunningChanged: if (running) overlay.visible = true

85+ }

86+ hideAnimation: StandardAnimation {

87+ property: "opacity"

88+ to: 0

89+ duration: UbuntuAnimation.BriskDuration

90+ onRunningChanged: if (!running) overlay.hideNow()

91+ }

92+

93+ QtObject {

94+ id: d

95+ property bool skipOnHide: false

96+ property int edgeMargin: units.gu(4)

97+ }

98+

99+ Rectangle {

100+ objectName: "backgroundShade"

101+

102+ anchors.fill: parent

103+ color: "black"

104+ opacity: 0.8

105+ visible: overlay.active

106+

107+ MouseArea {

108+ anchors.fill: parent

109+ enabled: overlay.edge == "none" && overlay.opacity == 1.0

110+ onClicked: overlay.doSkip()

111+ }

112+ }

113+

114+ Item {

115+ id: hintGroup

116+ x: 0

117+ y: 0

118+ width: parent.width

119+ height: parent.height

120+ visible: overlay.active

121+

122+ Column {

123+ id: labelGroup

124+ layer.enabled: true // otherwise the underlining on "Skip intro" jumps

125+ spacing: units.gu(3)

126+

127+ anchors {

128+ margins: d.edgeMargin

129+ left: parent.left

130+ top: overlay.edge == "bottom" ? undefined : parent.top

131+ bottom: overlay.edge == "bottom" ? parent.bottom : undefined

132+ }

133+

134+ Label {

135+ id: titleLabel

136+ fontSize: "x-large"

137+ width: units.gu(25)

138+ wrapMode: Text.WordWrap

139+ }

140+

141+ Label {

142+ id: textLabel

143+ width: units.gu(25)

144+ wrapMode: Text.WordWrap

145+ }

146+

147+ Label {

148+ id: skipLabel

149+ objectName: "skipLabel"

150+ text: i18n.tr("Skip intro")

151+ color: UbuntuColors.orange

152+ fontSize: "small"

153+ font.underline: true

154+

155+ MouseArea {

156+ // Make clickable area bigger than just the link because

157+ // otherwise, the edge demo will feel hard to dismiss.

158+ anchors.fill: parent

159+ anchors.margins: -units.gu(5)

160+ onClicked: overlay.doSkip()

161+ }

162+ }

163+ }

164+

165+ LinearGradient {

166+ id: edgeHint

167+ property int size: 1

168+ cached: false

169+ visible: overlay.edge != "none"

170+ gradient: Gradient {

171+ GradientStop {

172+ position: 0.0

173+ color: Qt.hsla(16.0/360.0, 0.83, 0.47, 0.4) // UbuntuColors.orange, but transparent

174+ }

175+ GradientStop {

176+ position: 1.0

177+ color: "transparent"

178+ }

179+ }

180+ anchors.fill: parent

181+ start: {

182+ if (overlay.edge == "right") {

183+ return Qt.point(width, 0);

184+ } else if (overlay.edge == "left") {

185+ return Qt.point(0, 0);

186+ } else if (overlay.edge == "top") {

187+ return Qt.point(0, 0);

188+ } else {

189+ return Qt.point(0, height);

190+ }

191+ }

192+ end: {

193+ if (overlay.edge == "right") {

194+ return Qt.point(width - size, 0);

195+ } else if (overlay.edge == "left") {

196+ return Qt.point(size, 0);

197+ } else if (overlay.edge == "top") {

198+ return Qt.point(0, size);

199+ } else {

200+ return Qt.point(0, height - size);

201+ }

202+ }

203+ }

204+ }

205+

206+ SequentialAnimation {

207+ id: wholeAnimation

208+ objectName: "wholeAnimation"

209+ running: overlay.active

210+

211+ ParallelAnimation {

212+ id: fadeInAnimation

213+

214+ StandardAnimation {

215+ target: labelGroup

216+ property: {

217+ if (overlay.edge == "right" || overlay.edge == "left") {

218+ return "anchors.leftMargin";

219+ } else if (overlay.edge == "bottom") {

220+ return "anchors.bottomMargin";

221+ } else {

222+ return "anchors.topMargin";

223+ }

224+ }

225+ from: {

226+ if (overlay.edge == "right") {

227+ return d.edgeMargin + units.gu(3)

228+ } else {

229+ return d.edgeMargin - units.gu(3)

230+ }

231+ }

232+ to: d.edgeMargin

233+ duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration

234+ }

235+ StandardAnimation {

236+ target: overlay

237+ property: "opacity"

238+ from: 0.0

239+ to: 1.0

240+ duration: UbuntuAnimation.SleepyDuration

241+ }

242+ }

243+

244+ SequentialAnimation {

245+ id: hintAnimation

246+ loops: Animation.Infinite

247+ property string prop: (overlay.edge == "left" || overlay.edge == "right") ? "x" : "y"

248+ property double endVal: units.dp(5) * ((overlay.edge == "left" || overlay.edge == "top") ? 1 : -1)

249+ property double maxGlow: units.dp(20)

250+ property int duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration

251+

252+ ParallelAnimation {

253+ StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: 0; to: hintAnimation.endVal; duration: hintAnimation.duration }

254+ StandardAnimation { target: edgeHint; property: "size"; from: 1; to: hintAnimation.maxGlow; duration: hintAnimation.duration }

255+ }

256+

257+ // Undo the above

258+ ParallelAnimation {

259+ StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: hintAnimation.endVal; to: 0; duration: hintAnimation.duration }

260+ StandardAnimation { target: edgeHint; property: "size"; from: hintAnimation.maxGlow; to: 1; duration: hintAnimation.duration }

261+ }

262+ }

263+ }

264+}

Components/EdgeDragArea.qmlnew file+36

@@ -0,0 +1,36 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Gestures 0.1

20+

21+/*

22+ A DirectionalDragArea wrapper that provides some well-chosen defaults

23+ for its gesture recognition parameters.

24+*/

25+DirectionalDragArea {

26+

27+ // TODO: Re-evaluate those or even the recognition heuristics itself once

28+ // we have gesture cancelling/forwarding in place.

29+ //

30+ // The idea here is that it's better having lax rules than false negatives.

31+ // False negatives are very frustrating to the user.

32+ maxDeviation: units.gu(3)

33+ wideningAngle: 50

34+ distanceThreshold: units.gu(1.5)

35+ minSpeed: units.gu(0) // some people were getting false negatives with it enabled.

36+}

qml/Components/EdgeDragEvaluator.qml → Components/EdgeDragEvaluator.qmlrenamed+11−20

@@ -14,8 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19import Ubuntu.Gestures 0.1

19import Ubuntu.Gestures 0.1

20

20

21/*

21/*

@@ -53,20 +53,20 @@ AxisVelocityCalculator {

53 // Returns whether the drag should continue by itself until completed.

53 // Returns whether the drag should continue by itself until completed.

54 function shouldAutoComplete() {

54 function shouldAutoComplete() {

55 var deltaPos = trackedPosition - __startPosition;

55 var deltaPos = trackedPosition - __startPosition;

56−

57 if (Math.abs(deltaPos) < minDragDistance) {

56 if (Math.abs(deltaPos) < minDragDistance) {

58 velocity = 0;

57 velocity = 0;

59 minVelocity = 0;

58 minVelocity = 0;

60 return false;

59 return false;

61 }

60 }

62

61

62+ minVelocity = __calculateMinimumVelocityForAutoCompletion(deltaPos);

63 velocity = calculate();

63 velocity = calculate();

64− minVelocity = __calculateMinimumVelocityForAutoCompletion();

65

64

66− if (_dragDirectionIsPositive()) {

65+ if (Direction.isPositive(direction) && (velocity >= minVelocity)

67− return velocity >= minVelocity;

66+ || !Direction.isPositive(direction) && (velocity <= minVelocity)) {

67+ return true;

68 } else {

68 } else {

69− return velocity <= minVelocity;

69+ return false;

70 }

70 }

71 }

71 }

72

72

@@ -75,20 +75,11 @@ AxisVelocityCalculator {

75 // speedThreshold in pixels per millisecond

75 // speedThreshold in pixels per millisecond

76 property real __speedThresholdMs: speedThreshold / 1000.0

76 property real __speedThresholdMs: speedThreshold / 1000.0

77

77

78− function _dragDirectionIsPositive() {

79− if (direction === Direction.Horizontal) {

80− return (trackedPosition - __startPosition) > 0;

81− } else {

82− return Direction.isPositive(direction);

83− }

84− }

85−

86− function __calculateMinimumVelocityForAutoCompletion() {

87− // Minimum velocity when a drag total distance is zero

78+ // Minimum velocity when a drag total distance is zero

88− var v0 = _dragDirectionIsPositive() ? __speedThresholdMs : - __speedThresholdMs;

79+ property real __v0: Direction.isPositive(direction) ? __speedThresholdMs : - __speedThresholdMs

89− var deltaPos = trackedPosition - __startPosition;

90

80

81+ function __calculateMinimumVelocityForAutoCompletion(distance) {

91− return v0 - ((__speedThresholdMs / dragThreshold) * deltaPos);

82+ return __v0 - ((__speedThresholdMs / dragThreshold) * distance);

92 }

83 }

93

84

94 function reset() {

85 function reset() {

Components/FilterGrid.qmlnew file+107

@@ -0,0 +1,107 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Utils 0.1

20+import "../Components"

21+

22+/*

23+ A ResponsiveGridView that can optionally have the number of rows being displayed

24+ reduced to collapsedRowCount, in which case a button saying "View all (123)"

25+ will be shown at the bottom. If clicked, FilterGrid will them expand vertically

26+ to display all rows.

27+ */

28+Item {

29+ id: root

30+

31+ /* If true, the number of elements displayed will be limited by collapsedRowCount.

32+ If false, all elements will be displayed, effectively looking the same as a regular

33+ ResponsiveGridView. */

34+ property bool filter: true

35+

36+ /* Whether, when collapsed, a button should be displayed enabling the user to expand

37+ the grid to its full size. */

38+ readonly property bool expandable: model.count > collapsedRowCount * iconTileGrid.columns

39+

40+ property var model: null

41+

42+ /* Maximum number of rows to be show when filter=true. */

43+ property int collapsedRowCount: 2

44+ readonly property int collapsedHeight: {

45+ return iconTileGrid.contentHeightForRows(Math.min(collapsedRowCount, Math.ceil(model.count / columns)))

46+ }

47+ readonly property int uncollapsedHeight: {

48+ return iconTileGrid.contentHeightForRows(Math.ceil(model.count / columns))

49+ }

50+

51+ property alias minimumHorizontalSpacing: iconTileGrid.minimumHorizontalSpacing

52+ property alias maximumNumberOfColumns: iconTileGrid.maximumNumberOfColumns

53+ property alias columns: iconTileGrid.columns

54+ property alias delegateWidth: iconTileGrid.delegateWidth

55+ property alias delegateHeight: iconTileGrid.delegateHeight

56+ property alias verticalSpacing: iconTileGrid.verticalSpacing

57+ property alias delegate: iconTileGrid.delegate

58+ property alias cellWidth: iconTileGrid.cellWidth

59+ property alias cellHeight: iconTileGrid.cellHeight

60+ readonly property alias flicking: iconTileGrid.flicking

61+ readonly property alias moving: iconTileGrid.moving

62+ readonly property alias pressDelay: iconTileGrid.pressDelay

63+

64+ height: !filterAnimation.running ? childrenRect.height : height

65+ clip: filterAnimation.running

66+

67+ NumberAnimation {

68+ property bool filterEndValue

69+ id: filterAnimation

70+ target: root

71+ property: "height"

72+ to: filterEndValue ? root.collapsedHeight : root.uncollapsedHeight

73+ // Duration and easing here match the ListViewWithPageHeader::m_contentYAnimation

74+ // otherwise since both animations can run at the same time you'll get

75+ // some visual weirdness.

76+ duration: 200

77+ easing.type: Easing.InOutQuad

78+ onStopped: {

79+ root.filter = filterEndValue;

80+ }

81+ }

82+

83+ function startFilterAnimation(filter) {

84+ filterAnimation.filterEndValue = filter

85+ filterAnimation.start();

86+ }

87+

88+ ResponsiveGridView {

89+ id: iconTileGrid

90+

91+ anchors { left: parent.left; right: parent.right }

92+ height: totalContentHeight

93+ interactive: false

94+

95+ minimumHorizontalSpacing: units.gu(0.5)

96+ maximumNumberOfColumns: 6

97+ delegateWidth: units.gu(11)

98+ delegateHeight: units.gu(9.5)

99+ verticalSpacing: units.gu(2)

100+

101+ model: LimitProxyModel {

102+ model: root.model

103+ limit: (filter && !filterAnimation.running) ? collapsedRowCount * iconTileGrid.columns : -1

104+ }

105+

106+ }

107+}

Components/ListItems/Base.qmlnew file+125

@@ -0,0 +1,125 @@

1+/*

2+ * Copyright (C) 2012 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+AbstractButton {

21+ id: emptyListItem

22+ width: parent ? parent.width : units.gu(31)

23+ height: body.height + bottomDividerLine.height

24+

25+ /*!

26+ \preliminary

27+ Specifies whether the list item is selected.

28+ */

29+ property bool selected: false

30+

31+ /*!

32+ \preliminary

33+ Highlight the list item when it is pressed.

34+ This is used to disable the highlighting of the full list item

35+ when custom highlighting needs to be implemented (for example in

36+ ListItem.Standard which can have a split).

37+ */

38+ property bool highlightWhenPressed: true

39+

40+ /*!

41+ \preliminary

42+ Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component).

43+ This line is shown by default except in cases where this item is the delegate of a ListView.

44+ */

45+ property bool showDivider: __showDivider()

46+

47+ /*!

48+ \internal

49+ Method to automatically determine if the bottom divider line should be drawn.

50+ This always returns true, unless item is a delegate in a ListView. If in a ListView

51+ it will return false only when:

52+ + if this is the final item in the list, and ListView.footer is set (again as thin

53+ divider line won't look well with footer below it)

54+ */

55+ function __showDivider() {

56+ // if we're not in ListView, always show a thin dividing line at the bottom

57+ var model = null;

58+ if (typeof ListViewWithPageHeader !== 'undefined') {

59+ if (typeof ListViewWithPageHeader.model !== 'undefined') {

60+ model = ListViewWithPageHeader.model;

61+ }

62+ } else if (ListView.view !== null) {

63+ model = ListView.view.model;

64+ }

65+ // if we're last item in ListView don't show divider

66+ if (model && index === model.count - 1) return false;

67+

68+ return true;

69+ }

70+

71+ /* Relevant really only for ListViewWithPageHeader case: specify how many pixels we can overlap with the section header */

72+ readonly property int allowedOverlap: units.dp(1)

73+

74+ property real __heightToClip: {

75+ // Check this is in position where clipping is needed

76+ if (typeof ListViewWithPageHeader !== 'undefined') {

77+ if (typeof heightToClip !== 'undefined') {

78+ if (heightToClip >= allowedOverlap) {

79+ return heightToClip - allowedOverlap;

80+ }

81+ }

82+ }

83+ return 0;

84+ }

85+

86+ /*!

87+ \internal

88+ Reparent so that the visuals of the children does not

89+ occlude the bottom divider line.

90+ */

91+ default property alias children: body.children

92+

93+ Item {

94+ id: clippingContainer

95+ height: parent.height - __heightToClip

96+ anchors { left: parent.left; right: parent.right; bottom: parent.bottom }

97+ clip: __heightToClip > 0

98+

99+ Item {

100+ id: body

101+ anchors {

102+ left: parent.left

103+ right: parent.right

104+ bottom: bottomDividerLine.top

105+ }

106+ height: childrenRect.height

107+ }

108+

109+ ThinDivider {

110+ id: bottomDividerLine

111+ anchors.bottom: parent.bottom

112+ visible: showDivider

113+ }

114+

115+ Highlight {

116+ anchors {

117+ top: parent.top

118+ left: parent.left

119+ right: parent.right

120+ bottom: bottomDividerLine.top

121+ }

122+ pressed: (emptyListItem.selected || (emptyListItem.highlightWhenPressed && emptyListItem.pressed)) ? "pressed" : ""

123+ }

124+ }

125+}

Components/ListItems/Header.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ /*!

22+ \preliminary

23+ The text that is shown as the header text.

24+ \qmlproperty string text

25+ */

26+ property alias text: label.text

27+ property alias image: image.source

28+

29+ signal clicked(variant mouse)

30+

31+ height: units.gu(4.5)

32+

33+ Item {

34+ anchors {

35+ left: parent.left

36+ right: parent.right

37+ rightMargin: units.gu(0.5)

38+ top: parent.top

39+ bottom: bottomBorder.top

40+ }

41+

42+ Label {

43+ id: label

44+ anchors {

45+ left: parent.left

46+ leftMargin: units.gu(2)

47+ verticalCenter: parent.verticalCenter

48+ }

49+

50+ color: Theme.palette.selected.backgroundText //at 60%

51+ opacity: 0.6

52+ font.family: "Ubuntu"

53+ fontSize: "medium"

54+ elide: Text.ElideRight

55+ textFormat: Text.PlainText

56+ style: Text.Raised

57+ styleColor: "black"

58+ width: parent.width - image.width - image.leftMargin - anchors.leftMargin

59+ }

60+

61+ Image {

62+ id: image

63+ readonly property double leftMargin: units.gu(1)

64+ x: label.x + label.contentWidth + leftMargin

65+ anchors {

66+ verticalCenter: parent.verticalCenter

67+ }

68+ }

69+ }

70+

71+ ThinDivider {

72+ id: bottomBorder

73+ anchors {

74+ left: parent.left

75+ right: parent.right

76+ bottom: parent.bottom

77+ }

78+ }

79+

80+ MouseArea {

81+ anchors.fill: parent

82+ onClicked: parent.clicked(mouse)

83+ }

84+}

Components/ListItems/Highlight.qmlnew file+46

@@ -0,0 +1,46 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Rectangle {

20+ id: highlight

21+

22+ property bool pressed: false

23+ property real pressedOpacity: 0.3

24+

25+ color: "black"

26+ opacity: 0

27+ state: pressed ? "pressed" : ""

28+ states: [

29+ State {

30+ name: "pressed"

31+ PropertyChanges { target: highlight; opacity: pressedOpacity}

32+ }

33+ ]

34+ transitions: [

35+ Transition {

36+ from: ""

37+ to: "pressed"

38+ NumberAnimation { target: highlight; property: "opacity"; duration: 50}

39+ },

40+ Transition {

41+ from: "pressed"

42+ to: ""

43+ NumberAnimation { target: highlight; property: "opacity"; duration: 100}

44+ }

45+ ]

46+}

Components/ListItems/ThinDivider.qmlnew file+27

@@ -0,0 +1,27 @@

1+/*

2+ * Copyright (C) 2012 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Image {

20+ anchors {

21+ left: (parent) ? parent.left : null

22+ right: (parent) ? parent.right : null

23+ }

24+ height: (visible) ? units.dp(2) : 0

25+

26+ source: "graphics/ListItemDividerHorizontal.png"

27+}

tests/qmltests/Components/tst_EdgeDragEvaluator.qml → Components/ListItems/VerticalThinDivider.qmlrenamed+8−9

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015 Canonical, Ltd.

2+ * Copyright (C) 2012 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,14 +14,13 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import "../../../qml/Components"

19

18

20−Item {

19+Image {

21− width: units.gu(70)

20+ anchors {

22− height: units.gu(70)

21+ top: (parent) ? parent.top : null

23−

22+ bottom: (parent) ? parent.bottom : null

24− EdgeDragEvaluator {

25− objectName: "edgeDragEvaluator"

26 }

23 }

24+ width: (visible) ? units.dp(2) : 0

25+ source: "graphics/ListItemDividerVertical.png"

27}

26}

Components/ListItems/graphics/ListItemDividerHorizontal@18.pngnew file

Binary file not shown.

Components/ListItems/graphics/ListItemDividerVertical@18.pngnew file

Binary file not shown.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qml → Components/Math.jsrenamed+8−6

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,11 +14,13 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+.pragma library

18

18

19−Item {

19+function clamp(value, min, max) {

20− property bool reportCrashes: true

20+ if (min <= max) {

21− function setReportCrashes(report) {

21+ return Math.max(min, Math.min(max, value))

22− reportCrashes = report;

22+ } else {

23+ // swap min/max if min > max

24+ return clamp(value, max, min)

23 }

25 }

24}

26}

Components/OpenEffect.qmlnew file+138

@@ -0,0 +1,138 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Item {

20+ id: effect

21+ property bool enabled: topGapPx != positionPx || bottomGapPx != positionPx

22+ property alias live: effectSource.live

23+ property Item sourceItem

24+ property ShaderEffectSource source: ShaderEffectSource {

25+ id: effectSource

26+ sourceItem: effect.enabled ? effect.sourceItem : null

27+ hideSource: effect.enabled

28+ live: false

29+ sourceRect: {

30+ if (effect.enabled) {

31+ Qt.rect(0, -effect.topOverflow, sourceItem.width, sourceItem.height + effect.topOverflow + effect.bottomOverflow)

32+ } else {

33+ Qt.rect(0, 0, 0, 0)

34+ }

35+ }

36+ }

37+

38+ onEnabledChanged: if (!live && enabled) scheduleUpdate()

39+

40+ /*!

41+ \qmlproperty real positionPx

42+ The y coordinate of where to perform the split.

43+

44+ \qmlproperty real topGapPx

45+ Gap's top edge.

46+

47+ \qmlproperty real bottomGapPx

48+ Gap's bottom edge.

49+

50+ \qmlproperty real topOverflow

51+ How much of the sourceItem should be sourced above its bounds.

52+

53+ \qmlproperty real bottomOverflow

54+ How much of the sourceItem should be sourced below its bounds.

55+ */

56+

57+ property real positionPx: 0

58+ property real topGapPx: 0

59+ property real bottomGapPx: height

60+ property real topOverflow: 0.0

61+ property real bottomOverflow: 0.0

62+ property real topOpacity: 1.0

63+ property real bottomOpacity: 1.0

64+

65+ property real __roundedPositionPx: Math.round(positionPx)

66+

67+ function scheduleUpdate() {

68+ source.scheduleUpdate();

69+ }

70+

71+ ShaderEffect {

72+ id: top

73+ visible: effect.enabled

74+ opacity: topOpacity

75+ property ShaderEffectSource source: effect.source

76+ property real positionPx: __roundedPositionPx

77+ property real factor: effect.height / height

78+

79+ clip: true

80+

81+ anchors {

82+ top: parent.top

83+ left: parent.left

84+ right: parent.right

85+ topMargin: -topOverflow - positionPx + topGapPx

86+ }

87+ height: topOverflow + positionPx

88+

89+ vertexShader: "

90+ uniform highp mat4 qt_Matrix;

91+ attribute highp vec4 qt_Vertex;

92+ attribute highp vec2 qt_MultiTexCoord0;

93+ varying highp vec2 qt_TexCoord0;

94+ uniform highp float factor;

95+

96+ void main() {

97+ highp vec4 pos = qt_Vertex;

98+ pos.y *= factor;

99+ gl_Position = qt_Matrix * pos;

100+ qt_TexCoord0 = qt_MultiTexCoord0;

101+ }

102+ "

103+ }

104+

105+ ShaderEffect {

106+ id: bottom

107+ visible: effect.enabled

108+ opacity: bottomOpacity

109+ property ShaderEffectSource source: effect.source

110+ property real offset: effect.topOverflow + __roundedPositionPx

111+ property real factor: effect.height / height

112+

113+ clip: true

114+

115+ anchors {

116+ left: parent.left

117+ right: parent.right

118+ }

119+ y: topOverflow + bottomGapPx

120+ height: sourceItem.height - positionPx + bottomOverflow

121+

122+ vertexShader: "

123+ uniform highp mat4 qt_Matrix;

124+ attribute highp vec4 qt_Vertex;

125+ attribute highp vec2 qt_MultiTexCoord0;

126+ varying highp vec2 qt_TexCoord0;

127+ uniform highp float factor;

128+ uniform highp float offset;

129+

130+ void main() {

131+ highp vec4 pos = qt_Vertex;

132+ pos.y = (pos.y * factor) - offset;

133+ gl_Position = qt_Matrix * pos;

134+ qt_TexCoord0 = qt_MultiTexCoord0;

135+ }

136+ "

137+ }

138+}

Components/PageHeader.qmlnew file+346

@@ -0,0 +1,346 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Components.Popups 0.1

20+import Ubuntu.Components.ListItems 0.1 as ListItem

21+import SessionManager 0.1

22+

23+Item {

24+ /*!

25+ \preliminary

26+ The text that is shown inside the Page Header

27+ \qmlproperty string text

28+ */

29+ property alias text: label.text

30+

31+ property bool searchEntryEnabled: false

32+ property alias searchQuery: searchField.text

33+ property ListModel searchHistory: SearchHistoryModel {}

34+

35+ height: units.gu(8.5)

36+ implicitHeight: units.gu(8.5)

37+

38+ function triggerSearch() {

39+ if (searchEntryEnabled) searchField.forceActiveFocus()

40+ }

41+

42+ function resetSearch() {

43+ if (!searchHistory) return;

44+

45+ searchHistory.addQuery(searchField.text);

46+ searchField.text = "";

47+ searchField.focus = false;

48+ }

49+

50+ Connections {

51+ target: SessionManager

52+ onActiveChanged: if (!SessionManager.active) resetSearch()

53+ }

54+

55+ Flickable {

56+ id: header

57+ anchors {

58+ left: parent.left

59+ right: parent.right

60+ top: parent.top

61+ }

62+ height: units.gu(6.5)

63+

64+ interactive: false

65+ contentHeight: headerContainer.height

66+ clip: true

67+

68+ contentY: searchField.activeFocus || searchField.text != "" ? searchContainer.y : headerContainer.y

69+

70+ Behavior on contentY { NumberAnimation { duration: 200; easing.type: Easing.OutQuad } }

71+

72+ // FIXME this could potentially be simplified to avoid all the containers

73+ Item {

74+ id: headerContainer

75+

76+ width: parent.width

77+ height: childrenRect.height

78+

79+ Item {

80+ id: textContainer

81+

82+ width: header.width

83+ height: header.height

84+

85+ Label {

86+ id: label

87+ anchors {

88+ left: parent.left

89+ leftMargin: units.gu(2)

90+ right: parent.right

91+ verticalCenter: parent.verticalCenter

92+ }

93+

94+ color: Theme.palette.selected.backgroundText

95+ opacity: 0.8

96+ font.family: "Ubuntu"

97+ font.weight: Font.Light

98+ fontSize: "x-large"

99+ elide: Text.ElideRight

100+ style: Text.Raised

101+ styleColor: "black"

102+ }

103+ }

104+

105+ Item {

106+ id: searchContainer

107+ objectName: "searchContainer"

108+

109+ visible: searchEntryEnabled

110+

111+ property bool narrowMode: parent.width < label.contentWidth + units.gu(50)

112+

113+ property bool active: searchField.text != "" || searchField.activeFocus

114+ property var popover: null

115+

116+ anchors.right: textContainer.right

117+ height: header.height

118+

119+ state:

120+ if (active && narrowMode) "narrowActive"

121+ else if (!active && narrowMode) "narrowInactive"

122+ else if (active && !narrowMode) "active"

123+ else if (!active && !narrowMode) "inactive"

124+

125+ function openPopover() {

126+ if (searchHistory.count > 0) {

127+ searchContainer.popover = PopupUtils.open(popoverComponent, searchField,

128+ {

129+ "pointerTarget": pointerPositioner,

130+ "contentWidth": searchField.width,

131+ "edgeMargins": units.gu(1)

132+ }

133+ )

134+ }

135+ }

136+

137+ function closePopover() {

138+ if (searchContainer.popover) PopupUtils.close(searchContainer.popover)

139+ }

140+

141+ onActiveFocusChanged: if (!activeFocus) { searchHistory.addQuery(searchField.text) }

142+

143+ TextField {

144+ id: searchField

145+

146+ anchors.fill: parent

147+ anchors.margins: units.gu(1)

148+

149+ hasClearButton: false

150+

151+ primaryItem: AbstractButton {

152+ enabled: searchField.text != ""

153+ onClicked: {

154+ if (searchField.text != "") {

155+ searchHistory.addQuery(searchField.text)

156+ searchField.text = ""

157+ }

158+ }

159+ height: parent.height

160+ width: height

161+

162+ Image {

163+ id: primaryImage

164+ anchors {

165+ verticalCenter: parent.verticalCenter

166+ left: parent.left

167+ leftMargin: units.gu(0.5)

168+ }

169+ width: units.gu(3)

170+ height: units.gu(3)

171+ }

172+

173+ Item {

174+ id: pointerPositioner

175+ anchors.left: parent.right

176+ anchors.leftMargin: units.gu(0.5)

177+ anchors.top: parent.bottom

178+ }

179+ }

180+

181+ onTextChanged: {

182+ if (text != "") searchContainer.closePopover()

183+ else if (text == "" && activeFocus) searchContainer.openPopover()

184+ }

185+

186+ onActiveFocusChanged: {

187+ if (!activeFocus) searchContainer.closePopover()

188+ }

189+ }

190+

191+ states: [

192+ State {

193+ name: "wide"

194+ AnchorChanges { target: textContainer; anchors.top: headerContainer.top }

195+ AnchorChanges { target: searchContainer; anchors.left: undefined; anchors.top: textContainer.top }

196+ },

197+ State {

198+ name: "narrow"

199+ PropertyChanges { target: searchField; highlighted: true }

200+ AnchorChanges { target: textContainer; anchors.top: searchContainer.bottom }

201+ AnchorChanges { target: searchContainer; anchors.left: headerContainer.left; anchors.top: headerContainer.top }

202+ },

203+ State {

204+ name: "active"

205+ extend: "wide"

206+ PropertyChanges { target: searchContainer; width: units.gu(40) }

207+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

208+ PropertyChanges { target: searchField; highlighted: true }

209+ },

210+ State {

211+ name: "inactive"

212+ extend: "wide"

213+ PropertyChanges { target: searchContainer; width: units.gu(25) }

214+ PropertyChanges { target: primaryImage; source: "../Dash/graphics/icon_search_inactive.png" }

215+ PropertyChanges { target: searchField; highlighted: false }

216+ },

217+ State {

218+ name: "narrowActive"

219+ extend: "narrow"

220+ PropertyChanges { target: header; contentY: 0 }

221+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

222+ },

223+ State {

224+ name: "narrowInactive"

225+ extend: "narrow"

226+ PropertyChanges { target: header; contentY: header.height }

227+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

228+ }

229+ ]

230+

231+ transitions: [

232+ Transition {

233+ to: "active"

234+ SequentialAnimation {

235+ ParallelAnimation {

236+ NumberAnimation { targets: [searchContainer, searchField]; property: "width"; duration: 200; easing.type: Easing.InOutQuad }

237+ PropertyAction { target: primaryImage; property: "source" }

238+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

239+ }

240+ ScriptAction { script: searchContainer.openPopover() }

241+ }

242+ },

243+ Transition {

244+ to: "inactive"

245+ ScriptAction { script: searchContainer.closePopover() }

246+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.InOutQuad }

247+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

248+ },

249+ Transition {

250+ to: "narrowActive"

251+ SequentialAnimation {

252+ ParallelAnimation {

253+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }

254+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

255+ }

256+ ScriptAction { script: searchContainer.openPopover() }

257+ }

258+ },

259+ Transition {

260+ to: "narrowInactive"

261+ ScriptAction { script: searchContainer.closePopover() }

262+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }

263+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

264+ }

265+ ]

266+

267+ Component {

268+ id: popoverComponent

269+ Popover {

270+ id: popover

271+

272+ // FIXME: this should go into the first item below, but enable: false

273+ // prevents mouse events propagation

274+ AbstractButton {

275+ anchors {

276+ top: parent.top

277+ right: parent.right

278+ }

279+ height: units.gu(6)

280+ width: height

281+

282+ onClicked: searchContainer.closePopover()

283+

284+ Image {

285+ anchors.centerIn: parent

286+ width: units.gu(2)

287+ height: units.gu(2)

288+ source: "../Dash/graphics/icon_listview_clear.png"

289+ }

290+ }

291+

292+ Column {

293+ anchors {

294+ top: parent.top

295+ left: parent.left

296+ right: parent.right

297+ }

298+

299+ ListItem.Standard { enabled: false; text: i18n.tr("Recent searches") }

300+

301+ Repeater {

302+ id: recentSearches

303+ model: searchHistory

304+

305+ delegate: ListItem.Standard {

306+ showDivider: index < recentSearches.count - 1

307+ text: query

308+ onClicked: {

309+ searchHistory.addQuery(text)

310+ searchField.text = text

311+ }

312+ }

313+ }

314+ }

315+ }

316+ }

317+

318+ InverseMouseArea {

319+ enabled: searchField.activeFocus

320+

321+ anchors {

322+ top: parent.top

323+ left: parent.left

324+ right: parent.right

325+ }

326+

327+ height: searchContainer.popover ? parent.height + searchContainer.popover.contentHeight + units.gu(2) : parent.height

328+

329+ onPressed: searchField.focus = false

330+ }

331+ }

332+ }

333+ }

334+

335+ BorderImage {

336+ id: bottomBorder

337+ anchors {

338+ top: header.bottom

339+ left: parent.left

340+ right: parent.right

341+ bottom: parent.bottom

342+ }

343+

344+ source: "graphics/PageHeaderBaseDivider.sci"

345+ }

346+}

Components/RatingStars.qmlnew file+41

@@ -0,0 +1,41 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Row {

20+ id: root

21+ property int rating

22+ property int maximumRating: 5

23+ property int starCount: 5

24+ height: childrenRect.height

25+ width: childrenRect.width

26+

27+ readonly property int effectiveRating: Math.max(0, Math.min(root.starCount * root.rating / root.maximumRating, root.maximumRating))

28+

29+ Repeater {

30+ model: root.effectiveRating

31+ Image {

32+ source: "graphics/icon_star_on.png"

33+ }

34+ }

35+ Repeater {

36+ model: root.starCount - root.effectiveRating

37+ Image {

38+ source: "graphics/icon_star_off.png"

39+ }

40+ }

41+}

Components/ResponsiveFlowView.qmlnew file+81

@@ -0,0 +1,81 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ id: root

22+

23+ property int minimumHorizontalSpacing: units.gu(0.5)

24+ // property int minimumNumberOfColumns: 2 // FIXME: not implemented

25+ property int maximumNumberOfColumns: 6

26+ readonly property int columns: flow.columns

27+ property alias verticalSpacing: flow.verticalSpacing

28+ property alias horizontalSpacing: flow.horizontalSpacing

29+ property int referenceDelegateWidth

30+ property alias firstModel: repeater1.model

31+ property alias secondModel: repeater2.model

32+ property alias delegate: repeater1.delegate

33+ readonly property int cellWidth: referenceDelegateWidth + horizontalSpacing

34+ readonly property int cellHeight: referenceDelegateWidth + verticalSpacing

35+ property alias move: flow.move

36+

37+ height: flow.height + flow.anchors.topMargin

38+

39+ Flow {

40+ id: flow

41+ anchors {

42+ left: parent.left

43+ right: parent.right

44+ top: parent.top

45+ leftMargin: margin/2

46+ rightMargin: margin/2

47+ topMargin: verticalSpacing

48+ }

49+

50+ function pixelToGU(value) {

51+ return Math.floor(value / units.gu(1));

52+ }

53+

54+ function spacingForColumns(columns) {

55+ // spacing between columns as an integer number of GU, the remainder goes in the margins

56+ var spacingGU = pixelToGU(allocatableVerticalSpace / columns);

57+ return units.gu(spacingGU);

58+ }

59+

60+ function columnsForSpacing(space) {

61+ // minimum margin is half of the spacing

62+ return Math.floor((parent.width - space/2) / (referenceDelegateWidth + space));

63+ }

64+

65+ property real allocatableVerticalSpace: parent.width - columns * referenceDelegateWidth

66+ property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)

67+ property real horizontalSpacing: spacingForColumns(columns)

68+ property real verticalSpacing: horizontalSpacing

69+ property int margin: allocatableVerticalSpace - columns * horizontalSpacing

70+

71+ Repeater {

72+ id: repeater1

73+ model: (root.model) ? root.model[0] : null

74+ }

75+ Repeater {

76+ id: repeater2

77+ model: (root.model) ? root.model[1] : null

78+ delegate: repeater1.delegate

79+ }

80+ }

81+}

Components/ResponsiveGridView.qmlnew file+82

@@ -0,0 +1,82 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+/*

21+ Essentially a GridView where you can specify the maximum number of columns it can have.

22+ */

23+Item {

24+ property int minimumHorizontalSpacing: units.gu(0.5)

25+ // property int minimumNumberOfColumns: 2 // FIXME: not implemented

26+ property int maximumNumberOfColumns: 6

27+ readonly property int columns: gridView.columns

28+ property alias verticalSpacing: gridView.verticalSpacing

29+ property int delegateWidth

30+ property int delegateHeight

31+ property alias model: gridView.model

32+ property alias delegate: gridView.delegate

33+ readonly property int cellWidth: gridView.cellWidth

34+ readonly property int cellHeight: gridView.cellHeight

35+ readonly property int totalContentHeight: {

36+ return contentHeightForRows(Math.ceil(gridView.model.count / columns))

37+ }

38+ property alias interactive: gridView.interactive

39+ readonly property alias flicking: gridView.flicking

40+ readonly property alias moving: gridView.moving

41+ readonly property alias pressDelay: gridView.pressDelay

42+

43+ function contentHeightForRows(rows) {

44+ return rows * cellHeight + verticalSpacing

45+ }

46+

47+ GridView {

48+ id: gridView

49+ objectName: "responsiveGridViewGrid"

50+ anchors {

51+ fill: parent

52+ leftMargin: margin/2

53+ rightMargin: margin/2

54+ topMargin: verticalSpacing

55+ }

56+ clip: parent.height != totalContentHeight

57+

58+ function pixelToGU(value) {

59+ return Math.floor(value / units.gu(1));

60+ }

61+

62+ function spacingForColumns(columns) {

63+ // spacing between columns as an integer number of GU, the remainder goes in the margins

64+ var spacingGU = pixelToGU(allocatableHorizontalSpace / columns);

65+ return units.gu(spacingGU);

66+ }

67+

68+ function columnsForSpacing(spacing) {

69+ // minimum margin is half of the spacing

70+ return Math.max(1, Math.floor((parent.width - spacing/2) / (delegateWidth + spacing)));

71+ }

72+

73+ property real allocatableHorizontalSpace: parent.width - columns * delegateWidth

74+ property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)

75+ property real horizontalSpacing: spacingForColumns(columns)

76+ property real verticalSpacing: horizontalSpacing

77+ property int margin: allocatableHorizontalSpace - columns * horizontalSpacing

78+

79+ cellWidth: delegateWidth + horizontalSpacing

80+ cellHeight: delegateHeight + verticalSpacing

81+ }

82+}

Components/Revealer.qmlnew file+242

@@ -0,0 +1,242 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "Math.js" as MathLocal

20+

21+Item {

22+ id: revealer

23+

24+ property Showable target

25+ property var hintingAnimation: hintingAnimation

26+ property string boundProperty: orientation == Qt.Vertical ? "y" : "x"

27+ property int orientation: Qt.Vertical

28+ property int direction: Qt.LeftToRight

29+ property real openedValue: orientation == Qt.Vertical ? y : x

30+ property real closedValue: orientation == Qt.Vertical ? y + (direction == Qt.LeftToRight ? -height : height) : x + (direction == Qt.LeftToRight ? -width : width)

31+ property real hintDisplacement: 0

32+ property real handleSize: units.gu(2)

33+ property real dragVelocity: draggingArea.dragVelocity != 0 ? Math.abs(draggingArea.dragVelocity) : -1

34+ property real dragVelocityThreshold: units.gu(5)

35+ property bool dragging: false

36+ property bool pressed: draggingArea.pressed

37+ property int lateralPosition: draggingArea.lateralPosition

38+ property real dragPosition

39+ property bool openOnPress: true

40+

41+ signal openPressed(int mouseX, int mouseY)

42+ signal openReleased(int mouseX, int mouseY)

43+ signal closePressed

44+ signal openClicked

45+ signal closeClicked

46+

47+ dragPosition: {

48+ var value

49+ if (orientation == Qt.Vertical) {

50+ value = draggingArea.dragValue + draggingArea.y

51+ if (direction == Qt.RightToLeft) {

52+ value += draggingArea.height - height

53+ }

54+ } else {

55+ value = draggingArea.dragValue + draggingArea.x

56+ if (direction == Qt.RightToLeft) {

57+ value += draggingArea.width - width

58+ }

59+ }

60+ if (__opened) {

61+ if (direction == Qt.LeftToRight) {

62+ value += handleSize

63+ } else {

64+ value -= handleSize

65+ }

66+ } else if (dragging) {

67+ if (direction == Qt.LeftToRight) {

68+ value += hintDisplacement

69+ } else {

70+ value -= hintDisplacement

71+ }

72+ }

73+

74+ return value

75+ }

76+ property var draggingArea: leftDraggingArea.enabled ? leftDraggingArea : rightDraggingArea

77+

78+ property real __hintValue: closedValue + (direction == Qt.LeftToRight ? hintDisplacement : -hintDisplacement)

79+

80+ function dragToValue(dragPosition) {

81+ return dragPosition + closedValue

82+ }

83+

84+ property bool __opened: target.shown

85+ enabled: target.available

86+

87+ // Can be replaced with a fake implementation during tests

88+ // property var __getCurrentTimeMs: function () { return new Date().getTime() }

89+ property var __dateTime: new function() {

90+ this.getCurrentTimeMs = function() {return new Date().getTime()}

91+ }

92+

93+ Component.onCompleted: target[boundProperty] = __opened ? openedValue : closedValue

94+ onOpenedValueChanged: if (__opened && !dragging) target[boundProperty] = openedValue

95+ onClosedValueChanged: if (!__opened && !dragging) target[boundProperty] = closedValue

96+

97+ function __computeValue(dragPosition) {

98+ return MathLocal.clamp(dragToValue(dragPosition), __hintValue, openedValue)

99+ }

100+

101+ function __open() {

102+ hintingAnimation.stop()

103+ target.show()

104+ }

105+

106+ function __close() {

107+ hintingAnimation.stop()

108+ target.hide()

109+ }

110+

111+ function __hint() {

112+ target.showAnimation.stop()

113+ target.hideAnimation.stop()

114+ hintingAnimation.restart()

115+ }

116+

117+ function __settle() {

118+ hintingAnimation.stop()

119+ if (__opened) target.show()

120+ else target.hide()

121+ }

122+

123+ function __startDragging() {

124+ hintingAnimation.stop()

125+ dragging = true

126+ }

127+

128+ function __endDragging(dragVelocity) {

129+ dragging = false

130+ if (revealer.direction == Qt.RightToLeft) {

131+ dragVelocity = -dragVelocity

132+ }

133+ if (Math.abs(dragVelocity) >= dragVelocityThreshold) {

134+ if (dragVelocity > 0) __open()

135+ else __close()

136+ } else {

137+ __settle()

138+ }

139+ }

140+

141+ Binding {

142+ id: dragBinding

143+

144+ target: revealer.target

145+ property: revealer.boundProperty

146+ value: __computeValue(dragPosition)

147+ when: dragging

148+ }

149+

150+ SmoothedAnimation {

151+ id: hintingAnimation

152+

153+ target: revealer.target

154+ property: revealer.boundProperty

155+ duration: 150

156+ to: revealer.__hintValue

157+ }

158+

159+ DraggingArea {

160+ id: leftDraggingArea

161+

162+ property bool isOpeningArea: revealer.direction == Qt.LeftToRight

163+

164+ height: orientation == Qt.Vertical ? handleSize : parent.height

165+ width: orientation == Qt.Horizontal ? handleSize : parent.width

166+ orientation: revealer.orientation

167+ enabled: isOpeningArea ? !revealer.__opened : revealer.__opened

168+

169+ __dateTime: revealer.__dateTime

170+

171+ onPressed: {

172+ if (isOpeningArea) {

173+ if (revealer.openOnPress) {

174+ revealer.openPressed(mouseX, mouseY)

175+ __hint()

176+ }

177+ } else {

178+ revealer.closePressed()

179+ }

180+ }

181+ onReleased: {

182+ if (isOpeningArea && revealer.openOnPress) {

183+ revealer.openReleased(mouseX, mouseY)

184+ __settle()

185+ }

186+ }

187+ onDragStart: __startDragging()

188+ onDragEnd: __endDragging(dragVelocity)

189+ onClicked: {

190+ if (clickValidated) {

191+ if (isOpeningArea) {

192+ if (revealer.openOnPress) revealer.openClicked()

193+ } else {

194+ revealer.closeClicked()

195+ }

196+ }

197+ }

198+ }

199+

200+ DraggingArea {

201+ id: rightDraggingArea

202+

203+ property bool isOpeningArea: revealer.direction == Qt.RightToLeft

204+

205+ x: orientation == Qt.Vertical ? 0 : parent.width - width

206+ y: orientation == Qt.Vertical ? parent.height - height : 0

207+ height: orientation == Qt.Vertical ? handleSize : parent.height

208+ width: orientation == Qt.Horizontal ? handleSize : parent.width

209+ orientation: revealer.orientation

210+ enabled: isOpeningArea ? !revealer.__opened : revealer.__opened

211+

212+ __dateTime: revealer.__dateTime

213+

214+ onPressed: {

215+ if (isOpeningArea) {

216+ if (revealer.openOnPress) {

217+ revealer.openPressed(mouseX, mouseY)

218+ __hint()

219+ }

220+ } else {

221+ revealer.closePressed()

222+ }

223+ }

224+ onReleased: {

225+ if (isOpeningArea && revealer.openOnPress) {

226+ revealer.openReleased(mouseX, mouseY)

227+ __settle()

228+ }

229+ }

230+ onDragStart: __startDragging()

231+ onDragEnd: __endDragging(dragVelocity)

232+ onClicked: {

233+ if (clickValidated) {

234+ if (isOpeningArea) {

235+ if (revealer.openOnPress) revealer.openClicked()

236+ } else {

237+ revealer.closeClicked()

238+ }

239+ }

240+ }

241+ }

242+}

qml/Components/SearchHistoryModel/SearchHistoryModel.qml → Components/SearchHistoryModel.qmlrenamed+1−2

@@ -14,8 +14,7 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−pragma Singleton

18−import QtQuick 2.4

17+import QtQuick 2.0

19

18

20// TODO sanitize input, move to persistent storage

19// TODO sanitize input, move to persistent storage

21

20

qml/Components/Showable.qml → Components/Showable.qmlrenamed+9−46

@@ -1,6 +1,5 @@

1/*

1/*

2 * Copyright (C) 2013 Canonical, Ltd.

2 * Copyright (C) 2013 Canonical, Ltd.

3− * Copyright (C) 2019 UBports Foundation

4 *

3 *

5 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

6 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -15,7 +14,7 @@

15 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

16 */

15 */

17

16

18−import QtQuick 2.4

17+import QtQuick 2.0

19

18

20Item {

19Item {

21 id: showable

20 id: showable

@@ -31,17 +30,15 @@ Item {

31 property bool created: true

30 property bool created: true

32 property bool required

31 property bool required

33 property bool __shouldShow: false

32 property bool __shouldShow: false

34− property bool __skipShowAnimation: false

35− property bool __skipHideAnimation: false

36

33

37 property list<QtObject> hides

34 property list<QtObject> hides

38− property Animation showAnimation

35+ property var showAnimation

39− property Animation hideAnimation

36+ property var hideAnimation

40

37

41 // automatically set the target on showAnimation and hideAnimation to be the

38 // automatically set the target on showAnimation and hideAnimation to be the

42 // showable itself

39 // showable itself

43− onShowAnimationChanged: if (showAnimation && showAnimation.hasOwnProperty("target")) showAnimation["target"] = showable

40+ onShowAnimationChanged: if (showAnimation) showAnimation["target"] = showable

44− onHideAnimationChanged: if (hideAnimation && hideAnimation.hasOwnProperty("target")) hideAnimation["target"] = showable

41+ onHideAnimationChanged: if (hideAnimation) hideAnimation["target"] = showable

45

42

46 Component.onCompleted: required = shown;

43 Component.onCompleted: required = shown;

47

44

@@ -61,11 +58,6 @@ Item {

61 }

58 }

62 }

59 }

63

60

64− function showNow() {

65− __skipShowAnimation = true;

66− show();

67− }

68−

69 onCreatedChanged: {

61 onCreatedChanged: {

70 if (created && __shouldShow) {

62 if (created && __shouldShow) {

71 __reallyShow();

63 __reallyShow();

@@ -74,11 +66,7 @@ Item {

74 }

66 }

75

67

76 function __reallyShow() {

68 function __reallyShow() {

77− if (showAnimation != undefined && showAnimation.running)

78− return;

79−

80 if (!available) {

69 if (!available) {

81− __skipShowAnimation = false;

82 return false;

70 return false;

83 }

71 }

84

72

@@ -89,43 +77,24 @@ Item {

89 }

77 }

90

78

91 if (showAnimation != undefined) {

79 if (showAnimation != undefined) {

92− showAnimation.restart()

80+ if (!showAnimation.running) {

93− if (__skipShowAnimation || shown) {

94− showAnimation.complete();

81+ showAnimation.restart()

95 }

82 }

96 } else {

83 } else {

97 visible = true;

84 visible = true;

98 }

85 }

99

86

100 shown = true;

87 shown = true;

101− __skipShowAnimation = false;

102 return true;

88 return true;

103 }

89 }

104

90

105− /*

106− Will be called right before starting the hideAnimation.

107− */

108− property var prepareToHide: function(){}

109−

110 function hide() {

91 function hide() {

111− if (hideAnimation != undefined && hideAnimation.running)

112− return;

113−

114 if (showAnimation != undefined && showAnimation.running) {

92 if (showAnimation != undefined && showAnimation.running) {

115 showAnimation.stop()

93 showAnimation.stop()

116 }

94 }

117−

118− if (typeof prepareToHide === "function") {

119− prepareToHide();

120− } else {

121− console.warn("Showable.prepareToHide should be a function, but it's a " +

122− (typeof prepareToHide) + " instead");

123− }

124−

125 if (hideAnimation != undefined) {

95 if (hideAnimation != undefined) {

126− hideAnimation.restart()

96+ if (!hideAnimation.running) {

127− if (__skipHideAnimation || !shown) {

128− hideAnimation.complete();

97+ hideAnimation.restart()

129 }

98 }

130 } else {

99 } else {

131 visible = false

100 visible = false

@@ -133,12 +102,6 @@ Item {

133 }

102 }

134

103

135 shown = false

104 shown = false

136− __skipHideAnimation = false;

137− }

138−

139− function hideNow() {

140− __skipHideAnimation = true;

141− hide();

142 }

105 }

143

106

144 Connections {

107 Connections {

Components/Stage.qmlnew file+554

@@ -0,0 +1,554 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Unity.Application 0.1

19+import Ubuntu.Components 0.1

20+import Ubuntu.Gestures 0.1

21+

22+/*

23+ Responsible for application switching.

24+

25+ Drag from the right edge to switch to the next application.

26+ While being dragged, this component will show an animation for the user to

27+ visualize that he's changing the stacking of applications (next/new app comes from

28+ right edge and current/old app fades out).

29+ */

30+Showable {

31+ id: stage

32+

33+ width: units.gu(40)

34+ height: units.gu(71)

35+

36+ property int type: ApplicationInfo.MainStage

37+ property var applicationManager

38+ readonly property var applications:

39+ type == ApplicationInfo.MainStage ? applicationManager.mainStageApplications

40+ : applicationManager.sideStageApplications

41+ property bool fullyShown: false

42+ property bool fullyHidden: true

43+ readonly property var focusedApplication:

44+ type == ApplicationInfo.MainStage ? applicationManager.mainStageFocusedApplication

45+ : applicationManager.sideStageFocusedApplication

46+ property bool shouldUseScreenshots: true

47+

48+ /* Will be true whenever application screenshots are being shown.

49+ i.e. during application window transitions */

50+ readonly property bool usingScreenshots: {

51+ if (newApplicationScreenshot.application != null && oldApplicationScreenshot.application != null) {

52+ return newApplicationScreenshot.ready && oldApplicationScreenshot.ready;

53+ } else {

54+ return newApplicationScreenshot.ready || oldApplicationScreenshot.ready;

55+ }

56+ }

57+

58+ property bool rightEdgeEnabled: true

59+ property bool switchingFromFullscreenToFullscreen: false

60+

61+ property alias rightEdgeDraggingAreaWidth: rightEdgeDraggingArea.width

62+

63+ // Y coordinate for non-fullscreen applications

64+ property int normalApplicationY: 0

65+

66+ function activateApplication(desktopFile, addDelay) {

67+ var application = applicationManager.getApplicationFromDesktopFile(desktopFile, stage.type);

68+ if (application != null && application == stage.focusedApplication) {

69+ stage.show();

70+ return;

71+ }

72+

73+ showStartingApplicationAnimation.prepare(application);

74+ if (!stage.fullyShown) {

75+ // if launching this app reveals the stage, make new application screenshot visible

76+ newApplicationScreenshot.visible = true;

77+ stage.show();

78+ } else {

79+ showStartingApplicationAnimation.start();

80+ }

81+

82+ if (addDelay) {

83+ stage.__startingApplicationDesktopFile = desktopFile;

84+ }

85+ }

86+

87+ /* Keep a reference to the focused application so that we can safely

88+ unfocus it when the stage is not fully shown and refocus it when the stage

89+ is fully shown again.

90+ */

91+ property var focusedApplicationWhenUsingScreenshots

92+ onShouldUseScreenshotsChanged: {

93+ if (showStartingApplicationAnimation.running || switchToApplicationAnimation.running) {

94+ return;

95+ }

96+

97+ if (shouldUseScreenshots) {

98+ stage.__focusApplicationUsingScreenshots(stage.focusedApplication);

99+ } else {

100+ stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);

101+ }

102+ }

103+

104+

105+ property Item newApplicationScreenshot: ApplicationScreenshot {

106+ parent: stage

107+ width: stage.width

108+ height: stage.height - y

109+ }

110+ property Item oldApplicationScreenshot: ApplicationScreenshot {

111+ parent: stage

112+ width: stage.width

113+ height: stage.height - y

114+ }

115+

116+ function __getApplicationIndex(application) {

117+ if (!application)

118+ return -1

119+ for (var i = 0; i < stage.applications.count; i++ ) {

120+ if (stage.applications.get(i).desktopFile == application.desktopFile) {

121+ return i

122+ }

123+ }

124+ return -1

125+ }

126+

127+

128+ property string __startingApplicationDesktopFile

129+

130+ Timer {

131+ id: delayedHideScreenshots

132+ interval: 500 // on Galaxy Nexus, Telephony app is slowest application to draw a frame so needs this delay

133+ onTriggered: {

134+ __hideScreenshots();

135+ }

136+ }

137+

138+ function __hideScreenshots() {

139+ newApplicationScreenshot.clearApplication();

140+ oldApplicationScreenshot.clearApplication();

141+ newApplicationScreenshot.visible = false;

142+ oldApplicationScreenshot.visible = false;

143+ }

144+

145+ function __focusApplication(application) {

146+ if (!application) return

147+ if (shouldUseScreenshots) {

148+ stage.__focusApplicationUsingScreenshots(application);

149+ } else {

150+ stage.__focusActualApplication(application);

151+ }

152+ }

153+

154+

155+ function __focusActualApplication(application) {

156+ if (application == null) {

157+ return;

158+ }

159+

160+ if (stage.focusedApplication == application) {

161+ /* FIXME: this case is reached when showing the sidestage, we

162+ need to refocus the side stage app in order to show it.

163+ FIXME: this case is reached when doing a right edge swipe

164+ while in the dash to bring back the stage.

165+ FIXME: this case is reached when showStartingApplicationAnimation

166+ finishes after the newly started application has been focused

167+ automatically by the ApplicationManager.

168+ */

169+ if (stage.type == ApplicationInfo.SideStage) {

170+ applicationManager.focusApplication(application);

171+ }

172+ if (!delayedHideScreenshots.running) {

173+ stage.__hideScreenshots();

174+ }

175+ } else {

176+ /* FIXME: calling ApplicationManager::focusApplication does not focus

177+ the application immediately nor show the application's surface

178+ immediately. Delay hiding the screenshots until it has done so.

179+ */

180+ delayedHideScreenshots.stop();

181+ applicationManager.focusApplication(application);

182+ }

183+ stage.focusedApplicationWhenUsingScreenshots = null;

184+ }

185+

186+ function __focusApplicationUsingScreenshots(application) {

187+ delayedHideScreenshots.stop();

188+ if (application == null) {

189+ return;

190+ }

191+

192+ if (newApplicationScreenshot.application != null) {

193+ stage.focusedApplicationWhenUsingScreenshots = application;

194+ return;

195+ }

196+

197+ newApplicationScreenshot.setApplication(application);

198+ newApplicationScreenshot.scheduleUpdate();

199+ newApplicationScreenshot.opacity = 1.0;

200+ newApplicationScreenshot.x = 0.0;

201+ newApplicationScreenshot.y = __getApplicationY(application);

202+ newApplicationScreenshot.scale = 1.0;

203+ newApplicationScreenshot.visible = true;

204+ stage.focusedApplicationWhenUsingScreenshots = application;

205+ stage.switchingFromFullscreenToFullscreen = false;

206+ }

207+

208+ function __getApplicationY(application) {

209+ return Qt.binding( function(){

210+ return (application && application.fullscreen

211+ && application.stage !== ApplicationInfo.SideStage)

212+ ? 0 : normalApplicationY;

213+ } )

214+ }

215+

216+ /* FIXME: should hide the screenshots when the focused application's surface

217+ is visible. There is no API in QtUbuntu to support that yet.

218+ */

219+ Connections {

220+ target: stage

221+ onFocusedApplicationChanged: {

222+ if (stage.focusedApplication != null) {

223+ /* Move application to the beginning of the list of running applications */

224+ var index = stage.__getApplicationIndex(stage.focusedApplication);

225+ applicationManager.moveRunningApplicationStackPosition(index, 0, stage.type);

226+

227+ var startingApplication = applicationManager.getApplicationFromDesktopFile(

228+ stage.__startingApplicationDesktopFile, stage.type);

229+

230+ if (stage.focusedApplication == startingApplication) {

231+ stage.__startingApplicationDesktopFile = "";

232+

233+ /* Screenshots might still be in use at this point and their

234+ use can be stopped before delayedHideScreenshots is complete.

235+ Prepare for that case by setting appropriately

236+ stage.focusedApplicationWhenUsingScreenshots.

237+ */

238+ stage.focusedApplicationWhenUsingScreenshots = stage.focusedApplication;

239+

240+ /* FIXME: should hide the screenshots when the focused application's window

241+ is visible. There is no API in qtubuntu to support that yet. Therefore

242+ we delay their hiding to avoid a state where neither the screenshot nor

243+ the application's window is visible.

244+ */

245+ delayedHideScreenshots.start();

246+ } else {

247+ stage.__hideScreenshots();

248+ }

249+ }

250+ }

251+ }

252+

253+ Connections {

254+ target: stage.applications

255+ onCountChanged: { __discardObsoleteScreenshots(); }

256+ ignoreUnknownSignals: true

257+ }

258+ onFullyHiddenChanged: { __discardObsoleteScreenshots(); }

259+ function __discardObsoleteScreenshots() {

260+ if (stage.fullyHidden && stage.applications && stage.applications.count == 0) {

261+ stage.focusedApplicationWhenUsingScreenshots = undefined;

262+ stage.__hideScreenshots();

263+ }

264+ }

265+

266+

267+ SequentialAnimation {

268+ id: showStartingApplicationAnimation

269+

270+ function prepare(newApplication) {

271+ var oldApplication = stage.focusedApplication;

272+ newApplicationScreenshot.setApplication(newApplication);

273+ newApplicationScreenshot.updateFromCache();

274+ oldApplicationScreenshot.setApplication(oldApplication);

275+ oldApplicationScreenshot.scheduleUpdate();

276+ newApplicationScreenshot.withBackground = true; // FIXME: should be withBackground = newApplication.state == Application.Starting

277+ newApplicationScreenshot.y = __getApplicationY(newApplication);

278+ oldApplicationScreenshot.y = __getApplicationY(oldApplication);

279+ stage.focusedApplicationWhenUsingScreenshots = newApplication;

280+ stage.switchingFromFullscreenToFullscreen = false;

281+ }

282+

283+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: false}

284+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: false}

285+ PropertyAction {target: newApplicationScreenshot; property: "z"; value: 0}

286+ PropertyAction {target: oldApplicationScreenshot; property: "z"; value: 1}

287+ PropertyAction {target: newApplicationScreenshot; property: "scale"; value: 0.8}

288+ PropertyAction {target: oldApplicationScreenshot; property: "scale"; value: 1.0}

289+ PropertyAction {target: newApplicationScreenshot; property: "opacity"; value: 0.0}

290+ PropertyAction {target: oldApplicationScreenshot; property: "opacity"; value: 1.0}

291+ PropertyAction {target: newApplicationScreenshot; property: "x"; value: 0.0}

292+ PropertyAction {target: oldApplicationScreenshot; property: "x"; value: 0.0}

293+

294+ ParallelAnimation {

295+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: true}

296+ NumberAnimation {

297+ target: newApplicationScreenshot

298+ property: "scale"

299+ duration: 500

300+ easing.type: Easing.OutQuad

301+ to: 1.0

302+ }

303+ NumberAnimation {

304+ target: newApplicationScreenshot

305+ property: "opacity"

306+ duration: 500

307+ easing.type: Easing.OutQuad

308+ to: 1.0

309+ }

310+

311+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: true}

312+

313+ NumberAnimation {

314+ target: oldApplicationScreenshot

315+ property: "x"

316+ duration: 400

317+ easing.type: Easing.OutQuad

318+ to: stage.width

319+ }

320+ }

321+

322+ ScriptAction {

323+ script: {

324+ if (!stage.focusedApplicationWhenUsingScreenshots) {

325+ // FIXME: only here to support case where application does

326+ // not exist yet but is about to

327+ return;

328+ }

329+

330+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

331+ }

332+ }

333+ }

334+

335+

336+ SequentialAnimation {

337+ id: switchToApplicationAnimation

338+

339+ function prepare(newApplication) {

340+ var oldApplication = stage.focusedApplication;

341+ newApplicationScreenshot.setApplication(newApplication);

342+ newApplicationScreenshot.updateFromCache();

343+ oldApplicationScreenshot.setApplication(oldApplication);

344+ oldApplicationScreenshot.scheduleUpdate();

345+ newApplicationScreenshot.withBackground = false;

346+ newApplicationScreenshot.y = __getApplicationY(newApplication);

347+ oldApplicationScreenshot.y = __getApplicationY(oldApplication);

348+ stage.focusedApplicationWhenUsingScreenshots = newApplication;

349+ stage.switchingFromFullscreenToFullscreen = newApplication && newApplication.fullscreen;

350+ }

351+

352+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: false}

353+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: false}

354+ PropertyAction {target: newApplicationScreenshot; property: "z"; value: 1}

355+ PropertyAction {target: oldApplicationScreenshot; property: "z"; value: 0}

356+ PropertyAction {target: newApplicationScreenshot; property: "scale"; value: 1.0}

357+ PropertyAction {target: oldApplicationScreenshot; property: "scale"; value: 1.0}

358+ PropertyAction {target: newApplicationScreenshot; property: "opacity"; value: 1.0}

359+ PropertyAction {target: oldApplicationScreenshot; property: "opacity"; value: 1.0}

360+ PropertyAction {target: newApplicationScreenshot; property: "x"; value: stage.width}

361+ PropertyAction {target: oldApplicationScreenshot; property: "x"; value: 0.0}

362+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: true}

363+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: true}

364+

365+ ParallelAnimation {

366+ NumberAnimation {

367+ target: oldApplicationScreenshot

368+ property: "scale"

369+ duration: 500

370+ easing.type: Easing.OutQuad

371+ to: 0.8

372+ }

373+ NumberAnimation {

374+ target: oldApplicationScreenshot

375+ property: "opacity"

376+ duration: 500

377+ easing.type: Easing.OutQuad

378+ to: 0.0

379+ }

380+

381+ NumberAnimation {

382+ target: newApplicationScreenshot

383+ property: "x"

384+ duration: 500

385+ easing.type: Easing.OutQuad

386+ to: 0

387+ }

388+ }

389+

390+ ScriptAction {

391+ script: {

392+ // move previously focused application to the end of the list of running applications

393+ var oldApplication = oldApplicationScreenshot.application;

394+ if (oldApplication != null) {

395+ var oldApplicationIndex = stage.__getApplicationIndex(oldApplicationScreenshot.application);

396+ applicationManager.moveRunningApplicationStackPosition(

397+ oldApplicationIndex, stage.applications.count - 1, stage.type);

398+ }

399+

400+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

401+ }

402+ }

403+ }

404+

405+

406+ function __dragValueToProgress(dragValue, startValue, applicationsCount) {

407+ if (applicationsCount == 0) {

408+ return 0;

409+ } else if (applicationsCount == 1) {

410+ // prevent the current app from moving more than 1/4 of the screen

411+ var elasticValue = __elastic(dragValue, startValue/4);

412+ return elasticValue / startValue;

413+ } else {

414+ return dragValue / startValue;

415+ }

416+ }

417+

418+ function __elastic(x, limit) {

419+ return limit * ( 1 - Math.pow( ( limit - 1 ) / limit, x ) )

420+ }

421+

422+ property real __startValue: stage.width

423+

424+ AnimationControllerWithSignals {

425+ id: switchToApplicationAnimationController

426+

427+ onAnimationCompletedAtBeginning: {

428+ animation = null;

429+ stage.__focusApplication(oldApplicationScreenshot.application);

430+ }

431+ }

432+

433+ EdgeDragEvaluator {

434+ id: dragEvaluator

435+ trackedPosition: rightEdgeDraggingArea.touchX

436+ direction: rightEdgeDraggingArea.direction

437+ maxDragDistance: stage.width

438+ }

439+

440+ EdgeDragArea {

441+ id: rightEdgeDraggingArea

442+

443+ enabled: {

444+ if (status == DirectionalDragArea.WaitingForTouch) {

445+ return switchToApplicationAnimationController.completed

446+ && stage.applications.count > 0 && stage.rightEdgeEnabled

447+ && !delayedHideScreenshots.running

448+ } else {

449+ return true

450+ }

451+ }

452+ width: units.gu(2)

453+ anchors.top: parent.top

454+ anchors.bottom: parent.bottom

455+ anchors.right: parent.right

456+

457+ direction: Direction.Leftwards

458+

459+ onDistanceChanged: {

460+ if (status !== DirectionalDragArea.Recognized)

461+ return

462+

463+ var targetProgress = __dragValueToProgress(-distance, __startValue,

464+ stage.applications.count)

465+ var delta = targetProgress - switchToApplicationAnimationController.progress

466+

467+ // When the gesture finally gets recognized, the finger will likely be

468+ // reasonably far from the edge. If we made the progress immediately

469+ // follow the finger position it would be visually unpleasant as there

470+ // would be a jump to meet the finger's current position.

471+ //

472+ // The trick is not to go all the way (1.0) as it would cause the

473+ // aforementioned jump.

474+ switchToApplicationAnimationController.progress += 0.4 * delta

475+ }

476+

477+ property bool gotRejected: false

478+

479+ onStatusChanged: {

480+ if (status == DirectionalDragArea.Undecided) {

481+ gotRejected = false

482+ onUndecided();

483+ } else if (status == DirectionalDragArea.Rejected) {

484+ switchToApplicationAnimationController.completeToBeginningWithSignal();

485+ gotRejected = true;

486+ } else if (status == DirectionalDragArea.WaitingForTouch) {

487+ if (!gotRejected)

488+ onGestureEnded()

489+ }

490+ }

491+

492+ function onUndecided() {

493+ dragEvaluator.reset();

494+

495+ var nextApplication = null;

496+ if (stage.applications.count > 1) {

497+ nextApplication = stage.applications.get(1);

498+ }

499+ switchToApplicationAnimationController.progress = 0

500+ switchToApplicationAnimation.prepare(nextApplication);

501+ switchToApplicationAnimationController.animation = switchToApplicationAnimation;

502+

503+ }

504+

505+ function onGestureEnded() {

506+ if (stage.applications.count > 1 && dragEvaluator.shouldAutoComplete()) {

507+ switchToApplicationAnimationController.completeToEndWithSignal();

508+ } else {

509+ switchToApplicationAnimationController.completeToBeginningWithSignal();

510+ }

511+ }

512+ }

513+

514+

515+ // FIXME: very bad hack to detect when an application was closed or crashed

516+ property var __previouslyFocusedApplication

517+ Connections {

518+ target: stage

519+ onFocusedApplicationChanged: {

520+ if (stage.focusedApplication == null

521+ && __getApplicationIndex(stage.__previouslyFocusedApplication) == -1) {

522+ stage.__onFocusedApplicationClosed();

523+ }

524+ stage.__previouslyFocusedApplication = stage.focusedApplication;

525+ }

526+ }

527+

528+ function __onFocusedApplicationClosed() {

529+ if (!stage.shown) {

530+ return;

531+ }

532+

533+ if (stage.applications.count > 0) {

534+ // Do not change the focused application from within onFocusedApplicationChanged.

535+ // This causes binding loop warnings besides being a bad practice in general

536+ // (setting a property from within its "changed" signal handling)

537+ // Hence the timer.

538+ focusTopmostAppTimer.start();

539+ } else {

540+ stage.hide();

541+ }

542+ }

543+

544+ Timer {

545+ id: focusTopmostAppTimer

546+ interval: 1; repeat: false

547+ onTriggered: {

548+ if (stage.applications.count > 0) {

549+ stage.__focusApplication(stage.applications.get(0));

550+ }

551+ }

552+ }

553+

554+}

qml/Components/StandardAnimation.qml → Components/StandardAnimation.qmlrenamed+1−1

@@ -14,7 +14,7 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

18

19NumberAnimation {

19NumberAnimation {

20 duration: 200

20 duration: 200

Components/Tile.qmlnew file+87

@@ -0,0 +1,87 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+AbstractButton {

21+ id: root

22+ property alias source: image.source

23+ property alias fillMode: image.fillMode

24+ property alias horizontalAlignment: image.horizontalAlignment

25+ property alias verticalAlignment: image.verticalAlignment

26+ property alias text: label.text

27+ property int imageWidth

28+ property int imageHeight

29+

30+ UbuntuShape {

31+ id: icon

32+ anchors {

33+ top: parent.top

34+ horizontalCenter: parent.horizontalCenter

35+ }

36+ radius: "medium"

37+ width: imageWidth

38+ height: imageHeight

39+ image: Image {

40+ id: image

41+ objectName: "image"

42+ sourceSize { width: icon.width; height: icon.height }

43+ asynchronous: true

44+ cache: false

45+ }

46+ }

47+

48+ UbuntuShape {

49+ id: borderPressed

50+ objectName: "borderPressed"

51+

52+ anchors.fill: icon

53+ radius: "medium"

54+ borderSource: "radius_pressed.sci"

55+ opacity: root.pressed ? 1.0 : 0.0

56+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

57+ }

58+

59+ Item {

60+ anchors {

61+ left: parent.left

62+ right: parent.right

63+ top: icon.bottom

64+ }

65+ height: units.gu(2)

66+

67+ Label {

68+ id: label

69+ objectName: "label"

70+ anchors {

71+ baseline: parent.bottom

72+ left: parent.left

73+ right: parent.right

74+ leftMargin: units.gu(1)

75+ rightMargin: units.gu(1)

76+ }

77+

78+ color: Theme.palette.selected.backgroundText

79+ opacity: 0.9

80+ style: Text.Raised

81+ styleColor: "black"

82+ fontSize: "small"

83+ elide: Text.ElideMiddle

84+ horizontalAlignment: Text.AlignHCenter

85+ }

86+ }

87+}

Components/Time.jsnew file+49

@@ -0,0 +1,49 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+.pragma library

18+

19+var factors = {

20+ "second": [ 1000, "a second ago", "in a second", "%1 seconds ago", "in %1 seconds" ],

21+ "minute": [ 60, "a minute ago", "in a minute", "%1 minutes ago", "in %1 minutes" ],

22+ "hour": [ 60, "an hour ago", "in an hour", "%1 hours ago", "in %1 hours" ],

23+ "day": [ 24, "yesterday", "tomorrow", "%1 days ago", "in %1 days" ],

24+ "week": [ 7, "a week ago", "in a week", "about %1 weeks ago", "in about %1 weeks" ],

25+ "month": [ 4.35, "a month ago", "in a month", "%1 months ago", "in %1 months" ], // == 365.25 days / 12 months / 7 days

26+ "year": [ 12, "a year ago", "in a year", "%1 years ago", "in %1 years" ]

27+}

28+

29+function readableFromNow(date, now) {

30+ var then = new Date(date);

31+ if (isNaN(then)) return "";

32+ if (now === undefined) {

33+ now = new Date();

34+ } else if (isNaN(now)) throw "now is NaN";

35+ var diff = Math.abs(now - then);

36+ if (diff < 1000) return "just now";

37+

38+ var future = now < then;

39+ var humanDiff;

40+ for (var k in factors) {

41+ diff /= factors[k][0];

42+ if (Math.floor(diff) == 1) {

43+ humanDiff = factors[k][future ? 2 : 1];

44+ } else if (Math.floor(diff) > 1) {

45+ humanDiff = factors[k][future ? 4 : 3].arg(Math.round(diff));

46+ } else break;

47+ }

48+ return humanDiff;

49+}

qml/Components/BlurLayer.qml → Components/UbuntuShapeForItem.qmlrenamed+20−14

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015 Canonical, Ltd.

2+ * Copyright (C) 2012 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,26 +14,32 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import QtGraphicalEffects 1.0

18+import Ubuntu.Components 0.1

19+

20+/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more

21+ * general (Item-based) components. This ability should be incorporated into the SDK's

22+ * UbuntuShape so this file can be removed.

23+ * Bug: https://bugs.launchpad.net/tavastia/+bug/1089595

24+ */

19

25

20Item {

26Item {

21 id: root

27 id: root

22

28

23− property alias source: fastBlur.source

29+ property alias radius: shape.radius

24− property real brightness: 1

30+ property alias image: source.sourceItem

25− property real blurRadius: 0

26

31

27− FastBlur {

32+ ShaderEffectSource {

28− id: fastBlur

33+ id: source

29− anchors.fill: parent

34+ width: 1

30− visible: radius > 0

35+ height: 1

31− radius: Math.max(root.blurRadius, 0)

36+ hideSource: true

32 }

37 }

33

38

34− Rectangle {

39+ Shape {

40+ id: shape

41+ image: source

42+

35 anchors.fill: parent

43 anchors.fill: parent

36− color: "black"

37− opacity: 1 - root.brightness

38 }

44 }

39}

45}

qml/Components/ItemSnapshot.qml → Components/VolumeControl.qmlrenamed+17−19

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015-2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,32 +14,30 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18+import QMenuModel 0.1

18

19

19Item {

20Item {

20 id: root

21 id: root

22+ objectName: "volumeControl"

23+ visible: false

21

24

22− property Item target

25+ QDBusActionGroup {

26+ id: actionGroup

27+ busType: 1

28+ busName: "com.canonical.indicator.sound"

29+ objectPath: "/com/canonical/indicator/sound"

23

30

24− property bool ready: image.status === Image.Ready

31+ property variant actionObject: action("scroll")

25−

26− function take() {

27− if (!target) {

28− console.warn("ItemSnapshot.take(): no target set");

29− return;

30− }

31−

32− target.grabToImage(function(result) {

33− image.source = result.url;

34− });

35 }

32 }

36

33

37− // Unload the image to free up memory

38− function discard() {

34+ function volumeUp() {

39− image.source = "";

35+ actionGroup.actionObject.activate(1);

40 }

36 }

41

37

42− Image {

38+ function volumeDown() {

43− id: image

39+ actionGroup.actionObject.activate(-1);

44 }

40 }

41+

42+ Component.onCompleted: actionGroup.start()

45}

43}

qml/Components/WrongPasswordAnimation.qml → Components/WrongPasswordAnimation.qmlrenamed+1−1

@@ -14,7 +14,7 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

18

19SequentialAnimation {

19SequentialAnimation {

20 id: root

20 id: root

qml/Components/carousel.js → Components/carousel.jsrenamed

The content is the same.

Components/graphics/PageHeaderBaseDivider@18.pngnew file

Binary file not shown.

Components/graphics/PageHeaderBaseDivider@18.scinew file+5

@@ -0,0 +1,5 @@

1+border.top: 4

2+border.bottom: 4

3+border.left: 0

4+border.right: 0

5+source: PageHeaderBaseDivider@18.png

Components/graphics/icon_star_off@20.pngnew file

Binary file not shown.

Components/graphics/icon_star_on@20.pngnew file

Binary file not shown.

Components/graphics/non-selected@18.pngnew file

Binary file not shown.

qml/Components/graphics/non-selected@18.sci → Components/graphics/non-selected@18.scirenamed

The content is the same.

Dash/Apps/AppInfo.qmlnew file+89

@@ -0,0 +1,89 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../../Components"

20+

21+Row {

22+ id: root

23+ property alias icon: image.source

24+ property alias appName: appNameLabel.text

25+ property alias rating: ratingStars.rating

26+ property int rated: 0

27+ property int reviews: 0

28+

29+ spacing: units.gu(2)

30+

31+ UbuntuShape {

32+ id: imageShape

33+ width: units.gu(6)

34+ height: units.gu(6)

35+ image: Image {

36+ id: image

37+ sourceSize { width: imageShape.width; height: imageShape.height }

38+ asynchronous: true

39+ fillMode: Image.PreserveAspectFit

40+ }

41+ }

42+

43+ Column {

44+ spacing: units.gu(1)

45+

46+ Label {

47+ id: appNameLabel

48+ fontSize: "large"

49+ color: "white"

50+ style: Text.Raised

51+ styleColor: "black"

52+ opacity: .9

53+ }

54+

55+ Row {

56+ visible: root.rating >= 0

57+ spacing: units.gu(1)

58+

59+ RatingStars {

60+ id: ratingStars

61+ maximumRating: 10

62+ }

63+

64+ Label {

65+ id: ratedLabel

66+ objectName: "ratedLabel"

67+ fontSize: "medium"

68+ color: "white"

69+ style: Text.Raised

70+ styleColor: "black"

71+ opacity: .6

72+ //TRANSLATORS: Number of persons who rated this app

73+ text: i18n.tr("(%1)").arg(root.rated)

74+ }

75+

76+ Label {

77+ id: reviewsLabel

78+ objectName: "reviewsLabel"

79+ fontSize: "medium"

80+ color: "white"

81+ style: Text.Raised

82+ styleColor: "black"

83+ opacity: .6

84+ //TRANSLATORS: Number of persons who wrote reviews for this app

85+ text: i18n.tr("%1 review", "%1 reviews", root.reviews).arg(root.reviews)

86+ }

87+ }

88+ }

89+}

Dash/Apps/AppPreview.qmlnew file+210

@@ -0,0 +1,210 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Components.ListItems 0.1 as ListItem

20+import Ubuntu.DownloadDaemonListener 0.1

21+import ".."

22+import "../../Components"

23+

24+DashPreview {

25+ id: root

26+

27+ signal sendUserReview(string review)

28+

29+ title: root.previewData.title

30+

31+ header: ListView {

32+ spacing: units.gu(1)

33+ orientation: ListView.Horizontal

34+ height: units.gu(22)

35+ anchors {

36+ left: parent.left

37+ right: parent.right

38+ margins: units.gu(1)

39+ }

40+ model: previewData.infoMap["more-screenshots"] != null ? previewData.infoMap["more-screenshots"].value : [previewData.image]

41+

42+ delegate: UbuntuShape {

43+ id: shape

44+ anchors {

45+ top: parent.top

46+ bottom: parent.bottom

47+ }

48+ width: units.gu(12)

49+ radius: "medium"

50+ borderSource: ""

51+ image: Image {

52+ asynchronous: true

53+ sourceSize { width: shape.width; height: shape.height }

54+ source: modelData ? modelData : ""

55+ fillMode: Image.PreserveAspectCrop

56+ }

57+ }

58+ }

59+

60+ Component {

61+ id: buttonsComponent

62+

63+ GridView {

64+ id: buttonsGrid

65+ objectName: "gridButtons"

66+

67+ property int numOfRows: (count + 1) / 2

68+ property int spacing: units.gu(1)

69+ height: Math.max(units.gu(5), units.gu(5)*numOfRows + spacing*(numOfRows - 1))

70+

71+ interactive: false

72+ cellWidth: Math.max(units.gu(9), width / 2)

73+ cellHeight: buttonHeight + spacing

74+ property int buttonWidth: count > 1 ? Math.max(0, width / 2 - spacing) : width

75+ property int buttonHeight: units.gu(5)

76+

77+ delegate: Button {

78+ width: Math.max(units.gu(4), buttonsGrid.buttonWidth)

79+ height: buttonsGrid.buttonHeight

80+ color: Theme.palette.selected.foreground

81+ text: modelData.displayName

82+ iconSource: modelData.iconHint

83+ iconPosition: "right"

84+ onClicked: root.previewData.execute(modelData.id, { })

85+ }

86+ }

87+ }

88+

89+ Component {

90+ id: progressComponent

91+

92+ ProgressBar {

93+ id: progressBar

94+ objectName: "progressBar"

95+ value: 0

96+ maximumValue: 100

97+ height: units.gu(5)

98+

99+ property var model

100+

101+ DownloadTracker {

102+ service: "com.canonical.applications.Downloader"

103+ dbusPath: root.previewData.infoMap["progressbar_source"] ? root.previewData.infoMap["progressbar_source"].value : ""

104+

105+ onProgress: {

106+ var percentage = parseInt(received * 100 / total);

107+ progressBar.value = percentage;

108+ }

109+

110+ onFinished: {

111+ root.previewData.execute(progressBar.model[0].id, { })

112+ }

113+

114+ onError: {

115+ root.previewData.execute(progressBar.model[1].id, { "error": error });

116+ }

117+ }

118+

119+ }

120+ }

121+

122+ buttons: Loader {

123+ anchors {

124+ left: parent.left

125+ right: parent.right

126+ }

127+

128+ sourceComponent: root.previewData.infoMap["show_progressbar"] ? progressComponent : buttonsComponent

129+

130+ onLoaded: {

131+ item.model = root.previewData.actions;

132+ }

133+ }

134+

135+ body: Column {

136+ spacing: units.gu(1)

137+

138+ AppInfo {

139+ objectName: "appInfo"

140+ anchors { left: parent.left; right: parent.right }

141+

142+ appName: root.previewData.title

143+ icon: root.previewData.appIcon

144+ rating: Math.round(root.previewData.rating * 10)

145+ reviews: root.previewData.numRatings

146+ rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0

147+ }

148+

149+ Label {

150+ anchors { left: parent.left; right: parent.right }

151+ text: root.previewData.description

152+ fontSize: "medium"

153+ color: Theme.palette.selected.backgroundText

154+ opacity: .6

155+ wrapMode: Text.WordWrap

156+ style: Text.Raised

157+ styleColor: "black"

158+ }

159+

160+ Column {

161+ visible: root.previewData.rating >= 0

162+ anchors { left: parent.left; right: parent.right }

163+ spacing: parent.spacing

164+

165+ ListItem.ThinDivider { }

166+

167+ Item {

168+ anchors { left: parent.left; right: parent.right }

169+ height: rateLabel.height

170+

171+ Label {

172+ id: rateLabel

173+ fontSize: "medium"

174+ color: "white"

175+ style: Text.Raised

176+ styleColor: "black"

177+ opacity: .9

178+ text: i18n.tr("Rate this")

179+

180+ anchors.left: parent.left

181+ anchors.verticalCenter: parent.verticalCenter

182+ }

183+

184+ // FIXME these need to be made interactive and connected to the scope

185+ RatingStars {

186+ anchors.right: parent.right

187+ anchors.verticalCenter: parent.verticalCenter

188+ }

189+ }

190+

191+ ListItem.ThinDivider { }

192+

193+ AppReviews {

194+ id: appReviews

195+ objectName: "appReviews"

196+ // TODO: This should make this visible when the feature for reviews/comments is complete.

197+ visible: false

198+ anchors { left: parent.left; right: parent.right }

199+

200+ model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined

201+

202+ onSendReview: root.sendUserReview(review);

203+

204+ onEditing: {

205+ root.ensureVisible(appReviews.textArea);

206+ }

207+ }

208+ }

209+ }

210+}

Dash/Apps/AppReviews.qmlnew file+194

@@ -0,0 +1,194 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Components.ListItems 0.1 as ListItem

20+import "../../Components"

21+

22+Column {

23+ id: root

24+

25+ property var model

26+ property alias textArea: reviewField

27+

28+ signal sendReview(string review)

29+ signal editing

30+

31+ spacing: units.gu(2)

32+ state: ""

33+

34+ states: [

35+ State {

36+ name: ""

37+ PropertyChanges { target: reviewField; width: root.width }

38+ PropertyChanges { target: sendButton; opacity: 0 }

39+ PropertyChanges { target: inverseArea; enabled: false }

40+ },

41+ State {

42+ name: "editing"

43+ PropertyChanges { target: reviewField; width: (root.width - row.spacing - sendButton.width) }

44+ PropertyChanges { target: sendButton; opacity: 1 }

45+ PropertyChanges { target: inverseArea; enabled: true }

46+ }

47+ ]

48+

49+ transitions: [

50+ Transition {

51+ from: ""

52+ to: "editing"

53+ SequentialAnimation {

54+ UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }

55+ UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }

56+ }

57+ },

58+ Transition {

59+ from: "editing"

60+ to: ""

61+ SequentialAnimation {

62+ UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }

63+ UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }

64+ }

65+ }

66+ ]

67+

68+ Label {

69+ fontSize: "medium"

70+ color: "white"

71+ style: Text.Raised

72+ styleColor: "black"

73+ opacity: .9

74+ text: i18n.tr("Add a review")

75+ }

76+

77+ Row {

78+ id: row

79+ spacing: units.gu(1)

80+ width: root.width

81+

82+ // FIXME: needs to react to Qt.inputMethod geometry

83+ TextArea {

84+ id: reviewField

85+ objectName: "reviewField"

86+ placeholderText: i18n.tr("Review")

87+ width: parent.width

88+ verticalAlignment: Text.AlignVCenter

89+ autoSize: true

90+ maximumLineCount: 5

91+

92+ Behavior on height { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

93+

94+ onFocusChanged: {

95+ if(reviewField.focus){

96+ root.state = "editing";

97+ reviewField.selectAll();

98+ root.editing();

99+ }

100+ }

101+

102+ // FIXME: not active when in wide mode

103+ InverseMouseArea {

104+ id: inverseArea

105+ anchors.fill: parent

106+ enabled: false

107+ onPressed: {

108+ reviewField.focus = false;

109+ root.state = "";

110+ }

111+ }

112+ }

113+

114+ Button {

115+ id: sendButton

116+ objectName: "sendButton"

117+ width: units.gu(10)

118+ height: units.gu(4)

119+ anchors.bottom: reviewField.bottom

120+ color: Theme.palette.selected.foreground

121+ text: i18n.tr("Send")

122+ opacity: 0

123+

124+ onClicked: {

125+ root.sendReview(reviewField.text);

126+ reviewField.text = ""

127+ }

128+ }

129+ }

130+

131+ ListItem.ThinDivider {}

132+

133+ Label {

134+ fontSize: "medium"

135+ color: "white"

136+ style: Text.Raised

137+ styleColor: "black"

138+ opacity: .9

139+ text: i18n.tr("Comments:")

140+ }

141+

142+ Repeater {

143+ objectName: "commentsArea"

144+ model: root.model

145+

146+ Column {

147+ anchors { left: parent.left; right: parent.right }

148+

149+ Column {

150+ anchors { left: parent.left; right: parent.right }

151+

152+ Label {

153+ anchors { left: parent.left; right: parent.right }

154+ text: modelData[0]

155+ fontSize: "medium"

156+ color: "white"

157+ opacity: .8

158+ wrapMode: Text.WordWrap

159+ style: Text.Raised

160+ styleColor: "black"

161+ }

162+

163+ Row {

164+ spacing: units.gu(1)

165+

166+ RatingStars {

167+ maximumRating: 10

168+ rating: modelData[1]

169+ }

170+

171+ Label {

172+ text: modelData[2]

173+ fontSize: "medium"

174+ color: Theme.palette.selected.backgroundText

175+ opacity: .6

176+ style: Text.Raised

177+ styleColor: "black"

178+ }

179+ }

180+ }

181+

182+ Label {

183+ anchors { left: parent.left; right: parent.right }

184+ text: modelData[3]

185+ fontSize: "medium"

186+ color: Theme.palette.selected.backgroundText

187+ opacity: .6

188+ wrapMode: Text.WordWrap

189+ style: Text.Raised

190+ styleColor: "black"

191+ }

192+ }

193+ }

194+}

Dash/Apps/ApplicationsFilterGrid.qmlnew file+55

@@ -0,0 +1,55 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+import "../../Applications"

20+

21+FilterGrid {

22+ id: filterGrid

23+

24+ filter: false

25+ minimumHorizontalSpacing: units.gu(0.5)

26+ maximumNumberOfColumns: 6

27+ delegateWidth: units.gu(11)

28+ delegateHeight: units.gu(9.5)

29+ verticalSpacing: units.gu(2)

30+

31+ signal clicked(int index, variant data)

32+

33+ delegate: Tile {

34+ objectName: "delegate" + index

35+ Application {

36+ id: application

37+ desktopFile: model.dndUri ? stripProtocol(model.dndUri) : model.desktopFile // FIXME: this is temporary

38+

39+ function stripProtocol(uri) {

40+ var chunks = uri.split('file://')

41+ return chunks[chunks.length-1]

42+ }

43+ }

44+

45+ property string icon: model.icon ? model.icon : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary

46+

47+ width: filterGrid.cellWidth

48+ height: filterGrid.cellHeight

49+ text: model.title ? model.title : application.name // FIXME: this is temporary

50+ imageWidth: units.gu(8)

51+ imageHeight: units.gu(7.5)

52+ source: icon

53+ onClicked: filterGrid.clicked(index, application.desktopFile);

54+ }

55+}

Dash/Apps/AppsAvailableForDownloadModel.qmlnew file+81

@@ -0,0 +1,81 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Applications"

19+

20+ListModel {

21+ ListElement {

22+ uri: "application://evernote.desktop"

23+ icon: "../../graphics/applicationIcons/evernote.png"

24+ category: 0

25+ mimetype: "application/x-desktop"

26+ title: "Evernote"

27+ comment: ""

28+ dndUri: "file:///usr/share/applications/evernote.desktop"

29+ metadata: ""

30+ }

31+ ListElement {

32+ uri: "application://map.desktop"

33+ icon: "../../graphics/applicationIcons/map.png"

34+ category: 0

35+ mimetype: "application/x-desktop"

36+ title: "Map"

37+ comment: ""

38+ dndUri: "file:///usr/share/applications/map.desktop"

39+ metadata: ""

40+ }

41+ ListElement {

42+ uri: "application://pinterest.desktop"

43+ icon: "../../graphics/applicationIcons/pinterest.png"

44+ category: 0

45+ mimetype: "application/x-desktop"

46+ title: "Pinterest"

47+ comment: ""

48+ dndUri: "file:///usr/share/applications/pinterest.desktop"

49+ metadata: ""

50+ }

51+ ListElement {

52+ uri: "application://soundcloud.desktop"

53+ icon: "../../graphics/applicationIcons/soundcloud.png"

54+ category: 0

55+ mimetype: "application/x-desktop"

56+ title: "Soundcloud"

57+ comment: ""

58+ dndUri: "file:///usr/share/applications/soundcloud.desktop"

59+ metadata: ""

60+ }

61+ ListElement {

62+ uri: "application://wikipedia.desktop"

63+ icon: "../../graphics/applicationIcons/wikipedia.png"

64+ category: 0

65+ mimetype: "application/x-desktop"

66+ title: "Wikipedia"

67+ comment: ""

68+ dndUri: "file:///usr/share/applications/wikipedia.desktop"

69+ metadata: ""

70+ }

71+ ListElement {

72+ uri: "application://youtube.desktop"

73+ icon: "../../graphics/applicationIcons/youtube.png"

74+ category: 0

75+ mimetype: "application/x-desktop"

76+ title: "Youtube"

77+ comment: ""

78+ dndUri: "file:///usr/share/applications/youtube.desktop"

79+ metadata: ""

80+ }

81+}

Dash/Apps/CloseIcon.qmlnew file+62

@@ -0,0 +1,62 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Item {

20+ id: root

21+

22+ Image {

23+ id: closeIcon

24+ anchors.centerIn: parent

25+ source: "graphics/close_btn.png"

26+

27+ state: (root.enabled) ? "shown" : "hidden"

28+

29+ states: [

30+ State {

31+ name: "shown"

32+ PropertyChanges {

33+ target: closeIcon

34+ height: root.height

35+ width: root.width

36+ }

37+ },

38+ State {

39+ name: "hidden"

40+ PropertyChanges {

41+ target: closeIcon

42+ height: 0

43+ width: 0

44+ }

45+ }

46+

47+ ]

48+ transitions: [

49+ Transition {

50+ to: "shown"

51+ NumberAnimation {

52+ properties: "width, height"; duration: 300

53+ easing { type: Easing.OutBack; overshoot: 5 }

54+ }

55+ },

56+ Transition {

57+ to: "hidden"

58+ NumberAnimation { properties: "width, height"; duration: 250; }

59+ }

60+ ]

61+ }

62+}

Dash/Apps/FrequentlyUsedAppsModel.qmlnew file+110

@@ -0,0 +1,110 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+ListModel {

20+ ListElement {

21+ uri: "application:///usr/share/applications/dialer-app.desktop"

22+ icon: "../../graphics/applicationIcons/phone-app.png"

23+ category: 0

24+ mimetype: "application/x-desktop"

25+ title: "Dialer"

26+ comment: ""

27+ dndUri: "file:///usr/share/applications/dialer-app.desktop"

28+ metadata: ""

29+ }

30+ ListElement {

31+ uri: "application:///usr/share/applications/messaging-app.desktop"

32+ icon: "../../graphics/applicationIcons/messages-app.png"

33+ category: 0

34+ mimetype: "application/x-desktop"

35+ title: "Messaging"

36+ comment: ""

37+ dndUri: "file:///usr/share/applications/messaging-app.desktop"

38+ metadata: ""

39+ }

40+ ListElement {

41+ uri: "application:///usr/share/applications/address-book-app.desktop"

42+ icon: "../../graphics/applicationIcons/contacts-app.png"

43+ category: 0

44+ mimetype: "application/x-desktop"

45+ title: "Contacts"

46+ comment: ""

47+ dndUri: "file:///usr/share/applications/address-book-app.desktop"

48+ metadata: ""

49+ }

50+ ListElement {

51+ uri: "application:///usr/share/applications/camera-app.desktop"

52+ icon: "../../graphics/applicationIcons/camera.png"

53+ category: 0

54+ mimetype: "application/x-desktop"

55+ title: "Camera"

56+ comment: ""

57+ dndUri: "file:///usr/share/applications/camera-app.desktop"

58+ metadata: ""

59+ }

60+ ListElement {

61+ uri: "application:///usr/share/applications/gallery-app.desktop"

62+ icon: "../../graphics/applicationIcons/gallery.png"

63+ category: 0

64+ mimetype: "application/x-desktop"

65+ title: "Gallery"

66+ comment: ""

67+ dndUri: "file:///usr/share/applications/gallery.desktop"

68+ metadata: ""

69+ }

70+ ListElement {

71+ uri: "application:///usr/share/applications/facebook-webapp.desktop"

72+ icon: "../../graphics/applicationIcons/facebook.png"

73+ category: 0

74+ mimetype: "application/x-desktop"

75+ title: "Facebook"

76+ comment: ""

77+ dndUri: "file:///usr/share/applications/facebook-webapp.desktop"

78+ metadata: ""

79+ }

80+ ListElement {

81+ uri: "application:///usr/share/applications/webbrowser-app.desktop"

82+ icon: "../../graphics/applicationIcons/browser.png"

83+ category: 0

84+ mimetype: "application/x-desktop"

85+ title: "Browser"

86+ comment: ""

87+ dndUri: "file:///usr/share/applications/webbrowser-app.desktop"

88+ metadata: ""

89+ }

90+ ListElement {

91+ uri: "application:///usr/share/applications/gmail-webapp.desktop"

92+ icon: "../../graphics/applicationIcons/gmail.png"

93+ category: 0

94+ mimetype: "application/x-desktop"

95+ title: "GMail"

96+ comment: ""

97+ dndUri: "file:///usr/share/applications/gmail-webapp.desktop"

98+ metadata: ""

99+ }

100+ ListElement {

101+ uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"

102+ icon: "../../graphics/applicationIcons/system-settings.png"

103+ category: 0

104+ mimetype: "application/x-desktop"

105+ title: "System Settings"

106+ comment: ""

107+ dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"

108+ metadata: ""

109+ }

110+}

Dash/Apps/RunningApplicationTile.qmlnew file+137

@@ -0,0 +1,137 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Application 0.1

20+import "../../Components/"

21+import "../../Components/ListItems"

22+

23+AbstractButton {

24+ id: root

25+ property var application

26+ property bool __sideStageEnabled: shell.applicationManager.sideStageEnabled

27+

28+ signal requestedApplicationActivation(var application)

29+ signal requestedApplicationTermination(var application)

30+ signal requestedActivationMode()

31+ signal requestedTerminationMode()

32+

33+ // Was: childrenRect.height

34+ // To avoid "binding loop" warning

35+ height: shapedApplicationImage.height + labelContainer.height

36+

37+ width: shapedApplicationImage.width

38+

39+ property bool terminationModeEnabled: false

40+

41+ onClicked: {

42+ if (terminationModeEnabled)

43+ requestedApplicationTermination(application)

44+ else

45+ requestedApplicationActivation(application)

46+ }

47+

48+ onPressAndHold: {

49+ if (terminationModeEnabled) {

50+ requestedActivationMode()

51+ } else {

52+ requestedTerminationMode()

53+ }

54+ }

55+

56+ function updateScreenshotFromCache() {

57+ applicationImage.updateFromCache();

58+ }

59+

60+ // FIXME: should use UbuntuShape from SDK

61+ UbuntuShapeForItem {

62+ id: shapedApplicationImage

63+ anchors {

64+ top: parent.top

65+ horizontalCenter: parent.horizontalCenter

66+ }

67+

68+ // FIXME: width and height should be defined according to the

69+ // application window's aspect ratio.

70+ width: (application.stage === ApplicationInfo.MainStage && __sideStageEnabled) ?

71+ units.gu(22) : units.gu(11)

72+ height: (__sideStageEnabled) ? units.gu(22) : units.gu(19)

73+ radius: "medium"

74+ image: applicationImage

75+ }

76+

77+ ApplicationImage {

78+ id: applicationImage

79+ source: ApplicationManager.findApplication((application) ? application.appId : "")

80+ width: shapedApplicationImage.width

81+ height: shapedApplicationImage.height

82+ }

83+

84+ UbuntuShape {

85+ id: borderPressed

86+

87+ anchors.fill: shapedApplicationImage

88+ radius: "medium"

89+ borderSource: "radius_pressed.sci"

90+ opacity: root.pressed ? 1.0 : 0.0

91+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

92+ }

93+

94+ // FIXME: label code duplicated with Tile

95+ Item {

96+ id: labelContainer

97+ anchors {

98+ left: parent.left

99+ right: parent.right

100+ top: shapedApplicationImage.bottom

101+ }

102+ height: units.gu(2)

103+

104+ Label {

105+ id: label

106+ anchors {

107+ baseline: parent.bottom

108+ left: parent.left

109+ right: parent.right

110+ leftMargin: units.gu(1)

111+ rightMargin: units.gu(1)

112+ }

113+ text: (application) ? application.name : ""

114+

115+ color: Theme.palette.selected.backgroundText

116+ opacity: 0.9

117+ style: Text.Raised

118+ styleColor: "black"

119+ fontSize: "small"

120+ elide: Text.ElideMiddle

121+ horizontalAlignment: Text.AlignHCenter

122+ }

123+ }

124+

125+ CloseIcon {

126+ anchors {

127+ right: shapedApplicationImage.right

128+ rightMargin: -units.gu(1)

129+ top: parent.top

130+ topMargin: -units.gu(1)

131+ }

132+ height: units.gu(6)

133+ width: units.gu(6)

134+ id: closeIcon

135+ enabled: root.terminationModeEnabled

136+ }

137+}

Dash/Apps/RunningApplicationsGrid.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+ResponsiveFlowView {

21+ id: root

22+ clip: true

23+

24+ signal updateScreenshots

25+

26+ Connections {

27+ target: shell

28+ onDashShownChanged: if (shell.dashShown && shell.stageScreenshotsReady) updateScreenshots();

29+ onStageScreenshotsReadyChanged: if (shell.dashShown && shell.stageScreenshotsReady) updateScreenshots();

30+ }

31+

32+ Behavior on height { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } }

33+

34+ property bool canEnableTerminationMode: true

35+

36+ onCanEnableTerminationModeChanged: {

37+ if (!canEnableTerminationMode)

38+ terminationModeEnabled = false

39+ }

40+

41+ // when false, it means it's on activation mode

42+ property bool terminationModeEnabled: false

43+

44+ maximumNumberOfColumns: 10

45+ minimumHorizontalSpacing: units.gu(2)

46+ referenceDelegateWidth: units.gu(11)

47+ verticalSpacing: units.gu(2)

48+

49+ delegate: Item {

50+ width: runningAppTile.width + root.horizontalSpacing

51+ height: runningAppTile.height + root.verticalSpacing

52+

53+ RunningApplicationTile {

54+ id: runningAppTile

55+ objectName: "runningAppTile " + model.name

56+ anchors {

57+ top: parent.top

58+ horizontalCenter: parent.horizontalCenter

59+ }

60+ application: model

61+ onRequestedActivationMode: { root.terminationModeEnabled = false }

62+ onRequestedTerminationMode: {

63+ if (canEnableTerminationMode)

64+ root.terminationModeEnabled = true

65+ }

66+ onRequestedApplicationTermination: {

67+ shell.applicationManager.stopApplication(model.appId)

68+ }

69+ onRequestedApplicationActivation: {

70+ shell.activateApplication(model.appId)

71+ }

72+

73+ terminationModeEnabled: root.terminationModeEnabled

74+

75+ Component.onCompleted: {

76+ root.updateScreenshots.connect(updateScreenshotFromCache);

77+ }

78+ }

79+ }

80+

81+ move: Transition {

82+ NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutCubic }

83+ }

84+}

Dash/Apps/graphics/close_btn@9.pngnew file

Binary file not shown.

Dash/Dash.qmlnew file+90

@@ -0,0 +1,90 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity 0.1

20+import Utils 0.1

21+import "../Components"

22+

23+Showable {

24+ id: dash

25+

26+ property alias contentProgress: dashContent.contentProgress

27+ property string showScopeOnLoaded: "home.scope"

28+ property real contentScale: 1.0

29+

30+ function setCurrentScope(scopeId, animate, reset) {

31+ var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

32+

33+ if (scopeIndex == -1) {

34+ console.warn("No match for scope with id: %1".arg(scopeId))

35+ return

36+ }

37+

38+ if (scopeIndex == dashContent.currentIndex && !reset) {

39+ // the scope is already the current one

40+ return

41+ }

42+

43+ dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)

44+ }

45+

46+ SortFilterProxyModel {

47+ id: filteredScopes

48+ model: Scopes {

49+ id: scopes

50+ }

51+ dynamicSortFilter: true

52+

53+ filterRole: Scopes.RoleVisible

54+ filterRegExp: RegExp("^true$")

55+ }

56+

57+ DashContent {

58+ id: dashContent

59+ objectName: "dashContent"

60+ anchors.fill: parent

61+ model: filteredScopes

62+ scopes: scopes

63+ onMovementStarted: dashbar.startNavigation()

64+ onMovementEnded: dashbar.stopNavigation()

65+ onContentFlickStarted: dashbar.finishNavigation()

66+ onContentEndReached: dashbar.finishNavigation()

67+ onPreviewShown: dashbar.finishNavigation()

68+ onScopeLoaded: {

69+ if (scopeId == dash.showScopeOnLoaded) {

70+ dash.setCurrentScope(scopeId, false, false)

71+ dash.showScopeOnLoaded = ""

72+ }

73+ }

74+ scale: dash.contentScale

75+ clip: scale != 1.0

76+ }

77+

78+ DashBar {

79+ id: dashbar

80+ objectName: "dashbar"

81+ anchors.bottom: parent.bottom

82+ anchors.left: parent.left

83+ anchors.right: parent.right

84+ model: filteredScopes

85+ currentIndex: dashContent.currentIndex

86+ onItemSelected: dashContent.setCurrentScopeAtIndex(index, true, false)

87+ opacity: dash.contentScale == 1.0 ? 1.0 : 0.0

88+ Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 150 } }

89+ }

90+}

Dash/DashApps.qmlnew file+55

@@ -0,0 +1,55 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Utils 0.1

20+import "../Components"

21+import "../Components/ListItems"

22+import "../Applications"

23+import "Apps"

24+

25+GenericScopeView {

26+ id: scopeView

27+

28+ // FIXME: a way to aggregate these models would be ideal

29+ property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications

30+ property var sideStageApplicationModel: shell.applicationManager.sideStageApplications

31+

32+ ListModel {

33+ id: dummyVisibilityModifier

34+

35+ ListElement { name: "running-apps" }

36+ }

37+

38+ SortFilterProxyModel {

39+ id: runningApplicationsModel

40+

41+ property var firstModel: mainStageApplicationsModel

42+ property var secondModel: sideStageApplicationModel

43+ property bool canEnableTerminationMode: scopeView.isCurrent

44+

45+ model: dummyVisibilityModifier

46+ filterRole: 0

47+ filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0 &&

48+ sideStageApplicationModel.count === 0) ? RegExp("running-apps") : RegExp("")) : RegExp("disabled")

49+ invertMatch: scopeView.scope.searchQuery.length == 0

50+ }

51+

52+ onScopeChanged: {

53+ scopeView.scope.categories.overrideResults("recent", runningApplicationsModel);

54+ }

55+}

Dash/DashBar.qmlnew file+128

@@ -0,0 +1,128 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity 0.1

20+

21+Item {

22+ id: dashBar

23+

24+ property var model

25+ property alias currentIndex: row.currentIndex

26+

27+ property int lineHeight: units.dp(2)

28+ property int itemSize: units.gu(7)

29+ property int iconSize: units.gu(3.5)

30+

31+ signal itemSelected(int index)

32+

33+ width: units.gu(40)

34+ height: units.gu(6)

35+

36+ function startNavigation() {

37+ timeout.stop()

38+ panel.opened = true

39+ }

40+

41+ function stopNavigation() {

42+ timeout.restart()

43+ }

44+

45+ function finishNavigation() {

46+ panel.opened = false

47+ }

48+

49+ Timer {

50+ id: timeout

51+ interval: 1500

52+ running: false

53+ repeat: false

54+ onTriggered: finishNavigation()

55+ }

56+

57+ Panel {

58+ id: panel

59+ objectName: "panel"

60+ anchors.fill: parent

61+

62+ locked: true // TODO: remove this when lp bug #1179569 will be fixed

63+

64+ Rectangle {

65+ color: "black"

66+ anchors.fill: parent

67+

68+ ListView {

69+ id: row

70+ objectName: "row"

71+ model: dashBar.model

72+ orientation: ListView.Horizontal

73+ width: Math.min(Math.max(dashBar.width/2, units.gu(40)), count * itemSize)

74+ height: parent.height

75+ anchors.horizontalCenter: parent.horizontalCenter

76+ onMovingChanged: if (moving) { timeout.stop() } else { timeout.restart() }

77+ interactive: visibleArea.widthRatio < 1 && panel.opened

78+ highlightFollowsCurrentItem: false

79+

80+ onCurrentItemChanged: {

81+ highlightLine.width = currentItem.width

82+ highlightLine.x = x + currentItem.x

83+ }

84+

85+ delegate:

86+ // FIXME: Use Panel's integrated trigger() once that works again.

87+ MouseArea {

88+ width: itemSize

89+ height: dashBar.height

90+ anchors.top: parent.top

91+

92+ onClicked: {

93+ dashBar.itemSelected(index)

94+ timeout.restart()

95+ }

96+

97+ Image {

98+ anchors.centerIn: parent

99+ source: scope.iconHint

100+ sourceSize { width: iconSize; height: iconSize }

101+ // opacity: index == currentIndex ? 1 : 1 // same opacity for now

102+ }

103+ }

104+ }

105+ }

106+ }

107+

108+ Rectangle {

109+ anchors {

110+ left: parent.left

111+ right: parent.right

112+ bottom: parent.bottom

113+ }

114+ height: dashBar.lineHeight

115+ color: "black"

116+

117+ Rectangle {

118+ id: highlightLine

119+ color: Theme.palette.selected.foreground

120+ height: parent.height

121+ anchors.bottom: parent.bottom

122+ z: 1

123+

124+ Behavior on x {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}

125+ Behavior on width {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}

126+ }

127+ }

128+}

Dash/DashContent.qmlnew file+148

@@ -0,0 +1,148 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity 0.1

20+

21+Item {

22+ id: dashContent

23+

24+ property var model: null

25+ property var scopes: null

26+ property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))

27+ property alias currentIndex: dashContentList.currentIndex

28+

29+ property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}

30+

31+ signal movementStarted()

32+ signal movementEnded()

33+ signal contentFlickStarted()

34+ signal contentEndReached()

35+ signal previewShown()

36+ signal scopeLoaded(string scopeId)

37+ signal positionedAtBeginning()

38+

39+ // If we set the current scope index before the scopes have been added,

40+ // then we need to wait until the loaded signals gets emitted from the scopes

41+ property var set_current_index: undefined

42+ Connections {

43+ target: scopes

44+ onLoadedChanged: {

45+ if (scopes.loaded && set_current_index != undefined) {

46+ setCurrentScopeAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);

47+ set_current_index = undefined;

48+ }

49+ }

50+ }

51+

52+ function setCurrentScopeAtIndex(index, animate, reset) {

53+ var storedMoveDuration = dashContentList.highlightMoveDuration

54+ var storedMoveSpeed = dashContentList.highlightMoveVelocity

55+ if (!animate) {

56+ dashContentList.highlightMoveVelocity = units.gu(4167)

57+ dashContentList.highlightMoveDuration = 0

58+ }

59+

60+ // if the scopes haven't loaded yet, then wait until they are.

61+ if (!scopes.loaded) {

62+ set_current_index = [ index, animate, reset ]

63+ return;

64+ }

65+ set_current_index = undefined;

66+

67+ if (dashContentList.count > index)

68+ {

69+ dashContentList.currentIndex = index

70+

71+ if (reset) {

72+ dashContent.positionedAtBeginning()

73+ }

74+ }

75+

76+ if (!animate) {

77+ dashContentList.highlightMoveDuration = storedMoveDuration

78+ dashContentList.highlightMoveVelocity = storedMoveSpeed

79+ }

80+ }

81+

82+ ListView {

83+ id: dashContentList

84+ objectName: "dashContentList"

85+

86+ interactive: dashContent.scopes.loaded

87+

88+ anchors.fill: parent

89+ model: dashContent.model

90+ orientation: ListView.Horizontal

91+ boundsBehavior: Flickable.DragAndOvershootBounds

92+ flickDeceleration: units.gu(625)

93+ maximumFlickVelocity: width * 5

94+ snapMode: ListView.SnapOneItem

95+ highlightMoveDuration: 250

96+ highlightRangeMode: ListView.StrictlyEnforceRange

97+ /* FIXME: workaround rendering issue due to use of ShaderEffectSource in

98+ UbuntuShape. While switching from the home scope to the People scope the

99+ rendering would block midway.

100+ */

101+ cacheBuffer: 2147483647

102+ onMovementStarted: dashContent.movementStarted()

103+ onMovementEnded: dashContent.movementEnded()

104+

105+ // If the number of items is less than the current index, then need to reset to another item.

106+ onCountChanged: {

107+ if (currentIndex >= count)

108+ dashContent.setCurrentScopeAtIndex(count-1, true, true)

109+ }

110+

111+ delegate:

112+ Loader {

113+ width: ListView.view.width

114+ height: ListView.view.height

115+ asynchronous: true

116+ source: scopeMapper.map(scope.id)

117+

118+ // these are needed for autopilot tests

119+ readonly property string scopeId: scope.id

120+ readonly property bool isCurrent: ListView.isCurrentItem

121+ readonly property bool isLoaded: status == Loader.Ready

122+

123+ onLoaded: {

124+ item.scope = Qt.binding(function() { return scope })

125+ item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })

126+ item.searchHistory = Qt.binding(function() { return shell.searchHistory })

127+ dashContentList.movementStarted.connect(item.movementStarted)

128+ dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

129+ dashContent.scopeLoaded(item.scope.id)

130+ }

131+ Connections {

132+ target: item

133+ ignoreUnknownSignals: true

134+ onEndReached: contentEndReached()

135+ onPreviewShownChanged: {

136+ if (item.previewShown) {

137+ previewShown()

138+ dashContentList.interactive = false

139+ } else {

140+ dashContentList.interactive = true

141+ }

142+ }

143+ }

144+

145+ Component.onDestruction: active = false

146+ }

147+ }

148+}

Dash/DashHome.qmlnew file+39

@@ -0,0 +1,39 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Utils 0.1

20+import "../Components"

21+import "../Components/ListItems"

22+import "Apps"

23+

24+GenericScopeView {

25+ id: root

26+ objectName: "DashHome"

27+

28+ SearchableResultModel {

29+ id: appsModel

30+

31+ model: FrequentlyUsedAppsModel {}

32+ filterRole: 3

33+ searchQuery: root.scope.searchQuery

34+ }

35+

36+ onScopeChanged: {

37+ root.scope.categories.overrideResults("applications.scope", appsModel);

38+ }

39+}

Dash/DashMusic.qmlnew file+96

@@ -0,0 +1,96 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+import "../Components/ListItems" as ListItems

21+import "Music"

22+

23+ScopeView {

24+ id: scopeView

25+

26+ property var categoryNames: [

27+ i18n.tr("Featured"),

28+ i18n.tr("Recent"),

29+ i18n.tr("New Releases"),

30+ i18n.tr("Top Charting")

31+ ]

32+

33+ onIsCurrentChanged: {

34+ pageHeader.resetSearch();

35+ }

36+

37+ onMovementStarted: categoryView.showHeader()

38+

39+ Binding {

40+ target: scopeView.scope

41+ property: "searchQuery"

42+ value: pageHeader.searchQuery

43+ }

44+

45+ Connections {

46+ target: panel

47+ onSearchClicked: if (isCurrent) {

48+ pageHeader.triggerSearch()

49+ categoryView.showHeader()

50+ }

51+ }

52+

53+ function getRenderer(categoryId) {

54+ switch (categoryId) {

55+ case "featured": return "Music/MusicCarousel.qml"

56+ default: return "Music/MusicFilterGrid.qml"

57+ }

58+ }

59+

60+ ScopeListView {

61+ id: categoryView

62+ anchors.fill: parent

63+ model: scopeView.categories

64+

65+ onAtYEndChanged: if (atYEnd) endReached()

66+ onMovingChanged: if (moving && atYEnd) endReached()

67+

68+ delegate: ListItems.Base {

69+ id: base

70+ highlightWhenPressed: false

71+

72+ property string categoryId: model.categoryId

73+

74+ Loader {

75+ anchors { top: parent.top; left: parent.left; right: parent.right }

76+ source: scopeView.getRenderer(base.categoryId)

77+ onLoaded: {

78+ item.model = results

79+ }

80+ }

81+ }

82+

83+ sectionProperty: "name"

84+ sectionDelegate: ListItems.Header {

85+ width: categoryView.width

86+ text: i18n.tr(section)

87+ }

88+ pageHeader: PageHeader {

89+ id: pageHeader

90+ width: categoryView.width

91+ text: i18n.tr("Music")

92+ searchEntryEnabled: true

93+ searchHistory: scopeView.searchHistory

94+ }

95+ }

96+}

Dash/DashPreview.qmlnew file+201

@@ -0,0 +1,201 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Rectangle {

21+ id: root

22+

23+ property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0

24+ property var previewData

25+

26+ property string title: ""

27+ property real previewWidthRatio: 0.5

28+

29+ property Component header

30+ property Component buttons

31+ property Component body

32+

33+ readonly property bool narrowMode: width <= height

34+ readonly property int contentSpacing: units.gu(3)

35+

36+ signal close()

37+ signal previewImageClicked()

38+

39+ color: Qt.rgba(0, 0, 0, .3)

40+ clip: true

41+

42+ function ensureVisible(item) {

43+ var o = leftFlickable.mapFromItem(item, 0, 0, item.width, item.height);

44+ var keyboardY = shell.height - root.keyboardSize;

45+ if ((o.y + o.height) > keyboardY) {

46+ leftFlickable.contentY += o.y + o.height - keyboardY;

47+ }

48+ }

49+

50+ Connections {

51+ target: shell.applicationManager

52+ onMainStageFocusedApplicationChanged: {

53+ root.close();

54+ }

55+ onSideStageFocusedApplicationChanged: {

56+ root.close();

57+ }

58+ }

59+

60+ MouseArea {

61+ anchors.fill: parent

62+ }

63+

64+ Item {

65+ id: headerRow

66+ height: units.gu(4)

67+ anchors {

68+ top: parent.top

69+ left: parent.left

70+ right: parent.right

71+ margins: root.contentSpacing

72+ }

73+

74+ MouseArea {

75+ anchors {

76+ fill: parent

77+ leftMargin: -root.contentSpacing

78+ rightMargin: -root.contentSpacing

79+ topMargin: -root.contentSpacing

80+ }

81+

82+ onClicked: root.close();

83+ }

84+

85+ Item {

86+ id: labelItem

87+ anchors {

88+ fill: parent

89+ rightMargin: closePreviewImage.width + spacing

90+ }

91+

92+ property int spacing: units.gu(2)

93+

94+ Label {

95+ id: title

96+ objectName: "titleLabel"

97+ anchors {

98+ left: parent.left

99+ right: parent.right

100+ }

101+

102+ elide: Text.ElideRight

103+ fontSize: "x-large"

104+ font.weight: Font.Light

105+ color: Theme.palette.selected.backgroundText

106+ opacity: 0.9

107+ text: root.title

108+ style: Text.Raised

109+ styleColor: "black"

110+ }

111+ Image {

112+ id: closePreviewImage

113+ source: "graphics/tablet/icon_close_preview.png"

114+ width: units.gu(4)

115+ height: units.gu(1.5)

116+ anchors {

117+ bottom: title.bottom

118+ bottomMargin: units.dp(7)

119+ left: parent.left

120+ leftMargin: title.paintedWidth + labelItem.spacing

121+ }

122+ }

123+ }

124+ }

125+

126+ Row {

127+ id: contentRow

128+ anchors {

129+ left: parent.left

130+ right: parent.right

131+ top: headerRow.bottom

132+ bottom: parent.bottom

133+ margins: root.contentSpacing

134+ }

135+

136+ spacing: units.gu(2)

137+

138+ Flickable {

139+ id: leftFlickable

140+ objectName: "leftFlickable"

141+ anchors.top: parent.top

142+ anchors.bottom: parent.bottom

143+ width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio

144+ contentHeight: leftColumn.height

145+ anchors.bottomMargin: root.keyboardSize

146+ clip: true

147+

148+ Behavior on contentY { NumberAnimation { duration: 300 } }

149+

150+ Column {

151+ id: leftColumn

152+ objectName: "leftColumn"

153+ anchors {

154+ left: parent.left

155+ right: parent.right

156+ }

157+ height: childrenRect.height

158+ spacing: units.gu(1)

159+

160+ Loader {

161+ id: headerLoader

162+ anchors.left: parent.left

163+ anchors.right: parent.right

164+ sourceComponent: root.header

165+ }

166+ Loader {

167+ id: buttonLoader

168+ anchors.left: parent.left

169+ anchors.right: parent.right

170+ sourceComponent: root.buttons

171+ }

172+ }

173+ }

174+

175+ Flickable {

176+ id: rightFlickable

177+ anchors.top: parent.top

178+ anchors.bottom: parent.bottom

179+ width: narrowMode ? 0 : (contentRow.width - leftColumn.width - contentRow.spacing)

180+ contentHeight: rightColumn.height

181+ clip: true

182+

183+ Column {

184+ id: rightColumn

185+ objectName: "rightColumn"

186+ height: childrenRect.height

187+ anchors {

188+ left: parent.left

189+ right: parent.right

190+ }

191+ }

192+ }

193+ }

194+

195+ Loader {

196+ parent: root.narrowMode ? leftColumn : rightColumn

197+ anchors.left: parent.left

198+ anchors.right: parent.right

199+ sourceComponent: root.body

200+ }

201+}

Dash/DashVideos.qmlnew file+201

@@ -0,0 +1,201 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+import "../Components/ListItems" as ListItems

21+import "Video"

22+

23+ScopeView {

24+ id: scopeView

25+ property alias previewShown: previewLoader.onScreen

26+

27+ property var categoryNames: [

28+ i18n.tr("Featured"),

29+ i18n.tr("Recent"),

30+ i18n.tr("New Releases"),

31+ i18n.tr("Popular Online")

32+ ]

33+

34+ onIsCurrentChanged: {

35+ pageHeader.resetSearch();

36+ }

37+

38+ onMovementStarted: categoryView.showHeader()

39+

40+ Binding {

41+ target: scopeView.scope

42+ property: "searchQuery"

43+ value: pageHeader.searchQuery

44+ }

45+

46+ Connections {

47+ target: panel

48+ onSearchClicked: if (isCurrent) {

49+ pageHeader.triggerSearch()

50+ categoryView.showHeader()

51+ }

52+ }

53+

54+ function getRenderer(categoryId) {

55+ switch (categoryId) {

56+ case "featured": return "Video/VideosCarousel.qml"

57+ default: return "Video/VideosFilterGrid.qml"

58+ }

59+ }

60+

61+ OpenEffect {

62+ id: effect

63+ anchors {

64+ fill: parent

65+ bottomMargin: -bottomOverflow

66+ }

67+ sourceItem: categoryView

68+

69+ enabled: gap > 0.0

70+

71+ topGapPx: (1 - gap) * positionPx

72+ topOpacity: Math.max(0, (1 - gap * 1.2))

73+ bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)

74+ bottomOverflow: units.gu(6)

75+ bottomOpacity: 1 - (gap * 0.8)

76+

77+ property int targetBottomGapPx: height - units.gu(8) - bottomOverflow

78+ property real gap: previewLoader.open ? 1.0 : 0.0

79+

80+ Behavior on gap {

81+ NumberAnimation {

82+ duration: 200

83+ easing.type: Easing.InOutQuad

84+ onRunningChanged: {

85+ if (!previewLoader.open && !running) {

86+ previewLoader.onScreen = false;

87+ }

88+ }

89+ }

90+ }

91+ }

92+

93+ ScopeListView {

94+ id: categoryView

95+ anchors.fill: parent

96+ model: scopeView.categories

97+ forceNoClip: previewLoader.onScreen

98+

99+ onAtYEndChanged: if (atYEnd) endReached()

100+ onMovingChanged: if (moving && atYEnd) endReached()

101+

102+ delegate: ListItems.Base {

103+ id: base

104+ highlightWhenPressed: false

105+ property string categoryId: model.categoryId

106+

107+ Loader {

108+ id: loader

109+ anchors { top: parent.top; left: parent.left; right: parent.right }

110+ source: scopeView.getRenderer(base.categoryId)

111+ onLoaded: {

112+ item.model = results

113+ }

114+

115+ Connections {

116+ target: loader.item

117+ onClicked: {

118+ var dataItem;

119+ // VideosCarousel and VideosFilterGrid have different

120+ // clicked signals, accomodate for that

121+ if (categoryId == "featured") {

122+ var fileUri = delegateItem.model.uri.replace(/^[^:]+:/, "")

123+ dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.comment}

124+ } else {

125+ dataItem = data;

126+ }

127+ if (dataItem.nfoUri != "") {

128+ previewLoader.videoData = dataItem;

129+ previewLoader.open = true;

130+ effect.positionPx = mapToItem(categoryView, 0, itemY).y;

131+ }

132+ }

133+ }

134+ }

135+ }

136+

137+ sectionProperty: "name"

138+ sectionDelegate: ListItems.Header {

139+ width: categoryView.width

140+ text: i18n.tr(section)

141+ }

142+

143+ pageHeader: PageHeader {

144+ id: pageHeader

145+ width: categoryView.width

146+ text: i18n.tr("Videos")

147+ searchEntryEnabled: true

148+ searchHistory: scopeView.searchHistory

149+ }

150+ }

151+

152+ Loader {

153+ id: previewLoader

154+ height: effect.bottomGapPx - effect.topGapPx

155+ anchors {

156+ top: parent.top

157+ topMargin: effect.topGapPx

158+ left: parent.left

159+ right: parent.right

160+ }

161+ sourceComponent: onScreen ? previewComponent : undefined

162+

163+ property bool open: false

164+ property bool onScreen: false

165+ property var videoData

166+

167+

168+ onOpenChanged: {

169+ if (open) {

170+ onScreen = true;

171+ }

172+ }

173+

174+ onLoaded: {

175+ item.item = videoData;

176+ }

177+ }

178+

179+ Component {

180+ id: previewComponent

181+

182+ VideoPreview {

183+ id: preview

184+ anchors.fill: parent

185+ onClose: open = false;

186+ }

187+ }

188+

189+ // TODO: Move as InverseMouseArea to DashPreview

190+ MouseArea {

191+ enabled: previewLoader.onScreen

192+ anchors {

193+ fill: parent

194+ topMargin: effect.bottomGapPx

195+ }

196+ onClicked: {

197+ previewLoader.open = false;

198+ }

199+ }

200+

201+}

Dash/Generic/GenericCarousel.qmlnew file+57

@@ -0,0 +1,57 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../../Components"

20+

21+Carousel {

22+ id: genericCarousel

23+

24+ tileAspectRatio: 198 / 288

25+ minimumTileWidth: units.gu(13)

26+ itemComponent: carouselDelegateGeneric

27+ selectedItemScaleFactor: 1.14

28+ cacheBuffer: 1404 // 18px * 13gu * 6

29+ height: implicitHeight + units.gu(6)

30+

31+ Component {

32+ id: carouselDelegateGeneric

33+

34+ BaseCarouselDelegate {

35+ id: item

36+

37+ UbuntuShape {

38+ anchors.fill: parent

39+ radius: "medium"

40+ borderSource: ""

41+ image: Image {

42+ asynchronous: true

43+ sourceSize { width: item.width; height: item.height }

44+ source: model ? model.icon : ""

45+ }

46+ }

47+

48+ BorderImage {

49+ anchors.centerIn: parent

50+ opacity: 0.6

51+ source: "../../Components/graphics/non-selected.sci"

52+ width: parent.width + units.gu(1.5)

53+ height: parent.height + units.gu(1.5)

54+ }

55+ }

56+ }

57+}

Dash/Generic/GenericFilterGrid.qmlnew file+57

@@ -0,0 +1,57 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+FilterGrid {

21+ id: filtergrid

22+

23+ minimumHorizontalSpacing: units.gu(0.5)

24+ delegateWidth: units.gu(11)

25+ delegateHeight: units.gu(9.5)

26+ verticalSpacing: units.gu(2)

27+

28+ property int iconWidth: units.gu(8)

29+ property int iconHeight: units.gu(7.5)

30+

31+ signal clicked(int index, var delegateItem, real itemY)

32+ signal pressAndHold(int index, var delegateItem, real itemY)

33+

34+ delegate: Tile {

35+ id: tile

36+ objectName: "delegate" + index

37+ width: filtergrid.cellWidth

38+ height: filtergrid.cellHeight

39+ text: model.title

40+ imageWidth: filtergrid.iconWidth

41+ imageHeight: filtergrid.iconHeight

42+

43+ source: model.icon

44+

45+ fillMode: Image.PreserveAspectCrop

46+

47+ onClicked: {

48+ var data = { model: model }

49+ filtergrid.clicked(index, data, tile.y)

50+ }

51+

52+ onPressAndHold: {

53+ var data = { model: model }

54+ filtergrid.pressAndHold(index, data, tile.y)

55+ }

56+ }

57+}

tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.qml → Dash/Generic/GenericFilterGridPotrait.qmlrenamed+10−10

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2019 The UBports Foundation

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,17 +14,17 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−pragma Singleton

18import QtQuick 2.0

17import QtQuick 2.0

18+import "../../Components"

19

19

20−Item {

20+GenericFilterGrid {

21− id: root

21+ id: filtergrid

22

22

23− property int targetBuildNumber: 0

23+ minimumHorizontalSpacing: units.gu(0.5)

24− property bool checkingForUpdates: false

24+ delegateWidth: units.gu(11)

25− property bool updateAvailable: false

25+ delegateHeight: units.gu(18)

26+ verticalSpacing: units.gu(2)

26

27

27− signal updateDownloaded()

28+ iconWidth: (width / columns) * 0.8

28− signal applyUpdate()

29+ iconHeight: iconWidth * 16 / 11

29− signal checkForUpdate()

30}

30}

Dash/Generic/GenericPreview.qmlnew file+105

@@ -0,0 +1,105 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../../Components"

20+import "../../Components/ListItems" as ListItems

21+import ".."

22+

23+DashPreview {

24+ id: genericPreview

25+

26+ title: previewData.title

27+ previewWidthRatio: 0.6

28+

29+ property url url: previewData.image

30+

31+ header: UbuntuShape {

32+ id: urlLoader

33+ anchors.left: parent.left

34+ anchors.right: parent.right

35+ height: width * previewImage.sourceSize.height / previewImage.sourceSize.width

36+ radius: "medium"

37+ image: Image {

38+ id: previewImage

39+ asynchronous: true

40+ source: genericPreview.url

41+ fillMode: Image.PreserveAspectCrop

42+ }

43+ }

44+

45+ buttons: GridView {

46+ id: buttons

47+ model: genericPreview.previewData.actions

48+

49+ property int numOfRows: (count + 1) / 2

50+ property int spacing: units.gu(1)

51+ height: Math.max(units.gu(4), units.gu(4)*numOfRows + spacing*(numOfRows - 1))

52+

53+ cellWidth: Math.max(units.gu(9), width / 2)

54+ cellHeight: buttonHeight + spacing

55+ property int buttonWidth: Math.max(0, width / 2 - spacing)

56+ property int buttonHeight: units.gu(4)

57+

58+ delegate: Button {

59+ width: Math.max(units.gu(4), buttons.buttonWidth)

60+ height: buttons.buttonHeight

61+ color: "#dd4814"

62+ text: modelData.displayName

63+ iconSource: modelData.iconHint

64+ iconPosition: "right"

65+ visible: true

66+ onClicked: {

67+ genericPreview.previewData.execute(modelData.id, { })

68+ }

69+ }

70+ focus: false

71+ }

72+ body: Column {

73+ spacing: units.gu(2)

74+

75+ Label {

76+ anchors { left: parent.left; right: parent.right }

77+ visible: text != ""

78+ fontSize: "medium"

79+ opacity: 0.6

80+ color: "white"

81+ text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")

82+ style: Text.Raised

83+ styleColor: "black"

84+ wrapMode: Text.WordWrap

85+ textFormat: Text.RichText

86+ // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020

87+ onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }

88+ }

89+

90+ Label {

91+ anchors { left: parent.left; right: parent.right }

92+ visible: text != ""

93+ fontSize: "small"

94+ opacity: 0.6

95+ color: "white"

96+ text: previewData.description.replace(/[\r\n]+/g, "<br />")

97+ style: Text.Raised

98+ styleColor: "black"

99+ wrapMode: Text.WordWrap

100+ textFormat: Text.RichText

101+ // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020

102+ onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }

103+ }

104+ }

105+}

Dash/GenericScopeView.qmlnew file+302

@@ -0,0 +1,302 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+import "../Components/ListItems" as ListItems

21+

22+ScopeView {

23+ id: scopeView

24+ readonly property alias previewShown: previewLoader.onScreen

25+

26+ onIsCurrentChanged: {

27+ pageHeader.resetSearch();

28+ previewLoader.open = false;

29+ }

30+

31+ onMovementStarted: categoryView.showHeader()

32+

33+ Binding {

34+ target: scopeView.scope

35+ property: "searchQuery"

36+ value: pageHeader.searchQuery

37+ }

38+

39+ Binding {

40+ target: pageHeader

41+ property: "searchQuery"

42+ value: scopeView.scope.searchQuery

43+ }

44+

45+ Connections {

46+ target: panel

47+ onSearchClicked: if (isCurrent) {

48+ pageHeader.triggerSearch()

49+ categoryView.showHeader()

50+ }

51+ }

52+

53+ Connections {

54+ target: scopeView.scope

55+ onShowDash: previewLoader.open = false;

56+ onHideDash: previewLoader.open = false;

57+ }

58+

59+ ScopeListView {

60+ id: categoryView

61+ anchors.fill: parent

62+ model: scopeView.categories

63+ forceNoClip: previewLoader.onScreen

64+

65+ onAtYEndChanged: if (atYEnd) endReached()

66+ onMovingChanged: if (moving && atYEnd) endReached()

67+

68+ property string expandedCategoryId: ""

69+

70+ delegate: ListItems.Base {

71+ highlightWhenPressed: false

72+

73+ readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false

74+ readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true

75+ readonly property string category: categoryId

76+

77+ Loader {

78+ id: rendererLoader

79+ anchors {

80+ top: parent.top

81+ left: parent.left

82+ right: parent.right

83+ }

84+

85+ source: getRenderer(model.renderer, model.contentType)

86+

87+ onLoaded: {

88+ if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {

89+ // TODO: the running apps grid doesn't support standard scope results model yet

90+ item.firstModel = Qt.binding(function() { return results.firstModel })

91+ item.secondModel = Qt.binding(function() { return results.secondModel })

92+ } else {

93+ item.model = Qt.binding(function() { return results })

94+ }

95+ item.objectName = Qt.binding(function() { return categoryId })

96+ if (item.expandable) {

97+ var shouldFilter = categoryId != categoryView.expandedCategoryId;

98+ if (shouldFilter != item.filter) {

99+ item.filter = shouldFilter;

100+ }

101+ }

102+ }

103+

104+ Connections {

105+ target: rendererLoader.item

106+ onClicked: {

107+ effect.positionPx = mapToItem(categoryView, 0, itemY).y

108+ scopeView.scope.activate(delegateItem.model.uri,

109+ delegateItem.model.icon,

110+ delegateItem.model.category,

111+ 0,

112+ delegateItem.model.mimetype,

113+ delegateItem.model.title,

114+ delegateItem.model.comment,

115+ delegateItem.model.dndUri,

116+ delegateItem.model.metadata)

117+ }

118+ onPressAndHold: {

119+ effect.positionPx = mapToItem(categoryView, 0, itemY).y

120+ scopeView.scope.preview( delegateItem.model.uri,

121+ delegateItem.model.icon,

122+ delegateItem.model.category,

123+ 0,

124+ delegateItem.model.mimetype,

125+ delegateItem.model.title,

126+ delegateItem.model.comment,

127+ delegateItem.model.dndUri,

128+ delegateItem.model.metadata)

129+ }

130+ }

131+ Connections {

132+ target: categoryView

133+ onExpandedCategoryIdChanged: {

134+ var item = rendererLoader.item;

135+ if (item.expandable) {

136+ var shouldFilter = categoryId != categoryView.expandedCategoryId;

137+ if (shouldFilter != item.filter) {

138+ // If the filter animation will be seen start it, otherwise, just flip the switch

139+ var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

140+ var growingVisible = !shouldFilter && y + height < categoryView.height;

141+ if (shrinkingVisible || growingVisible) {

142+ item.startFilterAnimation(shouldFilter)

143+ } else {

144+ item.filter = shouldFilter;

145+ }

146+ if (!shouldFilter) {

147+ categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);

148+ }

149+ }

150+ }

151+ }

152+ }

153+ }

154+ }

155+

156+ sectionProperty: "name"

157+ sectionDelegate: ListItems.Header {

158+ property var delegate: categoryView.item(delegateIndex)

159+ width: categoryView.width

160+ text: section

161+ image: {

162+ if (delegate && delegate.expandable)

163+ return delegate.filtered ? "graphics/header_handlearrow.png" : "graphics/header_handlearrow2.png"

164+ return "";

165+ }

166+ onClicked: {

167+ if (categoryView.expandedCategoryId != delegate.category)

168+ categoryView.expandedCategoryId = delegate.category;

169+ else

170+ categoryView.expandedCategoryId = "";

171+ }

172+ }

173+ pageHeader: PageHeader {

174+ id: pageHeader

175+ objectName: "pageHeader"

176+ width: categoryView.width

177+ text: scopeView.scope.name

178+ searchEntryEnabled: true

179+ }

180+ }

181+

182+ function getDefaultRendererId(contentType) {

183+ switch (contentType) {

184+ default: return "grid";

185+ }

186+ }

187+

188+ function getRenderer(rendererId, contentType) {

189+ if (rendererId == "default") {

190+ rendererId = getDefaultRendererId(contentType);

191+ }

192+ switch (rendererId) {

193+ case "grid": {

194+ switch (contentType) {

195+ case "video": return "Generic/GenericFilterGridPotrait.qml";

196+ case "music": return "Music/MusicFilterGrid.qml";

197+ default: return "Generic/GenericFilterGrid.qml";

198+ }

199+ }

200+ case "carousel": return "Generic/GenericCarousel.qml";

201+ case "special": {

202+ switch (contentType) {

203+ case "apps": return "Apps/RunningApplicationsGrid.qml";

204+ default: return "Generic/GenericFilterGrid.qml";

205+ }

206+ }

207+ default: return "Generic/GenericFilterGrid.qml";

208+ }

209+ }

210+

211+ OpenEffect {

212+ id: effect

213+ anchors {

214+ fill: parent

215+ bottomMargin: -bottomOverflow

216+ }

217+ sourceItem: categoryView

218+

219+ enabled: gap > 0.0

220+

221+ topGapPx: (1 - gap) * positionPx

222+ topOpacity: (1 - gap * 1.2)

223+ bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)

224+ bottomOverflow: units.gu(20)

225+ bottomOpacity: 1 - (gap * 0.8)

226+

227+ property int targetBottomGapPx: height - units.gu(8) - bottomOverflow

228+ property real gap: previewLoader.open ? 1.0 : 0.0

229+

230+ Behavior on gap {

231+ NumberAnimation {

232+ duration: 200

233+ easing.type: Easing.InOutQuad

234+ onRunningChanged: {

235+ if (!previewLoader.open && !running) {

236+ previewLoader.onScreen = false

237+ }

238+ }

239+ }

240+ }

241+ }

242+

243+ Connections {

244+ target: scopeView.scope

245+ onPreviewReady: {

246+ previewLoader.previewData = preview

247+ previewLoader.open = true

248+ }

249+ }

250+

251+ PreviewDelegateMapper {

252+ id: previewDelegateMapper

253+ }

254+

255+ Connections {

256+ ignoreUnknownSignals: true

257+ target: previewLoader.valid ? previewLoader.item : null

258+ onClose: {

259+ previewLoader.open = false

260+ }

261+ }

262+

263+ Loader {

264+ objectName: "previewLoader"

265+ id: previewLoader

266+ property var previewData

267+ height: effect.bottomGapPx - effect.topGapPx

268+ anchors {

269+ top: parent.top

270+ topMargin: effect.topGapPx

271+ left: parent.left

272+ right: parent.right

273+ }

274+ source: onScreen ? previewDelegateMapper.map(previewLoader.previewData.rendererName) : ""

275+

276+ property bool open: false

277+ property bool onScreen: false

278+ property bool valid: item !== null

279+

280+ onOpenChanged: {

281+ if (open) {

282+ onScreen = true

283+ }

284+ }

285+

286+ onLoaded: {

287+ item.previewData = Qt.binding(function() { return previewLoader.previewData })

288+ }

289+ }

290+

291+ // TODO: Move as InverseMouseArea to DashPreview

292+ MouseArea {

293+ enabled: previewLoader.onScreen

294+ anchors {

295+ fill: parent

296+ topMargin: effect.bottomGapPx

297+ }

298+ onClicked: {

299+ previewLoader.open = false;

300+ }

301+ }

302+}

Dash/Music/AlbumTile.qmlnew file+116

@@ -0,0 +1,116 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+AbstractButton {

21+ id: root

22+ property url source

23+ property alias album: albumLabel.text

24+ property alias artist: artistLabel.text

25+ property alias iconWidth: icon.width

26+ property alias iconHeight: icon.height

27+

28+ UbuntuShape {

29+ id: icon

30+ anchors {

31+ top: parent.top

32+ horizontalCenter: parent.horizontalCenter

33+ }

34+ radius: "medium"

35+ image: Image {

36+ source: root.source

37+ sourceSize { width: icon.width; height: icon.height }

38+ asynchronous: true

39+ cache: false

40+ }

41+ }

42+

43+ UbuntuShape {

44+ id: borderPressed

45+

46+ anchors.fill: icon

47+ radius: "medium"

48+ borderSource: "radius_pressed.sci"

49+ opacity: root.pressed ? 1.0 : 0.0

50+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

51+ }

52+

53+ Item {

54+ id: artistContainer

55+ anchors {

56+ left: parent.left

57+ right: parent.right

58+ top: icon.bottom

59+ }

60+ height: units.gu(2)

61+

62+ Label {

63+ id: artistLabel

64+ anchors {

65+ baseline: parent.bottom

66+ left: parent.left

67+ right: parent.right

68+ leftMargin: units.gu(1)

69+ rightMargin: units.gu(1)

70+ }

71+

72+ color: Theme.palette.selected.backgroundText

73+ opacity: 0.9

74+ style: Text.Raised

75+ styleColor: "black"

76+ fontSize: "small"

77+ elide: Text.ElideMiddle

78+ horizontalAlignment: Text.AlignHCenter

79+ }

80+ }

81+

82+ Item {

83+ anchors {

84+ left: parent.left

85+ right: parent.right

86+ top: artistContainer.bottom

87+ }

88+ height: units.gu(1.5)

89+

90+ Label {

91+ id: albumLabel

92+ anchors {

93+ baseline: parent.bottom

94+ left: parent.left

95+ right: parent.right

96+ leftMargin: units.gu(1)

97+ rightMargin: units.gu(1)

98+ }

99+

100+ color: Theme.palette.selected.backgroundText

101+ opacity: 0.9

102+ style: Text.Raised

103+ styleColor: "black"

104+ fontSize: "small"

105+ font.weight: Font.Light

106+ elide: Text.ElideMiddle

107+ horizontalAlignment: Text.AlignHCenter

108+ }

109+ }

110+

111+ GridView.onRemove: SequentialAnimation {

112+ PropertyAction { target: root; property: "GridView.delayRemove"; value: true }

113+ NumberAnimation { target: root; property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.InOutQuad }

114+ PropertyAction { target: root; property: "GridView.delayRemove"; value: false }

115+ }

116+}

qml/Greeter/LoginAreaContainer.qml → Dash/Music/CarouselDelegateMusic.qmlrenamed+21−17

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,25 +14,29 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19+import "../../Components"

19

20

20−Item {

21+BaseCarouselDelegate {

21− BorderImage {

22+ id: item

22− anchors {

23− fill: parent

24− topMargin: -units.gu(3)

25− leftMargin: -units.gu(1.5)

26− rightMargin: -units.gu(1.5)

27− bottomMargin: -units.gu(1.5)

28− }

29− source: "../graphics/dropshadow2gu.sci"

30− opacity: 0

31− }

32

23

33 UbuntuShape {

24 UbuntuShape {

34 anchors.fill: parent

25 anchors.fill: parent

35− aspect: UbuntuShape.Flat

26+ radius: "medium"

36− backgroundColor: "transparent"

27+ borderSource: ""

28+ image: Image {

29+ asynchronous: true

30+ sourceSize { width: item.width; height: item.height }

31+ source: model ? model.icon : ""

32+ }

33+ }

34+

35+ BorderImage {

36+ anchors.centerIn: parent

37+ opacity: 0.6

38+ source: "../../Components/graphics/non-selected.sci"

39+ width: parent.width + units.gu(1.5)

40+ height: parent.height + units.gu(1.5)

37 }

41 }

38}

42}

Dash/Music/MusicCarousel.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+Carousel {

21+ id: musicCarousel

22+ tileAspectRatio: 1

23+ minimumTileWidth: units.gu(13)

24+ itemComponent: carouselDelegateMusic

25+ selectedItemScaleFactor: 1.2

26+ cacheBuffer: 1404 // 18px * 13gu * 6

27+ height: implicitHeight + units.gu(6)

28+

29+ Component {

30+ id: carouselDelegateMusic

31+ CarouselDelegateMusic {

32+ }

33+ }

34+}

Dash/Music/MusicFilterGrid.qmlnew file+57

@@ -0,0 +1,57 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+FilterGrid {

21+ id: filterGrid

22+

23+ minimumHorizontalSpacing: units.gu(2)

24+ maximumNumberOfColumns: 5

25+ delegateWidth: units.gu(17)

26+ delegateHeight: iconHeight + units.gu(3.5)

27+ verticalSpacing: units.gu(2)

28+

29+ readonly property int iconWidth: (width / columns) * 0.8

30+ readonly property int iconHeight: iconWidth

31+

32+ signal clicked(int index, var delegateItem, real itemY)

33+ signal pressAndHold(int index, var delegateItem, real itemY)

34+

35+ delegate: AlbumTile {

36+ id: tile

37+ objectName: "delegate" + index

38+ width: filterGrid.cellWidth

39+ height: filterGrid.cellHeight

40+ iconWidth: filterGrid.iconWidth

41+ iconHeight: filterGrid.iconHeight

42+

43+ artist: model.title

44+ album: model.comment

45+ source: model.icon

46+

47+ onClicked: {

48+ var data = { model: model }

49+ filterGrid.clicked(index, data, tile.y)

50+ }

51+

52+ onPressAndHold: {

53+ var data = { model: model }

54+ filterGrid.pressAndHold(index, data, tile.y)

55+ }

56+ }

57+}

Dash/PreviewDelegateMapper.qmlnew file+36

@@ -0,0 +1,36 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+QtObject {

20+ property var d: QtObject {

21+ readonly property string genericPreview: "Generic/GenericPreview.qml"

22+ readonly property string appPreview: "Apps/AppPreview.qml"

23+ property var previewDelegateMapping: {"preview-generic": genericPreview,

24+ "preview-application": appPreview,

25+ }

26+ }

27+

28+ function map(rendererName) {

29+ var customPreview = d.previewDelegateMapping[rendererName]

30+ if (customPreview != undefined) {

31+ return customPreview

32+ }

33+ console.debug("Renderer "+rendererName+" not found, using preview-generic")

34+ return d.genericPreview

35+ }

36+}

Dash/ScopeDelegateMapper.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+QtObject {

20+ property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",

21+ "applications.scope": "DashApps.qml",

22+ "home.scope": "DashHome.qml",

23+ "mockvideosmaster.scope": "DashVideos.qml"

24+ }

25+ property string genericScope: "GenericScopeView.qml"

26+

27+ function map(scopeId) {

28+ var customScope = scopeDelegateMapping[scopeId]

29+ if (customScope != undefined) {

30+ return customScope

31+ }

32+ return genericScope

33+ }

34+}

Dash/ScopeListView.qmlnew file+23

@@ -0,0 +1,23 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import ListViewWithPageHeader 0.1

19+

20+ListViewWithPageHeader {

21+ maximumFlickVelocity: height * 10

22+ flickDeceleration: height * 2

23+}

Dash/ScopeView.qmlnew file+56

@@ -0,0 +1,56 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Utils 0.1

19+import Unity 0.1

20+

21+FocusScope {

22+ property Scope scope

23+ property SortFilterProxyModel categories: categoryFilter

24+ property bool isCurrent

25+ property ListModel searchHistory

26+

27+ signal endReached

28+ signal movementStarted

29+ signal positionedAtBeginning

30+

31+ // FIXME delay the search so that daemons have time to settle, note that

32+ // removing this will break ScopeView::test_changeScope

33+ onScopeChanged: {

34+ timer.restart();

35+ scope.activateApplication.connect(activateApp);

36+ }

37+

38+ function activateApp(desktopFilePath) {

39+ shell.activateApplication(desktopFilePath);

40+ }

41+

42+ Timer {

43+ id: timer

44+ interval: 2000

45+ onTriggered: scope.searchQuery = ""

46+ }

47+

48+ SortFilterProxyModel {

49+ id: categoryFilter

50+ model: scope.categories

51+ dynamicSortFilter: true

52+ filterRole: Categories.RoleCount

53+ filterRegExp: /^0$/

54+ invertMatch: true

55+ }

56+}

Dash/SearchableResultModel.qmlnew file+40

@@ -0,0 +1,40 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import Utils 0.1

18+import Unity 0.1

19+

20+SortFilterProxyModel {

21+ id: root

22+

23+ property string searchQuery: ""

24+ property bool hideOnSearch: false

25+

26+ filterRole: CategoryResults.RoleTitle

27+

28+ onSearchQueryChanged: {

29+ if (searchQuery.length == 0) {

30+ filterRegExp = RegExp("");

31+ filterCaseSensitivity = Qt.CaseInsensitive;

32+ } else if (!hideOnSearch) {

33+ setFilterWildcard(searchQuery);

34+ filterCaseSensitivity = Qt.CaseInsensitive;

35+ } else {

36+ filterRegExp = /^$/;

37+ filterCaseSensitivity = Qt.CaseInsensitive;

38+ }

39+ }

40+}

qml/Stage/ResizeGrip.qml → Dash/Video/CarouselDelegateVideo.qmlrenamed+21−25

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,33 +14,29 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19+import "../../Components"

19

20

20−Rectangle {

21+BaseCarouselDelegate {

21− width: units.gu(4)

22+ id: item

22− height: width

23− radius: height / 2

24− color: theme.palette.normal.background

25− opacity: 0.95

26

23

27− // to be set from outside

24+ UbuntuShape {

28− property Item resizeTarget

29−

30− Image {

31− source: "graphics/arrows.png"

32− anchors.centerIn: parent

33− width: units.gu(2)

34− height: width

35− fillMode: Image.PreserveAspectFit

36− }

37−

38− MouseArea {

39 anchors.fill: parent

25 anchors.fill: parent

40− anchors.margins: -units.gu(1.5)

26+ radius: "medium"

41− hoverEnabled: true

27+ borderSource: ""

28+ image: Image {

29+ asynchronous: true

30+ sourceSize { width: item.width; height: item.height }

31+ source: model ? model.icon : ""

32+ }

33+ }

42

34

43− Mouse.enabled: resizeTarget

35+ BorderImage {

44− Mouse.forwardTo: resizeTarget

36+ anchors.centerIn: parent

37+ opacity: 0.6

38+ source: "../../Components/graphics/non-selected.sci"

39+ width: parent.width + units.gu(1.5)

40+ height: parent.height + units.gu(1.5)

45 }

41 }

46}

42}

Dash/Video/VideoInfo.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtQuick.XmlListModel 2.0

19+

20+Item {

21+ id: info

22+ property string source

23+

24+ property bool ready: nfo.status == XmlListModel.Ready || nfoTV.status == XmlListModel.Ready

25+ property bool isMovie: true

26+ property variant video: null

27+ property variant tvShow: null

28+

29+ function getActors() {

30+ var c = []

31+ if (video.actor1) c.push(video.actor1)

32+ if (video.actor2) c.push(video.actor2)

33+ if (video.actor3) c.push(video.actor3)

34+ return c

35+ }

36+

37+ onSourceChanged: isMovie = true

38+

39+ XmlListModel {

40+ id: nfo

41+ source: info.source

42+ query: (isMovie) ? "/movie" : "/episodedetails"

43+

44+ XmlRole { name: "title"; query: "title/string()" }

45+ XmlRole { name: "year"; query: "year/number()" }

46+ XmlRole { name: "runtime"; query: "runtime/number()" }

47+ XmlRole { name: "rating"; query: "rating/number()" }

48+ XmlRole { name: "plot"; query: "plot/string()" }

49+ XmlRole { name: "director"; query: "director[1]/string()" }

50+ XmlRole { name: "actor1"; query: "actor[1]/name/string()" }

51+ XmlRole { name: "actor2"; query: "actor[2]/name/string()" }

52+ XmlRole { name: "actor3"; query: "actor[3]/name/string()" }

53+ XmlRole { name: "author"; query: "author[1]/string()" }

54+ XmlRole { name: "season"; query: "season/number()" }

55+ XmlRole { name: "episode"; query: "episode/number()" }

56+

57+ XmlRole { name: "rentPrice"; query: "rent_price/string()" }

58+ XmlRole { name: "buyPrice"; query: "buy_price/string()" }

59+ XmlRole { name: "expires"; query: "expires/string()" }

60+

61+ onStatusChanged: if (status == XmlListModel.Ready) {

62+ if (count > 0) info.video = nfo.get(0)

63+ else info.isMovie = false

64+ } else if (status == XmlListModel.Error) info.isMovie = false

65+ }

66+

67+ XmlListModel {

68+ id: nfoTV

69+ source: (nfo.isMovie) ? "" : info.source.substring(0, info.source.lastIndexOf("/") + 1) + "tvshow.nfo"

70+ query: "/tvshow"

71+

72+ XmlRole { name: "title"; query: "title/string()" }

73+

74+ onStatusChanged: if (status == XmlListModel.Ready) {

75+ if (count > 0) info.tvShow = nfoTV.get(0)

76+ } else if (status == XmlListModel.Error) {

77+ // Search for tvshow.nfo in the directory above this one to cater

78+ // for directory layout Show/Season

79+ var path = info.source.split("/")

80+ path.splice(-2, 2, "tvshow.nfo")

81+ source = path.join("/")

82+ }

83+ }

84+}

Dash/Video/VideoPreview.qmlnew file+210

@@ -0,0 +1,210 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import ".."

20+import "../../Components"

21+

22+DashPreview {

23+ id: root

24+

25+ property var item

26+ property alias ready: nfo.ready

27+ property bool playable: fileUri != ""

28+ readonly property url fileUri: item ? item.fileUri : ""

29+ property url url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""

30+

31+ VideoInfo {

32+ id: nfo

33+ source: item ? item.nfoUri : ""

34+ }

35+

36+ title: nfo.ready ? nfo.video.title : ""

37+ previewWidthRatio: 0.6

38+

39+ onPreviewImageClicked: {

40+ if (playable) {

41+ shell.activateApplication('/usr/share/applications/mediaplayer-app.desktop', root.fileUri);

42+ }

43+ }

44+

45+ // TODO: replace this UbuntuShape with the Video component once that lands

46+ // with the player.

47+ header: UbuntuShape {

48+ id: urlLoader

49+ anchors.left: parent.left

50+ anchors.right: parent.right

51+ height: width * previewImage.sourceSize.height / previewImage.sourceSize.width

52+ radius: "medium"

53+ image: Image {

54+ id: previewImage

55+ asynchronous: true

56+ source: root.url

57+ fillMode: Image.PreserveAspectCrop

58+ }

59+

60+ Image {

61+ objectName: "playButton"

62+ anchors.centerIn: parent

63+ visible: root.playable

64+ readonly property bool bigButton: parent.width > units.gu(40)

65+ width: bigButton ? units.gu(8) : units.gu(4.5)

66+ height: width

67+ source: "../graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")

68+ }

69+

70+ MouseArea {

71+ id: previewImageMouseArea

72+ anchors.fill: parent

73+ onClicked: root.previewImageClicked()

74+ }

75+ }

76+

77+ buttons: Row {

78+ spacing: units.gu(2)

79+

80+ property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)

81+ Button {

82+ width: parent.buttonWidth

83+ color: Theme.palette.selected.foreground

84+ text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""

85+ visible: text != ""

86+ iconSource: "graphics/icon_button_amazon.png"

87+ iconPosition: "right"

88+ }

89+ Button {

90+ width: parent.buttonWidth

91+ color: Theme.palette.selected.foreground

92+ text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""

93+ visible: text != ""

94+ iconSource: "graphics/icon_button_u1.png"

95+ iconPosition: "right"

96+ }

97+ }

98+

99+ body: Column {

100+ spacing: units.gu(2)

101+ RatingStars {

102+ maximumRating: 10 // FIXME: this should happen on the backend side

103+ rating: nfo.ready ? nfo.video.rating: 0

104+ }

105+

106+ Label {

107+ text: nfo.ready ? nfo.video.plot : ""

108+ color: Theme.palette.selected.backgroundText

109+ opacity: .6

110+ fontSize: "medium"

111+ width: parent.width

112+ wrapMode: Text.WordWrap

113+ style: Text.Raised

114+ styleColor: "black"

115+ }

116+

117+ Grid {

118+ columns: 2

119+ spacing: units.gu(1)

120+ width: parent.width

121+ property int firstColWidth: units.gu(9)

122+ property int secondColWidth: width - firstColWidth - spacing

123+ Label {

124+ visible: directedLabel.visible

125+ fontSize: "small"

126+ opacity: 0.9

127+ color: "white"

128+ horizontalAlignment: Text.AlignRight

129+ width: parent.firstColWidth

130+ text: i18n.tr("Directed by:")

131+ style: Text.Raised

132+ styleColor: "black"

133+ }

134+ Label {

135+ id: directedLabel

136+ visible: text != ""

137+ fontSize: "small"

138+ opacity: 0.6

139+ color: "white"

140+ width: parent.secondColWidth

141+ text: nfo.ready ? nfo.video.director : ""

142+ style: Text.Raised

143+ styleColor: "black"

144+ wrapMode: Text.WordWrap

145+ }

146+ Label {

147+ visible: starringLabel.visible

148+ fontSize: "small"

149+ opacity: 0.9

150+ horizontalAlignment: Text.AlignRight

151+ color: "white"

152+ width: parent.firstColWidth

153+ text: i18n.tr("Starring:")

154+ style: Text.Raised

155+ styleColor: "black"

156+ }

157+ Label {

158+ id: starringLabel

159+ visible: text != ""

160+ fontSize: "small"

161+ opacity: 0.6

162+ color: "white"

163+ width: parent.secondColWidth

164+ text: nfo.ready ? nfo.getActors().join(", ") : ""

165+ wrapMode: Text.WordWrap

166+ style: Text.Raised

167+ styleColor: "black"

168+ }

169+ Label {

170+ visible: authorLabel.visible

171+ fontSize: "small"

172+ opacity: 0.9

173+ horizontalAlignment: Text.AlignRight

174+ color: "white"

175+ width: parent.firstColWidth

176+ text: i18n.tr("Author:")

177+ style: Text.Raised

178+ styleColor: "black"

179+ }

180+ Label {

181+ id: authorLabel

182+ visible: text != ""

183+ fontSize: "small"

184+ opacity: 0.6

185+ color: "white"

186+ width: parent.secondColWidth

187+ text: nfo.ready ? nfo.video.author : ""

188+ wrapMode: Text.WordWrap

189+ style: Text.Raised

190+ styleColor: "black"

191+ }

192+ }

193+

194+ Label {

195+ fontSize: "small"

196+ opacity: 0.6

197+ color: "white"

198+ text: {

199+ var parts = []

200+ if (nfo.ready) {

201+ if (nfo.video.year) parts.push(nfo.video.year)

202+ if (nfo.video.runtime) parts.push("%1 minutes".arg(nfo.video.runtime))

203+ }

204+ return parts.join(", ");

205+ }

206+ style: Text.Raised

207+ styleColor: "black"

208+ }

209+ }

210+}

Dash/Video/VideosCarousel.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+Carousel {

21+ id: videosCarousel

22+ tileAspectRatio: 198 / 288

23+ minimumTileWidth: units.gu(13)

24+ itemComponent: carouselDelegateVideo

25+ selectedItemScaleFactor: 1.14

26+ cacheBuffer: 1404 // 18px * 13gu * 6

27+ height: implicitHeight + units.gu(6)

28+

29+ Component {

30+ id: carouselDelegateVideo

31+ CarouselDelegateVideo {

32+ }

33+ }

34+}

Dash/Video/VideosFilterGrid.qmlnew file+50

@@ -0,0 +1,50 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../../Components"

19+

20+FilterGrid {

21+ id: filtergrid

22+

23+ minimumHorizontalSpacing: units.gu(0.5)

24+ maximumNumberOfColumns: 5

25+ delegateWidth: units.gu(11)

26+ delegateHeight: iconHeight + units.gu(2.5)

27+ verticalSpacing: units.gu(2)

28+

29+ readonly property int iconWidth: (width / columns) * 0.8

30+ readonly property int iconHeight: iconWidth * 16 / 11

31+

32+ signal clicked(int index, var data, real itemY)

33+

34+ delegate: Tile {

35+ id: tile

36+ objectName: "delegate" + index

37+ width: filtergrid.cellWidth

38+ height: filtergrid.cellHeight

39+ text: model.title

40+ imageWidth: filtergrid.iconWidth

41+ imageHeight: filtergrid.iconHeight

42+ source: model.icon

43+ fillMode: Image.PreserveAspectCrop

44+ onClicked: {

45+ var fileUri = model.uri.replace(/^[^:]+:/, "")

46+ var data = {fileUri: fileUri, nfoUri: model.comment}

47+ filtergrid.clicked(index, data, tile.y);

48+ }

49+ }

50+}

Dash/Video/graphics/icon_button_amazon@20.pngnew file

Binary file not shown.

Dash/Video/graphics/icon_button_u1@20.pngnew file

Binary file not shown.

Dash/graphics/header_handlearrow2@20.pngnew file

Binary file not shown.

Dash/graphics/header_handlearrow@20.pngnew file

Binary file not shown.

Dash/graphics/icon_clear@20.pngnew file

Binary file not shown.

Dash/graphics/icon_listview_clear@20.pngnew file

Binary file not shown.

Dash/graphics/icon_search_active@20.pngnew file

Binary file not shown.

Dash/graphics/icon_search_inactive@20.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/angrybirds@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/browser@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/camera@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/facebook@12.pngnew file

Binary file not shown.

tests/graphics/screenshots/gallery@12.png → Dash/graphics/phone/screenshots/gallery@12.pngrenamed

Binary file not shown.

Dash/graphics/phone/screenshots/map@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/music@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/phone@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/settings@12.pngnew file

Binary file not shown.

Dash/graphics/phone/screenshots/twitter@12.pngnew file

Binary file not shown.

Dash/graphics/play_button@18.pngnew file

Binary file not shown.

Dash/graphics/play_button_active@18.pngnew file

Binary file not shown.

Dash/graphics/play_button_active_big@20.pngnew file

Binary file not shown.

Dash/graphics/play_button_big@20.pngnew file

Binary file not shown.

Dash/graphics/tablet/icon_close_preview@20.pngnew file

Binary file not shown.

Greeter/Clock.qmlnew file+66

@@ -0,0 +1,66 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ id: clock

22+

23+ implicitWidth: childrenRect.width

24+ implicitHeight: childrenRect.height

25+

26+ property date __date

27+ property alias __timerInterval: timer.interval

28+ readonly property bool __timerRunning: timer.running

29+

30+ Timer {

31+ id: timer

32+ interval: 1000 * 60

33+ running: clock.enabled && clock.visible && clock.opacity != 0

34+ repeat: true

35+ triggeredOnStart: true

36+ onTriggered: __date = new Date

37+ }

38+

39+ Column {

40+ spacing: units.gu(0.5)

41+

42+ Label {

43+ id: timeLabel

44+ objectName: "timeLabel"

45+

46+ anchors.horizontalCenter: parent.horizontalCenter

47+ font.pixelSize: units.gu(7.5)

48+ color: "white"

49+ opacity: 0.5

50+ text: Qt.formatTime(__date)

51+ font.weight: Font.Light

52+ }

53+

54+ Label {

55+ id: dateLabel

56+ objectName: "dateLabel"

57+

58+ anchors.horizontalCenter: parent.horizontalCenter

59+ fontSize: "medium"

60+ color: "white"

61+ opacity: 0.5

62+ text: Qt.formatDate(__date, Qt.DefaultLocaleLongDate)

63+ font.weight: Font.Light

64+ }

65+ }

66+}

qml/Greeter/Dot.qml → Greeter/Dot.qmlrenamed+1−1

@@ -14,7 +14,7 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

18

19Image {

19Image {

20 states: [

20 states: [

qml/Greeter/Gradient.js → Greeter/Gradient.jsrenamed+3−7

@@ -15,12 +15,8 @@

15 */

15 */

16

16

17function threeColorByIndex(index, total, colors) {

17function threeColorByIndex(index, total, colors) {

18− var red, green, blue;

18+ var red, green, blue

19− var p = 0.0;

20−

21− if(total > 0) {

22− p = index / total;

19+ var p = index / total

23− }

24

20

25 if (p < 0.5) {

21 if (p < 0.5) {

26 red = (colors.main.r * p * 2.0) + colors.start.r * (0.5 - p) * 2.0;

22 red = (colors.main.r * p * 2.0) + colors.start.r * (0.5 - p) * 2.0;

@@ -32,5 +28,5 @@ function threeColorByIndex(index, total, colors) {

32 blue = colors.end.b * (p - 0.5) * 2.0 + colors.main.b * (1.0 - p) * 2.0;

28 blue = colors.end.b * (p - 0.5) * 2.0 + colors.main.b * (1.0 - p) * 2.0;

33 }

29 }

34

30

35− return Qt.rgba(red, green, blue, 1);

31+ return Qt.rgba(red, green, blue, 1)

36}

32}

Greeter/Greeter.qmlnew file+133

@@ -0,0 +1,133 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Gestures 0.1

20+import LightDM 0.1 as LightDM

21+import "../Components"

22+import "../Components/Math.js" as MathLocal

23+

24+Showable {

25+ id: greeter

26+ enabled: shown

27+ created: greeterContentLoader.status == Loader.Ready

28+

29+ property url background

30+

31+ // 1 when fully shown and 0 when fully hidden

32+ property real showProgress: MathLocal.clamp((width + x) / width, 0, 1)

33+

34+ showAnimation: StandardAnimation { property: "x"; to: 0 }

35+ hideAnimation: StandardAnimation { property: "x"; to: -width }

36+

37+ property alias dragHandleWidth: dragHandle.width

38+ property alias model: greeterContentLoader.model

39+ property bool locked: shown && !LightDM.Greeter.promptless

40+

41+ readonly property bool narrowMode: !multiUser && width <= units.gu(60)

42+ readonly property bool multiUser: LightDM.Users.count > 1

43+

44+ readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&

45+ greeterContentLoader.item.leftTeaserPressed

46+ readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&

47+ greeterContentLoader.item.rightTeaserPressed

48+

49+ readonly property int currentIndex: greeterContentLoader.currentIndex

50+

51+ signal selected(int uid)

52+ signal unlocked(int uid)

53+

54+ onRightTeaserPressedChanged: {

55+ if (rightTeaserPressed && !locked) {

56+ teasingTimer.start();

57+ }

58+ }

59+

60+ CrossFadeImage {

61+ id: backgroundImage

62+ objectName: "backgroundImage"

63+ anchors.fill: parent

64+ source: greeter.background

65+ fillMode: Image.PreserveAspectCrop

66+ }

67+

68+ Loader {

69+ id: greeterContentLoader

70+ objectName: "greeterContentLoader"

71+ anchors.fill: parent

72+ property var model: LightDM.Users

73+ property int currentIndex: 0

74+ property var infographicModel: LightDM.Infographic

75+

76+ source: required ? "GreeterContent.qml" : ""

77+

78+ Connections {

79+ target: greeterContentLoader.item

80+

81+ onSelected: {

82+ greeter.selected(uid);

83+ greeterContentLoader.currentIndex = uid;

84+ }

85+ onUnlocked: greeter.unlocked(uid);

86+ }

87+ }

88+

89+ Timer {

90+ id: teasingTimer

91+ interval: 200

92+ }

93+

94+ states: [

95+ State {

96+ name: "teasing"

97+ when: teasingTimer.running

98+ PropertyChanges {

99+ target: greeter

100+ x: -units.gu(2)

101+ }

102+ }

103+ ]

104+ transitions: [

105+ Transition {

106+ from: "*"

107+ to: "*"

108+ NumberAnimation {

109+ target: greeter

110+ property: "x"

111+ duration: 300

112+ easing.type: Easing.OutCubic

113+ }

114+ }

115+ ]

116+

117+ DragHandle {

118+ id: dragHandle

119+

120+ anchors.top: parent.top

121+ anchors.bottom: parent.bottom

122+ anchors.right: parent.right

123+

124+ // no need for requiring a directional drag since we are covering the screen

125+ // anyway (i.e., no change user could be trying to interact with some other

126+ // UI element)

127+ distanceThreshold: 0

128+

129+ enabled: greeter.narrowMode || !greeter.locked

130+

131+ direction: Direction.Leftwards

132+ }

133+}

Greeter/GreeterContent.qmlnew file+126

@@ -0,0 +1,126 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import AccountsService 0.1

19+import Ubuntu.Components 0.1

20+import LightDM 0.1 as LightDM

21+import "../Components"

22+

23+MouseArea {

24+ id: root

25+ anchors.fill: parent

26+

27+ property bool leftTeaserPressed: teasingMouseArea.pressed &&

28+ teasingMouseArea.mouseX < teasingMouseArea.width / 2

29+ property bool rightTeaserPressed: teasingMouseArea.pressed &&

30+ teasingMouseArea.mouseX > teasingMouseArea.width / 2

31+

32+ signal selected(int uid)

33+ signal unlocked(int uid)

34+

35+ Rectangle {

36+ anchors.fill: parent

37+ color: "black"

38+ opacity: 0.4

39+ }

40+

41+ Clock {

42+ id: clock

43+ visible: narrowMode

44+

45+ anchors {

46+ top: parent.top

47+ topMargin: units.gu(2)

48+ horizontalCenter: parent.horizontalCenter

49+ }

50+ }

51+

52+ MouseArea {

53+ id: teasingMouseArea

54+ anchors.fill: parent

55+ }

56+

57+ Loader {

58+ id: loginLoader

59+ objectName: "loginLoader"

60+ anchors {

61+ left: parent.left

62+ leftMargin: Math.min(parent.width * 0.16, units.gu(20))

63+ verticalCenter: parent.verticalCenter

64+ }

65+ width: units.gu(29)

66+ height: parent.height

67+

68+ // TODO: Once we have a system API for determining which mode we are

69+ // in, tablet/phone/desktop, that should be used instead of narrowMode.

70+ source: greeter.narrowMode ? "" : "LoginList.qml"

71+

72+ onLoaded: {

73+ item.currentIndex = greeterContentLoader.currentIndex;

74+ selected(item.currentIndex);

75+ item.resetAuthentication();

76+ }

77+

78+ Binding {

79+ target: loginLoader.item

80+ property: "model"

81+ value: greeterContentLoader.model

82+ }

83+

84+ Connections {

85+ target: loginLoader.item

86+

87+ onSelected: {

88+ root.selected(uid);

89+ }

90+

91+ onUnlocked: {

92+ root.unlocked(uid);

93+ }

94+

95+ onCurrentIndexChanged: {

96+ if (greeterContentLoader.currentIndex !== loginLoader.item.currentIndex) {

97+ greeterContentLoader.currentIndex = loginLoader.item.currentIndex;

98+ }

99+ }

100+ }

101+ }

102+

103+ Infographics {

104+ id: infographics

105+ height: narrowMode ? parent.height : 0.75 * parent.height

106+ model: greeterContentLoader.infographicModel

107+

108+ Component.onCompleted: infographics.updateUsername(greeterContentLoader.currentIndex)

109+

110+ Connections {

111+ target: root

112+ onSelected: infographics.updateUsername(uid)

113+ }

114+

115+ function updateUsername(uid) {

116+ greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)

117+ greeterContentLoader.infographicModel.readyForDataChangeSlot();

118+ }

119+

120+ anchors {

121+ verticalCenter: parent.verticalCenter

122+ left: narrowMode ? root.left : loginLoader.right

123+ right: root.right

124+ }

125+ }

126+}

Greeter/GreeterEdgeDemo.qmlnew file+103

@@ -0,0 +1,103 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import AccountsService 0.1

18+import LightDM 0.1 as LightDM

19+import QtQuick 2.0

20+

21+Item {

22+ id: demo

23+

24+ property Item greeter

25+

26+ property bool active: false

27+ property bool paused: false

28+

29+ onPausedChanged: {

30+ if (d.rightEdgeDemo) d.rightEdgeDemo.paused = paused

31+ }

32+

33+ function hideEdgeDemoInShell() {

34+ AccountsService.demoEdges = false;

35+ }

36+

37+ function hideEdgeDemoInGreeter() {

38+ AccountsService.demoEdgesForCurrentUser = false;

39+ stopDemo();

40+ }

41+

42+ function hideEdgeDemos() {

43+ hideEdgeDemoInGreeter();

44+ hideEdgeDemoInShell();

45+ }

46+

47+ function startDemo() {

48+ if (!d.overlay) {

49+ d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

50+ }

51+ startRightEdgeDemo()

52+ }

53+

54+ function stopDemo() {

55+ active = false

56+ if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()

57+ }

58+

59+ QtObject {

60+ id: d

61+ property Component overlay

62+ property QtObject rightEdgeDemo

63+ property bool showEdgeDemoInGreeter: AccountsService.demoEdgesForCurrentUser

64+

65+ onShowEdgeDemoInGreeterChanged: {

66+ stopDemo()

67+ if (d.showEdgeDemoInGreeter) {

68+ startDemo()

69+ }

70+ }

71+ }

72+

73+ function startRightEdgeDemo() {

74+ active = true;

75+ if (demo.greeter) {

76+ d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {

77+ "edge": "right",

78+ "title": i18n.tr("Right edge"),

79+ "text": i18n.tr("Try swiping from the right edge to unlock the phone"),

80+ "anchors.fill": demo.greeter,

81+ });

82+ }

83+ if (d.rightEdgeDemo) {

84+ d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)

85+ } else {

86+ stopDemo();

87+ }

88+ }

89+

90+ Connections {

91+ target: demo.greeter

92+

93+ function hide() {

94+ if (d.rightEdgeDemo && d.rightEdgeDemo.available) {

95+ d.rightEdgeDemo.hide()

96+ hideEdgeDemoInGreeter()

97+ }

98+ }

99+

100+ onUnlocked: hide()

101+ onShownChanged: if (!greeter.shown) hide()

102+ }

103+}

qml/Greeter/Infographics.qml → Greeter/Infographics.qmlrenamed+136−117

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2013-2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,9 +14,10 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17+import "../Components"

17import "Gradient.js" as Gradient

18import "Gradient.js" as Gradient

18−import QtQuick 2.4

19+import QtQuick 2.0

19−import Ubuntu.Components 1.3

20+import Ubuntu.Components 0.1

20

21

21Item {

22Item {

22 id: infographic

23 id: infographic

@@ -25,86 +26,31 @@ Item {

25

26

26 property int animDuration: 10

27 property int animDuration: 10

27

28

28− property int currentWeekDay

29−

30− QtObject {

31− id: d

32− objectName: "infographicPrivate"

33− property bool useDotAnimation: true

34− property int circleModifier: useDotAnimation ? 1 : 2

35− property bool animating: dotHideAnimTimer.running

36− || dotShowAnimTimer.running

37− || circleChangeAnimTimer.running

38− }

39−

40− QtObject {

41− id: whiteTheme

42− property color main: "white"

43− property color start: "white"

44− property color end: "white"

45− }

46−

47 Connections {

29 Connections {

48 target: model

30 target: model

49− ignoreUnknownSignals: model === undefined

50

31

51− onDataAboutToAppear: startHideAnimation() // hide "no data" label

52 onDataAppeared: startShowAnimation()

32 onDataAppeared: startShowAnimation()

53

33

54 onDataAboutToChange: startHideAnimation()

34 onDataAboutToChange: startHideAnimation()

35+

55 onDataChanged: startShowAnimation()

36 onDataChanged: startShowAnimation()

56

37

57 onDataAboutToDisappear: startHideAnimation()

38 onDataAboutToDisappear: startHideAnimation()

58− onDataDisappeared: startShowAnimation() // show "no data" label

59− }

60−

61− LiveTimer {

62− frequency: LiveTimer.Hour

63− onTrigger: handleTimerTrigger()

64− }

65−

66− function handleTimerTrigger(){

67− var today = new Date().getDay()

68− if(infographic.currentWeekDay !== today){

69− infographic.currentWeekDay = today

70− reloadUserData();

71− }

72− }

73−

74− function reloadUserData(){

75− d.useDotAnimation = false

76− infographic.model.nextDataSource()

77 }

39 }

78

40

79 function startShowAnimation() {

41 function startShowAnimation() {

80− dotHideAnimTimer.stop()

81− notification.hideAnim.stop()

82−

83− if (d.useDotAnimation) {

84− dotShowAnimTimer.startFromBeginning()

42+ dotShowAnimTimer.startFromBeginning()

85− }

86 notification.showAnim.start()

43 notification.showAnim.start()

87 }

44 }

88

45

89 function startHideAnimation() {

46 function startHideAnimation() {

90− dotShowAnimTimer.stop()

91− circleChangeAnimTimer.stop()

92− notification.showAnim.stop()

93−

94− if (d.useDotAnimation) {

95− dotHideAnimTimer.startFromBeginning()

47+ dotHideAnimTimer.startFromBeginning()

96− } else {

97− circleChangeAnimTimer.startFromBeginning()

98− }

99 notification.hideAnim.start()

48 notification.hideAnim.start()

100 }

49 }

101

50

102− visible: model.username !== ""

51+ visible: model.label !== ""

103

52

104− Component.onCompleted: {

53+ Component.onCompleted: startShowAnimation()

105− currentWeekDay = new Date().getDay()

106− startShowAnimation()

107− }

108

54

109 Item {

55 Item {

110 id: dataCircle

56 id: dataCircle

@@ -118,22 +64,22 @@ Item {

118 anchors.centerIn: parent

64 anchors.centerIn: parent

119

65

120 Timer {

66 Timer {

121− id: circleChangeAnimTimer

67+ id: circleGrowAnimTimer

122

68

123 property int pastCircleCounter

69 property int pastCircleCounter

124 property int presentCircleCounter

70 property int presentCircleCounter

125

71

126− interval: notification.duration

72+ interval: animDuration

127 running: false

73 running: false

128 repeat: true

74 repeat: true

129 onTriggered: {

75 onTriggered: {

130 if (pastCircleCounter < pastCircles.count) {

76 if (pastCircleCounter < pastCircles.count) {

131 var nextCircle = pastCircles.itemAt(pastCircleCounter++)

77 var nextCircle = pastCircles.itemAt(pastCircleCounter++)

132− if (nextCircle !== null) nextCircle.pastCircleChangeAnim.start()

78+ if (nextCircle !== null) nextCircle.pastCircleGrowAnim.start()

133 }

79 }

134 if (pastCircleCounter > pastCircles.count / 2) {

80 if (pastCircleCounter > pastCircles.count / 2) {

135 var nextCircle = presentCircles.itemAt(presentCircleCounter++)

81 var nextCircle = presentCircles.itemAt(presentCircleCounter++)

136− if (nextCircle !== null) nextCircle.presentCircleChangeAnim.start()

82+ if (nextCircle !== null) nextCircle.presentCircleGrowAnim.start()

137 }

83 }

138 if (presentCircleCounter > infographic.model.currentDay && pastCircleCounter >= pastCircles.count) {

84 if (presentCircleCounter > infographic.model.currentDay && pastCircleCounter >= pastCircles.count) {

139 stop()

85 stop()

@@ -141,8 +87,39 @@ Item {

141 }

87 }

142

88

143 function startFromBeginning() {

89 function startFromBeginning() {

144− circleChangeAnimTimer.pastCircleCounter = 0

90+ circleGrowAnimTimer.pastCircleCounter = 0

145− circleChangeAnimTimer.presentCircleCounter = 0

91+ circleGrowAnimTimer.presentCircleCounter = 0

92+ start()

93+ }

94+ }

95+

96+ Timer {

97+ id: circleShrinkAnimTimer

98+

99+ property int pastCircleCounter

100+ property int presentCircleCounter

101+

102+ interval: animDuration

103+ running: false

104+ repeat: true

105+ onTriggered: {

106+ if (pastCircleCounter >= 0) {

107+ var nextCircle = pastCircles.itemAt(pastCircleCounter--)

108+ if (nextCircle !== null) nextCircle.pastCircleShrinkAnim.start()

109+ }

110+ if (pastCircleCounter < pastCircles.count / 2) {

111+ var nextCircle = presentCircles.itemAt(presentCircleCounter--)

112+ if (nextCircle !== null) nextCircle.presentCircleShrinkAnim.start()

113+ }

114+ if (presentCircleCounter < 0) {

115+ stop()

116+ infographic.model.readyForDataChange()

117+ }

118+ }

119+

120+ function startFromBeginning() {

121+ pastCircleCounter = pastCircles.count - 1

122+ presentCircleCounter = model.currentDay

146 start()

123 start()

147 }

124 }

148 }

125 }

@@ -153,11 +130,12 @@ Item {

153 model: infographic.model.secondMonth

130 model: infographic.model.secondMonth

154

131

155 delegate: ObjectPositioner {

132 delegate: ObjectPositioner {

156− property alias pastCircleChangeAnim: pastCircleChangeAnim

133+ property alias pastCircleGrowAnim: pastCircleGrowAnim

134+ property alias pastCircleShrinkAnim: pastCircleShrinkAnim

157

135

158 index: model.index

136 index: model.index

159 count: pastCircles.count

137 count: pastCircles.count

160− radius: dataCircle.width / 2

138+ radius: parent.width / 2

161 halfSize: pastCircle.width / 2

139 halfSize: pastCircle.width / 2

162 posOffset: 0.0

140 posOffset: 0.0

163

141

@@ -171,36 +149,54 @@ Item {

171 width: dataCircle.width / divisor

149 width: dataCircle.width / divisor

172 height: dataCircle.height / divisor

150 height: dataCircle.height / divisor

173 opacity: 0.0

151 opacity: 0.0

174− circleScale: 0.0

152+ scale: 0.0

175 visible: modelData !== undefined

153 visible: modelData !== undefined

176− color: "transparent"

154+ color: Gradient.threeColorByIndex(index, count, infographic.model.secondColor)

177− centerCircle: dataCircle

178

155

179 SequentialAnimation {

156 SequentialAnimation {

180− id: pastCircleChangeAnim

157+ id: pastCircleGrowAnim

181

158

182 loops: 1

159 loops: 1

183 ParallelAnimation {

160 ParallelAnimation {

184 PropertyAnimation {

161 PropertyAnimation {

185 target: pastCircle

162 target: pastCircle

186 property: "opacity"

163 property: "opacity"

164+ from: 0.0

187 to: pastCircle.circleOpacity

165 to: pastCircle.circleOpacity

188 easing.type: Easing.OutCurve

166 easing.type: Easing.OutCurve

189− duration: circleChangeAnimTimer.interval * d.circleModifier

167+ duration: circleGrowAnimTimer.interval * 4

190 }

168 }

191 PropertyAnimation {

169 PropertyAnimation {

192 target: pastCircle

170 target: pastCircle

193− property: "circleScale"

171+ property: "scale"

172+ from: 0.0

194 to: modelData

173 to: modelData

195 easing.type: Easing.OutCurve

174 easing.type: Easing.OutCurve

196− duration: circleChangeAnimTimer.interval * d.circleModifier

175+ duration: circleGrowAnimTimer.interval * 4

176+ }

177+ }

178+ }

179+

180+ SequentialAnimation {

181+ id: pastCircleShrinkAnim

182+

183+ loops: 1

184+ ParallelAnimation {

185+ PropertyAnimation {

186+ target: pastCircle

187+ property: "opacity"

188+ from: pastCircle.circleOpacity

189+ to: 0.0

190+ easing.type: Easing.OutCurve

191+ duration: circleShrinkAnimTimer.interval * 4

197 }

192 }

198− ColorAnimation {

193+ PropertyAnimation {

199 target: pastCircle

194 target: pastCircle

200− property: "color"

195+ property: "scale"

201− to: Gradient.threeColorByIndex(index, count, whiteTheme)

196+ from: modelData

197+ to: 0.0

202 easing.type: Easing.OutCurve

198 easing.type: Easing.OutCurve

203− duration: circleChangeAnimTimer.interval * d.circleModifier

199+ duration: circleShrinkAnimTimer.interval * 4

204 }

200 }

205 }

201 }

206 }

202 }

@@ -214,11 +210,12 @@ Item {

214 model: infographic.model.firstMonth

210 model: infographic.model.firstMonth

215

211

216 delegate: ObjectPositioner {

212 delegate: ObjectPositioner {

217− property alias presentCircleChangeAnim: presentCircleChangeAnim

213+ property alias presentCircleGrowAnim: presentCircleGrowAnim

214+ property alias presentCircleShrinkAnim: presentCircleShrinkAnim

218

215

219 index: model.index

216 index: model.index

220 count: presentCircles.count

217 count: presentCircles.count

221− radius: dataCircle.width / 2

218+ radius: parent.width / 2

222 halfSize: presentCircle.width / 2

219 halfSize: presentCircle.width / 2

223 posOffset: 0.0

220 posOffset: 0.0

224

221

@@ -232,13 +229,12 @@ Item {

232 width: dataCircle.width / divisor

229 width: dataCircle.width / divisor

233 height: dataCircle.height / divisor

230 height: dataCircle.height / divisor

234 opacity: 0.0

231 opacity: 0.0

235− circleScale: 0.0

232+ scale: 0.0

236 visible: modelData !== undefined

233 visible: modelData !== undefined

237− color: "transparent"

234+ color: Gradient.threeColorByIndex(index, infographic.model.currentDay, infographic.model.firstColor)

238− centerCircle: dataCircle

239

235

240 SequentialAnimation {

236 SequentialAnimation {

241− id: presentCircleChangeAnim

237+ id: presentCircleGrowAnim

242

238

243 loops: 1

239 loops: 1

244

240

@@ -248,21 +244,36 @@ Item {

248 property: "opacity"

244 property: "opacity"

249 to: presentCircle.circleOpacity

245 to: presentCircle.circleOpacity

250 easing.type: Easing.OutCurve

246 easing.type: Easing.OutCurve

251− duration: circleChangeAnimTimer.interval * d.circleModifier

247+ duration: circleGrowAnimTimer.interval * 4

252 }

248 }

253 PropertyAnimation {

249 PropertyAnimation {

254 target: presentCircle

250 target: presentCircle

255− property: "circleScale"

251+ property: "scale"

256 to: modelData

252 to: modelData

257 easing.type: Easing.OutCurve

253 easing.type: Easing.OutCurve

258− duration: circleChangeAnimTimer.interval * d.circleModifier

254+ duration: circleGrowAnimTimer.interval * 4

255+ }

256+ }

257+ }

258+

259+ SequentialAnimation {

260+ id: presentCircleShrinkAnim

261+

262+ loops: 1

263+ ParallelAnimation {

264+ PropertyAnimation {

265+ target: presentCircle

266+ property: "opacity"

267+ to: 0.0

268+ easing.type: Easing.OutCurve

269+ duration: circleShrinkAnimTimer.interval * 4

259 }

270 }

260− ColorAnimation {

271+ PropertyAnimation {

261 target: presentCircle

272 target: presentCircle

262− property: "color"

273+ property: "scale"

263− to: Gradient.threeColorByIndex(index, infographic.model.currentDay, whiteTheme)

274+ to: 0.0

264 easing.type: Easing.OutCurve

275 easing.type: Easing.OutCurve

265− duration: circleChangeAnimTimer.interval * d.circleModifier

276+ duration: circleShrinkAnimTimer.interval * 4

266 }

277 }

267 }

278 }

268 }

279 }

@@ -270,6 +281,15 @@ Item {

270 }

281 }

271 }

282 }

272

283

284+ Image {

285+ id: backgroundCircle

286+ objectName: "backgroundCircle"

287+

288+ anchors.fill: parent

289+

290+ source: "graphics/infographic_circle_back.png"

291+ }

292+

273 Timer {

293 Timer {

274 id: dotShowAnimTimer

294 id: dotShowAnimTimer

275

295

@@ -278,16 +298,14 @@ Item {

278 interval: animDuration * 0.5; running: false; repeat: true

298 interval: animDuration * 0.5; running: false; repeat: true

279 onTriggered: {

299 onTriggered: {

280 if (dotCounter < dots.count) {

300 if (dotCounter < dots.count) {

281− var nextDot = dots.itemAt(dotCounter);

301+ var nextDot = dots.itemAt(dotCounter++)

282− if (nextDot) {

283− nextDot.unlockAnimation.start();

302+ nextDot.unlockAnimation.start()

284− if (++dotCounter == Math.round(dots.count / 2)) {

285− circleChangeAnimTimer.startFromBeginning();

286− }

287− }

288 } else {

303 } else {

289 stop()

304 stop()

290 }

305 }

306+ if (dotCounter == Math.round(dots.count / 2)) {

307+ circleGrowAnimTimer.startFromBeginning()

308+ }

291 }

309 }

292

310

293 function startFromBeginning() {

311 function startFromBeginning() {

@@ -313,8 +331,8 @@ Item {

313 } else {

331 } else {

314 stop()

332 stop()

315 }

333 }

316− if (dotCounter == 0) {

334+ if (dotCounter == Math.round(dots.count / 2)) {

317− infographic.model.readyForDataChange()

335+ circleShrinkAnimTimer.startFromBeginning()

318 }

336 }

319 }

337 }

320

338

@@ -340,7 +358,7 @@ Item {

340

358

341 index: model.index

359 index: model.index

342 count: dots.count

360 count: dots.count

343− radius: dataCircle.width / 2

361+ radius: backgroundCircle.width / 2

344 halfSize: dot.width / 2

362 halfSize: dot.width / 2

345 posOffset: radius / dot.width / 3

363 posOffset: radius / dot.width / 3

346 state: dot.state

364 state: dot.state

@@ -349,7 +367,7 @@ Item {

349 id: dot

367 id: dot

350 objectName: "dot" + index

368 objectName: "dot" + index

351

369

352− property real baseOpacity: 1

370+ property real baseOpacity: 0.4

353

371

354 width: units.dp(5) * parent.radius / 200

372 width: units.dp(5) * parent.radius / 200

355 height: units.dp(5) * parent.radius / 200

373 height: units.dp(5) * parent.radius / 200

@@ -378,26 +396,27 @@ Item {

378 }

396 }

379 }

397 }

380

398

381− Label {

399+ Text {

382 id: notification

400 id: notification

383 objectName: "label"

401 objectName: "label"

384

402

385 property alias hideAnim: decreaseOpacity

403 property alias hideAnim: decreaseOpacity

386 property alias showAnim: increaseOpacity

404 property alias showAnim: increaseOpacity

387

405

388− property real baseOpacity: 1

406+ property real baseOpacity: 0.6

389− property real duration: dotShowAnimTimer.interval * 5

390

407

391− height: 0.7 * dataCircle.width

408+ height: 0.7 * backgroundCircle.width

392 width: notification.height

409 width: notification.height

393 anchors.centerIn: parent

410 anchors.centerIn: parent

394

411

395 text: infographic.model.label

412 text: infographic.model.label

413+ font.pixelSize: notification.height / 12

396

414

397 wrapMode: Text.WordWrap

415 wrapMode: Text.WordWrap

398 horizontalAlignment: Text.AlignHCenter

416 horizontalAlignment: Text.AlignHCenter

399 verticalAlignment: Text.AlignVCenter

417 verticalAlignment: Text.AlignVCenter

400 color: "white"

418 color: "white"

419+ font.weight: Font.Light

401

420

402 PropertyAnimation {

421 PropertyAnimation {

403 id: increaseOpacity

422 id: increaseOpacity

@@ -406,7 +425,7 @@ Item {

406 property: "opacity"

425 property: "opacity"

407 from: 0.0

426 from: 0.0

408 to: notification.baseOpacity

427 to: notification.baseOpacity

409− duration: notification.duration * dots.count

428+ duration: dotShowAnimTimer.interval * dots.count * 5

410 }

429 }

411

430

412 PropertyAnimation {

431 PropertyAnimation {

@@ -416,20 +435,20 @@ Item {

416 property: "opacity"

435 property: "opacity"

417 from: notification.baseOpacity

436 from: notification.baseOpacity

418 to: 0.0

437 to: 0.0

419− duration: notification.duration * dots.count

438+ duration: dotShowAnimTimer.interval * dots.count * 5

420− onStopped: if (!d.useDotAnimation) infographic.model.readyForDataChange()

421 }

439 }

422 }

440 }

423 }

441 }

424

442

425 MouseArea {

443 MouseArea {

426 anchors.fill: dataCircle

444 anchors.fill: dataCircle

427− enabled: notification.text != ""

428

445

429 onDoubleClicked: {

446 onDoubleClicked: {

430− if (!d.animating) {

447+ if (!dotHideAnimTimer.running &&

431− reloadUserData()

448+ !dotShowAnimTimer.running &&

432− }

449+ !circleShrinkAnimTimer.running &&

450+ !circleGrowAnimTimer.running)

451+ infographic.model.nextDataSource()

433 }

452 }

434 }

453 }

435}

454}

Greeter/Lockscreen.qmlnew file+157

@@ -0,0 +1,157 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+import LightDM 0.1 as LightDM

21+

22+Showable {

23+ id: root

24+

25+ // Determine if a numeric or alphanumeric pad is used.

26+ property bool alphaNumeric: false

27+

28+ // Placeholder text

29+ property string placeholderText: ""

30+

31+ // In case the Lockscreen can show a greeter message, this is the username

32+ property string username: ""

33+

34+ // As the numeric PIN pad doesn't have a OK button by design, we need to auto-confirm on a certain length.

35+ // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.

36+ property int pinLength: 4

37+

38+ property url background: ""

39+

40+ signal unlocked()

41+ signal cancel()

42+ signal emergencyCall()

43+

44+ onRequiredChanged: {

45+ if (required && pinPadLoader.item) {

46+ pinPadLoader.item.clear(false);

47+ }

48+ }

49+

50+ function reset() {

51+ // This causes the loader below to destry and recreate the source

52+ pinPadLoader.resetting = true;

53+ pinPadLoader.resetting = false;

54+ }

55+

56+ Image {

57+ id: wallpaper

58+ anchors.fill: parent

59+ source: root.required ? root.background : ""

60+ fillMode: Image.PreserveAspectCrop

61+ }

62+

63+ MouseArea {

64+ anchors.fill: root

65+ }

66+

67+ Loader {

68+ id: pinPadLoader

69+ objectName: "pinPadLoader"

70+ anchors {

71+ left: parent.left

72+ right: parent.right

73+ verticalCenter: parent.verticalCenter

74+ verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : -units.gu(4)

75+ }

76+ property bool resetting: false

77+

78+ source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""

79+

80+ Connections {

81+ target: pinPadLoader.item

82+

83+ onEntered: {

84+ LightDM.Greeter.respond(passphrase);

85+ }

86+

87+ onCancel: {

88+ root.cancel()

89+ }

90+ }

91+

92+ Binding {

93+ target: pinPadLoader.item

94+ property: "pinLength"

95+ value: root.pinLength

96+ }

97+ Binding {

98+ target: pinPadLoader.item

99+ property: "placeholderText"

100+ value: root.placeholderText

101+ }

102+ Binding {

103+ target: pinPadLoader.item

104+ property: "username"

105+ value: root.username

106+ }

107+ }

108+

109+ Column {

110+ anchors {

111+ left: parent.left

112+ bottom: parent.bottom

113+ bottomMargin: units.gu(4)

114+ right: parent.right

115+ }

116+ height: childrenRect.height

117+ spacing: units.gu(1)

118+

119+ Icon {

120+ objectName: "emergencyCallIcon"

121+ height: units.gu(3)

122+ width: height

123+ anchors.horizontalCenter: parent.horizontalCenter

124+ name: "phone-app-call-symbolic"

125+ color: "#f3f3e7"

126+ opacity: 0.6

127+

128+ MouseArea {

129+ anchors.fill: parent

130+ onClicked: root.emergencyCall()

131+ }

132+ }

133+

134+ Label {

135+ text: i18n.tr("Emergency Call")

136+ color: "#f3f3e7"

137+ opacity: 0.6

138+ fontSize: "medium"

139+ anchors.horizontalCenter: parent.horizontalCenter

140+ }

141+ }

142+

143+ Connections {

144+ target: LightDM.Greeter

145+

146+ onAuthenticationComplete: {

147+ if (LightDM.Greeter.promptless) {

148+ return;

149+ }

150+ if (LightDM.Greeter.authenticated) {

151+ root.unlocked();

152+ } else {

153+ pinPadLoader.item.clear(true);

154+ }

155+ }

156+ }

157+}

Greeter/LoginList.qmlnew file+293

@@ -0,0 +1,293 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import LightDM 0.1 as LightDM

20+import "../Components"

21+

22+Item {

23+ id: root

24+

25+ property alias userList: userList

26+ property alias model: userList.model

27+ property alias currentIndex: userList.currentIndex

28+

29+ readonly property int numAboveBelow: 4

30+ readonly property int cellHeight: units.gu(5)

31+ readonly property int highlightedHeight: units.gu(10)

32+ readonly property int moveDuration: 200

33+ property bool wasPrompted: false

34+

35+ signal selected(int uid)

36+ signal unlocked(int uid)

37+

38+ Keys.onEscapePressed: root.resetAuthentication()

39+

40+ Rectangle {

41+ id: highlightItem

42+ anchors {

43+ left: parent.left

44+ right: parent.right

45+ verticalCenter: parent.verticalCenter

46+ }

47+ height: root.highlightedHeight

48+ color: Qt.rgba(0.1, 0.1, 0.1, 0.4)

49+ border.color: Qt.rgba(0.4, 0.4, 0.4, 0.4)

50+ border.width: units.dp(1)

51+ radius: units.gu(1.5)

52+ antialiasing: true

53+ }

54+

55+ ListView {

56+ id: userList

57+ objectName: "userList"

58+

59+ anchors.fill: parent

60+

61+ preferredHighlightBegin: userList.height / 2 - root.highlightedHeight / 2

62+ preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2

63+ highlightRangeMode: ListView.StrictlyEnforceRange

64+ highlightMoveDuration: root.moveDuration

65+ flickDeceleration: 10000

66+

67+ readonly property bool movingInternally: moveTimer.running || userList.moving

68+

69+ onCurrentIndexChanged: {

70+ if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {

71+ root.resetAuthentication();

72+ }

73+ }

74+

75+ onMovingInternallyChanged: {

76+ // Only emit the selected signal once we stop moving to avoid frequent background changes

77+ if (!movingInternally) {

78+ root.selected(userList.currentIndex);

79+ }

80+ }

81+

82+ delegate: Item {

83+ width: parent.width

84+ height: root.cellHeight

85+

86+ readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)

87+ readonly property int belowOffset: root.highlightedHeight - root.cellHeight

88+

89+ opacity: {

90+ // The goal here is to make names less and less opaque as they

91+ // leave the highlight area. Can't simply use index, because

92+ // that can change quickly if the user clicks at edges of

93+ // list. So we use actual pixel distance.

94+ var highlightDist = 0;

95+ var realY = y - userList.contentY;

96+ if (belowHighlight)

97+ realY += belowOffset;

98+ if (realY + height <= highlightItem.y)

99+ highlightDist = realY + height - highlightItem.y;

100+ else if (realY >= highlightItem.y + root.highlightedHeight)

101+ highlightDist = realY - highlightItem.y - root.highlightedHeight;

102+ else

103+ return 1;

104+ return 1 - Math.min(1, (Math.abs(highlightDist) + root.cellHeight) / ((root.numAboveBelow + 1) * root.cellHeight))

105+ }

106+

107+ Label {

108+ objectName: "username" + index

109+

110+ anchors {

111+ left: parent.left

112+ leftMargin: units.gu(2)

113+ right: parent.right

114+ rightMargin: units.gu(2)

115+ top: parent.top

116+ // Add an offset to topMargin for any items below the highlight

117+ topMargin: units.gu(1) + (parent.belowHighlight ? parent.belowOffset : 0)

118+ }

119+ text: realName

120+ color: "white"

121+ elide: Text.ElideRight

122+

123+ Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }

124+ }

125+

126+ MouseArea {

127+ anchors {

128+ left: parent.left

129+ right: parent.right

130+ top: parent.top

131+ // Add an offset to topMargin for any items below the highlight

132+ topMargin: parent.belowHighlight ? parent.belowOffset : 0

133+ }

134+ height: parent.height

135+ enabled: userList.currentIndex !== index

136+ onClicked: {

137+ moveTimer.start();

138+ userList.currentIndex = index;

139+ }

140+

141+ Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }

142+ }

143+ }

144+

145+ // This is needed because ListView.moving is not true if the ListView

146+ // moves because of an internal event (e.g. currentIndex has changed)

147+ Timer {

148+ id: moveTimer

149+ running: false

150+ repeat: false

151+ interval: root.moveDuration

152+ }

153+ }

154+

155+ Label {

156+ id: infoLabel

157+ objectName: "infoLabel"

158+ anchors {

159+ bottom: passwordInput.top

160+ left: parent.left

161+ topMargin: units.gu(1)

162+ bottomMargin: units.gu(1)

163+ leftMargin: units.gu(2)

164+ rightMargin: units.gu(1)

165+ }

166+

167+ color: "white"

168+ width: root.width - anchors.leftMargin - anchors.rightMargin

169+ fontSize: "small"

170+ textFormat: Text.StyledText

171+ clip: true

172+

173+ opacity: (userList.movingInternally || text == "") ? 0 : 1

174+ Behavior on opacity {

175+ NumberAnimation { duration: 100 }

176+ }

177+ }

178+

179+ TextField {

180+ id: passwordInput

181+ objectName: "passwordInput"

182+ anchors {

183+ bottom: highlightItem.bottom

184+ horizontalCenter: parent.horizontalCenter

185+ margins: units.gu(1)

186+ }

187+ height: units.gu(4.5)

188+ width: parent.width - anchors.margins * 2

189+ opacity: userList.movingInternally ? 0 : 1

190+

191+ Behavior on opacity {

192+ NumberAnimation { duration: 100 }

193+ }

194+

195+ onAccepted: {

196+ if (!enabled)

197+ return;

198+ root.focus = true; // so that it can handle Escape presses for us

199+ enabled = false;

200+ LightDM.Greeter.respond(text);

201+ }

202+ Keys.onEscapePressed: root.resetAuthentication()

203+

204+ Image {

205+ anchors {

206+ right: parent.right

207+ rightMargin: units.gu(2)

208+ verticalCenter: parent.verticalCenter

209+ }

210+ visible: LightDM.Greeter.promptless

211+ source: "graphics/icon_arrow.png"

212+ }

213+

214+ WrongPasswordAnimation {

215+ id: wrongPasswordAnimation

216+ target: passwordInput

217+ }

218+

219+ Connections {

220+ target: Qt.inputMethod

221+ onVisibleChanged: {

222+ if (!Qt.inputMethod.visible) {

223+ passwordInput.focus = false;

224+ }

225+ }

226+ }

227+

228+ }

229+

230+ MouseArea {

231+ anchors.fill: passwordInput

232+ enabled: LightDM.Greeter.promptless

233+ onClicked: {

234+ if (LightDM.Greeter.authenticated)

235+ root.unlocked(userList.currentIndex);

236+ else

237+ root.resetAuthentication();

238+ }

239+ }

240+

241+ function resetAuthentication() {

242+ if (!userList.currentItem) {

243+ return;

244+ }

245+ infoLabel.text = "";

246+ passwordInput.placeholderText = "";

247+ passwordInput.text = "";

248+ passwordInput.focus = false;

249+ passwordInput.enabled = true;

250+ root.wasPrompted = false;

251+ LightDM.Greeter.authenticate(userList.model.data(currentIndex, LightDM.UserRoles.NameRole));

252+ }

253+

254+ Connections {

255+ target: LightDM.Greeter

256+

257+ onShowMessage: {

258+ // inefficient, but we only rarely deal with messages

259+ text = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>");

260+ if (isError)

261+ text = "<font color=\"#df382c\">" + text + "</font>"

262+ if (infoLabel.text == "")

263+ infoLabel.text = text;

264+ else

265+ infoLabel.text = infoLabel.text + "<br>" + text;

266+ }

267+

268+ onShowPrompt: {

269+ passwordInput.text = "";

270+ passwordInput.placeholderText = text;

271+ passwordInput.enabled = true;

272+ passwordInput.echoMode = isSecret ? TextInput.Password : TextInput.Normal;

273+ if (root.wasPrompted) // stay in text field if second prompt

274+ passwordInput.focus = true;

275+ root.wasPrompted = true;

276+ }

277+

278+ onAuthenticationComplete: {

279+ if (LightDM.Greeter.promptless) {

280+ passwordInput.placeholderText = LightDM.Greeter.authenticated ? "Tap to unlock" : "Retry";

281+ return;

282+ }

283+ if (LightDM.Greeter.authenticated) {

284+ root.unlocked(userList.currentIndex);

285+ } else {

286+ wrongPasswordAnimation.start();

287+ root.resetAuthentication();

288+ passwordInput.focus = true;

289+ }

290+ passwordInput.text = "";

291+ }

292+ }

293+}

qml/Greeter/ObjectPositioner.qml → Greeter/ObjectPositioner.qmlrenamed+2−2

@@ -14,8 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19

19

20Item {

20Item {

21 property int count

21 property int count

Greeter/PassphraseLockscreen.qmlnew file+87

@@ -0,0 +1,87 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+Item {

22+ id: root

23+ height: highlightItem.height

24+

25+ property alias placeholderText: pinentryField.placeholderText

26+ property string username: ""

27+

28+ signal entered(string passphrase)

29+ signal cancel()

30+

31+ function clear(playAnimation) {

32+ pinentryField.text = "";

33+ if (playAnimation) {

34+ wrongPasswordAnimation.start();

35+ } else {

36+ pinentryField.focus = false

37+ }

38+ }

39+

40+ Rectangle {

41+ id: highlightItem

42+ width: units.gu(32)

43+ height: units.gu(10)

44+ anchors.centerIn: parent

45+ color: Qt.rgba(0.1, 0.1, 0.1, 0.4)

46+ border.color: Qt.rgba(0.4, 0.4, 0.4, 0.4)

47+ border.width: units.dp(1)

48+ radius: units.gu(1.5)

49+ antialiasing: true

50+

51+ Label {

52+ objectName: "greeterLabel"

53+ anchors {

54+ left: parent.left

55+ top: parent.top

56+ right: parent.right

57+ margins: units.gu(1.5)

58+ }

59+ text: root.username.length > 0 ? i18n.tr("Hello %1").arg(root.username) : i18n.tr("Hello")

60+ color: "white"

61+ }

62+

63+ TextField {

64+ id: pinentryField

65+ objectName: "pinentryField"

66+ anchors {

67+ horizontalCenter: parent.horizontalCenter

68+ bottom: parent.bottom

69+ margins: units.gu(1)

70+ }

71+ height: units.gu(4.5)

72+ width: parent.width - units.gu(2)

73+ echoMode: TextInput.Password

74+ opacity: 0.9

75+ hasClearButton: false

76+

77+ onAccepted: {

78+ root.entered(pinentryField.text);

79+ }

80+ }

81+ }

82+

83+ WrongPasswordAnimation {

84+ id: wrongPasswordAnimation

85+ target: pinentryField

86+ }

87+}

Greeter/PinLockscreen.qmlnew file+180

@@ -0,0 +1,180 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Components.ListItems 0.1

20+import "../Components"

21+

22+Column {

23+ id: root

24+ anchors.centerIn: parent

25+ spacing: units.gu(3.5)

26+

27+ property alias placeholderText: pinentryField.placeholderText

28+ property int padWidth: units.gu(34)

29+ property int padHeight: units.gu(28)

30+ property int pinLength: 4

31+

32+ signal entered(string passphrase)

33+ signal cancel()

34+

35+ function clear(playAnimation) {

36+ pinentryField.text = "";

37+ if (playAnimation) {

38+ wrongPasswordAnimation.start();

39+ }

40+ }

41+

42+

43+ UbuntuShape {

44+ id: pinentryField

45+ objectName: "pinentryField"

46+ anchors.horizontalCenter: parent.horizontalCenter

47+ color: "#55000000"

48+ width:root.padWidth

49+ height: units.gu(5)

50+ radius: "medium"

51+ property string text: ""

52+ property string placeholderText: ""

53+ onTextChanged: {

54+ pinentryFieldLabel.text = "";

55+ for (var i = 0; i < text.length; ++i) {

56+ pinentryFieldLabel.text += "•";

57+ }

58+ if (text.length === root.pinLength) {

59+ root.entered(text);

60+ }

61+ }

62+

63+ Label {

64+ id: pinentryFieldLabel

65+ anchors.centerIn: parent

66+ font.pixelSize: units.dp(44)

67+ color: "#f3f3e7"

68+ opacity: 0.6

69+ }

70+ Label {

71+ id: pinentryFieldPlaceHolder

72+ anchors.centerIn: parent

73+ color: "grey"

74+ text: parent.placeholderText

75+ visible: pinentryFieldLabel.text.length == 0

76+ }

77+ }

78+

79+ UbuntuShape {

80+ anchors {

81+ left: parent.left

82+ right: parent.right

83+ margins: (parent.width - root.padWidth) / 2

84+ }

85+ height: root.padHeight

86+ color: "#55000000"

87+ radius: "medium"

88+

89+ ThinDivider {

90+ anchors {

91+ left: parent.left

92+ right: parent.right

93+ top: parent.top

94+ topMargin: root.padHeight / 4

95+ }

96+ }

97+ ThinDivider {

98+ anchors {

99+ left: parent.left

100+ right: parent.right

101+ verticalCenter: parent.verticalCenter

102+ }

103+ }

104+ ThinDivider {

105+ anchors {

106+ left: parent.left

107+ right: parent.right

108+ bottom: parent.bottom

109+ bottomMargin: root.padHeight / 4

110+ }

111+ }

112+

113+ ThinDivider {

114+ anchors.centerIn: parent

115+ anchors.horizontalCenterOffset: -root.padWidth / 6

116+ width: root.padHeight

117+ rotation: -90

118+ }

119+ ThinDivider {

120+ anchors.centerIn: parent

121+ anchors.horizontalCenterOffset: root.padWidth / 6

122+ width: root.padHeight

123+ rotation: -90

124+ }

125+

126+ Grid {

127+ anchors {

128+ left: parent.left

129+ right: parent.right

130+ margins: (parent.width - root.padWidth) / 2

131+ }

132+

133+ columns: 3

134+

135+ Repeater {

136+ model: 9

137+

138+ PinPadButton {

139+ objectName: "pinPadButton" + (index + 1)

140+ width: root.padWidth / 3

141+ height: root.padHeight / 4

142+ text: index + 1

143+

144+ onClicked: {

145+ pinentryField.text = pinentryField.text + text;

146+ }

147+ }

148+ }

149+

150+ PinPadButton {

151+ objectName: "pinPadButtonBack"

152+ width: root.padWidth / 3

153+ height: root.padHeight / 4

154+ iconName: "back"

155+ onClicked: root.cancel();

156+ }

157+

158+ PinPadButton {

159+ objectName: "pinPadButton0"

160+ width: root.padWidth / 3

161+ height: root.padHeight / 4

162+ text: "0"

163+ onClicked: pinentryField.text = pinentryField.text + text

164+ }

165+

166+ PinPadButton {

167+ objectName: "pinPadButtonErase"

168+ width: root.padWidth / 3

169+ height: root.padHeight / 4

170+ iconName: "erase"

171+ onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)

172+ }

173+ }

174+ }

175+

176+ WrongPasswordAnimation {

177+ id: wrongPasswordAnimation

178+ target: pinentryField

179+ }

180+}

tests/qmltests/Components/tst_DragHandle/SimpleButton.qml → Greeter/PinPadButton.qmlrenamed+23−11

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright 2015 Canonical Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,21 +14,33 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19

19

20−

20+Item {

21−Rectangle {

22 id: root

21 id: root

22+

23− property alias text: textItem.text

23+ property alias text: label.text

24+ property alias iconName: icon.name

25+

24 signal clicked()

26 signal clicked()

25− width: textItem.width + units.gu(1.5)

27+

26− height: textItem.height + units.gu(1.5)

28+ Label {

27− Text {

29+ id: label

28− id: textItem

29 anchors.centerIn: parent

30 anchors.centerIn: parent

30− font.pixelSize: units.gu(1.5)

31+ color: "#f3f3e7"

32+ fontSize: "large"

33+ font.weight: Font.DemiBold

31 }

34 }

35+

36+ Icon {

37+ id: icon

38+ height: units.gu(3)

39+ width: height

40+ anchors.centerIn: parent

41+ color: "#f3f3e7"

42+ }

43+

32 MouseArea {

44 MouseArea {

33 anchors.fill: parent

45 anchors.fill: parent

34 onClicked: root.clicked()

46 onClicked: root.clicked()

Greeter/graphics/dot_empty.pngnew file

Binary file not shown.

Greeter/graphics/dot_filled.pngnew file

Binary file not shown.

Greeter/graphics/dot_pointer.pngnew file

Binary file not shown.

Greeter/graphics/icon_arrow.pngnew file

Binary file not shown.

Greeter/graphics/infographic_circle_back.pngnew file

Binary file not shown.

GreeterShell.qmlnew file+209

@@ -0,0 +1,209 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import AccountsService 0.1

18+import GSettings 1.0

19+import LightDM 0.1 as LightDM

20+import Powerd 0.1

21+import QtQuick 2.0

22+import SessionBroadcast 0.1

23+import Unity.Application 0.1

24+import Unity.Launcher 0.1

25+import "Components"

26+import "Components/Math.js" as MathLocal

27+import "Greeter"

28+import "Launcher"

29+import "Panel"

30+

31+BasicShell {

32+ id: shell

33+

34+ function activateApplication(appId) {

35+ SessionBroadcast.requestApplicationStart(LightDM.Greeter.authenticationUser, appId)

36+ greeter.hide()

37+ }

38+

39+ GSettings {

40+ id: backgroundSettings

41+ schema.id: "org.gnome.desktop.background"

42+ }

43+ backgroundFallbackSource: backgroundSettings.pictureUri // for ease of customization by system builders

44+ backgroundSource: AccountsService.backgroundFile

45+

46+ Lockscreen {

47+ id: lockscreen

48+ hides: [launcher, panel.indicators]

49+ shown: false

50+ enabled: true

51+ showAnimation: StandardAnimation { property: "opacity"; to: 1 }

52+ hideAnimation: StandardAnimation { property: "opacity"; to: 0 }

53+ y: panel.panelHeight

54+ x: required ? 0 : - width

55+ width: parent.width

56+ height: parent.height - panel.panelHeight

57+

58+ onUnlocked: lockscreen.hide()

59+ onCancel: greeter.show()

60+

61+ Component.onCompleted: {

62+ if (LightDM.Users.count == 1) {

63+ LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

64+ greeter.selected(0)

65+ }

66+ }

67+ }

68+

69+ Connections {

70+ target: LightDM.Greeter

71+

72+ onShowPrompt: {

73+ if (LightDM.Users.count == 1) {

74+ // TODO: There's no better way for now to determine if its a PIN or a passphrase.

75+ if (text == "PIN") {

76+ lockscreen.alphaNumeric = false

77+ } else {

78+ lockscreen.alphaNumeric = true

79+ }

80+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);

81+ lockscreen.show();

82+ }

83+ }

84+ }

85+

86+ Greeter {

87+ id: greeter

88+ objectName: "greeter"

89+

90+ available: true

91+ hides: [launcher, panel.indicators]

92+ shown: true

93+ background: shell.background

94+

95+ y: panel.panelHeight

96+ width: parent.width

97+ height: parent.height - panel.panelHeight

98+

99+ dragHandleWidth: shell.edgeSize

100+

101+ function login() {

102+ enabled = false;

103+ LightDM.Greeter.startSessionSync();

104+ }

105+

106+ onShownChanged: {

107+ if (shown) {

108+ lockscreen.reset();

109+ // If there is only one user, we start authenticating with that one here.

110+ // If there are more users, the Greeter will handle that

111+ if (LightDM.Users.count == 1) {

112+ LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

113+ greeter.selected(0);

114+ }

115+ greeter.forceActiveFocus();

116+ }

117+ else if (LightDM.Greeter.promptless)

118+ login();

119+ }

120+

121+ onUnlocked: login()

122+ onSelected: {

123+ // Update launcher items for new user

124+ var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

125+ AccountsService.user = user;

126+ LauncherModel.setUser(user);

127+ }

128+

129+ onLeftTeaserPressedChanged: {

130+ if (leftTeaserPressed) {

131+ launcher.tease();

132+ }

133+ }

134+ }

135+

136+ InputFilterArea {

137+ anchors.fill: parent

138+ blockInput: true

139+ }

140+

141+ Revealer {

142+ id: greeterRevealer

143+ objectName: "greeterRevealer"

144+

145+ property real animatedProgress: MathLocal.clamp(-dragPosition / closedValue, 0, 1)

146+ target: greeter

147+ width: greeter.width

148+ height: greeter.height

149+ handleSize: shell.edgeSize

150+ orientation: Qt.Horizontal

151+ enabled: !greeter.locked

152+ }

153+

154+ Item {

155+ id: overlay

156+

157+ anchors.fill: parent

158+

159+ Panel {

160+ id: panel

161+ anchors.fill: parent //because this draws indicator menus

162+ indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width

163+ indicators {

164+ hides: [launcher]

165+ available: !edgeDemo.active

166+ }

167+ fullscreenMode: false

168+ searchVisible: false

169+ }

170+

171+ Launcher {

172+ id: launcher

173+

174+ anchors.top: parent.top

175+ anchors.bottom: parent.bottom

176+ width: parent.width

177+ dragAreaWidth: shell.edgeSize

178+ available: greeter.narrowMode && !edgeDemo.active

179+ onLauncherApplicationSelected: {

180+ shell.activateApplication(appId)

181+ }

182+ onShownChanged: {

183+ if (shown) {

184+ panel.indicators.hide()

185+ }

186+ }

187+ onDashItemSelected: greeter.show()

188+ }

189+ }

190+

191+ Connections {

192+ id: powerConnection

193+ target: Powerd

194+

195+ onDisplayPowerStateChange: {

196+ if (status == Powerd.Off) {

197+ greeter.show();

198+ edgeDemo.paused = true;

199+ } else if (status == Powerd.On) {

200+ edgeDemo.paused = false;

201+ }

202+ }

203+ }

204+

205+ GreeterEdgeDemo {

206+ id: edgeDemo

207+ greeter: greeter

208+ }

209+}

Hud/Hud.qmlnew file+493

@@ -0,0 +1,493 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import HudClient 0.1

20+

21+import "../Components"

22+

23+Item {

24+ id: hud

25+

26+ readonly property real elementsPadding: units.gu(1)

27+ readonly property real elementsYSliding: units.gu(2)

28+

29+ property alias revealerTarget: hudShowable

30+ property alias showAnimation: hudShowable.showAnimation

31+ property alias hideAnimation: hudShowable.hideAnimation

32+ property alias available: hudShowable.available

33+ property alias shown: hudShowable.shown

34+ property alias handleHeight: handle.height

35+

36+ readonly property variant outEasing: Easing.OutQuad

37+ readonly property variant inEasing: Easing.InQuad

38+ readonly property int animationDuration: 200

39+ readonly property int showableAnimationDuration: 100

40+ property bool showingOpenIndicator: false

41+

42+ // FIXME At the moment since we have no appstack

43+ // it's not possible to get results of the sidestage app

44+ // design has to come up with a solution

45+ function show() {

46+ hudShowable.show()

47+ }

48+ function hide() {

49+ hudShowable.hide()

50+ }

51+ function resetToInitialState() {

52+ hud.state = "initial"

53+ searchBar.unfocus()

54+ searchBar.text = ""

55+ parametrizedActionsPage.shown = false

56+ }

57+

58+ states: [

59+ State {

60+ name: "initial"

61+ PropertyChanges { target: searchBar; placeholderText: i18n.tr("Type or say a command") }

62+ PropertyChanges { target: searchBar; searchEnabled: true }

63+ PropertyChanges { target: toolBarAnimator; visible: true}

64+ AnchorChanges { target: searchBarAnimator; anchors.top: undefined; anchors.bottom: parent.bottom; }

65+ AnchorChanges { target: resultsCardAnimator; anchors.top: undefined; anchors.bottom: toolBarAnimator.top; }

66+ },

67+ State {

68+ name: "input" //only inherited by other states.

69+ AnchorChanges { target: searchBarAnimator; anchors.top: parent.top; anchors.bottom: undefined; }

70+ AnchorChanges { target: resultsCardAnimator; anchors.top: searchBarAnimator.bottom; anchors.bottom: undefined; }

71+ PropertyChanges { target: toolBarAnimator; visible: false }

72+ },

73+ State {

74+ name: "voice_input" //only inherited by other states.

75+ extend: "input"

76+ PropertyChanges { target: soundAmplitudeVisualAnimator; visible: true }

77+ PropertyChanges { target: resultsCardAnimator; visible: false }

78+ PropertyChanges { target: soundAmplitudeVisualAnimator; progress: 1 }

79+ PropertyChanges { target: searchBar; searchEnabled: false }

80+ },

81+ State {

82+ name: "voice_recognition_loading"

83+ extend: "voice_input"

84+ PropertyChanges { target: searchBar; placeholderText: i18n.tr("Loading. Please Wait...") }

85+ },

86+ State {

87+ name: "voice_recognition_listening"

88+ extend: "voice_input"

89+ PropertyChanges { target: searchBar; placeholderText: i18n.tr("Speak Now...") }

90+ },

91+ State {

92+ name: "voice_recognition_processing"

93+ extend: "voice_input"

94+ PropertyChanges { target: searchBar; placeholderText: i18n.tr("Speaking...") }

95+ },

96+ State {

97+ name: "showing_results"

98+ extend: "input"

99+ PropertyChanges { target: searchBar; placeholderText: i18n.tr("Type or say a command") }

100+ PropertyChanges { target: searchBar; searchEnabled: true }

101+ }

102+ ]

103+

104+ transitions: [

105+ Transition {

106+ from: "initial"

107+ to: "voice_recognition_loading"

108+ SequentialAnimation {

109+ NumberAnimation { // hide these components

110+ targets: [toolBarAnimator, searchBarAnimator, resultsCardAnimator]

111+ property: "progress"; duration: animationDuration; to: 0

112+ }

113+

114+ PropertyAction { targets: [toolBarAnimator, resultsCardAnimator]; property: "visible"; value: false}

115+ PropertyAction { target: soundAmplitudeVisualAnimator; property: "visible"; value: true}

116+

117+ AnchorAnimation { duration: 0 } // so anchor change happens at this point

118+

119+ NumberAnimation { // show these components

120+ targets: [searchBarAnimator, soundAmplitudeVisualAnimator]

121+ property: "progress"; duration: animationDuration; from: 0; to: 1

122+ }

123+ }

124+ },

125+ Transition {

126+ from: "showing_results"

127+ to: "voice_recognition_loading"

128+ SequentialAnimation {

129+ PropertyAction { target: soundAmplitudeVisualAnimator; property: "progress"; value: 0}

130+

131+ PropertyAction { // hide these components

132+ target: resultsCardAnimator; property: "progress"; value: 0

133+ }

134+

135+ NumberAnimation { // show these components

136+ target: soundAmplitudeVisualAnimator; property: "progress"; duration: animationDuration; from: 0; to: 1

137+ }

138+ }

139+ },

140+ Transition {

141+ from: "voice_recognition_processing"

142+ to: "showing_results"

143+ SequentialAnimation {

144+ NumberAnimation { // hide these components

145+ target: soundAmplitudeVisualAnimator; property: "progress"; duration: animationDuration; to: 0

146+ }

147+ PropertyAction { target: resultsCardAnimator; property: "visible"; value: true}

148+

149+ NumberAnimation { // show these components

150+ target: resultsCardAnimator; property: "progress"; duration: animationDuration; from: 0; to: 1

151+ }

152+ }

153+ },

154+ Transition {

155+ from: "initial"

156+ to: "showing_results"

157+ SequentialAnimation {

158+ NumberAnimation {

159+ targets: [toolBarAnimator, searchBarAnimator, resultsCardAnimator]

160+ property: "progress"; duration: animationDuration; to: 0

161+ }

162+

163+ PropertyAction { target: toolBarAnimator; property: "visible"; value: false}

164+

165+ AnchorAnimation { duration: 0 } // so anchor change happens at this point

166+

167+ NumberAnimation {

168+ targets: [searchBarAnimator, resultsCardAnimator]

169+ property: "progress"; duration: animationDuration; from: 0; to: 1

170+ }

171+ }

172+ }

173+ ]

174+

175+ state: "initial"

176+

177+ HudClient {

178+ id: hudClient

179+

180+ onCommandExecuted: {

181+ hudShowable.hide()

182+ }

183+

184+ onShowParametrizedAction: {

185+ parametrizedActionsPage.header = action

186+ parametrizedActionsPage.setItems(items)

187+ parametrizedActionsPage.shown = true

188+ }

189+

190+ onVoiceQueryLoading: {

191+ hud.state = "voice_recognition_loading"

192+ searchBar.ignoreNextTextChange = true

193+ searchBar.text = ""

194+ searchBar.unfocus()

195+ soundAmplitudeVisual.startIdle()

196+ }

197+ onVoiceQueryListening: {

198+ if (hud.state == "voice_recognition_loading" || hud.state == "showing_results") {

199+ searchBar.ignoreNextTextChange = true

200+ searchBar.text = ""

201+ searchBar.unfocus()

202+ hud.state = "voice_recognition_listening"

203+ }

204+ }

205+ onVoiceQueryHeardSomething: {

206+ if (hud.state == "voice_recognition_listening") {

207+ hud.state = "voice_recognition_processing"

208+ soundAmplitudeVisual.setDetectorEnabled(true)

209+ }

210+ }

211+ onVoiceQueryFinished: {

212+ hud.state = "showing_results"

213+ searchBar.text = query

214+ soundAmplitudeVisual.setDetectorEnabled(false)

215+ }

216+ onVoiceQueryFailed: {

217+ hud.state = "showing_results"

218+ searchBar.text = ""

219+ soundAmplitudeVisual.setDetectorEnabled(false)

220+ }

221+ }

222+

223+ Showable {

224+ id: hudShowable

225+ objectName: "hudShowable"

226+ height: parent.height

227+ width: parent.width

228+

229+ onYChanged: {

230+ if (!showAnimation.running && !hideAnimation.running) {

231+ if (parent.height > 0) {

232+ showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)

233+ hideAnimation.duration = showableAnimationDuration - showAnimation.duration

234+ }

235+ }

236+ }

237+

238+ MouseArea {

239+ // Eat everything that doesn't go to other places

240+ anchors.fill: parent

241+ }

242+

243+ Image {

244+ anchors.fill: parent

245+ fillMode: Image.Tile

246+ source: "graphics/hud_bg.png"

247+ }

248+

249+ Connections {

250+ target: hideAnimation

251+ onRunningChanged: {

252+ if (!hideAnimation.running) {

253+ showAnimation.duration = showableAnimationDuration

254+ hud.resetToInitialState()

255+ }

256+ }

257+ }

258+

259+ Connections {

260+ target: showAnimation

261+ onRunningChanged: {

262+ if (!showAnimation.running) {

263+ hideAnimation.duration = showableAnimationDuration

264+ }

265+ }

266+ }

267+ }

268+

269+ Item {

270+ id: handle

271+ objectName: "handle"

272+

273+ y: hudShowable.y

274+ anchors {

275+ left: parent.left

276+ right: parent.right

277+ }

278+ height: handleImage.height

279+

280+ Image {

281+ id: handleImage

282+ anchors {

283+ left: parent.left

284+ right: parent.right

285+ }

286+ source: "graphics/hud_handlebar.png"

287+ }

288+

289+ Image {

290+ id: handleArrow

291+ y: units.gu(1)

292+ anchors.horizontalCenter: parent.horizontalCenter

293+ source: "graphics/hud_handlearrow.png"

294+ cache: false

295+ }

296+ }

297+

298+ Item {

299+ id: hudContentClipper

300+

301+ anchors {

302+ left: parent.left

303+ right: parent.right

304+ bottom: parent.bottom

305+ top: handle.bottom

306+ }

307+ clip: visible && hudContent.height !== height

308+ visible: hudContent.height >= 0

309+

310+ Item {

311+ id: hudContent

312+ anchors {

313+ left: parent.left

314+ right: parent.right

315+ bottom: parent.bottom

316+ }

317+ height: hud.height

318+

319+ Item {

320+ id: mainPage

321+ x: parametrizedActionsPage.x - width

322+ height: hud.height

323+ width: hud.width

324+

325+ ShowingAnimation {

326+ id: toolBarAnimator

327+ objectName: "toolBarAnimator"

328+ anchors {

329+ left: parent.left

330+ right: parent.right

331+ bottom: searchBarAnimator.top

332+ margins: 2*elementsPadding //ensures positioning correct

333+ }

334+ progress: MathUtils.clamp((y - hudShowable.y - anchors.margins)/elementsYSliding, 0, 1)

335+

336+ ToolBar {

337+ id: toolBar

338+ objectName: "toolBar"

339+ model: hudClient.toolBarModel

340+ anchors.horizontalCenter: parent.horizontalCenter

341+ onActionTriggered: {

342+ hudClient.executeToolBarAction(action)

343+ }

344+ }

345+ }

346+

347+ ShowingAnimation {

348+ id: searchBarAnimator

349+ objectName: "searchBarAnimator"

350+ anchors {

351+ left: parent.left

352+ right: parent.right

353+ bottom: parent.bottom

354+ margins: elementsPadding

355+ topMargin: handle.height + units.dp(1) + elementsPadding

356+ }

357+ progress: MathUtils.clamp((y - hudShowable.y - anchors.margins)/elementsYSliding, 0, 1)

358+

359+ SearchBar {

360+ id: searchBar

361+ objectName: "searchBar"

362+

363+ property bool ignoreNextTextChange: false

364+

365+ anchors.left: parent.left

366+ anchors.right: parent.right

367+ height: units.gu(5)

368+

369+ placeholderText: i18n.tr("Type or say a command")

370+ activityIndicatorVisible: hud.state == "voice_recognition_processing"

371+

372+ onMicrophoneClicked: hudClient.startVoiceQuery()

373+

374+ onTextChanged: {

375+ if (ignoreNextTextChange) {

376+ ignoreNextTextChange = false

377+ } else {

378+ hudClient.setQuery(searchBar.text)

379+ }

380+ }

381+

382+ onTextFocused: {

383+ hud.state = "showing_results"

384+ }

385+ }

386+ }

387+

388+ ShowingAnimation {

389+ id: resultsCardAnimator

390+ objectName: "resultsCardAnimator"

391+

392+ anchors {

393+ left: parent.left

394+ right: parent.right

395+ top: searchBarAnimator.bottom

396+ margins: elementsPadding

397+ }

398+ progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)

399+

400+ Flickable {

401+ anchors.left: parent.left

402+ anchors.right: parent.right

403+ contentHeight: resultList.height

404+ contentWidth: width

405+ clip: height < contentHeight

406+ interactive: height < contentHeight

407+

408+ height: {

409+ if (hud.state == "showing_results") {

410+ return shell.applicationManager.keyboardVisible ? Math.min(hud.height - searchBarAnimator.y - searchBarAnimator.height - units.gu(2) - shell.applicationManager.keyboardHeight, contentHeight) : contentHeight

411+ } else {

412+ return contentHeight

413+ }

414+ }

415+

416+

417+ ResultList {

418+ id: resultList

419+

420+ anchors.left: parent.left

421+ anchors.right: parent.right

422+ height: childrenRect.height

423+

424+ onActivated: {

425+ hudClient.executeCommand(index)

426+ }

427+

428+ model: hudClient.results

429+ }

430+ }

431+ }

432+

433+ ShowingAnimation {

434+ id: soundAmplitudeVisualAnimator

435+

436+ anchors {

437+ horizontalCenter: parent.horizontalCenter

438+ verticalCenter: parent.verticalCenter

439+ verticalCenterOffset: (searchBar.height + 2*elementsPadding)/2

440+ }

441+ visible: false

442+ width: units.gu(33)

443+ progress: MathUtils.clamp((y - hudShowable.y - anchors.verticalCenterOffset)/elementsYSliding, 0, 1)

444+

445+ SoundAmplitudeVisual {

446+ id: soundAmplitudeVisual

447+ width: units.gu(33)

448+ height: width

449+ }

450+ }

451+ }

452+

453+ HudParametrizedActionsPage {

454+ id: parametrizedActionsPage

455+ objectName: "parametrizedActionsPage"

456+ property bool shown: false

457+

458+ anchors.bottom: parent.bottom

459+ height: hud.height - handle.height - units.dp(1)

460+ width: parent.width

461+ x: shown ? 0 : width

462+ onConfirmPressed: {

463+ hudClient.executeParametrizedAction(values())

464+ }

465+ onValuesUpdated: {

466+ hudClient.updateParametrizedAction(values())

467+ }

468+ onBackPressed: {

469+ shown = false

470+ }

471+ onShownChanged: {

472+ if (!shown) {

473+ hudClient.cancelParametrizedAction()

474+ }

475+ }

476+ Behavior on x {

477+ NumberAnimation {

478+ easing.type: outEasing

479+ duration: animationDuration

480+ }

481+ }

482+ }

483+ }

484+ }

485+

486+ Image {

487+ anchors.left: hudContentClipper.right

488+ anchors.top: hudContentClipper.top

489+ anchors.bottom: hudContentClipper.bottom

490+ fillMode: Image.Tile

491+ source: "graphics/dropshadow_right.png"

492+ }

493+}

Hud/HudParametrizedActionsPage.qmlnew file+172

@@ -0,0 +1,172 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+Item {

22+ property alias header: header.text

23+ signal backPressed

24+ signal confirmPressed

25+ signal valuesUpdated

26+ id: root

27+

28+ ListModel {

29+ id: actionItems

30+ }

31+

32+ function setItems(items) {

33+ while (actionItems.count > 0) {

34+ var item = actionItems.get(0).item

35+ actionItems.remove(0)

36+ item.visible = false

37+ item.destroy()

38+ }

39+

40+ var sliderCreator = Qt.createComponent("SliderLabel.qml");

41+ var first = true

42+ var topAnchor = header.bottom

43+ for (var i = 0; i < items.length; i++) {

44+ var item = items[i]

45+ if (item["parameter-type"] == "slider")

46+ {

47+ var slider = sliderCreator.createObject(flickableColumn);

48+ slider.anchors.left = flickableColumn.left

49+ slider.anchors.right = flickableColumn.right

50+ slider.anchors.topMargin = first ? units.gu(1) : units.gu(2)

51+ slider.anchors.top = topAnchor

52+ slider.tooltip = tooltip

53+ slider.sliderData = item

54+ topAnchor = slider.bottom

55+ actionItems.append({"item": slider})

56+ slider.onValueChanged.connect(valueChanged)

57+ }

58+ first = false

59+ }

60+ }

61+

62+ function valueChanged()

63+ {

64+ valuesUpdated()

65+ }

66+

67+ function values() {

68+ var values = {}

69+ for (var i = 0; i < actionItems.count; ++i) {

70+ var item = actionItems.get(i).item

71+ values[item.action] = item.value

72+ }

73+ return values

74+ }

75+

76+ Flickable {

77+ anchors.top: parent.top

78+ anchors.bottom: buttons.top

79+ anchors.left: parent.left

80+ anchors.right: parent.right

81+ clip: true

82+

83+ flickableDirection: Flickable.VerticalFlick

84+ interactive: !tooltip.visible

85+

86+ Item {

87+ id: flickableColumn

88+ anchors.top: parent.top

89+ anchors.left: parent.left

90+ anchors.right: parent.right

91+

92+ PageHeader {

93+ id: header

94+ anchors.top: parent.top

95+ anchors.left: parent.left

96+ anchors.right: parent.right

97+ anchors.topMargin: units.gu(1)

98+ }

99+ }

100+ }

101+ Item {

102+ id: buttons

103+ anchors.bottom: parent.bottom

104+ anchors.left: parent.left

105+ anchors.right: parent.right

106+ anchors.margins: units.gu(1)

107+ height: confirmButton.height

108+

109+ Button {

110+ id: backButton

111+ anchors.left: parent.left

112+ anchors.top: parent.top

113+ anchors.bottom: parent.bottom

114+ width: units.gu(7)

115+ color: "black"

116+ opacity: 0.25

117+ MouseArea {

118+ anchors.fill: parent

119+ onClicked: backPressed()

120+ }

121+ }

122+ Image {

123+ anchors.centerIn: backButton

124+ source: "graphics/icon_arrow.png"

125+ }

126+

127+ Button {

128+ id: confirmButton

129+ anchors.right: parent.right

130+ width: units.gu(13)

131+ height: units.gu(5)

132+ text: i18n.tr("Confirm")

133+ color: "#F05D22"

134+ onClicked: confirmPressed()

135+ }

136+ }

137+

138+ Item {

139+ id: tooltip

140+ property variant target: undefined

141+ visible: target != undefined

142+ y: visible ? root.mapFromItem(target.parent, 0, target.y).y - height : 0

143+ x: visible ? target.anchors.leftMargin + target.__internals.thumb.x + target.__internals.thumb.width / 2 - width / 2 : 0

144+

145+ width: childrenRect.width

146+ height: childrenRect.height

147+

148+ Rectangle {

149+ id: tooltipRectangle

150+ width: units.gu(8)

151+ height: units.gu(6)

152+ color: "white"

153+ radius: units.gu(0.5)

154+

155+ Label {

156+ anchors.fill: parent

157+ text: tooltip.target ? tooltip.target.realFormatValue(tooltip.target.value) : ""

158+ horizontalAlignment: Text.AlignHCenter

159+ verticalAlignment: Text.AlignVCenter

160+ fontSize: "large"

161+ }

162+ }

163+ Image {

164+ id: tooltipTip

165+ source: "graphics/popup_triangle.png"

166+

167+ anchors.top: tooltipRectangle.bottom

168+ anchors.horizontalCenter: parent.horizontalCenter

169+ }

170+

171+ }

172+}

Hud/Result.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ property string contextSnippetText

22+ property variant contextSnippetHighlights

23+ property string nameText

24+ property variant nameHighlights

25+

26+ function highlightedText(text, highlights) {

27+ var hText = "";

28+ var nextIndexToProcess = 0;

29+ if (highlights && highlights.length % 2 == 0) {

30+ for (var i = 0; i < highlights.length - 1; i += 2) {

31+ var highlightStart = highlights[i];

32+ var highlightEnd = highlights[i + 1];

33+ if (highlightEnd < highlightStart)

34+ continue;

35+ if (highlightStart < nextIndexToProcess)

36+ continue;

37+ if (highlightStart != nextIndexToProcess) {

38+ // Prev non marked text

39+ hText += text.substr(nextIndexToProcess, highlightStart - nextIndexToProcess);

40+ }

41+

42+ // Marked text

43+ hText += "<font color=\"#ffffff\">" + text.substr(highlightStart, highlightEnd - highlightStart + 1) + "</font>";

44+ nextIndexToProcess = highlightEnd + 1;

45+ }

46+ }

47+ if (nextIndexToProcess != text.length) {

48+ // End non marked text

49+ hText += text.substr(nextIndexToProcess);

50+ }

51+ return hText;

52+ }

53+

54+ Label {

55+ id: actionLabel

56+ objectName: "actionLabel"

57+ anchors.left: parent.left

58+ anchors.leftMargin: units.gu(1)

59+ anchors.verticalCenter: parent.verticalCenter

60+ width: parent.width / 2

61+ fontSize: "medium"

62+ elide: Text.ElideRight

63+ maximumLineCount: 1

64+ text: highlightedText(nameText, nameHighlights)

65+ color: "#80ffffff"

66+ }

67+

68+ Label {

69+ horizontalAlignment: Text.AlignRight

70+ id: contextSnippetLabel

71+ objectName: "contextSnippetLabel"

72+ width: parent.width / 2 - units.gu(1)

73+ visible: text != ""

74+ anchors.right: parent.right

75+ anchors.rightMargin: units.gu(1)

76+ anchors.verticalCenter: parent.verticalCenter

77+ fontSize: "small"

78+ opacity: 0.5

79+ elide: Text.ElideRight

80+ maximumLineCount: 2

81+ text: highlightedText(contextSnippetText, contextSnippetHighlights)

82+ color: "#80ffffff"

83+ }

84+}

Hud/ResultList.qmlnew file+106

@@ -0,0 +1,106 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Column {

21+ property var model: undefined

22+

23+ // Hud gives lots of results, make sure we have 5 at most

24+ // FIXME This should use SortFilterProxyModel

25+ // but there is a problem with the hud-service refreshing the

26+ // data for no reason so we use the internal model + timer

27+ // to fix those issues

28+ ListModel {

29+ id: internalModel

30+ }

31+

32+ Connections {

33+ target: model

34+ // Accumulate count changes since hud clears

35+ // and then readds items to the models which means

36+ // even if the result is the same we get lots of count changes

37+ onCountChanged: updateModelTimer.restart()

38+ }

39+

40+ onModelChanged: updateModelTimer.restart()

41+

42+ Timer {

43+ id: updateModelTimer

44+ interval: 30

45+ onTriggered: updateModel()

46+ }

47+

48+ function updateModel() {

49+ internalModel.clear()

50+ for (var i = 0; i < 5 && i < model.count; ++i) {

51+ var itemData = model.get(i)

52+ internalModel.append({"name": itemData.column_1, "highlights": itemData.column_2, "context": itemData.column_3, "contextHighlights": itemData.column_4})

53+ }

54+ }

55+

56+ signal activated(int index)

57+

58+ height: repeater.height

59+

60+ Repeater {

61+ id: repeater

62+ objectName: "resultListRepeater"

63+ model: internalModel

64+

65+ delegate: MouseArea {

66+ id: delegate

67+ height: result.height + separatorLine.height * 2

68+ anchors.left: parent.left

69+ anchors.right: parent.right

70+

71+ onClicked: activated(index)

72+

73+ BorderImage {

74+ id: separatorLine

75+ anchors.top: parent.top

76+ anchors.left: parent.left

77+ anchors.right: parent.right

78+ source: "graphics/divider.sci"

79+ visible: index == 0

80+ }

81+

82+ Result {

83+ id: result

84+ height: units.gu(6)

85+ anchors.top: separatorLine.bottom

86+ anchors.left: parent.left

87+ anchors.right: parent.right

88+

89+ nameText: name

90+ nameHighlights: highlights

91+ contextSnippetText: context

92+ contextSnippetHighlights: contextHighlights

93+ }

94+

95+ BorderImage {

96+ anchors.top: result.bottom

97+ anchors.left: parent.left

98+ anchors.right: parent.right

99+ source: "graphics/divider.sci"

100+ }

101+

102+ Component.onCompleted: fadeIn.start()

103+ NumberAnimation { id: fadeIn; target: resultList; alwaysRunToEnd: true; property: "opacity"; duration: 200; from: 0; to: 1 }

104+ }

105+ }

106+}

Hud/SearchBar.qmlnew file+100

@@ -0,0 +1,100 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ id: root

22+ property alias activityIndicatorVisible: activityIndicator.visible

23+ property alias text: searchBar.text

24+ property alias placeholderText: searchBar.placeholderText

25+ property alias searchEnabled: searchBar.enabled

26+ signal microphoneClicked

27+ signal textFocused

28+

29+ readonly property real imageSize: units.gu(3)

30+

31+ function unfocus()

32+ {

33+ searchBar.focus = false

34+ }

35+

36+ ActivityIndicator {

37+ id: activityIndicator

38+ height: imageSize

39+ width: height

40+ x: magnifierImage.x

41+ y: magnifierImage.y

42+ running: visible

43+ }

44+

45+ TextField {

46+ id: searchBar

47+ anchors.fill: parent

48+

49+ hasClearButton: false

50+ font.pixelSize: FontUtils.sizeToPixels("large")

51+

52+ onActiveFocusChanged: {

53+ if (activeFocus) {

54+ root.textFocused()

55+ }

56+ }

57+

58+ Item {

59+ id: primary

60+ height: searchBar.height

61+ width: height

62+

63+ Image {

64+ id: magnifierImage

65+ height: imageSize

66+ width: height

67+ anchors.centerIn: parent

68+ source: "graphics/icon_search.png"

69+ visible: !activityIndicator.visible && !clearImage.visible

70+ }

71+

72+ Image {

73+ id: clearImage

74+ height: imageSize

75+ width: height

76+ anchors.centerIn: parent

77+ source: "graphics/icon_clear.png"

78+ visible: !activityIndicator.visible && searchBar.text != ""

79+ MouseArea {

80+ anchors.fill: parent

81+ onClicked: searchBar.text = ""

82+ }

83+ }

84+ }

85+

86+ primaryItem: primary

87+ secondaryItem: MouseArea {

88+ height: searchBar.height

89+ width: height

90+ onClicked: microphoneClicked()

91+

92+ Image {

93+ height: imageSize

94+ width: height

95+ anchors.centerIn: parent

96+ source: "graphics/microphone.png"

97+ }

98+ }

99+ }

100+}

Hud/ShowingAnimation.qmlnew file+54

@@ -0,0 +1,54 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+Item {

22+ id: root

23+ property real yOffsetAtAnimationStart: units.gu(2)

24+ property real progress: 0

25+ property int animationDuration: 200

26+ default property alias __itemsToAnimate: container.children

27+

28+ property bool showing: progress > 0

29+

30+ height: childrenRect.height

31+

32+ Item {

33+ id: container

34+ anchors {

35+ left: parent.left

36+ right: parent.right

37+ }

38+ height: childrenRect.height

39+ }

40+

41+ NumberAnimation {id: opacityAnimation; target: container; property: "opacity"; from: 0; to: 1; duration: animationDuration}

42+ NumberAnimation {id: yAnimation; target: container; property: "y"; from: yOffsetAtAnimationStart; to: 0; duration: animationDuration}

43+

44+ // FIXME This would much more sense in a ParallelAnimation and just

45+ // one AnimationController but that goes something crazy and rendering never stops

46+ AnimationController {

47+ animation: opacityAnimation

48+ progress: root.progress

49+ }

50+ AnimationController {

51+ animation: yAnimation

52+ progress: root.progress

53+ }

54+}

Hud/SliderLabel.qmlnew file+74

@@ -0,0 +1,74 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+Item {

21+ height: childrenRect.height

22+ width: childrenRect.width

23+ property variant tooltip

24+

25+ property variant sliderData

26+ property string action

27+ property alias value: slider.value

28+ onValueChanged: {

29+ // TODO We should not need this but without it

30+ // slider.onValueChanged.connect(valueChanged) in

31+ // HudParametrizedActionsPage.qml doesn't work

32+ // Michael thinks it's related to https://bugreports.qt-project.org/browse/QTBUG-29141

33+ }

34+

35+ onSliderDataChanged: {

36+ label.text = sliderData["label"]

37+ slider.minimumValue = sliderData["min"]

38+ slider.maximumValue = sliderData["max"]

39+ slider.live = sliderData["live"]

40+ // SDK Slider does not support step yet

41+// slider.step = sliderData["step"]

42+ slider.value = sliderData["value"]

43+ action = sliderData["action"]

44+ }

45+

46+ Label {

47+ id: label

48+ anchors.top: parent.top

49+ anchors.left: parent.left

50+ anchors.right: parent.right

51+ anchors.margins: units.gu(1)

52+ anchors.leftMargin: units.gu(2)

53+ color: "white"

54+ }

55+ Slider {

56+ id: slider

57+ anchors.top: label.bottom

58+ anchors.left: parent.left

59+ anchors.right: parent.right

60+ anchors.margins: units.gu(1)

61+ height: units.gu(6)

62+ live: true

63+ function realFormatValue(v) { return Math.round(v) + " %" }

64+ function formatValue(v) { return tooltip.target == slider ? "" : realFormatValue(v) }

65+ onPressedChanged: tooltip.target = pressed ? slider : undefined

66+ }

67+ BorderImage {

68+ source: "graphics/divider.sci"

69+ anchors.top: slider.bottom

70+ anchors.left: parent.left

71+ anchors.right: parent.right

72+ anchors.topMargin: units.gu(2)

73+ }

74+}

Hud/SoundAmplitudeDelegate.qmlnew file+52

@@ -0,0 +1,52 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+

19+Rectangle {

20+ id: delegate

21+ property real amplitude: 0

22+ property int totalCount

23+ property int ballIndex

24+ width: {

25+ var t = amplitude / 0.6

26+ t = -t * (t - 2)

27+ return units.gu(0.25) + units.gu(5) * t

28+ }

29+ visible: amplitude != 0

30+ height: width

31+ color: "#DD4814"

32+ radius: width * 0.5

33+ antialiasing: true

34+ opacity: {

35+ // TODO This formula has hardocded values everywhere :D

36+ var t

37+ var dampenAfterThisIndex = 7

38+ if (ballIndex < dampenAfterThisIndex) {

39+ t = (totalCount - ballIndex) / totalCount

40+ return Math.pow(t, 4);

41+ } else {

42+ t = (totalCount - dampenAfterThisIndex) / totalCount

43+ t = Math.pow(t, 4);

44+ t = t * 0.7;

45+ return 0.09 + t * (totalCount - ballIndex) / (totalCount - dampenAfterThisIndex)

46+ }

47+ }

48+

49+ property double orbitRadius: ((parent.width - units.gu(6)) / 2)

50+ x: -(width / 2) + (parent.width / 2) + orbitRadius * Math.sin((ballIndex / totalCount) * (2 * Math.PI))

51+ y: -(height / 2) + (parent.height / 2) - orbitRadius * Math.cos((ballIndex / totalCount) * (2 * Math.PI))

52+}

Hud/SoundAmplitudeVisual.qmlnew file+146

@@ -0,0 +1,146 @@

1+/*

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import HudClient 0.1

19+

20+Item {

21+ id: voiceInput

22+

23+ readonly property int totalSpots: 30

24+ readonly property int totalIdles: 7

25+

26+ property real __newPeak: 0

27+

28+ VolumePeakDetector {

29+ id: peakDetector

30+ desiredInterval: peakMover.interval

31+ onNewPeak: {

32+ __newPeak = volume

33+ }

34+ }

35+

36+ Timer {

37+ id: peakMover

38+ interval: 10

39+ repeat: true

40+ onTriggered: {

41+ moveBalls()

42+ voiceAmplitudes.itemAt(0).amplitude = __newPeak

43+ }

44+ }

45+

46+ Repeater {

47+ id: fixedPositionSoundAmplitudes

48+ model: totalSpots

49+ delegate: SoundAmplitudeDelegate {

50+ totalCount: fixedPositionSoundAmplitudes.count

51+ ballIndex: index

52+ opacity: 1

53+ visible: true

54+ }

55+ }

56+

57+ Repeater {

58+ id: voiceAmplitudes

59+ model: totalSpots

60+ delegate: SoundAmplitudeDelegate {

61+ totalCount: voiceAmplitudes.count

62+ ballIndex: index

63+ }

64+ }

65+

66+ Repeater {

67+ id: idleAmplitudes

68+ model: totalSpots

69+ delegate: SoundAmplitudeDelegate {

70+ totalCount: idleAmplitudes.count

71+ ballIndex: index

72+ amplitude: 0.05

73+ visible: idleAmplitudes.enabled

74+ }

75+ }

76+

77+ function setDetectorEnabled(enabled) {

78+ idleAmplitudes.enabled = false

79+ if (enabled) {

80+ peakMover.start()

81+ } else {

82+ peakDetector.enabled = false

83+ peakMover.stop()

84+ }

85+ }

86+

87+ function moveBalls() {

88+ var i = 0

89+ var amplitude = voiceAmplitudes.itemAt(0).amplitude

90+ for (var i = 1; i < totalSpots; ++i) {

91+ var item = voiceAmplitudes.itemAt(i)

92+ var tempAmplitude = item.amplitude

93+ item.amplitude = amplitude

94+ amplitude = tempAmplitude

95+ }

96+ }

97+

98+ property int __firstIdle

99+ property int __idleCount

100+

101+ Timer {

102+ id: idleBallsTimer

103+ interval: 40

104+ onTriggered: moveAndAddIdleBalls()

105+ }

106+

107+ function moveAndAddIdleBalls() {

108+ // Check if we are doing the real thing

109+ if (!idleAmplitudes.enabled) {

110+ return

111+ }

112+

113+ for (var i = 0; i < __idleCount; ++i) {

114+ var index = __firstIdle - i

115+ var item = idleAmplitudes.itemAt(index % totalSpots)

116+ var nextItem = idleAmplitudes.itemAt((index + 1) % totalSpots)

117+ nextItem.opacity = item.opacity

118+ }

119+ __firstIdle++

120+ idleAmplitudes.itemAt((__firstIdle - __idleCount) % totalSpots).opacity = 0

121+

122+ if (__idleCount < totalIdles) {

123+ idleAmplitudes.itemAt(0).opacity = 1 - (__idleCount / totalIdles)

124+ __idleCount++

125+ }

126+ idleBallsTimer.start()

127+ }

128+

129+ function startIdle() {

130+ // On the device the peak detector takes quite a lot to start up

131+ // so enable it as soon as we know we are going to do voice capture

132+ peakDetector.enabled = true

133+ for (var i = 0; i < totalSpots; ++i) {

134+ idleAmplitudes.itemAt(i).opacity = 0

135+ }

136+ for (var i = 0; i < totalSpots; ++i) {

137+ voiceAmplitudes.itemAt(i).amplitude = 0

138+ }

139+

140+ idleAmplitudes.enabled = true

141+ idleAmplitudes.itemAt(0).opacity = 1

142+ __idleCount = 1

143+ __firstIdle = 0

144+ idleBallsTimer.start()

145+ }

146+}

tests/mocks/Utils/URLDispatcher.cpp → Hud/ToolBar.qmlrenamed+14−19

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2016 Canonical, Ltd.

2+ * Copyright (C) 2012, 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,25 +14,20 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−#include "URLDispatcher.h"

17+import QtQuick 2.0

18+import HudClient 0.1

18

19

19−#include <QDBusConnection>

20+Row {

21+ signal actionTriggered(int action)

22+ property alias model: repeater.model

20

23

21−URLDispatcher::URLDispatcher(QObject *parent)

24+ spacing: units.gu(3)

22− : QObject(parent)

25+ Repeater {

23− , m_active(false)

26+ id: repeater

24−{

27+ ToolBarIcon {

25−}

28+ source: model.iconPath

26−

29+ onClicked: actionTriggered(model.action)

27−bool URLDispatcher::active() const

30+ enabled: model.enabled

28−{

31+ }

29− return m_active;

30−}

31−

32−void URLDispatcher::setActive(bool value)

33−{

34− if (m_active != value) {

35− m_active = value;

36− Q_EMIT activeChanged();

37 }

32 }

38}

33}

Hud/ToolBarIcon.qmlnew file+32

@@ -0,0 +1,32 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+

20+AbstractButton {

21+ property alias source: image.source

22+

23+ height: units.gu(4)

24+ width: height

25+ opacity: enabled ? 1 : 0.5

26+ Behavior on opacity { NumberAnimation { duration: 150 } }

27+

28+ Image {

29+ id: image

30+ anchors.fill: parent

31+ }

32+}

Hud/graphics/divider@20.pngnew file

Binary file not shown.

Hud/graphics/divider@20.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 0

2+border.top: 0

3+border.bottom: 0

4+border.right: 2

5+source: divider@20.png

Hud/graphics/dropshadow_right@20.pngnew file

Binary file not shown.

Hud/graphics/help@20.pngnew file

Binary file not shown.

Hud/graphics/hud_bg@20.pngnew file

Binary file not shown.

Hud/graphics/hud_handlearrow@20.pngnew file

Binary file not shown.

Hud/graphics/hud_handlebar@20.pngnew file

Binary file not shown.

Hud/graphics/icon_arrow@20.pngnew file

Binary file not shown.

Hud/graphics/icon_clear@20.pngnew file

Binary file not shown.

Hud/graphics/icon_search@20.pngnew file

Binary file not shown.

Hud/graphics/microphone@20.pngnew file

Binary file not shown.

Hud/graphics/popup_triangle@20.pngnew file

Binary file not shown.

Hud/graphics/settings@20.pngnew file

Binary file not shown.

Hud/graphics/undo@20.pngnew file

Binary file not shown.

Hud/graphics/view-fullscreen@20.pngnew file

Binary file not shown.

Jenkinsfiledeleted−2

@@ -1,2 +0,0 @@

1−@Library('ubports-build-tools') _

2−buildAndProvideDebianPackage()

qml/Launcher/FoldingLauncherDelegate.qml → Launcher/FoldingLauncherDelegate.qmlrenamed+2−2

@@ -14,8 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19

19

20LauncherDelegate {

20LauncherDelegate {

21 id: root

21 id: root

Launcher/Launcher.qmlnew file+253

@@ -0,0 +1,253 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../Components"

19+import Ubuntu.Components 0.1

20+import Ubuntu.Gestures 0.1

21+import Unity 0.1

22+import Unity.Launcher 0.1

23+

24+Item {

25+ id: root

26+

27+ property bool available: true // can be used to disable all interactions

28+

29+ property int panelWidth: units.gu(8)

30+ property int dragAreaWidth: units.gu(1)

31+ property int minimizeDistance: panelWidth * 2.5

32+ property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?

33+ (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0

34+

35+ readonly property bool shown: panel.x > -panel.width

36+

37+ // emitted when an application is selected

38+ signal launcherApplicationSelected(string appId)

39+

40+ // emitted when the apps dash should be shown because of a swipe gesture

41+ signal dash()

42+

43+ // emitted when the dash icon in the launcher has been tapped

44+ signal dashItemSelected()

45+

46+ onStateChanged: {

47+ if (state == "") {

48+ dismissTimer.stop()

49+ } else {

50+ dismissTimer.restart()

51+ }

52+ }

53+

54+ function hide() {

55+ switchToNextState("")

56+ }

57+

58+ function switchToNextState(state) {

59+ animateTimer.nextState = state

60+ animateTimer.start();

61+ }

62+

63+ function tease() {

64+ if (available) {

65+ teaseTimer.start();

66+ }

67+ }

68+

69+ Timer {

70+ id: teaseTimer

71+ interval: 200

72+ }

73+

74+ Timer {

75+ id: dismissTimer

76+ interval: 5000

77+ onTriggered: {

78+ if (!panel.preventHiding) {

79+ root.state = ""

80+ } else {

81+ dismissTimer.restart()

82+ }

83+ }

84+ }

85+

86+ // Because the animation on x is disabled while dragging

87+ // switching state directly in the drag handlers would not animate

88+ // the completion of the hide/reveal gesture. Lets update the state

89+ // machine and switch to the final state in the next event loop run

90+ Timer {

91+ id: animateTimer

92+ interval: 1

93+ property string nextState: ""

94+ onTriggered: {

95+ // switching to an intermediate state here to make sure all the

96+ // values are restored, even if we were already in the target state

97+ root.state = "tmp"

98+ root.state = nextState

99+ }

100+ }

101+

102+ MouseArea {

103+ id: launcherDragArea

104+ enabled: root.state == "visible"

105+ anchors.fill: panel

106+ anchors.rightMargin: -units.gu(2)

107+ drag {

108+ axis: Drag.XAxis

109+ maximumX: 0

110+ target: panel

111+ }

112+

113+ onReleased: {

114+ if (panel.x < -panel.width/3) {

115+ root.switchToNextState("")

116+ } else {

117+ root.switchToNextState("visible")

118+ }

119+ }

120+

121+ }

122+ MouseArea {

123+ id: closeMouseArea

124+ anchors {

125+ left: launcherDragArea.right

126+ top: parent.top

127+ right: parent.right

128+ bottom: parent.bottom

129+ }

130+ enabled: root.state == "visible"

131+ onPressed: {

132+ root.state = ""

133+ }

134+ }

135+

136+ Rectangle {

137+ id: backgroundShade

138+ anchors.fill: parent

139+ color: "black"

140+ opacity: root.state == "visible" ? 0.6 : 0

141+

142+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }

143+ }

144+

145+ LauncherPanel {

146+ id: panel

147+ objectName: "launcherPanel"

148+ enabled: root.available

149+ width: root.panelWidth

150+ anchors {

151+ top: parent.top

152+ bottom: parent.bottom

153+ }

154+ x: -width

155+ opacity: (x == -width && dragArea.status === DirectionalDragArea.WaitingForTouch) ? 0 : 1

156+ model: LauncherModel

157+

158+ property bool animate: true

159+

160+ onApplicationSelected: {

161+ root.state = ""

162+ launcherApplicationSelected(appId)

163+ }

164+ onDashItemSelected: {

165+ root.state = ""

166+ root.dashItemSelected(index)

167+ }

168+

169+ onPreventHidingChanged: {

170+ if (dismissTimer.running) {

171+ dismissTimer.restart();

172+ }

173+ }

174+

175+ Behavior on x {

176+ NumberAnimation {

177+ // Disabling animation when dragging

178+ duration: dragArea.dragging || launcherDragArea.drag.active ? 0 : 300;

179+ easing.type: Easing.OutCubic

180+ }

181+ }

182+

183+ Behavior on opacity {

184+ NumberAnimation {

185+ duration: UbuntuAnimation.FastDuration; easing.type: Easing.OutCubic

186+ }

187+ }

188+ }

189+

190+ EdgeDragArea {

191+ id: dragArea

192+

193+ direction: Direction.Rightwards

194+

195+ enabled: root.available

196+ width: root.dragAreaWidth

197+ height: root.height

198+

199+ onTouchXChanged: {

200+ if (status !== DirectionalDragArea.Recognized || launcher.state == "visible")

201+ return;

202+

203+ // When the gesture finally gets recognized, the finger will likely be

204+ // reasonably far from the edge. If we made the panel immediately

205+ // follow the finger position it would be visually unpleasant as it

206+ // would appear right next to the user's finger out of nowhere.

207+ // Instead, we make the panel go towards the user's finger in several

208+ // steps. ie., in an animated way.

209+ var targetPanelX = Math.min(0, touchX - panel.width)

210+ var delta = targetPanelX - panel.x

211+ // the trick is not to go all the way (1.0) as it would cause a sudden jump

212+ panel.x += 0.4 * delta

213+ }

214+

215+ onDraggingChanged: {

216+ if (!dragging) {

217+ if (distance > panel.width / 2) {

218+ root.switchToNextState("visible")

219+ if (distance > minimizeDistance) {

220+ root.dash()

221+ }

222+ } else {

223+ root.switchToNextState("")

224+ }

225+ }

226+ }

227+ }

228+

229+ states: [

230+ State {

231+ name: "" // hidden state. Must be the default state ("") because "when:" falls back to this.

232+ PropertyChanges {

233+ target: panel

234+ x: -root.panelWidth

235+ }

236+ },

237+ State {

238+ name: "visible"

239+ PropertyChanges {

240+ target: panel

241+ x: 0

242+ }

243+ },

244+ State {

245+ name: "teasing"

246+ when: teaseTimer.running

247+ PropertyChanges {

248+ target: panel

249+ x: -root.panelWidth + units.gu(2)

250+ }

251+ }

252+ ]

253+}

qml/Launcher/LauncherDelegate.qml → Launcher/LauncherDelegate.qmlrenamed+54−167

@@ -14,26 +14,19 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19

19

20Item {

20Item {

21 id: root

21 id: root

22

22

23− property int itemIndex: 0

24 property string iconName

23 property string iconName

25− property string name

26− property int count: 0

24+ property int count: -1

27− property bool countVisible: false

28 property int progress: -1

25 property int progress: -1

29− property bool itemRunning: false

26+ property bool highlighted: false

30 property bool itemFocused: false

27 property bool itemFocused: false

31 property real maxAngle: 0

28 property real maxAngle: 0

32 property bool inverted: false

29 property bool inverted: false

33− property bool alerting: false

34− property bool highlighted: false

35− property bool shortcutHintShown: false

36− property int surfaceCount: 1

37

30

38 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight

31 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight

39 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight

32 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight

@@ -46,144 +39,84 @@ Item {

46 property real offset: 0

39 property real offset: 0

47 property real itemOpacity: 1

40 property real itemOpacity: 1

48 property real brightness: 0

41 property real brightness: 0

49− property double maxWiggleAngle: 5.0

50

42

51− QtObject {

43+ onIconNameChanged: shaderEffectSource.scheduleUpdate();

52− id: priv

44+ onCountChanged: shaderEffectSource.scheduleUpdate();

53−

45+ onProgressChanged: shaderEffectSource.scheduleUpdate();

54− readonly property int wiggleDuration: UbuntuAnimation.SnapDuration

46+ onHighlightedChanged: shaderEffectSource.scheduleUpdate();

55− property real wiggleAngle: 0

47+ onItemFocusedChanged: shaderEffectSource.scheduleUpdate();

56− }

57−

58− readonly property var wiggleAnim: SequentialAnimation {

59−

60− running: alerting

61− loops: 1

62− alwaysRunToEnd: true

63−

64− NumberAnimation {

65− target: priv

66− property: "wiggleAngle"

67− from: 0

68− to: maxWiggleAngle

69− duration: priv.wiggleDuration

70− easing.type: Easing.InQuad

71− }

72−

73− NumberAnimation {

74− target: priv

75− property: "wiggleAngle"

76− from: maxWiggleAngle

77− to: -maxWiggleAngle

78− duration: priv.wiggleDuration

79− easing.type: Easing.InOutQuad

80− }

81−

82− NumberAnimation {

83− target: priv

84− property: "wiggleAngle"

85− from: -maxWiggleAngle

86− to: maxWiggleAngle

87− duration: priv.wiggleDuration

88− easing.type: Easing.InOutQuad

89− }

90−

91− NumberAnimation {

92− target: priv

93− property: "wiggleAngle"

94− from: maxWiggleAngle

95− to: -maxWiggleAngle

96− duration: priv.wiggleDuration

97− easing.type: Easing.InOutQuad

98− }

99−

100− NumberAnimation {

101− target: priv

102− property: "wiggleAngle"

103− from: -maxWiggleAngle

104− to: maxWiggleAngle

105− duration: priv.wiggleDuration

106− easing.type: Easing.InOutQuad

107− }

108−

109− NumberAnimation {

110− target: priv

111− property: "wiggleAngle"

112− from: maxWiggleAngle

113− to: 0

114− duration: priv.wiggleDuration

115− easing.type: Easing.OutQuad

116− }

117− }

118

48

119 Item {

49 Item {

120 id: iconItem

50 id: iconItem

121− width: root.width

51+ width: parent.itemWidth + units.gu(1)

122 height: parent.itemHeight + units.gu(1)

52 height: parent.itemHeight + units.gu(1)

123 anchors.centerIn: parent

53 anchors.centerIn: parent

124

54

125− StyledItem {

55+ UbuntuShape {

126− styleName: "FocusShape"

127− anchors.fill: iconShape

128− activeFocusOnTab: true

129− StyleHints {

130− visible: root.highlighted

131− radius: units.gu(2.55)

132− }

133− }

134−

135− ProportionalShape {

136 id: iconShape

56 id: iconShape

137− anchors.centerIn: parent

57+ anchors.fill: parent

138− width: root.itemWidth

58+ anchors.margins: units.gu(1)

139− aspect: UbuntuShape.DropShadow

59+ radius: "medium"

60+

140− source: Image {

61+ image: Image {

141 id: iconImage

62 id: iconImage

142 sourceSize.width: iconShape.width

63 sourceSize.width: iconShape.width

143 sourceSize.height: iconShape.height

64 sourceSize.height: iconShape.height

144 source: root.iconName

65 source: root.iconName

145− cache: false // see lpbug#1543290 why no cache

146 }

66 }

147 }

67 }

148

68

149− UbuntuShape {

69+ BorderImage {

150− id: countEmblem

70+ id: overlayHighlight

71+ anchors.centerIn: iconItem

72+ rotation: inverted ? 180 : 0

73+ source: root.highlighted ? "graphics/selected.sci" : "graphics/non-selected.sci"

74+ width: root.itemWidth + units.gu(0.5)

75+ height: root.itemHeight + units.gu(0.5)

76+ }

77+

78+ BorderImage {

151 objectName: "countEmblem"

79 objectName: "countEmblem"

152 anchors {

80 anchors {

153 right: parent.right

81 right: parent.right

154− bottom: parent.bottom

82+ top: parent.top

155− rightMargin: (iconItem.width - root.itemWidth) / 2 - units.dp(2)

156− margins: units.dp(5)

83+ margins: units.dp(3)

157 }

84 }

158− width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))

85+ width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

159− height: units.gu(2)

86+ height: units.gu(3)

160− backgroundColor: theme.palette.normal.positive

87+ source: "graphics/notification.sci"

161− visible: root.countVisible

88+ visible: root.count > 0

162− aspect: UbuntuShape.Flat

163

89

164 Label {

90 Label {

165 id: countLabel

91 id: countLabel

166− objectName: "countLabel"

167 text: root.count

92 text: root.count

168 anchors.centerIn: parent

93 anchors.centerIn: parent

169 width: root.itemWidth - units.gu(1)

94 width: root.itemWidth - units.gu(1)

170 horizontalAlignment: Text.AlignHCenter

95 horizontalAlignment: Text.AlignHCenter

171 elide: Text.ElideRight

96 elide: Text.ElideRight

172 color: "white"

97 color: "white"

173− fontSize: "x-small"

98+ fontSize: "small"

99+ font.bold: true

174 }

100 }

175 }

101 }

176

102

177− UbuntuShape {

103+ BorderImage {

178 id: progressOverlay

104 id: progressOverlay

179 objectName: "progressOverlay"

105 objectName: "progressOverlay"

180−

181− anchors.centerIn: parent

106+ anchors {

182− width: root.itemWidth * .8

107+ left: iconItem.left

108+ right: iconItem.right

109+ bottom: iconItem.bottom

110+ leftMargin: units.gu(1)

111+ rightMargin: units.gu(1)

112+ bottomMargin: units.gu(1)

113+ }

183− height: units.dp(3)

114+ height: units.gu(1.5)

184 visible: root.progress > -1

115 visible: root.progress > -1

185− backgroundColor: "white"

116+ source: "graphics/progressbar-trough.sci"

186− borderSource: "none"

117+

118+ // For fill calculation we need to remove the 2 units of border defined in .sci file

119+ property int adjustedWidth: width - units.gu(2)

187

120

188 Item {

121 Item {

189 anchors {

122 anchors {

@@ -191,67 +124,28 @@ Item {

191 top: parent.top

124 top: parent.top

192 bottom: parent.bottom

125 bottom: parent.bottom

193 }

126 }

194− width: Math.min(100, root.progress) / 100 * parent.width

127+ width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)

195 clip: true

128 clip: true

196

129

197− UbuntuShape {

130+ BorderImage {

198 anchors {

131 anchors {

199 left: parent.left

132 left: parent.left

200 top: parent.top

133 top: parent.top

201 bottom: parent.bottom

134 bottom: parent.bottom

202 }

135 }

203− backgroundColor: theme.palette.normal.activity

204− borderSource: "none"

205 width: progressOverlay.width

136 width: progressOverlay.width

137+ source: "graphics/progressbar-fill.sci"

206 }

138 }

207 }

139 }

208 }

140 }

209−

141+ Image {

210− Column {

211− anchors {

212− left: parent.left

213− verticalCenter: parent.verticalCenter

214− }

215− spacing: units.gu(.5)

216− Repeater {

217− objectName: "surfacePipRepeater"

218− model: Math.min(3, root.surfaceCount)

219− Rectangle {

220− objectName: "runningHighlight" + index

221− width: units.gu(0.25)

222− height: units.gu(.5)

223− color: root.alerting ? theme.palette.normal.activity : "white"

224− visible: root.itemRunning

225− }

226− }

227− }

228−

229− Rectangle {

230 objectName: "focusedHighlight"

142 objectName: "focusedHighlight"

231 anchors {

143 anchors {

232 right: parent.right

144 right: parent.right

233 verticalCenter: parent.verticalCenter

145 verticalCenter: parent.verticalCenter

234 }

146 }

235− width: units.gu(0.25)

236− height: units.gu(.5)

237− color: "white"

238 visible: root.itemFocused

147 visible: root.itemFocused

239− }

148+ source: "graphics/focused_app_arrow.png"

240−

241− UbuntuShape {

242− objectName: "shortcutHint"

243− anchors.centerIn: parent

244− width: units.gu(2.5)

245− height: width

246− backgroundColor: "#F2111111"

247− visible: root.shortcutHintShown

248− aspect: UbuntuShape.Flat

249− Label {

250− anchors.centerIn: parent

251− text: (itemIndex + 1) % 10

252− color: "white"

253− font.weight: Font.Light

254− }

255 }

149 }

256 }

150 }

257

151

@@ -270,17 +164,10 @@ Item {

270 id: shaderEffectSource

164 id: shaderEffectSource

271 sourceItem: iconItem

165 sourceItem: iconItem

272 hideSource: true

166 hideSource: true

167+ live: false

273 }

168 }

274

169

275 transform: [

170 transform: [

276− // The rotation about the icon's center/z-axis for the wiggle

277− // needs to happen here too, because there's no other way to

278− // align the wiggle with the icon-folding otherwise

279− Rotation {

280− axis { x: 0; y: 0; z: 1 }

281− origin { x: iconItem.width / 2; y: iconItem.height / 2; z: 0 }

282− angle: priv.wiggleAngle

283− },

284 // Rotating 3 times at top/bottom because that increases the perspective.

171 // Rotating 3 times at top/bottom because that increases the perspective.

285 // This is a hack, but as QML does not support real 3D coordinates

172 // This is a hack, but as QML does not support real 3D coordinates

286 // getting a higher perspective can only be done by a hack. This is the most

173 // getting a higher perspective can only be done by a hack. This is the most

Launcher/LauncherPanel.qmlnew file+537

@@ -0,0 +1,537 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Components.ListItems 0.1 as ListItems

20+import Unity 0.1

21+import Unity.Launcher 0.1

22+import Ubuntu.Components.Popups 0.1

23+import "../Components/ListItems"

24+

25+Item {

26+ id: root

27+

28+ rotation: inverted ? 180 : 0

29+

30+ property var model

31+ property bool inverted: true

32+ property bool dragging: false

33+ property bool moving: launcherListView.moving || launcherListView.flicking

34+ property bool preventHiding: moving || dndArea.draggedIndex >= 0 || dndArea.quickListPopover !== null || dndArea.pressed

35+ property int highlightIndex: -1

36+

37+ signal applicationSelected(string appId)

38+ signal dashItemSelected(int index)

39+

40+ BorderImage {

41+ id: background

42+ source: "graphics/launcher_bg.sci"

43+ anchors.fill: parent

44+ anchors.rightMargin: root.inverted ? 0 : -units.gu(1)

45+ anchors.leftMargin: root.inverted ? -units.gu(1) : 0

46+ rotation: root.rotation

47+ }

48+

49+ Column {

50+ id: mainColumn

51+ anchors {

52+ fill: parent

53+ }

54+

55+ MouseArea {

56+ id: dashItem

57+ width: parent.width

58+ height: units.gu(7)

59+ onClicked: root.dashItemSelected(0)

60+ z: 1

61+ Image {

62+ objectName: "dashItem"

63+ width: units.gu(5)

64+ height: width

65+ anchors.centerIn: parent

66+ source: "graphics/home.png"

67+ rotation: root.rotation

68+ }

69+ }

70+ ThinDivider {

71+ anchors {

72+ left: parent.left

73+ right: parent.right

74+ margins: -mainColumn.anchors.leftMargin

75+ }

76+ rotation: root.rotation

77+ }

78+

79+ Item {

80+ anchors.left: parent.left

81+ anchors.right: parent.right

82+ height: parent.height - dashItem.height - parent.spacing*2

83+

84+ Item {

85+ anchors.fill: parent

86+ clip: true

87+

88+ ListView {

89+ id: launcherListView

90+ objectName: "launcherListView"

91+ anchors {

92+ fill: parent

93+ topMargin: -extensionSize + units.gu(0.5)

94+ bottomMargin: -extensionSize + units.gu(1)

95+ leftMargin: units.gu(0.5)

96+ rightMargin: units.gu(0.5)

97+ }

98+ topMargin: extensionSize

99+ bottomMargin: extensionSize

100+ height: parent.height - dashItem.height - parent.spacing*2

101+ model: root.model

102+ cacheBuffer: itemHeight * 3

103+ snapMode: interactive ? ListView.SnapToItem : ListView.NoSnap

104+ highlightRangeMode: ListView.ApplyRange

105+ preferredHighlightBegin: (height - itemHeight) / 2

106+ preferredHighlightEnd: (height + itemHeight) / 2

107+ spacing: units.gu(0.5)

108+

109+ // The size of the area the ListView is extended to make sure items are not

110+ // destroyed when dragging them outside the list. This needs to be at least

111+ // itemHeight to prevent folded items from disappearing and DragArea limits

112+ // need to be smaller than this size to avoid breakage.

113+ property int extensionSize: 0

114+

115+ // Setting extensionSize after the list has been populated because it has

116+ // the potential to mess up with the intial positioning in combination

117+ // with snapping to the center of the list. This catches all the cases

118+ // where the item would be outside the list for more than itemHeight / 2.

119+ // For the rest, give it a flick to scroll to the beginning. Note that

120+ // the flicking alone isn't enough because in some cases it's not strong

121+ // enough to overcome the snapping.

122+ // https://bugreports.qt-project.org/browse/QTBUG-32251

123+ Component.onCompleted: {

124+ extensionSize = itemHeight * 3

125+ flick(0, clickFlickSpeed)

126+ }

127+

128+ // The height of the area where icons start getting folded

129+ property int foldingStartHeight: units.gu(6.5)

130+ // The height of the area where the items reach the final folding angle

131+ property int foldingStopHeight: foldingStartHeight - itemHeight - spacing

132+ property int itemWidth: units.gu(7)

133+ property int itemHeight: units.gu(6.5)

134+ property int clickFlickSpeed: units.gu(60)

135+ property int draggedIndex: dndArea.draggedIndex

136+ property real realContentY: contentY - originY + topMargin

137+ property int realItemHeight: itemHeight + spacing

138+

139+ // In case the start dragging transition is running, we need to delay the

140+ // move because the displaced transition would clash with it and cause items

141+ // to be moved to wrong places

142+ property bool draggingTransitionRunning: false

143+ property int scheduledMoveTo: -1

144+

145+ displaced: Transition {

146+ NumberAnimation { properties: "x,y"; duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }

147+ }

148+

149+ delegate: FoldingLauncherDelegate {

150+ id: launcherDelegate

151+ objectName: "launcherDelegate" + index

152+ itemHeight: launcherListView.itemHeight

153+ itemWidth: launcherListView.itemWidth

154+ width: itemWidth

155+ height: itemHeight

156+ iconName: model.icon

157+ count: model.count

158+ progress: model.progress

159+ itemFocused: model.focused

160+ inverted: root.inverted

161+ z: -Math.abs(offset)

162+ maxAngle: 55

163+ property bool dragging: false

164+

165+ ThinDivider {

166+ id: dropIndicator

167+ objectName: "dropIndicator"

168+ anchors.centerIn: parent

169+ width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin

170+ opacity: 0

171+ }

172+

173+ states: [

174+ State {

175+ name: "selected"

176+ when: dndArea.selectedItem === launcherDelegate && fakeDragItem.visible && !dragging

177+ PropertyChanges {

178+ target: launcherDelegate

179+ itemOpacity: 0

180+ }

181+ },

182+ State {

183+ name: "dragging"

184+ when: dragging

185+ PropertyChanges {

186+ target: launcherDelegate

187+ height: units.gu(1)

188+ itemOpacity: 0

189+ }

190+ PropertyChanges {

191+ target: dropIndicator

192+ opacity: 1

193+ }

194+ },

195+ State {

196+ name: "expanded"

197+ when: dndArea.draggedIndex >= 0 && (dndArea.preDragging || dndArea.dragging || dndArea.postDragging) && dndArea.draggedIndex != index

198+ PropertyChanges {

199+ target: launcherDelegate

200+ angle: 0

201+ offset: 0

202+ itemOpacity: 0.6

203+ }

204+ }

205+ ]

206+

207+ transitions: [

208+ Transition {

209+ from: ""

210+ to: "selected"

211+ NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.FastDuration }

212+ },

213+ Transition {

214+ from: "*"

215+ to: "expanded"

216+ NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.FastDuration }

217+ UbuntuNumberAnimation { properties: "angle,offset" }

218+ },

219+ Transition {

220+ from: "expanded"

221+ to: ""

222+ NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }

223+ UbuntuNumberAnimation { properties: "angle,offset" }

224+ },

225+ Transition {

226+ id: draggingTransition

227+ from: "selected"

228+ to: "dragging"

229+ SequentialAnimation {

230+ PropertyAction { target: launcherListView; property: "draggingTransitionRunning"; value: true }

231+ ParallelAnimation {

232+ UbuntuNumberAnimation { properties: "height" }

233+ NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

234+ }

235+ ScriptAction {

236+ script: {

237+ if (launcherListView.scheduledMoveTo > -1) {

238+ launcherListView.model.move(dndArea.draggedIndex, launcherListView.scheduledMoveTo)

239+ dndArea.draggedIndex = launcherListView.scheduledMoveTo

240+ launcherListView.scheduledMoveTo = -1

241+ }

242+ }

243+ }

244+ PropertyAction { target: launcherListView; property: "draggingTransitionRunning"; value: false }

245+ }

246+ },

247+ Transition {

248+ from: "dragging"

249+ to: "*"

250+ NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

251+ NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }

252+ SequentialAnimation {

253+ ScriptAction { script: if (index == launcherListView.count-1) launcherListView.flick(0, -launcherListView.clickFlickSpeed); }

254+ UbuntuNumberAnimation { properties: "height" }

255+ ScriptAction { script: if (index == launcherListView.count-1) launcherListView.flick(0, -launcherListView.clickFlickSpeed); }

256+ PropertyAction { target: dndArea; property: "postDragging"; value: false }

257+ PropertyAction { target: dndArea; property: "draggedIndex"; value: -1 }

258+ }

259+ }

260+ ]

261+ }

262+

263+ MouseArea {

264+ id: dndArea

265+ objectName: "dndArea"

266+ anchors {

267+ fill: parent

268+ topMargin: launcherListView.topMargin

269+ bottomMargin: launcherListView.bottomMargin

270+ }

271+ drag.minimumY: -launcherListView.topMargin

272+ drag.maximumY: height + launcherListView.bottomMargin

273+

274+ property int draggedIndex: -1

275+ property var selectedItem

276+ property bool preDragging: false

277+ property bool dragging: selectedItem !== undefined && selectedItem !== null && selectedItem.dragging

278+ property bool postDragging: false

279+ property int startX

280+ property int startY

281+ property var quickListPopover: null

282+

283+ onPressed: {

284+ selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)

285+ }

286+

287+ onClicked: {

288+ var index = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);

289+ var clickedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)

290+

291+ // Check if we actually clicked an item or only at the spacing in between

292+ if (clickedItem === null) {

293+ return;

294+ }

295+

296+ // First/last item do the scrolling at more than 12 degrees

297+ if (index == 0 || index == launcherListView.count - 1) {

298+ if (clickedItem.angle > 12) {

299+ launcherListView.flick(0, -launcherListView.clickFlickSpeed);

300+ } else if (clickedItem.angle < -12) {

301+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

302+ } else {

303+ root.applicationSelected(LauncherModel.get(index).appId);

304+ }

305+ return;

306+ }

307+

308+ // the rest launches apps up to an angle of 30 degrees

309+ if (clickedItem.angle > 30) {

310+ launcherListView.flick(0, -launcherListView.clickFlickSpeed);

311+ } else if (clickedItem.angle < -30) {

312+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

313+ } else {

314+ root.applicationSelected(LauncherModel.get(index).appId);

315+ }

316+ }

317+

318+ onCanceled: {

319+ selectedItem = undefined;

320+ preDragging = false;

321+ postDragging = false;

322+ }

323+

324+ onReleased: {

325+ var droppedIndex = draggedIndex;

326+ if (dragging) {

327+ postDragging = true;

328+ } else {

329+ draggedIndex = -1;

330+ }

331+

332+ if (!selectedItem) {

333+ return;

334+ }

335+

336+ selectedItem.dragging = false;

337+ selectedItem = undefined;

338+ preDragging = false;

339+

340+ drag.target = undefined

341+

342+ progressiveScrollingTimer.stop();

343+ launcherListView.interactive = true;

344+ if (droppedIndex >= launcherListView.count - 2 && postDragging) {

345+ launcherListView.flick(0, -launcherListView.clickFlickSpeed);

346+ }

347+ if (droppedIndex == 0 && postDragging) {

348+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

349+ }

350+ }

351+

352+ onPressAndHold: {

353+ if (Math.abs(selectedItem.angle) > 30) {

354+ return;

355+ }

356+

357+ draggedIndex = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);

358+

359+ // Opening QuickList

360+ var quickListModel = launcherListView.model.get(draggedIndex).quickList

361+ var quickListAppId = launcherListView.model.get(draggedIndex).appId

362+

363+ quickListPopover = PopupUtils.open(popoverComponent, selectedItem,

364+ {model: quickListModel, appId: quickListAppId})

365+

366+ launcherListView.interactive = false

367+

368+ var yOffset = draggedIndex > 0 ? (mouseY + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouseY + launcherListView.realContentY

369+

370+ fakeDragItem.iconName = launcherListView.model.get(draggedIndex).icon

371+ fakeDragItem.x = 0

372+ fakeDragItem.y = mouseY - yOffset + launcherListView.anchors.topMargin + launcherListView.topMargin

373+ fakeDragItem.angle = selectedItem.angle * (root.inverted ? -1 : 1)

374+ fakeDragItem.offset = selectedItem.offset * (root.inverted ? -1 : 1)

375+ fakeDragItem.count = LauncherModel.get(draggedIndex).count

376+ fakeDragItem.progress = LauncherModel.get(draggedIndex).progress

377+ fakeDragItem.flatten()

378+ drag.target = fakeDragItem

379+

380+ startX = mouseX

381+ startY = mouseY

382+ }

383+

384+ onPositionChanged: {

385+ if (draggedIndex >= 0) {

386+ if (!selectedItem.dragging) {

387+ var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))

388+ if (!preDragging && distance > units.gu(1.5)) {

389+ preDragging = true;

390+ PopupUtils.close(quickListPopover)

391+ }

392+ if (distance > launcherListView.itemHeight) {

393+ selectedItem.dragging = true

394+ preDragging = false;

395+ }

396+ }

397+ if (!selectedItem.dragging) {

398+ return

399+ }

400+

401+ var itemCenterY = fakeDragItem.y + fakeDragItem.height / 2

402+

403+ // Move it down by the the missing size to compensate index calculation with only expanded items

404+ itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2

405+

406+ if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight) {

407+ progressiveScrollingTimer.downwards = false

408+ progressiveScrollingTimer.start()

409+ } else if (mouseY < launcherListView.realItemHeight) {

410+ progressiveScrollingTimer.downwards = true

411+ progressiveScrollingTimer.start()

412+ } else {

413+ progressiveScrollingTimer.stop()

414+ }

415+

416+ var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight

417+

418+ if (newIndex > draggedIndex + 1) {

419+ newIndex = draggedIndex + 1

420+ } else if (newIndex < draggedIndex) {

421+ newIndex = draggedIndex -1

422+ } else {

423+ return

424+ }

425+

426+ if (newIndex >= 0 && newIndex < launcherListView.count) {

427+ if (launcherListView.draggingTransitionRunning) {

428+ launcherListView.scheduledMoveTo = newIndex

429+ } else {

430+ launcherListView.model.move(draggedIndex, newIndex)

431+ draggedIndex = newIndex

432+ }

433+ }

434+ }

435+ }

436+ }

437+ Timer {

438+ id: progressiveScrollingTimer

439+ interval: 2

440+ repeat: true

441+ running: false

442+ property bool downwards: true

443+ onTriggered: {

444+ if (downwards) {

445+ var minY = -launcherListView.topMargin

446+ if (launcherListView.contentY > minY) {

447+ launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(2), minY)

448+ }

449+ } else {

450+ var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY

451+ if (launcherListView.contentY < maxY) {

452+ launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(2), maxY)

453+ }

454+ }

455+ }

456+ }

457+ }

458+ }

459+

460+ LauncherDelegate {

461+ id: fakeDragItem

462+ objectName: "fakeDragItem"

463+ visible: dndArea.draggedIndex >= 0 && !dndArea.postDragging

464+ itemWidth: launcherListView.itemWidth

465+ itemHeight: launcherListView.itemHeight

466+ height: itemHeight

467+ width: itemWidth

468+ rotation: root.rotation

469+ itemOpacity: 0.9

470+

471+ function flatten() {

472+ fakeDragItemAnimation.start();

473+ }

474+

475+ UbuntuNumberAnimation {

476+ id: fakeDragItemAnimation

477+ target: fakeDragItem;

478+ properties: "angle,offset";

479+ to: 0

480+ }

481+ }

482+ }

483+ }

484+

485+ Component {

486+ id: popoverComponent

487+

488+ Popover {

489+ id: popover

490+ property var model

491+ property string appId

492+ contentWidth: quickListColumn.width

493+ foregroundStyle: QuicklistForegroundStyle {}

494+

495+ // FIXME: There's a bug in the Popover positioning that it covers the item in case it is rotated.

496+ // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1204470

497+ // For now, let's move the Popover around with callerMargin.

498+ // Remove popupMargin once the bug is fixed.

499+ property int popupMargin: root.inverted ? launcherListView.itemHeight : 0;

500+

501+ callerMargin: units.gu(1) + popupMargin

502+

503+ Column {

504+ id: quickListColumn

505+ width: units.gu(30)

506+ height: childrenRect.height

507+

508+ Repeater {

509+ id: popoverRepeater

510+ model: popover.model

511+

512+ ListItems.Standard {

513+ objectName: "quickListEntry" + index

514+ text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")

515+ highlightWhenPressed: model.clickable

516+

517+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the

518+ // ListItems don't know that they are sitting in a themed Popover where the color

519+ // needs to be inverted.

520+ __foregroundColor: Theme.palette.selected.backgroundText

521+

522+ onClicked: {

523+ if (!model.clickable) {

524+ return;

525+ }

526+ PopupUtils.close(popover);

527+ // Unsetting model to prevent showing changing entries during fading out

528+ // that may happen because of triggering an action.

529+ LauncherModel.quickListActionInvoked(appId, index);

530+ popoverRepeater.model = undefined;

531+ }

532+ }

533+ }

534+ }

535+ }

536+ }

537+}

qml/Wizard/WizardTextField.qml → Launcher/QuicklistForegroundStyle.qmlrenamed+6−8

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015-2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,12 +14,10 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

18−import Ubuntu.Components 1.3

19−import Ubuntu.Components.Themes.Ambiance 1.3

17+import Ubuntu.Components.Themes.Ambiance 0.1

20

18

21−TextField {

19+PopoverForegroundStyle {

22− id: styledItem

20+ bubbleColor: "#221e1c"

23− style: TextFieldStyle {

21+ bubbleOpacity: 0.9

24− }

22+ arrowSource: "graphics/quicklist_tooltip.png"

25}

23}

Launcher/graphics/focused_app_arrow@30.pngnew file

Binary file not shown.

Launcher/graphics/highlight@18.pngnew file

Binary file not shown.

Launcher/graphics/home@18.pngnew file

Binary file not shown.

Launcher/graphics/launcher_bg@30.pngnew file

Binary file not shown.

Launcher/graphics/launcher_bg@30.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 4

2+border.top: 4

3+border.bottom: 4

4+border.right: 66

5+source: launcher_bg@30.png

Launcher/graphics/non-selected@18.pngnew file

Binary file not shown.

Launcher/graphics/non-selected@18.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 54

2+border.top: 60

3+border.bottom: 60

4+border.right: 54

5+source: non-selected@18.png

Launcher/graphics/notification@30.pngnew file

Binary file not shown.

Launcher/graphics/notification@30.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 36

2+border.top: 36

3+border.bottom: 36

4+border.right: 36

5+source: notification@30.png

Launcher/graphics/progressbar-fill@30.pngnew file

Binary file not shown.

Launcher/graphics/progressbar-fill@30.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 36

2+border.top: 16

3+border.bottom: 28

4+border.right: 36

5+source: progressbar-fill@30.png

Launcher/graphics/progressbar-trough@30.pngnew file

Binary file not shown.

Launcher/graphics/progressbar-trough@30.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 36

2+border.top: 16

3+border.bottom: 26

4+border.right: 36

5+source: progressbar-trough@30.png

Launcher/graphics/quicklist_tooltip@30.pngnew file

Binary file not shown.

Launcher/graphics/selected@18.pngnew file

Binary file not shown.

Launcher/graphics/selected@18.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 54

2+border.top: 60

3+border.bottom: 60

4+border.right: 54

5+source: selected@18.png

Launcher/graphics/triangle@18.pngnew file

Binary file not shown.

MouseTouchAdaptor.cppnew file+153

@@ -0,0 +1,153 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>

17+ */

18+

19+#include "MouseTouchAdaptor.h"

20+

21+#include <qpa/qwindowsysteminterface.h>

22+

23+#include <QtGui/QMouseEvent>

24+#include <QtTest/QTest>

25+

26+using QTest::QTouchEventSequence;

27+

28+namespace {

29+Qt::MouseButton translateMouseButton(xcb_button_t detail)

30+{

31+ switch (detail) {

32+ case 1: return Qt::LeftButton;

33+ case 2: return Qt::MidButton;

34+ case 3: return Qt::RightButton;

35+ // Button values 4-7 are Wheel events

36+ default: return Qt::NoButton;

37+ }

38+}

39+} // end of anonymous namespace

40+

41+MouseTouchAdaptor::MouseTouchAdaptor()

42+ : m_leftButtonIsPressed(false)

43+{

44+ m_touchDevice = new QTouchDevice;

45+ m_touchDevice->setType(QTouchDevice::TouchScreen);

46+ QWindowSystemInterface::registerTouchDevice(m_touchDevice);

47+}

48+

49+bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,

50+ void * message, long * /*result*/)

51+{

52+ if (eventType != "xcb_generic_event_t") {

53+ // wrong backend.

54+ qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");

55+ return false;

56+ }

57+

58+ xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);

59+

60+ switch (xcbEvent->response_type & ~0x80) {

61+ case XCB_BUTTON_PRESS:

62+ return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));

63+ break;

64+ case XCB_BUTTON_RELEASE:

65+ return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));

66+ break;

67+ case XCB_MOTION_NOTIFY:

68+ return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));

69+ break;

70+ default:

71+ return false;

72+ break;

73+ };

74+}

75+

76+bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)

77+{

78+ Qt::MouseButton button = translateMouseButton(pressEvent->detail);

79+

80+ // Just eat the event if it wasn't a left mouse press

81+ if (button != Qt::LeftButton)

82+ return true;

83+

84+ QPoint windowPos(pressEvent->event_x, pressEvent->event_y);

85+

86+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));

87+

88+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

89+ false /* autoCommit */);

90+ touchEvent.press(0 /* touchId */, windowPos);

91+ touchEvent.commit(false /* processEvents */);

92+

93+ m_leftButtonIsPressed = true;

94+ return true;

95+}

96+

97+bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)

98+{

99+ Qt::MouseButton button = translateMouseButton(releaseEvent->detail);

100+

101+ // Just eat the event if it wasn't a left mouse release

102+ if (button != Qt::LeftButton)

103+ return true;

104+

105+ QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);

106+

107+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));

108+

109+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

110+ false /* autoCommit */);

111+ touchEvent.release(0 /* touchId */, windowPos);

112+ touchEvent.commit(false /* processEvents */);

113+

114+ m_leftButtonIsPressed = false;

115+ return true;

116+}

117+

118+bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)

119+{

120+ if (!m_leftButtonIsPressed) {

121+ return true;

122+ }

123+

124+ QPoint windowPos(event->event_x, event->event_y);

125+

126+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));

127+

128+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

129+ false /* autoCommit */);

130+ touchEvent.move(0 /* touchId */, windowPos);

131+ touchEvent.commit(false /* processEvents */);

132+

133+ return true;

134+}

135+

136+QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)

137+{

138+ QWindowList windowList = QGuiApplication::topLevelWindows();

139+ QWindow *foundWindow = nullptr;

140+

141+ int i = 0;

142+ while (!foundWindow && i < windowList.count()) {

143+ QWindow *window = windowList[i];

144+ if (window->winId() == windowId) {

145+ foundWindow = window;

146+ } else {

147+ ++i;

148+ }

149+ }

150+

151+ Q_ASSERT(foundWindow);

152+ return foundWindow;

153+}

src/MouseTouchAdaptor.h → MouseTouchAdaptor.hrenamed+8−31

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2013,2015 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -21,52 +21,29 @@

21

21

22#include <QtCore/QAbstractNativeEventFilter>

22#include <QtCore/QAbstractNativeEventFilter>

23#include <QWindow>

23#include <QWindow>

24−

25#include <xcb/xcb.h>

24#include <xcb/xcb.h>

26

25

27class QMouseEvent;

26class QMouseEvent;

28class QTouchDevice;

27class QTouchDevice;

29

28

30// Transforms QMouseEvents into single-finger QTouchEvents.

29// Transforms QMouseEvents into single-finger QTouchEvents.

31−class MouseTouchAdaptor : public QObject, public QAbstractNativeEventFilter {

30+class MouseTouchAdaptor : public QAbstractNativeEventFilter {

32− Q_OBJECT

33−public:

34− virtual ~MouseTouchAdaptor();

35

31

32+public:

36− static MouseTouchAdaptor* instance();

33+ MouseTouchAdaptor();

37

34

38 // Filters mouse events and posts the equivalent QTouchEvents.

35 // Filters mouse events and posts the equivalent QTouchEvents.

39− bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;

36+ virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);

40−

41− Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)

42−

43− bool enabled() const;

44− void setEnabled(bool value);

45−

46−Q_SIGNALS:

47− void enabledChanged(bool value);

48

37

49private:

38private:

50− MouseTouchAdaptor();

51− void fetchXInput2Info();

52− bool xi2HandleEvent(xcb_ge_event_t *event);

53

39

54− bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);

40+ bool handleButtonPress(xcb_button_press_event_t *pressEvent);

55− bool handleButtonRelease(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);

41+ bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);

56− bool handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y);

42+ bool handleMotionNotify(xcb_motion_notify_event_t *event);

57 QWindow *findQWindowWithXWindowID(WId windowId);

43 QWindow *findQWindowWithXWindowID(WId windowId);

58

44

59 QTouchDevice *m_touchDevice;

45 QTouchDevice *m_touchDevice;

60 bool m_leftButtonIsPressed;

46 bool m_leftButtonIsPressed;

61− bool m_triPressModifier;

62− bool m_quadPressModifier;

63−

64−

65− bool m_enabled;

66−

67− bool m_xi2Enabled{false};

68− int m_xi2Minor{-1};

69− int m_xiOpCode, m_xiEventBase, m_xiErrorBase;

70};

47};

71

48

72#endif // MOUSE_TOUCH_ADAPTOR_H

49#endif // MOUSE_TOUCH_ADAPTOR_H

Notifications/Notification.qmlnew file+254

@@ -0,0 +1,254 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Notifications 1.0

20+

21+UbuntuShape {

22+ id: notification

23+

24+ property alias iconSource: avatarIcon.source

25+ property alias secondaryIconSource: secondaryIcon.source

26+ property alias summary: summaryLabel.text

27+ property alias body: bodyLabel.text

28+ property var actions

29+ property var notificationId

30+ property var type

31+ property var hints

32+ property var notification

33+

34+ objectName: "background"

35+ implicitHeight: contentColumn.height + contentColumn.spacing * 2

36+ color: Qt.rgba(0, 0, 0, 0.85)

37+ opacity: 0

38+

39+ clip: true

40+

41+ Behavior on implicitHeight {

42+ id: heightBehavior

43+

44+ enabled: false

45+ UbuntuNumberAnimation {

46+ duration: UbuntuAnimation.SnapDuration

47+ }

48+ }

49+

50+ // delay enabling height behavior until the add transition is complete

51+ onOpacityChanged: if (opacity == 1) heightBehavior.enabled = true

52+

53+ MouseArea {

54+ id: interactiveArea

55+

56+ anchors.fill: contentColumn

57+ objectName: "interactiveArea"

58+ enabled: notification.type == Notification.Interactive

59+ onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)

60+ }

61+

62+ Column {

63+ id: contentColumn

64+

65+ anchors {

66+ left: parent.left

67+ right: parent.right

68+ top: parent.top

69+ margins: spacing

70+ }

71+

72+ spacing: units.gu(1)

73+

74+ Row {

75+ id: topRow

76+

77+ spacing: contentColumn.spacing

78+ anchors {

79+ left: parent.left

80+ right: parent.right

81+ }

82+

83+ UbuntuShape {

84+ id: icon

85+

86+ objectName: "icon"

87+ width: units.gu(6)

88+ height: units.gu(6)

89+ visible: iconSource !== undefined && iconSource != ""

90+ image: Image {

91+ id: avatarIcon

92+

93+ fillMode: Image.PreserveAspectCrop

94+ }

95+ }

96+

97+ Image {

98+ id: secondaryIcon

99+

100+ objectName: "secondaryIcon"

101+ width: units.gu(2)

102+ height: units.gu(2)

103+ visible: source !== undefined && source != ""

104+ fillMode: Image.PreserveAspectCrop

105+ }

106+

107+ Column {

108+ id: labelColumn

109+ width: parent.width - x

110+

111+ Label {

112+ id: summaryLabel

113+

114+ objectName: "summaryLabel"

115+ anchors {

116+ left: parent.left

117+ right: parent.right

118+ }

119+ fontSize: "medium"

120+ font.bold: true

121+ color: Theme.palette.selected.backgroundText

122+ elide: Text.ElideRight

123+ }

124+

125+ Label {

126+ id: bodyLabel

127+

128+ objectName: "bodyLabel"

129+ anchors {

130+ left: parent.left

131+ right: parent.right

132+ }

133+ visible: body != ""

134+ fontSize: "small"

135+ color: Theme.palette.selected.backgroundText

136+ opacity: 0.6

137+ wrapMode: Text.WordWrap

138+ maximumLineCount: 10

139+ elide: Text.ElideRight

140+ }

141+ }

142+ }

143+

144+ Item {

145+ id: buttonRow

146+

147+ objectName: "buttonRow"

148+ anchors {

149+ left: parent.left

150+ right: parent.right

151+ }

152+ visible: notification.type == Notification.SnapDecision

153+ height: units.gu(4)

154+

155+ property real buttonWidth: (width - contentColumn.spacing) / 2

156+ property bool expanded

157+

158+ Button {

159+ id: leftButton

160+

161+ objectName: "button1"

162+ width: parent.expanded ? parent.width : parent.buttonWidth

163+ anchors {

164+ top: parent.top

165+ bottom: parent.bottom

166+ }

167+ text: notification.type == Notification.SnapDecision && actionRepeater.count >= 2 ? actionRepeater.itemAt(1).actionLabel : ""

168+ gradient: UbuntuColors.greyGradient

169+ onClicked: {

170+ if (actionRepeater.count > 2) {

171+ buttonRow.expanded = !buttonRow.expanded

172+ } else {

173+ notification.notification.invokeAction(actionRepeater.itemAt(1).actionId)

174+ }

175+ }

176+

177+ Behavior on width {

178+ UbuntuNumberAnimation {

179+ duration: UbuntuAnimation.SnapDuration

180+ }

181+ }

182+ }

183+

184+ Button {

185+ id: rightButton

186+

187+ objectName: "button0"

188+ anchors {

189+ left: leftButton.right

190+ leftMargin: contentColumn.spacing

191+ right: parent.right

192+ }

193+ text: notification.type == Notification.SnapDecision && actionRepeater.count >= 1 ? actionRepeater.itemAt(0).actionLabel : ""

194+ anchors {

195+ top: parent.top

196+ bottom: parent.bottom

197+ }

198+ gradient: notification.hints == Notification.ButtonTint ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient

199+ visible: width > 0

200+ onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)

201+ }

202+ }

203+

204+ Column {

205+ objectName: "buttonColumn"

206+ spacing: contentColumn.spacing

207+ anchors {

208+ left: parent.left

209+ right: parent.right

210+ }

211+

212+ // calculate initial position before Column takes over

213+ y: buttonRow.y + buttonRow.height + contentColumn.spacing

214+

215+ visible: notification.type == Notification.SnapDecision

216+ height: buttonRow.expanded ? implicitHeight : 0

217+

218+ Repeater {

219+ id: actionRepeater

220+

221+ model: notification.actions

222+ delegate: Loader {

223+ id: loader

224+

225+ property string actionId: id

226+ property string actionLabel: label

227+

228+ anchors {

229+ left: parent.left

230+ right: parent.right

231+ }

232+

233+ Component {

234+ id: actionButton

235+

236+ Button {

237+ objectName: "button" + index

238+ anchors {

239+ left: parent.left

240+ right: parent.right

241+ }

242+

243+ text: loader.actionLabel

244+ height: units.gu(4)

245+ gradient: UbuntuColors.greyGradient

246+ onClicked: notification.notification.invokeAction(loader.actionId)

247+ }

248+ }

249+ sourceComponent: (index == 0 || index == 1) ? undefined : actionButton

250+ }

251+ }

252+ }

253+ }

254+}

Notifications/Notifications.qmlnew file+77

@@ -0,0 +1,77 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+ListView {

22+ id: notificationList

23+

24+ objectName: "notificationList"

25+ interactive: false

26+

27+ spacing: units.gu(.5)

28+ delegate: Notification {

29+ objectName: "notification" + index

30+ anchors {

31+ left: parent.left

32+ right: parent.right

33+ }

34+ type: model.type

35+ hints: model.hints

36+ iconSource: model.icon

37+ secondaryIconSource: model.secondaryIcon

38+ summary: model.summary

39+ body: model.body

40+ actions: model.actions

41+ notificationId: model.id

42+ notification: notificationList.model.getRaw(notificationId)

43+

44+ // make sure there's no opacity-difference between the several

45+ // elements in a notification

46+ layer.enabled: add.running || remove.running || populate.running

47+ }

48+

49+ populate: Transition {

50+ UbuntuNumberAnimation {

51+ property: "opacity"

52+ to: 1

53+ duration: UbuntuAnimation.SnapDuration

54+ }

55+ }

56+

57+ add: Transition {

58+ UbuntuNumberAnimation {

59+ property: "opacity"

60+ to: 1

61+ duration: UbuntuAnimation.SnapDuration

62+ }

63+ }

64+

65+ remove: Transition {

66+ UbuntuNumberAnimation {

67+ property: "opacity"

68+ to: 0

69+ }

70+ }

71+

72+ displaced: Transition {

73+ UbuntuNumberAnimation {

74+ properties: "x,y"

75+ }

76+ }

77+}

Panel/IndicatorItem.qmlnew file+61

@@ -0,0 +1,61 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Indicators 0.1 as Indicators

20+import "../Components"

21+

22+Item {

23+ id: indicatorItem

24+

25+ property alias widgetSource: loader.source

26+ property bool highlighted: false

27+ property bool dimmed: false

28+ property var indicatorProperties: undefined

29+ property bool indicatorVisible: loader.item ? loader.item.enabled : false

30+

31+ opacity: dimmed ? 0.4 : 1

32+ Behavior on opacity { StandardAnimation {} }

33+

34+ width: loader.item ? loader.item.width : 0

35+

36+ Loader {

37+ id: loader

38+

39+ onLoaded: {

40+ item.height = Qt.binding(function() { return indicatorItem.height; });

41+

42+ for(var pName in indicatorProperties) {

43+ if (item.hasOwnProperty(pName)) {

44+ item[pName] = indicatorProperties[pName];

45+ }

46+ }

47+ }

48+ }

49+

50+ Rectangle {

51+ color: Theme.palette.selected.foreground

52+ objectName: "highlight"

53+ height: units.dp(2)

54+ width: parent.width

55+ anchors.top: parent.bottom

56+ visible: highlighted

57+

58+ opacity: highlighted ? 1 : 0

59+ Behavior on opacity { StandardAnimation {} }

60+ }

61+}

Panel/IndicatorRow.qmlnew file+109

@@ -0,0 +1,109 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Indicators 0.1 as Indicators

20+import "../Components"

21+

22+Item {

23+ id: indicatorRow

24+

25+ property QtObject currentItem : null

26+ readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1

27+ property alias row: row

28+ property QtObject indicatorsModel: null

29+ property var visibleIndicators: defined

30+

31+ width: units.gu(40)

32+ height: units.gu(3)

33+

34+ function setDefaultItem() {

35+ // The leftmost indicator

36+ setCurrentItem(0);

37+ }

38+

39+ function setCurrentItem(index) {

40+ if (currentItemIndex !== index) {

41+ currentItem = rowRepeater.itemAt(index);

42+ }

43+ }

44+

45+ Row {

46+ id: row

47+

48+ width: children.width

49+ height: parent.height

50+ anchors.right: parent.right

51+

52+ Repeater {

53+ id: rowRepeater

54+ objectName: "rowRepeater"

55+ model: indicatorsModel ? indicatorsModel : undefined

56+

57+ Item {

58+ id: itemWrapper

59+ height: indicatorRow.height

60+ width: indicatorItem.width

61+ visible: indicatorItem.indicatorVisible

62+

63+ property int ownIndex: index

64+ property alias highlighted: indicatorItem.highlighted

65+ property alias dimmed: indicatorItem.dimmed

66+

67+ IndicatorItem {

68+ id: indicatorItem

69+ height: parent.height

70+

71+ highlighted: indicatorRow.state != "initial" ? itemWrapper.ownIndex == indicatorRow.currentItemIndex : false

72+ dimmed: indicatorRow.state != "initial" ? itemWrapper.ownIndex != indicatorRow.currentItemIndex : false

73+

74+ widgetSource: model.widgetSource

75+ indicatorProperties : model.indicatorProperties

76+

77+ Component.onCompleted: {

78+ if (visibleIndicators == undefined) {

79+ visibleIndicators = {}

80+ }

81+ indicatorRow.visibleIndicators[model.identifier] = indicatorVisible;

82+ indicatorRow.visibleIndicatorsChanged();

83+ }

84+ onIndicatorVisibleChanged: {

85+ if (visibleIndicators == undefined) {

86+ visibleIndicators = {}

87+ }

88+ indicatorRow.visibleIndicators[model.identifier] = indicatorVisible;

89+ indicatorRow.visibleIndicatorsChanged();

90+ }

91+ }

92+

93+ opacity: {

94+ if (!indicatorItem.highlighted && (indicatorRow.state == "locked" || indicatorRow.state == "commit")) {

95+ return 0.0;

96+ } else {

97+ return 1.0;

98+ }

99+ }

100+ Behavior on opacity {

101+ StandardAnimation {

102+ // flow away from current index

103+ duration: (rowRepeater.count - Math.abs(indicatorRow.currentItemIndex - index)) * (500/rowRepeater.count)

104+ }

105+ }

106+ }

107+ }

108+ }

109+}

Panel/Indicators.qmlnew file+389

@@ -0,0 +1,389 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Ubuntu.Gestures 0.1

20+

21+import "../Components"

22+import "../Components/ListItems"

23+import "../Components/Math.js" as MathLocal

24+

25+Showable {

26+ id: indicators

27+

28+ property real openedHeight: units.gu(71)

29+ property int panelHeight: units.gu(3)

30+ property bool pinnedMode: true //should be set true if indicators menu can cover whole screen

31+

32+ property int hintValue

33+ readonly property int lockThreshold: openedHeight / 2

34+ property bool fullyOpened: height == openedHeight

35+ property bool partiallyOpened: height > panelHeight && !fullyOpened

36+ property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)

37+ property bool contentEnabled: true

38+ readonly property alias content: menuContent

39+

40+ // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

41+ // use its own values. Need to ask design about this.

42+ showAnimation: StandardAnimation {

43+ property: "height"

44+ duration: 350

45+ to: openedHeight

46+ easing.type: Easing.OutCubic

47+

48+ // Re-size if we've changed the openHeight while shown.

49+ onToChanged: {

50+ if (indicators.shown) {

51+ indicators.show();

52+ }

53+ }

54+ }

55+

56+ hideAnimation: StandardAnimation {

57+ property: "height"

58+ duration: 350

59+ to: panelHeight

60+ easing.type: Easing.OutCubic

61+ }

62+

63+ height: panelHeight

64+

65+ onHeightChanged: {

66+ // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)

67+ var revealProgress = indicators.height - panelHeight

68+ if (!showAnimation.running && !hideAnimation.running) {

69+ if (revealProgress == 0) {

70+ indicators.state = "initial";

71+ } else if (revealProgress <= hintValue) {

72+ indicators.state = "hint";

73+ } else if (revealProgress > hintValue && revealProgress < lockThreshold) {

74+ indicators.state = "reveal";

75+ } else if (revealProgress >= lockThreshold && lockThreshold > 0) {

76+ indicators.state = "locked";

77+ }

78+ }

79+

80+ if (revealProgress == 0) {

81+ menuContent.releaseContent();

82+ }

83+ }

84+

85+ function calculateCurrentItem(xValue, useBuffer) {

86+ var rowCoordinates;

87+ var itemCoordinates;

88+ var currentItem;

89+ var distanceFromRightEdge;

90+ var bufferExceeded = false;

91+

92+ if (indicators.state == "commit" || indicators.state == "locked" || showAnimation.running || hideAnimation.running) return;

93+

94+ /*

95+ If user drags the indicator handle bar down a distance hintValue or less, this is 0.

96+ If bar is dragged down a distance greater than or equal to lockThreshold, this is 1.

97+ Otherwise it contains the bar's location as a fraction of the distance between hintValue (is 0) and lockThreshold (is 1).

98+ */

99+ var verticalProgress =

100+ MathLocal.clamp((indicators.height - handle.height - hintValue) /

101+ (lockThreshold - hintValue), 0, 1);

102+

103+ /*

104+ Vertical velocity check. Don't change the indicator if we're moving too quickly.

105+ */

106+ var verticalSpeed = Math.abs(yVelocityCalculator.calculate());

107+ if (verticalSpeed >= 0.05 && indicatorRow.currentItem!=null) {

108+ return;

109+ }

110+

111+ /*

112+ Percentage of an indicator icon's width the user's press can stray horizontally from the

113+ focused icon before we change focus to another icon. E.g. a value of 0.5 means you must

114+ go right a distance of half an icon's width before focus moves to the icon on the right

115+ */

116+ var maxBufferThreshold = 0.5;

117+

118+ /*

119+ To help users find the indicator of their choice while opening the indicators, we add logic to add a

120+ left/right buffer to each icon so it is harder for the focus to be moved accidentally to another icon,

121+ as the user moves their finger down, but yet allows them to switch indicator if they want.

122+ This buffer is wider the further the user's finger is from the top of the screen.

123+ */

124+ var effectiveBufferThreshold = maxBufferThreshold * verticalProgress;

125+

126+ rowCoordinates = indicatorRow.mapToItem(indicatorRow.row, xValue, 0);

127+ // get the current delegate

128+ currentItem = indicatorRow.row.childAt(rowCoordinates.x, 0);

129+ if (currentItem && currentItem != indicatorRow.currentItem ) {

130+ itemCoordinates = indicatorRow.row.mapToItem(currentItem, rowCoordinates.x, 0);

131+ distanceFromRightEdge = (currentItem.width - itemCoordinates.x) / (currentItem.width);

132+ if (Math.abs(currentItem.ownIndex - indicatorRow.currentItemIndex) > 1) {

133+ bufferExceeded = true;

134+ } else {

135+ if (indicatorRow.currentItemIndex < currentItem.ownIndex && distanceFromRightEdge < (1 - effectiveBufferThreshold)) {

136+ bufferExceeded = true;

137+ } else if (indicatorRow.currentItemIndex > currentItem.ownIndex && distanceFromRightEdge > effectiveBufferThreshold) {

138+ bufferExceeded = true;

139+ }

140+ }

141+ if ((!useBuffer || (useBuffer && bufferExceeded)) || indicatorRow.currentItem < 0 || indicatorRow.currentItem == null) {

142+ indicatorRow.currentItem = currentItem;

143+ }

144+ } else if (!currentItem) {

145+ indicatorRow.setDefaultItem();

146+ }

147+ }

148+

149+ // eater

150+ MouseArea {

151+ anchors {

152+ top: parent.top

153+ bottom: handle.bottom

154+ left: parent.left

155+ right: parent.right

156+ }

157+ }

158+

159+ VerticalThinDivider {

160+ anchors {

161+ top: indicators.top

162+ topMargin: panelHeight

163+ bottom: handle.bottom

164+ right: indicators.left

165+ }

166+ width: units.dp(2)

167+ source: "graphics/VerticalDivider.png"

168+ }

169+

170+ MenuContent {

171+ id: menuContent

172+ objectName: "menuContent"

173+

174+ anchors {

175+ left: parent.left

176+ right: parent.right

177+ top: indicatorRow.bottom

178+ bottom: handle.top

179+ }

180+ indicatorsModel: indicatorsModel

181+ clip: !indicators.fullyOpened

182+ activeHeader: indicators.state == "hint" || indicators.state == "reveal"

183+ enabled: contentEnabled

184+ visibleIndicators: indicatorRow.visibleIndicators

185+

186+ Connections {

187+ property bool enableIndexChangeSignal: true

188+

189+ target: enableIndexChangeSignal ? indicatorRow : null

190+ onCurrentItemIndexChanged: {

191+ var oldActive = enableIndexChangeSignal;

192+ enableIndexChangeSignal = false;

193+

194+ menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);

195+

196+ enableIndexChangeSignal = oldActive;

197+ }

198+ }

199+

200+ //small shadow gradient at bottom of menu

201+ Rectangle {

202+ anchors {

203+ left: parent.left

204+ right: parent.right

205+ bottom: parent.bottom

206+ }

207+ height: units.gu(0.5)

208+ gradient: Gradient {

209+ GradientStop { position: 0.0; color: "transparent" }

210+ GradientStop { position: 1.0; color: "black" }

211+ }

212+ opacity: 0.4

213+ }

214+ }

215+

216+ Rectangle {

217+ id: handle

218+

219+ color: menuContent.backgroundColor

220+

221+ anchors {

222+ left: parent.left

223+ right: parent.right

224+ bottom: parent.bottom

225+ }

226+ height: get_height()

227+ clip: height < handleImage.height

228+

229+ function get_height() {

230+ return Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0);

231+ }

232+

233+ BorderImage {

234+ id: handleImage

235+ source: "graphics/handle.sci"

236+ height: panelHeight

237+ anchors {

238+ left: parent.left

239+ right: parent.right

240+ bottom: parent.bottom

241+ }

242+ }

243+ MouseArea { //prevent clicks passing through

244+ anchors.fill: parent

245+ }

246+ }

247+

248+ PanelBackground {

249+ anchors.fill: indicatorRow

250+ }

251+

252+ IndicatorsDataModel {

253+ id: indicatorsModel

254+ }

255+

256+ IndicatorRow {

257+ id: indicatorRow

258+ objectName: "indicatorRow"

259+ anchors {

260+ left: parent.left

261+ right: parent.right

262+ }

263+ height: indicators.panelHeight

264+ indicatorsModel: indicatorsModel

265+ state: indicators.state

266+

267+ Connections {

268+ property bool enableIndexChangeSignal: true

269+

270+ target: enableIndexChangeSignal ? menuContent : null

271+ onCurrentMenuIndexChanged: {

272+ var oldActive = enableIndexChangeSignal;

273+ enableIndexChangeSignal = false;

274+

275+ indicatorRow.setCurrentItem(menuContent.currentMenuIndex);

276+

277+ enableIndexChangeSignal = oldActive;

278+ }

279+ }

280+ }

281+

282+ Connections {

283+ target: showAnimation

284+ onRunningChanged: {

285+ if (showAnimation.running) {

286+ indicators.state = "commit";

287+ }

288+ }

289+ }

290+

291+ Connections {

292+ target: hideAnimation

293+ onRunningChanged: {

294+ if (hideAnimation.running) {

295+ indicators.state = "initial";

296+ indicatorRow.currentItem = null;

297+ }

298+ }

299+ }

300+

301+ property var activeDragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle.dragging ? hideDragHandle : null

302+ // connections to the active drag handle

303+ Connections {

304+ target: activeDragHandle

305+ onTouchXChanged: {

306+ indicators.calculateCurrentItem(activeDragHandle.touchX, true);

307+ }

308+ onTouchSceneYChanged: {

309+ yVelocityCalculator.trackedPosition = activeDragHandle.touchSceneY;

310+ }

311+ }

312+

313+ DragHandle {

314+ id: showDragHandle

315+ anchors.bottom: parent.bottom

316+ // go beyond parent so that it stays reachable, at the top of the screen.

317+ anchors.bottomMargin: pinnedMode ? 0 : -panelHeight

318+ anchors.left: parent.left

319+ anchors.right: parent.right

320+ height: panelHeight

321+ direction: Direction.Downwards

322+ enabled: !indicators.shown && indicators.available

323+ hintDisplacement: pinnedMode ? indicators.hintValue : 0

324+ autoCompleteDragThreshold: maxTotalDragDistance / 2

325+ stretch: true

326+ maxTotalDragDistance: openedHeight - panelHeight

327+ distanceThreshold: pinnedMode ? 0 : units.gu(3)

328+

329+ onStatusChanged: {

330+ if (status === DirectionalDragArea.Recognized) {

331+ menuContent.activateContent();

332+ }

333+ }

334+ }

335+ DragHandle {

336+ id: hideDragHandle

337+ anchors.fill: handle

338+ direction: Direction.Upwards

339+ enabled: indicators.shown && indicators.available

340+ hintDisplacement: indicators.hintValue

341+ autoCompleteDragThreshold: maxTotalDragDistance / 6

342+ stretch: true

343+ maxTotalDragDistance: openedHeight - panelHeight

344+ distanceThreshold: 0

345+ }

346+

347+ AxisVelocityCalculator {

348+ id: yVelocityCalculator

349+ }

350+

351+ states: [

352+ State {

353+ name: "initial"

354+ },

355+ State {

356+ name: "hint"

357+ PropertyChanges {

358+ target: indicatorRow;

359+ y: pinnedMode ? 0 : panelHeight

360+ }

361+ StateChangeScript {

362+ script: {

363+ if (activeDragHandle) {

364+ calculateCurrentItem(activeDragHandle.touchX, false);

365+ }

366+ }

367+ }

368+ },

369+ State {

370+ name: "reveal"

371+ extend: "hint"

372+ },

373+ State {

374+ name: "locked"

375+ extend: "hint"

376+ },

377+ State {

378+ name: "commit"

379+ extend: "hint"

380+ }

381+ ]

382+ state: "initial"

383+

384+ transitions: [

385+ Transition {

386+ NumberAnimation {targets: [indicatorRow, menuContent]; property: "y"; duration: 300; easing.type: Easing.OutCubic}

387+ }

388+ ]

389+}

Panel/Indicators/DatetimeIndicatorPage.qmlnew file+97

@@ -0,0 +1,97 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ * Ubo Riboni <ugo.riboni@canonical.com>

19+ */

20+

21+import QtQuick 2.0

22+import Ubuntu.Components 0.1

23+

24+Flickable {

25+ id: page

26+

27+ contentHeight: image.height

28+

29+ Image {

30+ id: image

31+ anchors {

32+ left: parent.left

33+ right: parent.right

34+ }

35+ source: "../graphics/time_and_date@18.png"

36+ fillMode: Image.PreserveAspectFit

37+ }

38+

39+ Item {

40+ anchors {

41+ top: parent.top

42+ topMargin: units.gu(5)

43+ left: parent.left

44+ right: parent.right

45+ }

46+

47+ height: units.gu(30)

48+

49+ Label {

50+ id: timeLabel

51+ anchors {

52+ horizontalCenter: parent.horizontalCenter

53+ verticalCenter: parent.verticalCenter

54+ }

55+

56+ text: ""

57+ color: Theme.palette.selected.backgroundText

58+ font.weight: Font.Light

59+ font.pixelSize: units.gu(6)

60+ }

61+

62+ Label {

63+ id: dateLabel

64+

65+ anchors {

66+ left: parent.left

67+ leftMargin: units.gu(2)

68+ bottom: parent.bottom

69+ bottomMargin: units.gu(1.5)

70+ }

71+ text: ""

72+ color: Theme.palette.selected.backgroundText

73+ fontSize: "small"

74+ }

75+ }

76+

77+ Timer {

78+ interval: 1000 * 10 // 10 seconds

79+ running: true

80+ repeat: true

81+ triggeredOnStart: true

82+ onTriggered: updateTime();

83+ }

84+

85+ function updateTime() {

86+ var dt = new Date();

87+ var time = Qt.formatTime(dt);

88+ var space = time.indexOf(" ");

89+ timeLabel.text = time.substr(0, space > 0 ? space : 5);

90+ dateLabel.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM");

91+ }

92+

93+ // Make it compatible with the PluginItem interface

94+ function start() {}

95+ function stop() {}

96+ function reset() {}

97+}

Panel/Indicators/DatetimeIndicatorWidget.qmlnew file+67

@@ -0,0 +1,67 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.IndicatorsLegacy 0.1 as Indicators

23+

24+Indicators.IndicatorWidget {

25+ id: indicatorWidget

26+

27+ width: timeLabel.width + units.gu(1)

28+ rootMenuType: "com.canonical.indicator.root.time"

29+

30+ property alias label: timeLabel.text

31+

32+ Label {

33+ id: timeLabel

34+ objectName: "timeLabel"

35+ color: Theme.palette.selected.backgroundText

36+ opacity: 0.8

37+ font.family: "Ubuntu"

38+ fontSize: "medium"

39+ anchors.centerIn: parent

40+ text: Qt.formatTime(timer.dateNow)

41+ }

42+

43+ Timer {

44+ id: timer

45+ interval: 1000 * 10

46+ running: indicatorWidget.visible

47+ repeat: true

48+ triggeredOnStart: true

49+ property date dateNow

50+

51+ onTriggered: dateNow = new Date

52+ }

53+

54+ onActionStateChanged: {

55+ if (action == undefined || !action.valid) {

56+ enabled = false;

57+ return;

58+ }

59+

60+ if (action.state == undefined) {

61+ enabled = false;

62+ return;

63+ }

64+

65+ enabled = action.state[3];

66+ }

67+}

qml/Panel/Indicators/IndicatorDelegate.qml → Panel/Indicators/DefaultIndicatorPage.qmlrenamed+4−4

@@ -17,9 +17,9 @@

17 * Nick Dedekind <nick.dedekind@canonical.com>

17 * Nick Dedekind <nick.dedekind@canonical.com>

18 */

18 */

19

19

20−import QtQuick 2.4

20+import QtQuick 2.0

21+import Unity.IndicatorsLegacy 0.1 as Indicators

21

22

22−IndicatorBase {

23+Indicators.IndicatorPage {

23− readonly property bool indicatorVisible: rootActionState.indicatorVisible

24+ anchors.fill: parent

24− readonly property string title: rootActionState.title || rootActionState.accessibleName

25}

25}

tests/qmltests/Notifications/Notification.qml → Panel/Indicators/DefaultIndicatorPage2.qmlrenamed+6−13

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright 2015 Canonical Ltd.

2+ * Copyright 2013 Canonical Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU Lesser General Public License as published by

5 * it under the terms of the GNU Lesser General Public License as published by

@@ -14,19 +14,12 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 *

15 *

16 * Authors:

16 * Authors:

17− * Mirco Mueller <mirco.mueller@canonical.com>

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18 */

18 */

19

19

20−import Unity.Notifications 1.0

20+import QtQuick 2.0

21+import Unity.Indicators 0.1 as Indicators

21

22

22−Notification {

23+Indicators.IndicatorPage {

23− nid: 0

24+ anchors.fill: parent

24− type: Notification.PlaceHolder

25− summary: ""

26− body: ""

27− icon: ""

28− secondaryIcon: ""

29− value: 0

30− rawActions: []

31− fullscreen: false

32}

25}

Panel/Indicators/DefaultIndicatorWidget.qmlnew file+77

@@ -0,0 +1,77 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.IndicatorsLegacy 0.1 as Indicators

23+

24+Indicators.IndicatorWidget {

25+ id: indicatorWidget

26+

27+ enabled:true

28+ width: itemRow.width + units.gu(0.5)

29+

30+ property alias label: itemLabel.text

31+ property alias iconSource: itemImage.source

32+

33+ Row {

34+ id: itemRow

35+ objectName: "itemRow"

36+ anchors {

37+ top: parent.top

38+ bottom: parent.bottom

39+ horizontalCenter: parent.horizontalCenter

40+ }

41+ spacing: units.gu(0.5)

42+

43+ // FIXME : Should us Ubuntu.Icon . results in low res images

44+ Image {

45+ id: itemImage

46+ objectName: "itemImage"

47+ visible: source != ""

48+ height: indicatorWidget.iconSize

49+ width: indicatorWidget.iconSize

50+ anchors.verticalCenter: parent.verticalCenter

51+ }

52+

53+ Label {

54+ id: itemLabel

55+ objectName: "itemLabel"

56+ color: Theme.palette.selected.backgroundText

57+ opacity: 0.8

58+ font.family: "Ubuntu"

59+ fontSize: "medium"

60+ anchors.verticalCenter: parent.verticalCenter

61+ visible: text != ""

62+ }

63+ }

64+

65+ onActionStateChanged: {

66+ if (action == undefined || !action.valid) {

67+ return;

68+ }

69+

70+ if (action.state == undefined) {

71+ return;

72+ }

73+

74+ label = action.state[Indicators.ActionState.Label];

75+ iconSource = "image://theme/" + action.state[Indicators.ActionState.IconSource];

76+ }

77+}

Panel/Indicators/DefaultIndicatorWidget2.qmlnew file+103

@@ -0,0 +1,103 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.Indicators 0.1 as Indicators

23+

24+Indicators.IndicatorWidget {

25+ id: indicatorWidget

26+

27+ width: itemRow.width + units.gu(0.5)

28+

29+ property alias leftLabel: itemLeftLabel.text

30+ property alias rightLabel: itemRightLabel.text

31+ property var icons: undefined

32+

33+ Row {

34+ id: itemRow

35+ objectName: "itemRow"

36+ anchors {

37+ top: parent.top

38+ bottom: parent.bottom

39+ horizontalCenter: parent.horizontalCenter

40+ }

41+ spacing: units.gu(0.5)

42+

43+ Label {

44+ id: itemLeftLabel

45+ objectName: "leftLabel"

46+ color: Theme.palette.selected.backgroundText

47+ opacity: 0.8

48+ font.family: "Ubuntu"

49+ fontSize: "medium"

50+ anchors.verticalCenter: parent.verticalCenter

51+ visible: text != ""

52+ }

53+

54+ Row {

55+ width: childrenRect.width

56+ anchors {

57+ top: parent.top

58+ bottom: parent.bottom

59+ }

60+ spacing: units.gu(0.5)

61+

62+ Repeater {

63+ model: indicatorWidget.icons

64+

65+ Image {

66+ id: itemImage

67+ objectName: "itemImage"

68+ visible: source != ""

69+ source: modelData

70+ height: indicatorWidget.iconSize

71+ width: indicatorWidget.iconSize

72+ anchors.verticalCenter: parent.verticalCenter

73+ }

74+ }

75+ }

76+

77+ Label {

78+ id: itemRightLabel

79+ objectName: "rightLabel"

80+ color: Theme.palette.selected.backgroundText

81+ opacity: 0.8

82+ font.family: "Ubuntu"

83+ fontSize: "medium"

84+ anchors.verticalCenter: parent.verticalCenter

85+ visible: text != ""

86+ }

87+ }

88+

89+ onActionStateChanged: {

90+ if (actionState == undefined) {

91+ leftLabel = "";

92+ rightLabel = "";

93+ icons = undefined;

94+ enabled = false;

95+ return;

96+ }

97+

98+ leftLabel = actionState.leftLabel ? actionState.leftLabel : "";

99+ rightLabel = actionState.rightLabel ? actionState.rightLabel : "";

100+ icons = actionState.icons;

101+ enabled = actionState.visible;

102+ }

103+}

Panel/Indicators/MessagingIndicatorPage.qmlnew file+35

@@ -0,0 +1,35 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.IndicatorsLegacy 0.1 as Indicators

23+

24+Indicators.IndicatorPage {

25+ anchors.fill: parent

26+

27+ highlightFollowsCurrentItem: false

28+ emptyText: "You have no more outstanding messages."

29+

30+ function stop() {

31+ // never stops the service

32+ // this will keep all objects in memory, consume more memory

33+ // but will optimize the menu contruction on the screen

34+ }

35+}

tests/mocks/Unity/InputInfo/plugin.h → Panel/Indicators/MessagingIndicatorWidget.qmlrenamed+9−14

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright 2015 Canonical Ltd.

2+ * Copyright 2013 Canonical Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU Lesser General Public License as published by

5 * it under the terms of the GNU Lesser General Public License as published by

@@ -12,19 +12,14 @@

12 *

12 *

13 * You should have received a copy of the GNU Lesser General Public License

13 * You should have received a copy of the GNU Lesser General Public License

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

15 */

18 */

16

19

17−#ifndef INPUTINFO_PLUGIN_H

20+import QtQuick 2.0

18−#define INPUTINFO_PLUGIN_H

19−

20−#include <QtQml/QQmlExtensionPlugin>

21−

22−class InputInfoPlugin : public QQmlExtensionPlugin

23−{

24− Q_OBJECT

25− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

26−public:

27− void registerTypes(const char *uri) override;

28−};

29

21

30−#endif // INPUTINFO_PLUGIN_H

22+DefaultIndicatorWidget {

23+ // default the icon so we have something to show when we don't have the bus.

24+ iconSource: "image://theme/indicator-messages"

25+}

Panel/Indicators/NetworkIndicatorPage.qmlnew file+83

@@ -0,0 +1,83 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Unity.IndicatorsLegacy 0.1 as Indicators

22+import Unity.IndicatorsLegacy.Network 0.1 as ICNetwork

23+import Ubuntu.Components 0.1

24+

25+PageStack {

26+ id: networkPage

27+ // Stops the search for a parent tree node.

28+ // We don't want it going up to the indicator tabs.

29+ // FIXME: need a better way of doing this.

30+ // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704

31+ __propagated: null

32+

33+ property alias title: _mainPage.title

34+ property alias emptyText: pluginItem.emptyText

35+ property alias busType: pluginItem.busType

36+ property alias busName: pluginItem.busName

37+ property alias actionsObjectPath : pluginItem.actionsObjectPath

38+ property alias menuObjectPaths : pluginItem.menuObjectPaths

39+

40+ anchors.fill: parent

41+

42+ Page {

43+ id: _mainPage

44+

45+ Indicators.IndicatorPage {

46+ id: pluginItem

47+ anchors.fill: parent

48+ }

49+ }

50+

51+ Component {

52+ id: passwordPageComponent

53+

54+ ICNetwork.PasswordPage {

55+ agent: networkAgent

56+ }

57+ }

58+

59+ ICNetwork.NetworkAgent {

60+ id: networkAgent

61+

62+ onSecretRequested: {

63+ networkPage.push(passwordPageComponent, {"token": token});

64+ }

65+ }

66+

67+ function start()

68+ {

69+ push(_mainPage);

70+ pluginItem.start();

71+ }

72+

73+ function stop()

74+ {

75+ clear();

76+ pluginItem.stop();

77+ }

78+

79+ function reset()

80+ {

81+ pluginItem.reset();

82+ }

83+}

Panel/Indicators/NetworkIndicatorPage2.qmlnew file+82

@@ -0,0 +1,82 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Unity.Indicators 0.1 as Indicators

22+import Unity.Indicators.Network 0.1 as ICNetwork

23+import Ubuntu.Components 0.1

24+

25+PageStack {

26+ id: networkPage

27+ // Stops the search for a parent tree node.

28+ // We don't want it going up to the indicator tabs.

29+ // FIXME: need a better way of doing this.

30+ // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704

31+ __propagated: null

32+

33+ property alias title: _mainPage.title

34+ property alias emptyText: pluginItem.emptyText

35+ property alias busName: pluginItem.busName

36+ property alias actionsObjectPath : pluginItem.actionsObjectPath

37+ property alias menuObjectPaths : pluginItem.menuObjectPaths

38+

39+ anchors.fill: parent

40+

41+ Page {

42+ id: _mainPage

43+

44+ Indicators.IndicatorPage {

45+ id: pluginItem

46+ anchors.fill: parent

47+ }

48+ }

49+

50+ Component {

51+ id: passwordPageComponent

52+

53+ ICNetwork.PasswordPage {

54+ agent: networkAgent

55+ }

56+ }

57+

58+ ICNetwork.NetworkAgent {

59+ id: networkAgent

60+

61+ onSecretRequested: {

62+ networkPage.push(passwordPageComponent, {"token": token});

63+ }

64+ }

65+

66+ function start()

67+ {

68+ push(_mainPage);

69+ pluginItem.start();

70+ }

71+

72+ function stop()

73+ {

74+ clear();

75+ pluginItem.stop();

76+ }

77+

78+ function reset()

79+ {

80+ pluginItem.reset();

81+ }

82+}

Panel/Indicators/NetworkIndicatorWidget.qmlnew file+112

@@ -0,0 +1,112 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.IndicatorsLegacy 0.1 as Indicators

23+

24+Indicators.IndicatorWidget {

25+ id: indicatorWidget

26+

27+ width: networkIcon.width + units.gu(0.5)

28+

29+ property int signalStrength: 0

30+ property int connectionState: Indicators.NetworkConnection.Initial

31+ rootMenuType: "com.canonical.indicator.root.network"

32+

33+ // FIXME : Should us Ubuntu.Icon . results in low res images

34+ Image {

35+ id: networkIcon

36+ objectName: "itemImage"

37+ source: get_icon_for_signal(connectionState, signalStrength)

38+ visible: source != ""

39+ height: indicatorWidget.iconSize

40+ width: indicatorWidget.iconSize

41+ anchors.centerIn: parent

42+ }

43+

44+ onActionStateChanged: {

45+ if (action == undefined || !action.valid) {

46+ enabled = false;

47+ return;

48+ }

49+

50+ if (action.state == undefined) {

51+ enabled = false;

52+ connectionState = 0;

53+ return;

54+ }

55+

56+ enabled = true;

57+ connectionState = action.state[Indicators.NetworkActionState.Connection];

58+ if (connectionState == Indicators.NetworkConnection.Activated) {

59+ signalStrength = action.state[Indicators.NetworkActionState.SignalStrength];

60+ }

61+ }

62+

63+ NumberAnimation {

64+ id: activation_animation

65+ target: indicatorWidget

66+ property: "signalStrength"

67+ from: 0

68+ to: 100

69+ duration: 2500 // 5 states in 2.5 seconds

70+ loops: Animation.Infinite

71+ }

72+

73+ states: [

74+ State {

75+ name: "unknown"

76+ when: connectionState < Indicators.NetworkConnection.Activating || connectionState > Indicators.NetworkConnection.Deactivating

77+ PropertyChanges { target: activation_animation; running: false }

78+ },

79+ State {

80+ name: "activating"

81+ when: connectionState == Indicators.NetworkConnection.Activating

82+ PropertyChanges { target: activation_animation; running: true }

83+ },

84+ State {

85+ name: "activated"

86+ when: connectionState == Indicators.NetworkConnection.Activated

87+ PropertyChanges { target: activation_animation; running: false }

88+ },

89+ State {

90+ name: "deactivating"

91+ when: connectionState == Indicators.NetworkConnection.Deactivating

92+ PropertyChanges { target: activation_animation; running: true }

93+ }

94+ ]

95+

96+

97+ function get_icon_for_signal(con_state, value) {

98+ if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {

99+ if (value == 0) {

100+ return "image://theme/nm-signal-00";

101+ } else if (value <= 25) {

102+ return "image://theme/nm-signal-25";

103+ } else if (value <= 50) {

104+ return "image://theme/nm-signal-50";

105+ } else if (value <= 75) {

106+ return "image://theme/nm-signal-75";

107+ }

108+ return "image://theme/nm-signal-100";

109+ }

110+ return "image://theme/wifi-none";

111+ }

112+}

plugins/Unity/InputInfo/plugin.h → Panel/Indicators/SoundIndicatorWidget.qmlrenamed+10−14

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright 2015 Canonical Ltd.

2+ * Copyright 2013 Canonical Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU Lesser General Public License as published by

5 * it under the terms of the GNU Lesser General Public License as published by

@@ -12,19 +12,15 @@

12 *

12 *

13 * You should have received a copy of the GNU Lesser General Public License

13 * You should have received a copy of the GNU Lesser General Public License

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

15 */

18 */

16

19

17−#ifndef INPUTINFO_PLUGIN_H

20+import QtQuick 2.0

18−#define INPUTINFO_PLUGIN_H

19−

20−#include <QtQml/QQmlExtensionPlugin>

21−

22−class InputInfoPlugin : public QQmlExtensionPlugin

23−{

24− Q_OBJECT

25− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

26−public:

27− void registerTypes(const char *uri) override;

28−};

29

21

30−#endif // INPUTINFO_PLUGIN_H

22+DefaultIndicatorWidget {

23+ // default the icon so we have something to show when we don't have the bus.

24+ iconSource: "image://theme/audio-volume-high"

25+ enabled: true

26+}

qml/Panel/Indicators/client/IndicatorsClient.qml → Panel/Indicators/client/IndicatorsClient.qmlrenamed+6−15

@@ -17,16 +17,13 @@

17 * Renato Araujo Oliveira Filho <renato@canonical.com>

17 * Renato Araujo Oliveira Filho <renato@canonical.com>

18 */

18 */

19

19

20−import QtQuick 2.4

20+import QtQuick 2.0

21−import Ubuntu.Components 1.3

21+import Ubuntu.Components 0.1

22+import Ubuntu.Components.ListItems 0.1 as ListItem

22

23

23Rectangle {

24Rectangle {

25+ color: "black"

24 id: root

26 id: root

25− color: theme.palette.normal.background

26−

27− Component.onCompleted: {

28− theme.name = "Ubuntu.Components.Themes.SuruDark"

29− }

30

27

31 PageStack {

28 PageStack {

32 id: pages

29 id: pages

@@ -36,14 +33,8 @@ Rectangle {

36 function reset() {

33 function reset() {

37 clear();

34 clear();

38 var component = Qt.createComponent("IndicatorsList.qml");

35 var component = Qt.createComponent("IndicatorsList.qml");

39− if (component.status !== Component.Ready) {

40− if (component.status === Component.Error)

41− console.error("Error: " + component.errorString());

42−

43− return;

44− }

45−

46− var page = component.createObject(pages, {"profile": indicatorProfile});

36+ var page = component.createObject(pages);

37+ console.log(component.errorString());

47 push(page);

38 push(page);

48 }

39 }

49 }

40 }

qml/Panel/Indicators/client/IndicatorsList.qml → Panel/Indicators/client/IndicatorsList.qmlrenamed+19−25

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright 2013-2016 Canonical Ltd.

2+ * Copyright 2013 Canonical Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU Lesser General Public License as published by

5 * it under the terms of the GNU Lesser General Public License as published by

@@ -15,27 +15,21 @@

15 *

15 *

16 * Authors:

16 * Authors:

17 * Renato Araujo Oliveira Filho <renato@canonical.com>

17 * Renato Araujo Oliveira Filho <renato@canonical.com>

18− * Marco Trevisan <marco.trevisan@canonical.com>

19 */

18 */

20

19

21−import QtQuick 2.4

20+import QtQuick 2.0

22−import Ubuntu.Components 1.3

21+import Ubuntu.Components 0.1

22+import Ubuntu.Components.ListItems 0.1 as ListItem

23−import Unity.Indicators 0.1 as Indicators

23+import Unity.IndicatorsLegacy 0.1 as Indicators

24import "../.."

24import "../.."

25−import "../../../Components"

26

25

27Page {

26Page {

28 id: page

27 id: page

29 anchors.fill: parent

28 anchors.fill: parent

30− property string profile: ""

29+ title: "Plugin list"

31− header: PageHeader {

32− title: "Indicators List"

33− }

34

30

35− Indicators.IndicatorsModel {

31+ IndicatorsDataModel {

36 id: indicatorsModel

32 id: indicatorsModel

37− profile: page.profile

38− Component.onCompleted: load()

39 }

33 }

40

34

41 ListView {

35 ListView {

@@ -44,24 +38,24 @@ Page {

44 anchors.fill: parent

38 anchors.fill: parent

45 model: indicatorsModel

39 model: indicatorsModel

46

40

47− delegate: ListItem {

41+ delegate: Indicators.MenuItem {

42+ anchors.left: parent.left

43+ anchors.right: parent.right

44+ progression: isValid

48 objectName: identifier

45 objectName: identifier

49− height: menuItem.height + (divider.visible ? divider.height : 0)

50

46

51− ListItemLayout {

47+ Label {

52− id: menuItem

48+ anchors.left: parent.left

53− title.text: identifier

49+ anchors.leftMargin: units.gu(0.5)

50+ anchors.verticalCenter: parent.verticalCenter

51+ text: title

54 }

52 }

55

53

56 onClicked: {

54 onClicked: {

55+ if (progression) {

57− var new_page = Qt.createComponent("IndicatorRepresentation.qml");

56+ var new_page = Qt.createComponent("IndicatorsPage.qml");

58− if (new_page.status !== Component.Ready) {

57+ page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});

59− if (new_page.status === Component.Error)

60− console.error("Error: " + new_page.errorString());

61−

62− return;

63 }

58 }

64− page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });

65 }

59 }

66 }

60 }

67 }

61 }

Panel/Indicators/client/IndicatorsPage.qmlnew file+91

@@ -0,0 +1,91 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ * Nick Dedekind <nick.dedekind@canonical.com>

19+ */

20+

21+import QtQuick 2.0

22+import Ubuntu.Components 0.1

23+import Ubuntu.Components.ListItems 0.1 as ListItem

24+

25+Page {

26+ id: page

27+

28+ title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title : ""

29+ property variant indicatorProperties

30+ property string pageSource : pageLoader.source

31+

32+ anchors.fill: parent

33+

34+ ListItem.Standard {

35+ id: visualCheckItem

36+ text: "Enable Visual Representation"

37+ control: Switch {

38+ id: visualCheck

39+ checked: true

40+ }

41+ }

42+

43+ Loader {

44+ id: pageLoader

45+ objectName: "pageLoader"

46+ clip:true

47+

48+ Rectangle {

49+ anchors.fill: pageLoader

50+ color: "#221e1c" // FIXME not in palette yet

51+ }

52+

53+ anchors {

54+ top: visualCheckItem.bottom

55+ left: parent.left

56+ right: parent.right

57+ bottom: buttons.top

58+ topMargin: units.gu(2)

59+ bottomMargin: units.gu(2)

60+ }

61+ source : visualCheck.checked ? page.pageSource : "IndicatorsTree.qml"

62+

63+ onLoaded: {

64+ for(var pName in indicatorProperties) {

65+ if (item.hasOwnProperty(pName)) {

66+ item[pName] = indicatorProperties[pName];

67+ }

68+ }

69+ item.start();

70+ }

71+ }

72+

73+ Item {

74+ id: buttons

75+ anchors {

76+ left: parent.left

77+ right: parent.right

78+ bottom: parent.bottom

79+ margins: units.gu(1)

80+ }

81+ height: childrenRect.height

82+

83+ Button {

84+ anchors {

85+ left: parent.left

86+ }

87+ text: "Back"

88+ onClicked: page.pageStack.reset()

89+ }

90+ }

91+}

Panel/Indicators/client/IndicatorsTree.qmlnew file+62

@@ -0,0 +1,62 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dededkind@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+import Unity.Indicators 0.1 as Indicators

23+import QMenuModel 0.1

24+import Ubuntu.Components.ListItems 0.1 as ListItem

25+

26+Page {

27+ id: page

28+ anchors.fill: parent

29+

30+ property string busName: unityModel.busName

31+ property string actionsObjectPath

32+ property var menuObjectPaths: undefined

33+ readonly property string device: "phone"

34+

35+ property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""

36+

37+ function start() {

38+ }

39+

40+ UnityMenuModel {

41+ id: unityModel

42+ busName: page.busName

43+ actions: { "indicator": page.actionsObjectPath }

44+ menuObjectPath: page.deviceMenuObjectPath

45+ }

46+

47+ Indicators.ModelPrinter {

48+ id: printer

49+ model: unityModel

50+ }

51+

52+ Flickable {

53+ anchors.fill: parent

54+ contentHeight: all_data.height

55+ clip:true

56+ Text {

57+ id: all_data

58+ color: "white"

59+ text: printer.text

60+ }

61+ }

62+}

Panel/IndicatorsDataModel.qmlnew file+79

@@ -0,0 +1,79 @@

1+/*

2+ * Copyright 2013 Canonical Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ */

19+

20+import QtQuick 2.0

21+import Unity.Indicators 0.1 as Indicators

22+import Utils 0.1

23+

24+Indicators.IndicatorsModel {

25+ id: ic_model

26+

27+ Component.onCompleted: load()

28+

29+ indicatorData : {

30+ 'indicator-location' : {

31+ 'title': 'Location',

32+ 'description' : '',

33+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

34+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

35+ },

36+ 'indicator-bluetooth' : {

37+ 'title': 'Bluetooth',

38+ 'description' : '',

39+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

40+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

41+ },

42+ 'indicator-messages' : {

43+ 'title': 'Messaging',

44+ 'description' : '',

45+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',

46+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'

47+ },

48+ 'indicator-sound' : {

49+ 'title': 'Sound',

50+ 'description' : '',

51+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

52+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

53+ },

54+ 'indicator-network' : {

55+ 'title': 'Networks',

56+ 'description' : '',

57+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

58+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage2.qml'

59+ },

60+ 'indicator-power' : {

61+ 'title': 'Battery',

62+ 'description' : '',

63+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

64+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

65+ },

66+ 'indicator-session' : {

67+ 'title': 'Session',

68+ 'description' : '',

69+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

70+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

71+ },

72+ 'indicator-datetime' : {

73+ 'title': 'Date and Time',

74+ 'description' : '',

75+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

76+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

77+ }

78+ }

79+}

Panel/MenuContent.qmlnew file+161

@@ -0,0 +1,161 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import Unity.Indicators 0.1 as Indicators

20+import Utils 0.1

21+import "../Components"

22+

23+// FIXME : We dont want to use MainView.

24+// Need a regular Item which can have tabs with local header.

25+// https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704

26+MainView {

27+ id: content

28+

29+ property QtObject indicatorsModel: null

30+ property bool __contentActive: false

31+ readonly property int currentMenuIndex : filteredIndicators.mapToSource(tabs.selectedTabIndex)

32+ backgroundColor: "#221e1c" // FIXME not in palette yet

33+ property int contentReleaseInterval: 20000

34+ property bool activeHeader: false

35+ property alias visibleIndicators: visibleIndicatorsModel.visible

36+

37+ width: units.gu(40)

38+ height: units.gu(42)

39+

40+ function setCurrentMenuIndex(index) {

41+ var filteredIndex = filteredIndicators.mapFromSource(index)

42+

43+ if (tabs.selectedTabIndex !== filteredIndex) {

44+ if (tabs.selectedTabIndex == -1) {

45+ tabs.tabBar.animate = false;

46+ }

47+ tabs.selectedTabIndex = filteredIndex;

48+ tabs.tabBar.animate = true;

49+ }

50+ }

51+

52+ function activateContent() {

53+ contentReleaseTimer.stop();

54+ __contentActive = true;

55+ }

56+

57+ function releaseContent() {

58+ if (__contentActive) {

59+ contentReleaseTimer.restart();

60+ }

61+ }

62+

63+ onActiveHeaderChanged: {

64+ tabs.tabBar.selectionMode = activeHeader;

65+ tabs.tabBar.alwaysSelectionMode = activeHeader;

66+ }

67+

68+ SortFilterProxyModel {

69+ id: filteredIndicators

70+ model: visibleIndicatorsModel

71+ dynamicSortFilter: true

72+

73+ filterRole: Indicators.IndicatorsModelRole.IsVisible

74+ filterRegExp: RegExp("^true$")

75+ }

76+

77+ Indicators.VisibleIndicatorsModel {

78+ id: visibleIndicatorsModel

79+ model: indicatorsModel

80+ }

81+

82+ Tabs {

83+ id: tabs

84+ objectName: "tabs"

85+ anchors.fill: parent

86+ selectedTabIndex: -1

87+

88+ Repeater {

89+ id: repeater

90+ model: filteredIndicators

91+ objectName: "tabsRepeater"

92+

93+ // FIXME: This is needed because tabs dont handle repeaters well.

94+ // Due to the child ordering happening after child insertion.

95+ // QTBUG-32438

96+ onItemAdded: {

97+ parent.childrenChanged();

98+ }

99+

100+ Tab {

101+ id: tab

102+ objectName: model.identifier

103+ title: model.title

104+

105+ page: Page {

106+ Loader {

107+ clip: true

108+ anchors.fill: parent

109+ source: pageSource

110+ asynchronous: true

111+

112+ property bool contentActive: content.__contentActive && menuActivator.content[index].active

113+

114+ onContentActiveChanged: {

115+ if (contentActive && item) {

116+ item.start()

117+ } else if (!contentActive && item) {

118+ item.stop()

119+ }

120+ }

121+

122+ onVisibleChanged: {

123+ // Reset the indicator states

124+ if (!visible && item && item["reset"]) {

125+ item.reset()

126+ }

127+ }

128+

129+ onLoaded: {

130+ for(var pName in indicatorProperties) {

131+ if (item.hasOwnProperty(pName)) {

132+ item[pName] = indicatorProperties[pName]

133+ }

134+ }

135+ if (contentActive && tabs.visible) {

136+ item.start()

137+ }

138+ }

139+ }

140+ }

141+ }

142+ }

143+ }

144+

145+ Timer {

146+ id: contentReleaseTimer

147+

148+ interval: contentReleaseInterval

149+ onTriggered: {

150+ content.__contentActive = false;

151+ menuActivator.clear();

152+ }

153+ }

154+

155+ Indicators.MenuContentActivator {

156+ id: menuActivator

157+ running: content.__contentActive

158+ baseIndex: content.currentMenuIndex

159+ count: indicatorsModel.count

160+ }

161+}

Panel/Panel.qmlnew file+152

@@ -0,0 +1,152 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+Item {

22+ id: root

23+ readonly property real panelHeight: units.gu(3) + units.dp(2)

24+ property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(40) : shell.width

25+ property alias indicators: indicatorsMenu

26+ property bool fullscreenMode: false

27+ property bool searchVisible: true

28+

29+ readonly property real separatorLineHeight: leftSeparatorLine.height

30+ readonly property real __panelMinusSeparatorLineHeight: panelHeight - separatorLineHeight

31+

32+ signal searchClicked

33+

34+ PanelBackground {

35+ id: panelBackground

36+ anchors {

37+ left: parent.left

38+ right: parent.right

39+ }

40+ height: __panelMinusSeparatorLineHeight

41+ y: 0

42+

43+ Behavior on y { StandardAnimation {} }

44+ }

45+

46+ PanelSeparatorLine {

47+ id: leftSeparatorLine

48+ anchors {

49+ top: panelBackground.bottom

50+ left: parent.left

51+ right: indicatorsMenu.left

52+ }

53+ saturation: 1 - indicatorsMenu.unitProgress

54+ }

55+

56+ Rectangle {

57+ id: darkenedArea

58+ property real darkenedOpacity: 0.6

59+ anchors {

60+ left: parent.left

61+ right: parent.right

62+ top: panelBackground.bottom

63+ bottom: parent.bottom

64+ }

65+ color: "black"

66+ opacity: indicatorsMenu.unitProgress * darkenedOpacity

67+ MouseArea {

68+ anchors.fill: parent

69+ enabled: indicatorsMenu.shown

70+ onClicked: if (indicatorsMenu.fullyOpened) indicatorsMenu.hide();

71+ }

72+ }

73+

74+ Indicators {

75+ id: indicatorsMenu

76+

77+ anchors.right: parent.right

78+ y: panelBackground.y

79+ width: root.indicatorsMenuWidth

80+ shown: false

81+ hintValue: __panelMinusSeparatorLineHeight * 3

82+ panelHeight: __panelMinusSeparatorLineHeight

83+ openedHeight: parent.height + (pinnedMode ? 0 : root.panelHeight)

84+ pinnedMode: !fullscreenMode

85+

86+ property real unitProgress: (height - panelHeight) / (openedHeight - panelHeight)

87+ }

88+

89+ PanelSeparatorLine {

90+ id: indicatorsSeparatorLine

91+ visible: true

92+ anchors {

93+ left: indicatorsMenu.left

94+ right: indicatorsMenu.right

95+ }

96+ y: indicatorsMenu.visualBottom

97+ }

98+

99+ BorderImage {

100+ id: dropShadow

101+ anchors {

102+ top: indicators.top

103+ bottom: indicatorsSeparatorLine.bottom

104+ left: indicators.left

105+ right: indicators.right

106+ margins: -units.gu(1)

107+ }

108+ visible: indicatorsMenu.height > indicatorsMenu.panelHeight

109+ source: "graphics/rectangular_dropshadow.sci"

110+ }

111+

112+ SearchIndicator {

113+ id: search

114+ objectName: "search"

115+ enabled: root.searchVisible

116+

117+ state: {

118+ if (parent.width < indicatorsMenu.width + width) {

119+ if (indicatorsMenu.state != "initial") {

120+ return "hidden";

121+ }

122+ }

123+ if (root.searchVisible) {

124+ return "visible";

125+ }

126+

127+ return "hidden";

128+ }

129+

130+ width: units.gu(13)

131+ height: __panelMinusSeparatorLineHeight

132+ anchors {

133+ top: panelBackground.top

134+ left: panelBackground.left

135+ }

136+

137+ onClicked: root.searchClicked()

138+ }

139+

140+ states: [

141+ State {

142+ name: "in" //fully opaque and visible at top edge of screen

143+ when: !fullscreenMode

144+ PropertyChanges { target: panelBackground; y: 0 }

145+ },

146+ State {

147+ name: "out" //pushed off screen

148+ when: fullscreenMode

149+ PropertyChanges { target: panelBackground; y: -panelHeight }

150+ }

151+ ]

152+}

plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel → Panel/PanelBackground.qmlrenamed+6−2

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2016 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,4 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−#include "../liblightdm/SessionsModel.h"

17+import QtQuick 2.0

18+

19+Rectangle {

20+ color: "black"

21+}

tests/plugins/Ubuntu/Gestures/touchGateExample.qml → Panel/PanelSeparatorLine.qmlrenamed+6−8

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2014 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,14 +14,12 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Gestures 0.1

19

18

20Rectangle {

19Rectangle {

21− width: 720; height: 720

20+ property real saturation: 1.0

22

21

23− TouchGate {

22+ // orange in HSL

24− anchors.fill: parent

23+ color: Qt.hsla(16.0/360.0, saturation * 0.83, 0.47, 1.0)

25− objectName: "touchGate"

24+ height: units.dp(2)

26− }

27}

25}

Panel/SearchIndicator.qmlnew file+81

@@ -0,0 +1,81 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../Components"

20+

21+Item {

22+ id: search

23+

24+ width: units.gu(9)

25+ height: units.gu(3)

26+

27+ property string headerText: i18n.tr("Search")

28+

29+ signal clicked

30+

31+ // eater

32+ MouseArea {

33+ anchors.fill: parent

34+ onClicked: search.clicked()

35+ }

36+

37+ Item {

38+ id: container

39+ objectName: "container"

40+

41+ width: parent.width

42+ height: parent.height

43+

44+ Behavior on opacity { StandardAnimation {} }

45+

46+ Image {

47+ id: icon

48+ source: "graphics/search.png"

49+ anchors.verticalCenter: parent.verticalCenter

50+ anchors.left: parent.left

51+ anchors.leftMargin: units.gu(1)

52+ }

53+

54+ Label {

55+ text: search.headerText

56+ color: Qt.rgba(0.8, 0.8, 0.8, 1.0)

57+ fontSize: "small"

58+ font.capitalization: Font.AllUppercase

59+ anchors.left: icon.right

60+ anchors.leftMargin: units.gu(1)

61+ anchors.verticalCenter: parent.verticalCenter

62+ }

63+ }

64+

65+ states: [

66+ State {

67+ name: "visible"

68+ PropertyChanges {

69+ target: container

70+ opacity: 1

71+ }

72+ },

73+ State {

74+ name: "hidden"

75+ PropertyChanges {

76+ target: container

77+ opacity: 0

78+ }

79+ }

80+ ]

81+}

Panel/graphics/Battery@18.pngnew file

Binary file not shown.

Panel/graphics/Bluetooth@18.pngnew file

Binary file not shown.

Panel/graphics/Clock@18.pngnew file

Binary file not shown.

Panel/graphics/Location@18.pngnew file

Binary file not shown.

Panel/graphics/Messages@18.pngnew file

Binary file not shown.

Panel/graphics/Network@18.pngnew file

Binary file not shown.

Panel/graphics/Sound@18.pngnew file

Binary file not shown.

Panel/graphics/Sync@18.pngnew file

Binary file not shown.

Panel/graphics/System@18.pngnew file

Binary file not shown.

Panel/graphics/Time@18.pngnew file

Binary file not shown.

Panel/graphics/VerticalDivider@18.pngnew file

Binary file not shown.

Panel/graphics/handle@12.pngnew file

Binary file not shown.

Panel/graphics/handle@12.scinew file+5

@@ -0,0 +1,5 @@

1+border.left: 0

2+border.top: 1

3+border.bottom: 0

4+border.right: 0

5+source: handle@12.png

Panel/graphics/rectangular_dropshadow@30.pngnew file

Binary file not shown.

qml/Panel/graphics/rectangular_dropshadow@30.sci → Panel/graphics/rectangular_dropshadow@30.scirenamed

The content is the same.

Panel/graphics/search@12.pngnew file

Binary file not shown.

Panel/graphics/time_and_date@18.pngnew file

Binary file not shown.

README.mddeleted−31

@@ -1,31 +0,0 @@

1−# Lomiri

2−

3−Lomiri is the operating environment for everywhere. It is able to span the gaps between touch, mouse, and keyboard; between phones, tablets, and workstations; and look good doing it.

4−

5−If you want to contribute to Lomiri on Ubuntu Touch, you've come to the right place. If you want to package Lomiri for other operating systems, you'll be better served by the main branch on the repository that we're migrating to: https://gitlab.com/ubports/core/lomiri

6−

7−Lomiri has been renamed from Unity8. Most of the software on-device in Ubuntu Touch based on Ubuntu 16.04 is still called `unity8`.

8−

9−## Where to report issues

10−

11−Issues related to the version of Lomiri that currently runs on Ubuntu Touch devices may still be reported on this repository. We will move these reports to the GitLab repository as part of our final migration.

12−

13−## Developing Lomiri on Ubuntu Touch

14−

15−This repository contains the code for Lomiri currently running on Ubuntu Touch. If you would like to modify this version of Lomiri, follow the steps below. If you would like to modify Lomiri in another operating system, check out our new repository: https://gitlab.com/ubports/core/lomiri

16−

17−Lomiri can be built and its test suite run using [`clickable`](https://clickable-ut.dev). This is a convenient method to try out most graphical changes to Lomiri without an annoying redeployment process. If you wish to test your changes on your device or make changes that are more difficult to test without real hardware, check out [Making changes and testing locally on the UBports documentation](https://docs.ubports.com/en/latest/systemdev/testing-locally.html). If not, read on.

18−

19−Before you start, [install Clickable](https://clickable-ut.dev/en/latest/install.html).

20−

21−Now, clone this repository to your computer: `git clone https://github.com/ubports/unity8.git`

22−

23−Move into this directory: `cd unity8`

24−

25−Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:

26−

27−* `clickable ide qtcreator` will open QtCreator with this repository open as a project. You can edit and build the project this way, but running the tests will be a bit difficult.

28−* `clickable build --libs --verbose` will build Lomiri in the same environment as it would receive in Ubuntu Touch.

29−* `clickable test --libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...

30−* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make tryShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow trying out some Lomiri components in a mock environment. You can use this to try out your changes to Lomiri as you develop.

31−* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make xvfbtestShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow running a single TestCase. You can remove the `xvfb` part of the make target to run the test case graphically, which might help you see what is causing the test to fail.

Shell.qmlnew file+601

@@ -0,0 +1,601 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import AccountsService 0.1

19+import GSettings 1.0

20+import Unity.Application 0.1

21+import Ubuntu.Components 0.1

22+import Ubuntu.Gestures 0.1

23+import Unity.Launcher 0.1

24+import Powerd 0.1

25+import SessionBroadcast 0.1

26+import SessionManager 0.1

27+import "Dash"

28+import "Launcher"

29+import "Panel"

30+import "Hud"

31+import "Components"

32+import "Components/Math.js" as MathLocal

33+import "Bottombar"

34+import "SideStage"

35+import "Notifications"

36+import Unity.Notifications 1.0 as NotificationBackend

37+

38+BasicShell {

39+ id: shell

40+

41+ readonly property real panelHeight: panel.panelHeight

42+

43+ property bool dashShown: dash.shown

44+ property bool stageScreenshotsReady: {

45+ if (sideStage.shown) {

46+ if (mainStage.applications.count > 0) {

47+ return mainStage.usingScreenshots && sideStage.usingScreenshots;

48+ } else {

49+ return sideStage.usingScreenshots;

50+ }

51+ } else {

52+ return mainStage.usingScreenshots;

53+ }

54+ }

55+

56+ property ListModel searchHistory: SearchHistoryModel {}

57+

58+ property var applicationManager: ApplicationManagerWrapper {}

59+

60+ Binding {

61+ target: LauncherModel

62+ property: "applicationManager"

63+ value: ApplicationManager

64+ }

65+

66+ Component.onCompleted: {

67+ Theme.name = "Ubuntu.Components.Themes.SuruGradient"

68+

69+ applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })

70+

71+ // FIXME: if application focused before shell starts, shell draws on top of it only.

72+ // We should detect already running applications on shell start and bring them to the front.

73+ applicationManager.unfocusCurrentApplication();

74+ }

75+

76+ readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication

77+ || !!applicationManager.sideStageFocusedApplication

78+ // Used for autopilot testing.

79+ readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId

80+

81+ readonly property bool fullscreenMode: {

82+ if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode

83+ return mainStage.switchingFromFullscreenToFullscreen;

84+ } else if (applicationManager.mainStageFocusedApplication) {

85+ return applicationManager.mainStageFocusedApplication.fullscreen;

86+ } else {

87+ return false;

88+ }

89+ }

90+

91+ Connections {

92+ target: applicationManager

93+ ignoreUnknownSignals: true

94+ onFocusRequested: {

95+ shell.activateApplication(desktopFile);

96+ }

97+ }

98+

99+ function activateApplication(desktopFile, argument) {

100+ if (applicationManager) {

101+ // For newly started applications, as it takes them time to draw their first frame

102+ // we add a delay before we hide the animation screenshots to compensate.

103+ var addDelay = !applicationManager.getApplicationFromDesktopFile(desktopFile);

104+

105+ var application;

106+ application = applicationManager.activateApplication(desktopFile, argument);

107+ if (application == null) {

108+ return;

109+ }

110+ if (application.stage == ApplicationInfo.MainStage || !sideStage.enabled) {

111+ mainStage.activateApplication(desktopFile, addDelay);

112+ } else {

113+ sideStage.activateApplication(desktopFile, addDelay);

114+ }

115+ stages.show();

116+ }

117+ }

118+

119+ GSettings {

120+ id: backgroundSettings

121+ schema.id: "org.gnome.desktop.background"

122+ }

123+ backgroundSource: backgroundSettings.pictureUri

124+

125+ Item {

126+ id: underlay

127+ objectName: "underlay"

128+ anchors.fill: parent

129+

130+ // Whether the underlay is fully covered by opaque UI elements.

131+ property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth

132+

133+ readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)

134+ || (sideStage.applications && sideStage.applications.count > 0))

135+

136+ // Whether the user should see the topmost application surface (if there's one at all).

137+ readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden

138+ && !mainStage.usingScreenshots // but want sideStage animating over app surface

139+

140+

141+

142+ // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user

143+ // through the translucent parts of the shell surface.

144+ visible: !fullyCovered && !applicationSurfaceShouldBeSeen

145+

146+ CrossFadeImage {

147+ id: backgroundImage

148+ objectName: "backgroundImage"

149+

150+ anchors.fill: parent

151+ source: shell.background

152+ fillMode: Image.PreserveAspectCrop

153+ }

154+

155+ Rectangle {

156+ anchors.fill: parent

157+ color: "black"

158+ opacity: dash.disappearingAnimationProgress

159+ }

160+

161+ Dash {

162+ id: dash

163+ objectName: "dash"

164+

165+ hides: [stages, launcher, panel.indicators]

166+ shown: disappearingAnimationProgress !== 1.0

167+ enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled

168+ // FIXME: unfocus all applications when going back to the dash

169+ onEnabledChanged: {

170+ if (enabled) {

171+ shell.applicationManager.unfocusCurrentApplication()

172+ }

173+ }

174+

175+ anchors {

176+ fill: parent

177+ topMargin: panel.panelHeight

178+ }

179+

180+ contentScale: 1.0 - 0.2 * disappearingAnimationProgress

181+ opacity: 1.0 - disappearingAnimationProgress

182+ property real disappearingAnimationProgress: stagesOuterContainer.showProgress

183+

184+ // FIXME: only necessary because stagesOuterContainer.showProgress

185+ // is not animated

186+ Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

187+ }

188+ }

189+

190+ Item {

191+ id: stagesOuterContainer

192+

193+ width: parent.width

194+ height: parent.height

195+ x: launcher.progress

196+ Behavior on x {SmoothedAnimation{velocity: 600}}

197+

198+ property real showProgress:

199+ MathLocal.clamp(1 - (x + stages.x) / shell.width, 0, 1)

200+

201+ Showable {

202+ id: stages

203+ objectName: "stages"

204+

205+ x: width

206+

207+ property bool fullyShown: shown && x == 0 && parent.x == 0

208+ property bool fullyHidden: !shown && x == width

209+ hides: [panel.indicators]

210+ shown: false

211+ opacity: 1.0

212+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }

213+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: width; easing.type: Easing.OutCubic }

214+

215+ width: parent.width

216+ height: parent.height

217+

218+ // close the stages when no focused application remains

219+ Connections {

220+ target: shell.applicationManager

221+ onMainStageFocusedApplicationChanged: stages.closeIfNoApplications()

222+ onSideStageFocusedApplicationChanged: stages.closeIfNoApplications()

223+ ignoreUnknownSignals: true

224+ }

225+

226+ function closeIfNoApplications() {

227+ if (!shell.applicationManager.mainStageFocusedApplication

228+ && !shell.applicationManager.sideStageFocusedApplication

229+ && shell.applicationManager.mainStageApplications.count == 0

230+ && shell.applicationManager.sideStageApplications.count == 0) {

231+ stages.hide();

232+ }

233+ }

234+

235+ // show the stages when an application gets the focus

236+ Connections {

237+ target: shell.applicationManager

238+ onMainStageFocusedApplicationChanged: {

239+ if (shell.applicationManager.mainStageFocusedApplication) {

240+ mainStage.show();

241+ stages.show();

242+ }

243+ }

244+ onSideStageFocusedApplicationChanged: {

245+ if (shell.applicationManager.sideStageFocusedApplication) {

246+ sideStage.show();

247+ stages.show();

248+ }

249+ }

250+ ignoreUnknownSignals: true

251+ }

252+

253+ Stage {

254+ id: mainStage

255+

256+ anchors.fill: parent

257+ fullyShown: stages.fullyShown

258+ fullyHidden: stages.fullyHidden

259+ shouldUseScreenshots: !fullyShown

260+ rightEdgeEnabled: !sideStage.enabled

261+

262+ applicationManager: shell.applicationManager

263+ rightEdgeDraggingAreaWidth: shell.edgeSize

264+ normalApplicationY: shell.panelHeight

265+

266+ shown: true

267+ function show() {

268+ stages.show();

269+ }

270+ function hide() {

271+ }

272+

273+ // FIXME: workaround the fact that focusing a main stage application

274+ // raises its surface on top of all other surfaces including the ones

275+ // that belong to side stage applications.

276+ onFocusedApplicationChanged: {

277+ if (focusedApplication && sideStage.focusedApplication && sideStage.fullyShown) {

278+ shell.applicationManager.focusApplication(sideStage.focusedApplication);

279+ }

280+ }

281+ }

282+

283+ SideStage {

284+ id: sideStage

285+

286+ applicationManager: shell.applicationManager

287+ rightEdgeDraggingAreaWidth: shell.edgeSize

288+ normalApplicationY: shell.panelHeight

289+

290+ onShownChanged: {

291+ if (!shown && mainStage.applications.count == 0) {

292+ stages.hide();

293+ }

294+ }

295+ // FIXME: when hiding the side stage, refocus the main stage

296+ // application so that it goes in front of the side stage

297+ // application and hides it

298+ onFullyShownChanged: {

299+ if (!fullyShown && stages.fullyShown && sideStage.focusedApplication != null) {

300+ shell.applicationManager.focusApplication(mainStage.focusedApplication);

301+ }

302+ }

303+

304+ enabled: shell.width >= units.gu(60)

305+ visible: enabled

306+ fullyShown: stages.fullyShown && shown

307+ && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue

308+ shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed

309+

310+ available: enabled

311+ hides: [launcher, panel.indicators]

312+ shown: false

313+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }

314+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.closedValue; easing.type: Easing.OutQuint }

315+

316+ width: units.gu(40)

317+ height: stages.height

318+ handleExpanded: sideStageRevealer.pressed

319+ }

320+

321+ Revealer {

322+ id: sideStageRevealer

323+

324+ enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0

325+ && sideStage.available

326+ direction: Qt.RightToLeft

327+ openedValue: parent.width - sideStage.width

328+ hintDisplacement: units.gu(3)

329+ /* The size of the sidestage handle needs to be bigger than the

330+ typical size used for edge detection otherwise it is really

331+ hard to grab.

332+ */

333+ handleSize: sideStage.shown ? units.gu(4) : shell.edgeSize

334+ closedValue: parent.width + sideStage.handleSizeCollapsed

335+ target: sideStage

336+ x: parent.width - width

337+ width: sideStage.width + handleSize * 0.7

338+ height: sideStage.height

339+ orientation: Qt.Horizontal

340+ }

341+

342+ DragHandle {

343+ id: stagesDragHandle

344+

345+ anchors.top: parent.top

346+ anchors.bottom: parent.bottom

347+ anchors.right: parent.left

348+

349+ width: shell.edgeSize

350+ direction: Direction.Leftwards

351+ enabled: edgeDemo.dashEnabled

352+ property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0

353+

354+ maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7

355+ // Make autocompletion impossible when !haveApps

356+ edgeDragEvaluator.minDragDistance: haveApps ? maxTotalDragDistance * 0.1 : Number.MAX_VALUE

357+ }

358+ }

359+ }

360+

361+ Connections {

362+ id: powerConnection

363+ target: Powerd

364+

365+ property var previousMainApp: null

366+ property var previousSideApp: null

367+

368+ function setFocused(focused) {

369+ if (!focused) {

370+ powerConnection.previousMainApp = applicationManager.mainStageFocusedApplication;

371+ powerConnection.previousSideApp = applicationManager.sideStageFocusedApplication;

372+ applicationManager.unfocusCurrentApplication();

373+ } else {

374+ if (powerConnection.previousMainApp) {

375+ applicationManager.focusApplication(powerConnection.previousMainApp);

376+ powerConnection.previousMainApp = null;

377+ }

378+ if (powerConnection.previousSideApp) {

379+ applicationManager.focusApplication(powerConnection.previousSideApp);

380+ powerConnection.previousSideApp = null;

381+ }

382+ }

383+ }

384+

385+ onDisplayPowerStateChange: {

386+ // We ignore any display-off signals when the proximity sensor

387+ // is active. This usually indicates something like a phone call.

388+ if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {

389+ powerConnection.setFocused(false);

390+ SessionManager.lock();

391+ } else if (status == Powerd.On) {

392+ powerConnection.setFocused(true);

393+ }

394+

395+ // No reason to chew demo CPU when user isn't watching

396+ if (status == Powerd.Off) {

397+ edgeDemo.paused = true;

398+ } else if (status == Powerd.On) {

399+ edgeDemo.paused = false;

400+ }

401+ }

402+ }

403+

404+ function showHome() {

405+ // Animate if moving between application and dash

406+ if (!stages.shown) {

407+ dash.setCurrentScope("home.scope", true, false)

408+ } else {

409+ dash.setCurrentScope("home.scope", false, false)

410+ }

411+ stages.hide()

412+ }

413+

414+ Item {

415+ id: overlay

416+

417+ anchors.fill: parent

418+

419+ Panel {

420+ id: panel

421+ anchors.fill: parent //because this draws indicator menus

422+ indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width

423+ indicators {

424+ hides: [launcher]

425+ available: edgeDemo.panelEnabled

426+ contentEnabled: edgeDemo.panelContentEnabled

427+ }

428+ fullscreenMode: shell.fullscreenMode

429+

430+ InputFilterArea {

431+ anchors {

432+ top: parent.top

433+ left: parent.left

434+ right: parent.right

435+ }

436+ height: (panel.fullscreenMode) ? shell.edgeSize : panel.panelHeight

437+ blockInput: true

438+ }

439+ }

440+

441+ Hud {

442+ id: hud

443+

444+ width: parent.width > units.gu(60) ? units.gu(40) : parent.width

445+ height: parent.height

446+

447+ available: !panel.indicators.shown && edgeDemo.dashEnabled

448+ shown: false

449+ showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }

450+ hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

451+

452+ Connections {

453+ target: shell.applicationManager

454+ onMainStageFocusedApplicationChanged: hud.hide()

455+ onSideStageFocusedApplicationChanged: hud.hide()

456+ }

457+ }

458+

459+ Revealer {

460+ id: hudRevealer

461+

462+ enabled: hud.shown

463+ width: hud.width

464+ anchors.left: hud.left

465+ height: parent.height

466+ target: hud.revealerTarget

467+ closedValue: height

468+ openedValue: 0

469+ direction: Qt.RightToLeft

470+ orientation: Qt.Vertical

471+ handleSize: hud.handleHeight

472+ onCloseClicked: target.hide()

473+ }

474+

475+ Bottombar {

476+ theHud: hud

477+ anchors.fill: parent

478+ enabled: hud.available

479+ applicationIsOnForeground: applicationFocused

480+ }

481+

482+ InputFilterArea {

483+ blockInput: launcher.shown

484+ anchors {

485+ top: parent.top

486+ bottom: parent.bottom

487+ left: parent.left

488+ }

489+ width: launcher.width

490+ }

491+

492+ Launcher {

493+ id: launcher

494+

495+ anchors.top: parent.top

496+ anchors.bottom: parent.bottom

497+ width: parent.width

498+ dragAreaWidth: shell.edgeSize

499+ available: edgeDemo.launcherEnabled

500+ onDashItemSelected: showHome()

501+ onDash: {

502+ if (stages.shown) {

503+ dash.setCurrentScope("applications.scope", true, false)

504+ stages.hide();

505+ launcher.hide();

506+ }

507+ }

508+ onLauncherApplicationSelected:{

509+ shell.activateApplication(appId)

510+ }

511+ onShownChanged: {

512+ if (shown) {

513+ panel.indicators.hide()

514+ hud.hide()

515+ }

516+ }

517+ }

518+

519+ Notifications {

520+ id: notifications

521+

522+ model: NotificationBackend.Model

523+ anchors {

524+ top: parent.top

525+ right: parent.right

526+ bottom: parent.bottom

527+ leftMargin: units.gu(1)

528+ rightMargin: units.gu(1)

529+ topMargin: panel.panelHeight + units.gu(1)

530+ }

531+ states: [

532+ State {

533+ name: "narrow"

534+ when: overlay.width <= units.gu(60)

535+ AnchorChanges { target: notifications; anchors.left: parent.left }

536+ },

537+ State {

538+ name: "wide"

539+ when: overlay.width > units.gu(60)

540+ AnchorChanges { target: notifications; anchors.left: undefined }

541+ PropertyChanges { target: notifications; width: units.gu(38) }

542+ }

543+ ]

544+ }

545+ }

546+

547+ focus: true

548+

549+ InputFilterArea {

550+ anchors {

551+ top: parent.top

552+ bottom: parent.bottom

553+ left: parent.left

554+ }

555+ width: shell.edgeSize

556+ blockInput: true

557+ }

558+

559+ Binding {

560+ target: i18n

561+ property: "domain"

562+ value: "unity8"

563+ }

564+

565+ //FIXME: This should be handled in the input stack, keyboard shouldnt propagate

566+ MouseArea {

567+ anchors.bottom: parent.bottom

568+ anchors.left: parent.left

569+ anchors.right: parent.right

570+ height: shell.applicationManager ? shell.applicationManager.keyboardHeight : 0

571+

572+ enabled: shell.applicationManager && shell.applicationManager.keyboardVisible

573+ }

574+

575+ Label {

576+ anchors.centerIn: parent

577+ visible: applicationManager.fake

578+ text: "EARLY ALPHA\nNOT READY FOR USE"

579+ color: "lightgrey"

580+ opacity: 0.2

581+ font.weight: Font.Black

582+ horizontalAlignment: Text.AlignHCenter

583+ verticalAlignment: Text.AlignVCenter

584+ fontSizeMode: Text.Fit

585+ rotation: -45

586+ scale: Math.min(parent.width, parent.height) / width

587+ }

588+

589+ EdgeDemo {

590+ id: edgeDemo

591+ launcher: launcher

592+ dash: dash

593+ indicators: panel.indicators

594+ underlay: underlay

595+ }

596+

597+ Connections {

598+ target: SessionBroadcast

599+ onShowHome: showHome()

600+ }

601+}

SideStage/SideStage.qmlnew file+68

@@ -0,0 +1,68 @@

1+/*

2+ * Copyright (C) 2013 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Unity.Application 0.1

19+import Ubuntu.Components 0.1

20+import "../Components"

21+

22+Stage {

23+ id: stage

24+

25+ type: ApplicationInfo.SideStage

26+ property real handleSizeCollapsed: units.gu(2.5)

27+ property real handleSizeExpanded: units.gu(4)

28+ property bool handleExpanded

29+

30+ /* FIXME: workaround so that when a main stage app goes fullscreen

31+ the sidestage's top is not transparent. Proper fix would be to

32+ resize the side stage app.

33+ */

34+ Rectangle {

35+ id: backgroundBeneathPanel

36+ anchors {

37+ top: parent.top

38+ left: parent.left

39+ right: parent.right

40+ }

41+ height: shell.panelHeight

42+ color: background.color

43+ z: -1

44+ }

45+

46+ Rectangle {

47+ id: background

48+ anchors.fill: parent

49+ color: "#2c2924"

50+ z: -1

51+ visible: stage.usingScreenshots

52+ }

53+

54+ SidestageHandle {

55+ id: handle

56+ objectName: "sideStageHandle"

57+

58+ anchors {

59+ top: parent.top

60+ bottom: parent.bottom

61+ left: parent.left

62+ leftMargin: -width

63+ }

64+ width: handleExpanded ? handleSizeExpanded : handleSizeCollapsed

65+ Behavior on width { NumberAnimation { easing.type: Easing.OutQuart} }

66+ z: -1

67+ }

68+}

tests/mocks/Utils/EdgeBarrierSettings.qml → SideStage/SidestageHandle.qmlrenamed+5−5

@@ -1,5 +1,5 @@

1/*

1/*

2− * Copyright (C) 2015 Canonical, Ltd.

2+ * Copyright (C) 2013 Canonical, Ltd.

3 *

3 *

4 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -14,9 +14,9 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

15 */

16

16

17−pragma Singleton

18−import QtQuick 2.4

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19

19

20−QtObject {

20+BorderImage {

21− readonly property real pushThreshold: units.gu(8)

21+ source: "graphics/sidestage_handle.sci"

22}

22}

SideStage/graphics/sidestage_handle@20.pngnew file

Binary file not shown.

qml/Stage/graphics/sidestage_handle@20.sci → SideStage/graphics/sidestage_handle@20.scirenamed

The content is the same.

buildnew file+87

@@ -0,0 +1,87 @@

1+#!/bin/sh

2+

3+SETUP=false

4+CLEAN=false

5+NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))

6+CODE_DIR=$( dirname `readlink -f $0` )

7+

8+usage() {

9+ echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2

10+ echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2

11+ echo "OPTIONS:" >&2

12+ echo " -s, --setup Setup the build environment and branch Unity" >&2

13+ echo " -c, --clean Clean the build tree before building" >&2

14+ echo >&2

15+ exit 1

16+}

17+

18+ARGS=`getopt -n$0 -u -a --longoptions="setup,clean,help" -o "sch" -- "$@"`

19+[ $? -ne 0 ] && usage

20+eval set -- "$ARGS"

21+

22+while [ $# -gt 0 ]

23+do

24+ case "$1" in

25+ -s|--setup) SETUP=true;;

26+ -c|--clean) CLEAN=true;;

27+ -h|--help) usage;;

28+ --) shift;break;;

29+ esac

30+ shift

31+done

32+

33+[ $# -gt 1 ] && usage

34+

35+BUILD_TYPE="debug"

36+[ $# -eq 1 ] && BUILD_TYPE="$1"

37+

38+install_dependencies() {

39+ sudo apt-get update || exit 4

40+ echo "Installing Unity 8 dependencies.."

41+ sudo apt-get install devscripts \

42+ equivs \

43+ gsettings-desktop-schemas \

44+ qmenumodel-qml \

45+ qtdeclarative5-dee-plugin \

46+ qtdeclarative5-gsettings1.0 \

47+ qtdeclarative5-ubuntu-ui-toolkit-plugin \

48+ unity-notifications-impl \

49+ qtdeclarative5-xmllistmodel-plugin \

50+ ubuntu-mobile-icons \

51+ unity-scope-home \

52+ unity-lens-applications \

53+ || exit 5

54+}

55+

56+mk_build_deps() {

57+ [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control

58+}

59+

60+if [ -f "/usr/bin/ccache" ] ; then

61+ if [ "x$CC" = "x" ]; then

62+ export CC='ccache gcc'

63+ fi

64+ if [ "x$CXX" = "x" ] ; then

65+ export CXX='ccache g++'

66+ fi

67+fi

68+

69+if [ -f "/usr/bin/ninja" ] ; then

70+ GENERATOR="-G Ninja"

71+ # Ninja does not need -j, it parallelizes automatically.

72+ BUILD_COMMAND="ninja"

73+else

74+ GENERATOR=

75+ BUILD_COMMAND="make -j$NUM_JOBS"

76+fi

77+

78+if $SETUP; then

79+ install_dependencies

80+else

81+ if $CLEAN; then rm -rf builddir; fi

82+ mkdir -p builddir

83+ cd builddir

84+ mk_build_deps

85+ cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

86+ ${BUILD_COMMAND} || exit 7

87+fi

build.shdeleted−82

@@ -1,82 +0,0 @@

1−#!/bin/sh

2−

3−#

4−# Copyright (C) 2017 Canonical Ltd

5−#

6−# This program is free software: you can redistribute it and/or modify

7−# it under the terms of the GNU General Public License version 3 as

8−# published by the Free Software Foundation.

9−#

10−# This program is distributed in the hope that it will be useful,

11−# but WITHOUT ANY WARRANTY; without even the implied warranty of

12−# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13−# GNU General Public License for more details.

14−#

15−# You should have received a copy of the GNU General Public License

16−# along with this program. If not, see <http://www.gnu.org/licenses/>.

17−#

18−

19−SETUP=false

20−CLEAN=false

21−NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))

22−CODE_DIR=$( dirname `readlink -f $0` )

23−

24−usage() {

25− echo "usage: build [OPTIONS] [BUILD_TYPE]\n" >&2

26− echo "Script to build the shell. If BUILD_TYPE is not specified, it defaults to \"debug\".\n" >&2

27− echo "OPTIONS:" >&2

28− echo " -c, --clean Clean the build tree before building" >&2

29− echo >&2

30− exit 1

31−}

32−

33−ARGS=`getopt -n$0 -u -a --longoptions="setup,clean,help" -o "sch" -- "$@"`

34−[ $? -ne 0 ] && usage

35−eval set -- "$ARGS"

36−

37−while [ $# -gt 0 ]

38−do

39− case "$1" in

40− -c|--clean) CLEAN=true;;

41− -h|--help) usage;;

42− --) shift;break;;

43− esac

44− shift

45−done

46−

47−[ $# -gt 1 ] && usage

48−

49−BUILD_TYPE="debug"

50−[ $# -eq 1 ] && BUILD_TYPE="$1"

51−

52−mk_build_deps() {

53− if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

54− sed 's/\:native//g' $CODE_DIR/debian/control > control

55− mk-build-deps --install --root-cmd sudo control

56− fi

57−}

58−

59−if [ -f "/usr/bin/ccache" ] ; then

60− if [ "x$CC" = "x" ]; then

61− export CC='ccache gcc'

62− fi

63− if [ "x$CXX" = "x" ] ; then

64− export CXX='ccache g++'

65− fi

66−fi

67−

68−if [ -f "/usr/bin/ninja" ] ; then

69− GENERATOR="-G Ninja"

70− # Ninja does not need -j, it parallelizes automatically.

71− BUILD_COMMAND="ninja"

72−else

73− GENERATOR=

74− BUILD_COMMAND="make -j$NUM_JOBS"

75−fi

76−

77−if $CLEAN; then rm -rf builddir; fi

78−mkdir -p builddir

79−cd builddir

80−mk_build_deps

81−cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

82−${BUILD_COMMAND} || exit 7

clickable.yamldeleted−153

@@ -1,153 +0,0 @@

1−clickable_minimum_required: '7'

2−builder: custom

3−build: echo Run \'clickable build --libs --verbose\' to build && false

4−restrict_arch: amd64

5−libraries:

6− unity8:

7− builder: cmake

8− src_dir: "${ROOT}"

9− test: make xvfballtests -j${NUM_PROCS}

10− dependencies_host:

11− - android-headers

12− - cmake

13− - cmake-extras

14− - dbus-test-runner

15− - debhelper

16− - dh-apparmor

17− - doxyqml

18− - g++:native

19− - gdb

20− - graphviz

21− - gsettings-ubuntu-schemas

22− - libandroid-properties-dev

23− - libconnectivity-qt1-dev

24− - libevdev-dev

25− - libgeonames-dev

26− - libgl1-mesa-dev

27− - libgl1-mesa-dri

28− - libgles2-mesa-dev

29− - libglib2.0-dev

30− - libgnome-desktop-3-12

31− - libgnome-desktop-3-dev

32− - libgsettings-qt-dev

33− - libhardware-dev

34− - liblightdm-qt5-3-dev

35− - libpam0g-dev

36− - libpulse-dev

37− - libqmenumodel-dev

38− - libqt5sql5-sqlite

39− - libqt5svg5-dev

40− - libqt5xmlpatterns5-dev

41− - libqtdbusmock1-dev

42− - libqtdbustest1-dev

43− - libsystemsettings-dev

44− - libubuntu-app-launch2-dev

45− - libubuntu-download-manager-common-dev

46− - libubuntugestures5-dev

47− - libubuntugestures5-private-dev

48− - libudev-dev

49− - libudm-common-dev

50− - libunity-api-dev

51− - libusermetricsoutput1-dev

52− - libx11-dev

53− - libxcb1-dev

54− - libxi-dev

55− - pkg-config

56− - python3-all:any

57− - python3-setuptools:native

58− - qml-module-qt-labs-folderlistmodel

59− - qml-module-qt-labs-settings

60− - qml-module-qtmultimedia

61− - qml-module-qtqml-statemachine

62− - qml-module-qtquick-layouts

63− - qml-module-qtquick-xmllistmodel

64− - qml-module-qtquick2

65− - qml-module-qtsysteminfo

66− - qml-module-qttest

67− - qml-module-ubuntu-components

68− - qml-module-ubuntu-layouts

69− - qml-module-ubuntu-settings-components

70− - qml-module-ubuntu-test

71− - qtbase5-dev

72− - qtbase5-dev-tools

73− - qtbase5-private-dev

74− - qtdbustest-runner

75− - qtdeclarative5-dev

76− - qtdeclarative5-dev-tools

77− - qtdeclarative5-private-dev

78− - qtdeclarative5-ubuntu-content1

79− - ttf-ubuntu-font-family

80− - ubports-wallpapers

81− - xvfb

82−dependencies_target:

83− - android-headers

84− - cmake

85− - cmake-extras

86− - dbus-test-runner

87− - debhelper

88− - dh-apparmor

89− - doxyqml

90− - g++:native

91− - gdb

92− - graphviz

93− - gsettings-ubuntu-schemas

94− - libandroid-properties-dev

95− - libconnectivity-qt1-dev

96− - libevdev-dev

97− - libgeonames-dev

98− - libgl1-mesa-dev

99− - libgl1-mesa-dri

100− - libgles2-mesa-dev

101− - libglib2.0-dev

102− - libgnome-desktop-3-12

103− - libgnome-desktop-3-dev

104− - libgsettings-qt-dev

105− - libhardware-dev

106− - liblightdm-qt5-3-dev

107− - libpam0g-dev

108− - libpulse-dev

109− - libqmenumodel-dev

110− - libqt5sql5-sqlite

111− - libqt5svg5-dev

112− - libqt5xmlpatterns5-dev

113− - libqtdbusmock1-dev

114− - libqtdbustest1-dev

115− - libsystemsettings-dev

116− - libubuntu-app-launch2-dev

117− - libubuntu-download-manager-common-dev

118− - libubuntugestures5-dev

119− - libubuntugestures5-private-dev

120− - libudev-dev

121− - libudm-common-dev

122− - libunity-api-dev

123− - libusermetricsoutput1-dev

124− - libx11-dev

125− - libxcb1-dev

126− - libxi-dev

127− - pkg-config

128− - python3-all:any

129− - python3-setuptools:native

130− - qml-module-qt-labs-folderlistmodel

131− - qml-module-qt-labs-settings

132− - qml-module-qtmultimedia

133− - qml-module-qtqml-statemachine

134− - qml-module-qtquick-layouts

135− - qml-module-qtquick-xmllistmodel

136− - qml-module-qtquick2

137− - qml-module-qtsysteminfo

138− - qml-module-qttest

139− - qml-module-ubuntu-components

140− - qml-module-ubuntu-layouts

141− - qml-module-ubuntu-settings-components

142− - qml-module-ubuntu-test

143− - qtbase5-dev

144− - qtbase5-dev-tools

145− - qtbase5-private-dev

146− - qtdbustest-runner

147− - qtdeclarative5-dev

148− - qtdeclarative5-dev-tools

149− - qtdeclarative5-private-dev

150− - qtdeclarative5-ubuntu-content1

151− - ttf-ubuntu-font-family

152− - ubports-wallpapers

153− - xvfb

cmake/modules/Plugins.cmakenew file+67

@@ -0,0 +1,67 @@

1+find_program(qmlplugindump_exe qmlplugindump)

2+

3+if(NOT qmlplugindump_exe)

4+ msg(FATAL_ERROR "Could not locate qmlplugindump.")

5+endif()

6+

7+# Creates target for copying and installing qmlfiles

8+#

9+# export_qmlfiles(plugin sub_path)

10+#

11+#

12+# Target to be created:

13+# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.

14+

15+macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)

16+

17+ file(GLOB QMLFILES

18+ *.qml

19+ *.js

20+ qmldir

21+ )

22+

23+ # copy the qmldir file

24+ add_custom_target(${PLUGIN}-qmlfiles ALL

25+ COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}

26+ DEPENDS ${QMLFILES}

27+ )

28+

29+ # install the qmlfiles file.

30+ install(FILES ${QMLFILES}

31+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

32+ )

33+endmacro(export_qmlfiles)

34+

35+

36+# Creates target for generating the qmltypes file for a plugin and installs plugin files

37+#

38+# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])

39+#

40+# TARGETS additional install targets (eg the plugin shared object)

41+#

42+# Target to be created:

43+# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.

44+

45+macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)

46+ set(multi_value_keywords TARGETS)

47+ cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})

48+

49+ # Only try to generate .qmltypes if not cross compiling

50+ if(NOT CMAKE_CROSSCOMPILING)

51+ # create the plugin.qmltypes file

52+ add_custom_target(${PLUGIN}-qmltypes ALL

53+ COMMAND ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

54+ )

55+ add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})

56+

57+ # install the qmltypes file.

58+ install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

59+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

60+ )

61+ endif()

62+

63+ # install the additional targets

64+ install(TARGETS ${qmlplugin_TARGETS}

65+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

66+ )

67+endmacro(export_qmlplugin)

cmake/modules/QmlTest.cmake+101−469

@@ -1,489 +1,121 @@

1−# If you need to override the qmlscene or qmltestrunner executables,

1+# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS]

2−# create the corresponding executable target.

2+# [TARGETS target1 [target2 [...]]]

3−

3+# [IMPORT_PATHS import_path1 [import_path2 [...]]

4−# These functions respect the global STDOUT_LOGGER and ARTIFACTS_DIR variables.

4+# [PROPERTIES prop1 value1 [prop2 value2 [...]]])

5−

6−# You can use those with cmake_parse_arguments

7−# if you need to wrap and mangle arguments.

8−set(QMLTEST_OPTIONS ADD_TEST CACHE INTERNAL "")

9−set(QMLTEST_SINGLE ITERATIONS ARG_PREFIX CACHE INTERNAL "")

10−set(QMLTEST_MULTI ARGS ENVIRONMENT DEPENDS IMPORT_PATHS TARGETS CACHE INTERNAL "")

11−

12−# import_executables(name1 [name2 [...]]

13−# [OPTIONAL] # continue when not found

14−# )

15−#

16−# This will find the named executables and import them

17−# to an imported target of the same name.

18−

19−function(import_executables)

20− cmake_parse_arguments(QMLTEST "OPTIONAL" "" "" ${ARGN})

21−

22− foreach(NAME ${QMLTEST_UNPARSED_ARGUMENTS})

23− if(NOT TARGET ${NAME})

24− add_executable(${NAME} IMPORTED GLOBAL)

25− find_program(${NAME}_exe ${NAME})

26−

27− if(NOT QMLTEST_OPTIONAL AND NOT ${NAME}_exe)

28− message(FATAL_ERROR "Could not locate ${NAME}.")

29− elseif(NOT ${NAME}_exe)

30− message(STATUS "Could not locate ${NAME}, skipping.")

31− else()

32− set_target_properties(${NAME} PROPERTIES IMPORTED_LOCATION ${${NAME}_exe})

33− endif()

34− endif()

35− endforeach()

36−endfunction()

37−

38−

39−# add_qml_test(path component_name

40−# [...]

41−# )

42−#

43−# Add test targets for ${component_name} under ${path}. It's assumed

44−# that the test file is named ${path}/tst_${component_name}.qml.

45−#

46−# This function wraps add_manual_qml_test and add_qml_unittest,

47−# see below for available arguments.

48−

49−function(add_qml_test PATH COMPONENT_NAME)

50− cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

51− mangle_arguments()

52−

53− add_qml_unittest(${ARGV})

54− add_manual_qml_test(${ARGV})

55−endfunction()

56−

57−

58−# add_qml_test_data(path component_name

59−# [...]

60−# )

61#

5#

62−# Install file called ${component_name} (or ${component_name}.qml) under

6+# NO_ADD_TEST will prevent adding the test to the "test" target

63−# ${path}.

7+# NO_TARGETS will prevent adding the test to any targets

64−

8+# TARGETS lists the targets the test should be added to

65−function(add_qml_test_data PATH COMPONENT_NAME)

9+# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments

66− cmake_parse_arguments(TEST "" "DESTINATION" "" ${ARGN})

10+# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()

67−

68− set(filename "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/${COMPONENT_NAME}")

69−

70− if (IS_DIRECTORY "${filename}")

71− # As a convenience, allow specifying a directory and we will install

72− # all files in the dir. We do it this way rather than passing

73− # DIRECTORY to install() because we want to process any qml files.

74− file(GLOB subfiles RELATIVE "${filename}" "${filename}/*")

75− foreach(subfile ${subfiles})

76− add_qml_test_data("${PATH}/${COMPONENT_NAME}" "${subfile}")

77− endforeach()

78− return()

79− endif()

80−

81− if (NOT EXISTS "${filename}")

82− set(filename "${filename}.qml")

83− set(COMPONENT_NAME "${COMPONENT_NAME}.qml")

84− endif()

85−

86− if ("${filename}" MATCHES "\\.qml$")

87− file(READ "${filename}" contents)

88− string(REGEX REPLACE "(\"[./]*)/qml(/|\")" "\\1\\2" contents "${contents}")

89− # this is for (at least) cardcreatortest which pulls in an architecture-specific

90− # import into the plugins directory (which is a 'qml' once installed).

91− string(REGEX REPLACE "(import \"[./]*)/plugins(/|\")" "\\1/qml\\2" contents "${contents}")

92− set(filename "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${COMPONENT_NAME}")

93− file(WRITE "${filename}" "${contents}")

94− endif()

95−

96− if (TEST_DESTINATION)

97− set(DESTINATION "${TEST_DESTINATION}")

98− else()

99− file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")

100− set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")

101− endif()

102−

103− install(FILES "${filename}" DESTINATION "${DESTINATION}")

104−endfunction()

105−

106−

107−# add_qml_unittest(path component_name

108−# [...]

109−# )

110#

11#

111−# Add test targets for ${component_name} under ${path}. It's assumed

12+# Two targets will be created:

112−# that the test file is named ${path}/tst_${component_name}.qml.

13+# - testComponentName - Runs the test with qmltestrunner

14+# - tryComponentName - Runs the test with uqmlscene, for manual interaction

113#

15#

114−# This function wraps add_executable_test, see below for available arguments.

16+# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:

115−

17+# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)

116−function(add_qml_unittest PATH COMPONENT_NAME)

18+# qmltest_DEFAULT_TARGETS

117− import_executables(qmltestrunner)

19+# qmltest_DEFAULT_IMPORT_PATHS

118−

20+# qmltest_DEFAULT_PROPERTIES

119− add_executable_test(${COMPONENT_NAME} qmltestrunner

21+

120− ${ARGN}

22+find_program(qmltestrunner_exe qmltestrunner)

23+

24+if(NOT qmltestrunner_exe)

25+ msg(FATAL_ERROR "Could not locate qmltestrunner.")

26+endif()

27+

28+set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)

29+

30+macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

31+ set(options NO_ADD_TEST NO_TARGETS)

32+ set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

33+

34+ cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})

35+

36+ set(qmlscene_TARGET try${COMPONENT_NAME})

37+ set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})

38+

39+ set(qmlscene_imports "")

40+ if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")

41+ foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

42+ list(APPEND qmlscene_imports "-I")

43+ list(APPEND qmlscene_imports ${IMPORT_PATH})

44+ endforeach(IMPORT_PATH)

45+ elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")

46+ foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})

47+ list(APPEND qmlscene_imports "-I")

48+ list(APPEND qmlscene_imports ${IMPORT_PATH})

49+ endforeach(IMPORT_PATH)

50+ endif()

51+

52+ set(qmlscene_command

53+ env ${qmltest_ENVIRONMENT}

121− ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}

54+ ${qmlscene_exe} ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml

55+ ${qmlscene_imports}

122 )

56 )

57+ add_custom_target(${qmlscene_TARGET} ${qmlscene_command})

123

58

124− if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")

59+endmacro(add_manual_qml_test)

125− add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")

126− endif()

127−endfunction()

128−

129

60

130−# add_manual_qml_test(path component_name

61+macro(add_qml_test SUBPATH COMPONENT_NAME)

131−# [...]

62+ set(options NO_ADD_TEST NO_TARGETS)

132−# )

63+ set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)

133−#

134−# Add manual test targets for ${component_name} under ${path}. It's assumed

135−# that the test file is named ${path}/tst_${component_name}.qml.

136−#

137−# This function wraps add_manual_test, see below for available arguments.

138

64

139−function(add_manual_qml_test PATH COMPONENT_NAME)

65+ cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})

140− import_executables(qmlscene)

141− cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

142

66

143− add_manual_test(${COMPONENT_NAME} qmlscene

67+ set(qmltest_TARGET test${COMPONENT_NAME})

144− ${ARGN}

68+ set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})

145− ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}

146− )

147

69

148− if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")

70+ set(qmltestrunner_imports "")

149− add_qml_test_data("${PATH}" "tst_${COMPONENT_NAME}.qml")

71+ if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")

72+ foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})

73+ list(APPEND qmltestrunner_imports "-import")

74+ list(APPEND qmltestrunner_imports ${IMPORT_PATH})

75+ endforeach(IMPORT_PATH)

76+ elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")

77+ foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})

78+ list(APPEND qmltestrunner_imports "-import")

79+ list(APPEND qmltestrunner_imports ${IMPORT_PATH})

80+ endforeach(IMPORT_PATH)

150 endif()

81 endif()

151−endfunction()

152−

153−

154−# add_executable_test(target component_name

155−# [...] # see doc for add_manual_qml_test for common arguments

156−# [ADD_TEST] # whether to add to the "test" target

157−# [ARG_PREFIX arg_prefix] # prefix logging arguments with this string

158−# [ARGS] arg1 [arg2 [...]] # pass these arguments to the test executable

159−# [TARGETS target1 [target2 [...]]] # make the listed targets depend on this test

160−# # if a corresponding xvfbtarget1, xvfbtarget2 etc. exists,

161−# # this test running under xvfb will be added as a dependency

162−# # of those targets

163−# [ITERATIONS count] # run this test as a benchmark for ${count} iterations

164−# )

165−#

166−# Logging options in the standard form of "-o filename,format"

167−# will be appended to the arguments list, prefixed with ARG_PREFIX.

168−# XUnitXML files will be stored in current binary dir.

169−#

170−# Three targets will be created:

171−# - test${component_name} - Runs the test

172−# - xvfbtest${component_name} - Runs the test under xvfb

173−# - gdbtest${component_name} - Runs the test under gdb

174−

175−function(add_executable_test COMPONENT_NAME TARGET)

176− import_executables(gdb xvfb-run OPTIONAL)

177−

178− cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

179− mangle_arguments()

180−

181− file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

182− set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)

183−

184− bake_arguments("${QMLTEST_ARG_PREFIX}" args ${iterations} ${file_logger} ${STDOUT_LOGGER})

185

82

186 set(qmltest_command

83 set(qmltest_command

187− $<TARGET_FILE:${TARGET}>

84+ env ${qmltest_ENVIRONMENT}

188− ${QMLTEST_ARGS}

85+ ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml

189− ${args}

86+ ${qmltestrunner_imports}

87+ -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml

88+ -o -,txt

190 )

89 )

90+ add_custom_target(${qmltest_TARGET} ${qmltest_command})

191

91

192− add_qmltest_target(test${COMPONENT_NAME} ${TARGET}

92+ if(NOT "${qmltest_PROPERTIES}" STREQUAL "")

193− COMMAND ${qmltest_command}

93+ set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})

194− ${depends}

94+ elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")

195− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

95+ set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})

196− ${add_test}

197− ${targets}

198− )

199−

200− if(TARGET xvfb-run)

201− add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}

202− COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}

203− ${depends}

204− ENVIRONMENT QT_QPA_PLATFORM=xcb QML2_IMPORT_PATH=${imports} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1 ${QMLTEST_ENVIRONMENT}

205− TARGETS ${xvfb_targets}

206− )

207− endif()

208−

209− if(TARGET gdb)

210− add_qmltest_target(gdbtest${COMPONENT_NAME} ${TARGET}

211− COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltest_command}

212− ${depends}

213− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

214− )

215 endif()

96 endif()

216−endfunction()

217−

218−

219−# add_manual_test(target component_name

220−# [DEPENDS target1 [target2 [...]]] # make this test depend on the specified targets

221−# [IMPORT_PATHS import_path1 [import_path2 [...]] # use these QML import paths

222−# # (they're searched first to last)

223−# [ENVIRONMENT var1=value1 [var2=value2 [...]]] # set these environment variables

224−# )

225−#

226−# Two targets will be created:

227−# - try${component_name} - Runs the test for manual interaction

228−# - gdbtry${component_name} - Runs the test under gdb

229

97

230−function(add_manual_test COMPONENT_NAME TARGET)

98+ if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")

231− import_executables(gdb OPTIONAL)

99+ add_test(${qmltest_TARGET} ${qmltest_command})

232

100

233− cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})

101+ if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")

234− mangle_arguments()

102+ set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})

235−

103+ elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")

236− bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768,3800)

104+ set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})

237−

238− set(qmltry_command

239− $<TARGET_FILE:${TARGET}>

240− ${QMLTEST_ARGS}

241− ${args}

242− )

243−

244− add_qmltest_target(try${COMPONENT_NAME} ${TARGET}

245− COMMAND ${qmltry_command}

246− ${depends}

247− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

248− )

249−

250− if(TARGET gdb)

251− add_qmltest_target(gdbtry${COMPONENT_NAME} ${TARGET}

252− COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltry_command}

253− ${depends}

254− ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}

255− )

256− endif()

257−endfunction()

258−

259−

260−# add_meta_test(target)

261−#

262−# Adds a test target that will run one of our "meta" test targets, like

263−# xvfbuitests. This script will run the specified suite of tests on an

264−# installed system.

265−

266−function(add_meta_test TARGET_NAME)

267− cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})

268−

269− add_custom_target(${TARGET_NAME})

270−

271− set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

272− if(TEST_SERIAL)

273− file(WRITE "${filename}" "#!/bin/sh\n\n")

274− else()

275− file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")

276− endif()

277−

278− add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})

279− # else we will write the rest of the script as we add cmake targets

280−

281− install(FILES "${filename}"

282− PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

283− GROUP_EXECUTE GROUP_READ

284− WORLD_EXECUTE WORLD_READ

285− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"

286− )

287−endfunction()

288−

289−

290−################### INTERNAL ####################

291−

292−function(install_test_script TARGET_NAME)

293− cmake_parse_arguments(TEST "" "" "COMMAND;ENVIRONMENT" ${ARGN})

294−

295− # Now write the above test into a shell script that we can run on an

296− # installed system.

297− set(script "#!/bin/sh\n\nset -x\n\n")

298− foreach(ONE_ENV ${TEST_ENVIRONMENT})

299− set(script "${script}export ${ONE_ENV}\n")

300− endforeach()

301− set(script "${script}export UNITY_TESTING_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}\"\n")

302− set(script "${script}export UNITY_TESTING_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\"\n")

303− set(script "${script}\n")

304− set(script "${script}XML_ARGS=\n")

305− set(script "${script}if [ -n \"\$ARTIFACTS_DIR\" ]; then\n")

306− set(script "${script} XML_ARGS=\"@XML_ARGS@\"\n")

307− set(script "${script} mkdir -p \"@XML_DIR@\"\n")

308− set(script "${script} touch \"@XML_FILE@\"\n")

309− set(script "${script}fi\n")

310− set(script "${script}\n")

311− foreach(ONE_CMD ${TEST_COMMAND})

312− set(script "${script}'${ONE_CMD}' ")

313− endforeach()

314− set(script "${script}\"\$@\"") # Allow passing arguments if desired

315−

316− set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")

317−

318− # Generate script to file then read it back to resolve any generator

319− # expressions before we try to replace paths.

320− file(GENERATE

321− OUTPUT "${filename}"

322− CONTENT "${script}"

323− )

324−

325− # Do replacement at install time to save needless work and to make sure

326− # we are modifying file after generate step above (which doesn't happen

327− # immediately). We can't use a custom-defined function or macro here...

328− # So instead we use a giant ugly code block.

329−

330− # START OF CODE BLOCK --------------------------------------------------

331− install(CODE "

332− file(READ \"${filename}\" replacestr)

333−

334− # Now some replacements...

335− # tests like to write xml output to our builddir; we don't need that, but we do want them in ARTIFACTS_DIR

336− string(REGEX MATCH \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" xmlargs \"\${replacestr}\")

337− string(REGEX REPLACE \"( '--parameter')? '-o'( '--parameter')? '[^']*,xunitxml' \" \" \\\$XML_ARGS \" replacestr \"\${replacestr}\")

338− string(REGEX REPLACE \"'[^']*/tests/\" \"'\\\$ARTIFACTS_DIR/tests/\" xmlargs \"\${xmlargs}\")

339− string(REGEX REPLACE \".*'([^']*),xunitxml'.*\" \"\\\\1\" xmlfile \"\${xmlargs}\")

340− string(REGEX REPLACE \"(.*)/[^/]*\" \"\\\\1\" xmldir \"\${xmlfile}\")

341− string(REGEX REPLACE \"'\" \"\" xmlargs \"\${xmlargs}\") # strip single quotes

342− string(REGEX REPLACE \"@XML_ARGS@\" \"\${xmlargs}\" replacestr \"\${replacestr}\")

343− string(REGEX REPLACE \"@XML_DIR@\" \"\${xmldir}\" replacestr \"\${replacestr}\")

344− string(REGEX REPLACE \"@XML_FILE@\" \"\${xmlfile}\" replacestr \"\${replacestr}\")

345− # replace build/source roots with their install paths

346− string(REPLACE \"${CMAKE_BINARY_DIR}/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")

347− string(REPLACE \"${CMAKE_BINARY_DIR}/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}\" replacestr \"\${replacestr}\")

348− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/libs\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/libs\" replacestr \"\${replacestr}\")

349− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/mocks\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks\" replacestr \"\${replacestr}\")

350− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/plugins\" replacestr \"\${replacestr}\")

351− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/qmltests\" replacestr \"\${replacestr}\")

352− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/uqmlscene\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}\" replacestr \"\${replacestr}\")

353− string(REPLACE \"${CMAKE_BINARY_DIR}/tests/utils/modules\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/utils\" replacestr \"\${replacestr}\")

354− string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/plugins\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/plugins\" replacestr \"\${replacestr}\")

355− string(REPLACE \"${CMAKE_SOURCE_DIR}/tests/qmltests\" \"${CMAKE_INSTALL_PREFIX}/${SHELL_APP_DIR}/tests/qmltests\" replacestr \"\${replacestr}\")

356−

357− file(WRITE \"${filename}\" \"\${replacestr}\")

358− ")

359− # END OF CODE BLOCK --------------------------------------------------

360−

361− install(FILES "${filename}"

362− PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

363− GROUP_EXECUTE GROUP_READ

364− WORLD_EXECUTE WORLD_READ

365− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/scripts"

366− )

367−endfunction()

368−

369−function(add_meta_dependencies UPSTREAM_TARGET)

370− cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})

371−

372− foreach(depend ${TEST_DEPENDS})

373− add_dependencies(${UPSTREAM_TARGET} ${depend})

374−

375− # add depend to the meta test script that we will install on system

376− set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")

377− if (EXISTS "${filename}")

378− file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh \"\$@\" 2>&1\n")

379 endif()

105 endif()

380− endforeach()

106+ endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")

381−endfunction()

107+

382−

108+ if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")

383−# add_qmltest_target(target_name target

109+ if(NOT "${qmltest_TARGETS}" STREQUAL "")

384−# COMMAND test_exe [arg1 [...]] # execute this test with arguments

110+ foreach(TARGET ${qmltest_TARGETS})

385−# [...] # see above for available arguments:

111+ add_dependencies(${TARGET} ${qmltest_TARGET})

386−# # ADD_TEST, ENVIRONMENT, DEPENDS and TARGETS

112+ endforeach(TARGET)

387−# )

113+ elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")

388−

114+ foreach(TARGET ${qmltest_DEFAULT_TARGETS})

389−function(add_qmltest_target TARGET_NAME TARGET)

115+ add_dependencies(${TARGET} ${qmltest_TARGET})

390− cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "COMMAND;${QMLTEST_MULTI}" ${ARGN})

116+ endforeach(TARGET)

391− mangle_arguments()

392−

393− # Additional arguments

394− string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)

395− if(cmake_generator_lower STREQUAL "unix makefiles")

396− set(function "$(FUNCTION)")

397− endif()

398−

399− add_custom_target(${TARGET_NAME}

400− env ${QMLTEST_ENVIRONMENT}

401− ${QMLTEST_COMMAND} ${function}

402− DEPENDS ${TARGET} ${QMLTEST_DEPENDS}

403− )

404−

405− install_test_script(${TARGET_NAME}

406− ENVIRONMENT ${QMLTEST_ENVIRONMENT}

407− COMMAND ${QMLTEST_COMMAND}

408− )

409−

410− if(QMLTEST_ADD_TEST)

411− add_test(

412− NAME ${TARGET_NAME}

413− COMMAND ${QMLTEST_COMMAND}

414− )

415−

416− foreach(ENV ${QMLTEST_ENVIRONMENT})

417− set_property(TEST ${TARGET_NAME} APPEND PROPERTY ENVIRONMENT ${ENV})

418− endforeach()

419−

420− set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${TARGET})

421− foreach(DEPEND ${DEPENDS})

422− set_property(TEST ${TARGET_NAME} APPEND PROPERTY DEPENDS ${DEPEND})

423− endforeach()

424− endif()

425−

426− foreach(UPSTREAM_TARGET ${QMLTEST_TARGETS})

427− add_meta_dependencies(${UPSTREAM_TARGET} DEPENDS ${TARGET_NAME})

428− endforeach()

429−endfunction()

430−

431−

432−# mangle_arguments(${ARGN})

433−#

434−# Verify there were no unparsed arguments and

435−# mangle the known ones for further processing.

436−

437−macro(mangle_arguments)

438− if(QMLTEST_UNPARSED_ARGUMENTS)

439− message(FATAL_ERROR "Unexpected arguments: ${QMLTEST_UNPARSED_ARGUMENTS}")

440− endif()

441−

442− if(QMLTEST_ADD_TEST)

443− set(add_test ADD_TEST)

444− endif()

445−

446− if(QMLTEST_IMPORT_PATHS)

447− string(REPLACE ";" ":" imports "${QMLTEST_IMPORT_PATHS}")

448− endif()

449−

450− if(QMLTEST_ITERATIONS)

451− set(iterations -iterations ${QMLTEST_ITERATIONS})

452− endif()

453−

454− if(QMLTEST_DEPENDS)

455− set(depends DEPENDS ${QMLTEST_DEPENDS})

456− endif()

457−

458− if(QMLTEST_TARGETS)

459− set(targets TARGETS ${QMLTEST_TARGETS})

460− endif()

461−

462− set(xvfb_targets "")

463− foreach(target ${QMLTEST_TARGETS})

464− if(TARGET xvfb${target})

465− list(APPEND xvfb_targets xvfb${target})

466 endif()

117 endif()

467− endforeach()

118+ endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")

468− set(xvfb_targets "${xvfb_targets}" PARENT_SCOPE)

469−endmacro()

470−

471

119

472−# bake_arguments(prefix output

120+ add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})

473−# arg1 [arg2 [...]]

121+endmacro(add_qml_test)

474−# )

475−#

476−# If set, add the argument prefix before every passed

477−# argument and store the result in ${OUTPUT} variable.

478−

479−function(bake_arguments PREFIX OUTPUT)

480− set(args "${ARGN}")

481− if(PREFIX)

482− set(args "")

483− foreach(arg ${ARGN})

484− list(APPEND args ${PREFIX})

485− list(APPEND args ${arg})

486− endforeach()

487− endif()

488− set(${OUTPUT} "${args}" PARENT_SCOPE)

489−endfunction()

cmake/modules/autopilot.cmake+2−7

@@ -2,15 +2,10 @@ add_custom_target(autopilot)

2

2

3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

4 add_custom_target(autopilot-${TEST_NAME}

4 add_custom_target(autopilot-${TEST_NAME}

5− COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}

5+ COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_PRIVATE_LIBDIR}/qml/mocks autopilot run ${TEST_SUITE}

6 WORKING_DIRECTORY ${WORKING_DIR}

6 WORKING_DIRECTORY ${WORKING_DIR}

7− DEPENDS fake_install

7+ DEPENDS install

8− )

9−

10− add_custom_target(fake_install

11− COMMAND cmake --build ${CMAKE_BINARY_DIR} --target install

12 )

8 )

13

9

14 add_dependencies(autopilot autopilot-${TEST_NAME})

10 add_dependencies(autopilot autopilot-${TEST_NAME})

15−

16endfunction()

11endfunction()

data/CMakeLists.txtdeleted−27

@@ -1,27 +0,0 @@

1−# generate desktop files

2−configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

3−configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

4−configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)

5−

6−# install desktop files

7−install(FILES

8− ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

9− ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop

10− DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

11− )

12−

13−install(FILES

14− ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop

15− DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters

16− )

17−

18−install(FILES

19− 51-unity8-greeter.conf

20− DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d

21− )

22−

23−add_custom_target(pkgversion ALL COMMAND dpkg-parsechangelog -l${CMAKE_SOURCE_DIR}/debian/changelog --show-field version > ${CMAKE_CURRENT_BINARY_DIR}/version)

24−

25−install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

26−install(FILES com.canonical.Unity.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)

27−install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/unity8)

data/com.canonical.Unity.gschema.xmldeleted−255

@@ -1,255 +0,0 @@

1−<schemalist>

2− <enum id="form-factor-enum">

3− <value nick="Automatic" value="0" />

4− <value nick="Desktop" value="1" />

5− <value nick="Netbook" value="2" />

6− <value nick="TV" value="3" />

7− </enum>

8− <enum id="home-expanded-enum">

9− <value nick="Not Expanded" value="0" />

10− <value nick="Expanded" value="1" />

11− </enum>

12− <enum id="launcher-position-enum">

13− <value nick="Left" value="0" />

14− <value nick="Bottom" value="1" />

15− </enum>

16− <enum id="desktop-type-enum">

17− <value nick="Ubuntu" value="0" />

18− <value nick="UbuntuKylin" value="1" />

19− </enum>

20−

21− <schema path="/com/canonical/unity/" id="com.canonical.Unity" gettext-domain="unity">

22− <key enum="form-factor-enum" name="form-factor">

23− <default>"Automatic"</default>

24− <summary>The form factor Unity should target.</summary>

25− <description>The form factor chosen will affect the size and appearance of the Dash, Launcher and also the Window Management behaviour.</description>

26− </key>

27− <key enum="home-expanded-enum" name="home-expanded">

28− <default>"Expanded"</default>

29− <summary>Whether the home screen should be expanded.</summary>

30− <description>Whether the home screen should be expanded.</description>

31− </key>

32− <key enum="desktop-type-enum" name="desktop-type">

33− <default>"Ubuntu"</default>

34− <summary>The current desktop name.</summary>

35− <description>The current desktop name.</description>

36− </key>

37− <key type="i" name="minimize-count">

38− <default>0</default>

39− <summary>Number of times a normal window has been minimized.</summary>

40− <description>This is used to adjust the animation speed by making it progressively faster the more it is used.</description>

41− </key>

42− <key type="i" name="minimize-fast-duration">

43− <default>300</default>

44− <summary>The duration for the minimize animation when it is at its fastest setting.</summary>

45− <description>This is the duration that the minimize animation will have when it has been used more than an number of times equal minimize-speed-threshold.</description>

46− </key>

47− <key type="i" name="minimize-slow-duration">

48− <default>800</default>

49− <summary>The duration for the minimize animation when it is at its slowest setting.</summary>

50− <description>This is the duration that the minimize animation will have when it has never been used.</description>

51− </key>

52− <key type="i" name="minimize-speed-threshold">

53− <default>100</default>

54− <summary>The number of minimizations required to reach maximum speed.</summary>

55− <description>The speed of the minimize animation will progressively get faster as minimize-count approaches this value.</description>

56− </key>

57− <key type="b" name="double-click-activate">

58− <default>true</default>

59− <summary>Enable/Disable dash result double-click activation.</summary>

60− <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>

61− </key>

62− <key type="b" name="integrated-menus">

63− <default>false</default>

64− <summary>Enable/Disable the integrated menus in Unity.</summary>

65− <description>When this is enabled, the application menus will be shown

66− on the window decoration, otherwise they will be always shown on the

67− unity top panel</description>

68− </key>

69− <key type="u" name="show-menus-now-delay">

70− <default>180</default>

71− <range min="0" max="5000"/>

72− <summary>Delay (in ms) before showing the menus when pressing Alt</summary>

73− <description>This allows tune the delay before presenting unity menus

74− (in non always-show-menus mode).</description>

75− </key>

76− <key type="b" name="always-show-menus">

77− <default>false</default>

78− <summary>Toggle the menu visibility based on mouse hovering.</summary>

79− <description>When this is enabled, the application menus will be always

80− shown (on the window decoration or in the unity panel, depending whether

81− integrated menus are enabled), otherwise they will be shown only when

82− the mouse cursor is over the relative mouse area.</description>

83− </key>

84− <key type="as" name="whitelist-repeated-keys">

85− <default>[

86− 'XF86KbdBrightnessUp',

87− 'XF86KbdBrightnessDown',

88− 'XF86MonBrightnessUp',

89− 'XF86MonBrightnessDown',

90− 'XF86AudioRaiseVolume',

91− 'XF86AudioLowerVolume'

92− ]</default>

93− <summary>List of keycodes that should be processed even if auto-repated.</summary>

94− <description>These keycodes are processed even if they are auto-repeated.</description>

95− </key>

96− <key type="b" name="pam-check-account-type">

97− <default>false</default>

98− <summary>Enable/Disable PAM account checking</summary>

99− <description>Whether PAM should check the result of account modules

100− when authenticating. Only do this if you have account

101− configured properly on your system.</description>

102− </key>

103− <key type="b" name="lowgfx">

104− <default>false</default>

105− <summary>Enable/Disable Low Graphics Mode</summary>

106− <description>Whether Unity runs in Low Graphics Mode.</description>

107− </key>

108− </schema>

109− <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">

110− <key type="d" name="text-scale-factor">

111− <default>1.0</default>

112− <range min="0.5" max="3.0"/>

113− <summary>Font scaling for unity and applications.</summary>

114− <description>This value defines the global font scaling used by both

115− unity and applications. It will match the current system font scaling.</description>

116− </key>

117− <key type="d" name="cursor-scale-factor">

118− <default>1.0</default>

119− <range min="0.5" max="3.0"/>

120− <summary>Mouse cursor scaling.</summary>

121− <description>This value defines the global mouse cursor scaling used by both

122− unity and applications. Changing this value allows to use a custom scaling

123− for the mouse cursor.</description>

124− </key>

125− <key type="s" name="app-scale-factor-monitor">

126− <default>''</default>

127− <summary>The name of the monitor that controls the global app scaling factor.</summary>

128− <description>This value defines the monitor that unity will use (if found) as reference

129− for scaling all the applications.</description>

130− </key>

131− <key type="b" name="app-fallback-to-maximum-scale-factor">

132− <default>true</default>

133− <summary>Use the maximum per-monitor scale-factor as application scale factor if no target monitor is found.</summary>

134− <description>When this is enabled, the applications scale factor will match

135− the scale factor of the monitor with the greater value, in case the monitor

136− defined in 'app-scale-factor-monitor' is not provided or available.</description>

137− </key>

138− </schema>

139− <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">

140− <key type="as" name="favorites">

141− <default>[

142− 'application://ubiquity.desktop',

143− 'application://org.gnome.Nautilus.desktop',

144− 'application://firefox.desktop',

145− 'application://libreoffice-writer.desktop',

146− 'application://libreoffice-calc.desktop',

147− 'application://libreoffice-impress.desktop',

148− 'application://org.gnome.Software.desktop',

149− 'application://ubuntu-amazon-default.desktop',

150− 'application://unity-control-center.desktop',

151− 'unity://running-apps',

152− 'unity://expo-icon',

153− 'unity://devices'

154− ]</default>

155− <summary>List of items that should be shown by default in the launcher</summary>

156− <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description>

157− </key>

158− <key type="as" name="items">

159− <default>[

160− 'application:///dialer-app.desktop',

161− 'application:///messaging-app.desktop',

162− 'application:///address-book-app.desktop',

163− 'application:///ubuntu-system-settings.desktop',

164− 'appid://openstore.openstore-team/openstore/current-user-version',

165− 'appid://com.ubuntu.camera/camera/current-user-version',

166− 'appid://com.ubuntu.gallery/gallery/current-user-version',

167− 'application:///morph-browser.desktop'

168− ]</default>

169− <summary>List of items that should be shown by default in the launcher</summary>

170− <description>These items can be: application:///desktop-id.desktop or appid://package/app/current-user-version.</description>

171− </key>

172− <key type="s" name="favorite-migration">

173− <default>''</default>

174− <summary>Version of last migration done</summary>

175− <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description>

176− </key>

177− <key enum="launcher-position-enum" name="launcher-position">

178− <default>"Left"</default>

179− <summary>The position of launcher.</summary>

180− <description>The position of launcher.</description>

181− </key>

182− </schema>

183− <schema path="/com/canonical/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">

184− <key type="as" name="blacklist">

185− <default>[]</default>

186− <summary>List of device uuid blacklist from the launcher.</summary>

187− <description>These devices are not shown in the launcher by default.</description>

188− </key>

189− </schema>

190− <schema path="/com/canonical/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">

191− <key type="as" name="scopes">

192− <default>[ 'home.scope', 'applications.scope', 'files.scope', 'video.scope', 'music.scope', 'photos.scope', 'social.scope' ]</default>

193− <summary>List of scope ids specifying which scopes should be created and the order to display them in.</summary>

194− <description>The scopes listed in the scope bar will be ordered according to this list.</description>

195− </key>

196− <key type="as" name="favorite-scopes">

197− <default>[ 'scope://clickscope', 'scope://musicaggregator', 'scope://videoaggregator' ]</default>

198− <summary>List of scope queries specifying what should be displayed in the dash.</summary>

199− <description>List of favorite scopes displayed in the dash.</description>

200− </key>

201− </schema>

202− <schema path="/com/canonical/unity/decorations/" id="com.canonical.Unity.Decorations" gettext-domain="unity">

203− <key type="u" name="grab-wait">

204− <default>175</default>

205− <range min="0" max="1000"/>

206− <summary>Milliseconds to wait before considering a mouse pressure a grab</summary>

207− <description>The number of ms to wait before starting the window movement (and then

208− showing the proper mouse cursor, and grabbing the window)</description>

209− </key>

210− </schema>

211− <schema path="/com/canonical/unity/integrated-menus/" id="com.canonical.Unity.IntegratedMenus" gettext-domain="unity">

212− <key type="u" name="click-movement-threshold">

213− <default>15</default>

214− <range min="0" max="30"/>

215− <summary>Number of pixels to ignore on mouse pressure</summary>

216− <description>This value define how many pixels the user can move the mouse

217− when holding the mouse button, before we consider his action a movement

218− (to grab the window).</description>

219− </key>

220− <key type="u" name="double-click-wait">

221− <default>0</default>

222− <range min="0" max="300"/>

223− <summary>Milliseconds to wait before activating a menu after mouse release</summary>

224− <description>The number of ms to wait after a mouse button release event before considering

225− it a click. When this value is greater than 0, then it's possible to maximize

226− a window by double-clicking on its menus if the second click happens before the

227− specified value of ms is elapsed</description>

228− </key>

229− <key type="b" name="unfocused-windows-popup">

230− <default>true</default>

231− <summary>Whether to pop-up a menu when clicking over unfocused windows entries</summary>

232− <description>By disabling this setting you can make unity to only focus a window

233− when clicking over unfocused menu entries</description>

234− </key>

235− </schema>

236− <schema path="/com/canonical/unity/gestures/" id="com.canonical.Unity.Gestures" gettext-domain="unity">

237− <key type="b" name="launcher-drag">

238− <default>true</default>

239− <summary>Multi-touch gesture to reveal the launcher.</summary>

240− <description>When this is enabled, a 4 finger swipe from left to right will reveal launcher,

241− provided that the launcher is set to auto-hide.</description>

242− </key>

243− <key type="b" name="dash-tap">

244− <default>true</default>

245− <summary>Multi-touch gesture to open the dash.</summary>

246− <description>When this is enabled, a 4 finger tap will open the dash.</description>

247− </key>

248− <key type="b" name="windows-drag-pinch">

249− <default>true</default>

250− <summary>Multi-touch gestures to manage the windows.</summary>

251− <description>When this is enabled, 3 finger gestures such as drag, and pinch, will

252− help manage the windows.</description>

253− </key>

254− </schema>

255−</schemalist>

data/com.canonical.Unity8.gschema.xmldeleted−75

@@ -1,75 +0,0 @@

1−<schemalist>

2− <enum id="usage-mode-enum">

3− <value nick="Staged" value="0" />

4− <value nick="Windowed" value="1" />

5− <value nick="Automatic" value="2" />

6− </enum>

7−

8− <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">

9− <key enum="usage-mode-enum" name="usage-mode">

10− <default>"Automatic"</default>

11− <summary>The usage mode.</summary>

12− <description>The usage mode chosen will affect the Window Management behaviour.</description>

13− </key>

14− <key type="u" name="edge-barrier-sensitivity">

15− <default>50</default>

16− <range min="1" max="100"/>

17− <summary>Sensitivity of screen edge barriers for the mouse pointer.</summary>

18− <description>Some UI actions like revealing the launcher or the applications spread are triggered by pushing the mouse pointer against a screen edge. This key defines how much you have to push in order to trigger the associated action.</description>

19− </key>

20− <key type="u" name="edge-barrier-min-push">

21− <default>2</default>

22− <summary>Minimum push needed to overcome edge barrier</summary>

23− <description>How much you have to push (in grid units)the mouse against an edge barrier when sensibility is 100.</description>

24− </key>

25− <key type="u" name="edge-barrier-max-push">

26− <default>120</default>

27− <summary>Maximum push needed to overcome edge barrier</summary>

28− <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>

29− </key>

30− <key type="u" name="edge-drag-width">

31− <default>2</default>

32− <summary>The width of the edge drag areas</summary>

33− <description>How big (in grid units) the edge-drag sensitive area should be.</description>

34− </key>

35− <key type="b" name="autohide-launcher">

36− <default>false</default>

37− <summary>Autohide the launcher</summary>

38− <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>

39− </key>

40− <key type="u" name="launcher-width">

41− <default>8</default>

42− <range min="6" max="12"/>

43− <summary>Width of the launcher in grid units.</summary>

44− <description>Changes the width of the launcher in all usage modes.</description>

45− </key>

46− <key type="b" name="enable-indicator-menu">

47− <default>true</default>

48− <summary>Enable or disable the indicator pull down menus</summary>

49− <description>Toggle the availability of the indicator pull down menus</description>

50− </key>

51− <key type="s" name="appstore-uri">

52− <default>'appid://openstore.openstore-team/openstore/current-user-version'</default>

53− <summary>The uri to the app store</summary>

54− <description>This will be used whenever the user triggers an action to open the app store.</description>

55− </key>

56− <key type="b" name="always-show-osk">

57− <default>false</default>

58− <summary>Force showing/hiding the OSK</summary>

59− <description>Toggle the visibility of the On Screen Keyboard unconditionally</description>

60− </key>

61− <key type="b" name="osk-switch-visible">

62− <default>false</default>

63− <summary>Whether the OSK switch should be visible</summary>

64− <description>Toggle the visibility of the OSK switch</description>

65− </key>

66− </schema>

67−

68− <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">

69− <key type="x" name="locked-out-time">

70− <default>0</default>

71− <summary>When the greeter was last locked.</summary>

72− <description>If too many unsuccessful login attempts have been made in a row, the greeter locks you out for a while. This unix timestamp indicates when you were locked out, so unity8 knows when to let you back in.</description>

73− </key>

74− </schema>

75−</schemalist>

data/devices.confdeleted−30

@@ -1,30 +0,0 @@

1−# This file can hold multiple device configs. Devices are separated by sections.

2−#

3−# SupportedOrientations holds a list of all enabled orientations. A standard

4−# phone will usually have Portrait,Landcape,InvertedLandscape in order to

5−# disable upside down usage.

6−#

7−# PrimaryOrientation gives the orientation the device will start up with

8−# when there is no orientations sensor input available (yet) or lock to

9−# when an application specifies to be locked to PrimaryOrientation.

10−#

11−# The other Orientation settings can be used to re-map the orientations.

12−# A device might be used with different orientations than how the screen

13−# is physically mounted on the hardware.

14−#

15−# Category can be phone, tablet, or desktop. This option determines

16−# whether the side stage is shown (tablet) or not (phone). Using

17−# desktop will load the shell in windowed mode. Note that the user

18−# can override/change this by connecting input hardware or change

19−# user settings.

20−#

21−# Any options not listed will default to the values of the example below.

22−

23−# [devicename]

24−# SupportedOrientations=Portrait,InvertedPortrait,Landscape,InvertedLandscape

25−# PrimaryOrientation=PrimaryOrienation

26−# PortraitOrientation=Portrait

27−# InvertedPortraitOrientation=InvertedPortrait

28−# LandscapeOrientation=Landscape

29−# InvertedLandscapeOrientation=InvertedLandscape

30−# Category=phone

data/indicators-client.desktop.indeleted−9

@@ -1,9 +0,0 @@

1−[Desktop Entry]

2−Type=Application

3−Name=Indicators Client

4−Comment=Application for testing the Indicators system

5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/indicators-client

6−Terminal=false

7−Icon=

8−NoDisplay=false

9−X-Ubuntu-Touch=true

data/test.sensorsdeleted−12

@@ -1,12 +0,0 @@

1−create light 0 10 1

2−create accel 0 1000 0.1

3−create proximity

4−

5−200 proximity near

6−500 light 5

7−# simulate crash on the ground

8−500 accel 0.2 0.1 10

9−100 accel 0.2 0.2 1000

10−20 accel 0 0 0

11−10 proximity far

12−10 light 10

data/unity-mock-indicator-service.confdeleted−7

@@ -1,7 +0,0 @@

1−description "Unity Shell v8 Mock Indicator"

2−author "Nick Dedekind <nick.dedekind@canonical.com>"

3−

4−respawn

5−respawn limit 2 10

6−

7−exec ${BINARY:-unity-mock-indicator-service} $ARGS

data/unity8-filewatcher.confdeleted−13

@@ -1,13 +0,0 @@

1−description "File system watcher for unity8"

2−author "Michael Zanetti <michael.zanetti@canonical.com>"

3−

4−# This method of updating the launcher will not work in our new snappy world,

5−# neither for snaps installed in the system nor if we are running inside a snap.

6−# Plus it hardcodes the phablet user... To be replaced once bug 1630997 is

7−# fixed in ubuntu-app-launch.

8−

9−# Workaround for bug 1360208. ~ and * in one expression doesn't work currently

10−start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)

11−

12−exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh

13−

data/unity8-greeter-init.confdeleted−12

@@ -1,12 +0,0 @@

1−description "Unity 8 Greeter initialization"

2−author "Michael Terry <mterry@ubuntu.com>"

3−

4−start on unity8-greeter-started

5−task

6−emits indicator-services-start

7−

8−script

9− start --no-wait ofono-setup || true

10− initctl emit --no-wait indicator-services-start || true

11− start --no-wait maliit-server || true

12−end script

data/unity8-greeter-logrotate.confdeleted−14

@@ -1,14 +0,0 @@

1−description "Unity 8 Greeter logrotate support"

2−author "Michael Terry <mterry@ubuntu.com>"

3−

4−start on unity8-greeter-started

5−task

6−

7−script

8− # logrotate normally starts on startup and then sleeps for 60 seconds.

9− # Otherwise, it skips that sleep. Since we can't emit the startup signal

10− # for a unity8-greeter session, we have to trigger logrotate manually.

11− # So we do the sleep ourselves in its stead.

12− sleep 60

13− initctl emit :sys:rotate-logs

14−end script

data/unity8-greeter-wrapperdeleted−109

@@ -1,109 +0,0 @@

1−#!/bin/sh

2−# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-

3−#

4−# Copyright (C) 2011,2013,2016 Canonical Ltd

5−#

6−# This program is free software: you can redistribute it and/or modify it under

7−# the terms of the GNU General Public License as published by the Free Software

8−# Foundation, version 3 of the License.

9−#

10−# See http://www.gnu.org/copyleft/gpl.html the full text of the license.

11−

12−# This wrapper merely ensures that init and friends live only as long as this

13−# script does. Otherwise, it's very easy for some processes to not notice that

14−# the session died. We could try to do this in-process, but we want to do this

15−# cleanup even if the greeter aborts.

16−

17−trap cleanup TERM EXIT

18−

19−cleanup()

20−{

21− trap - TERM EXIT

22− # Kill upstart and indicators

23− if [ -n "$INIT_PID" ]; then

24− kill "$INIT_PID"

25− fi

26− if [ -n "$CMD_PID" ]; then

27− kill "$CMD_PID"

28− fi

29− exit 0

30−}

31−

32−set_greeter_var()

33−{

34− export "$1=$2"

35− gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"

36− if [ -n "$INIT_PID" ]; then

37− initctl set-env --global "$1=$2"

38− fi

39−}

40−

41−SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket

42−rm -f $SUB_SOCKET # clear socket in case we were hard shut down

43−

44−echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"

45−

46−# If touch session script (which sets up grid units and mir variables) is available, use it

47−TOUCH_WRAPPER=

48−if which ubuntu-touch-session >/dev/null; then

49− TOUCH_WRAPPER=ubuntu-touch-session

50−fi

51−

52−# Advertise as a unity8 session, so that indicator-network will start.

53−export XDG_SESSION_DESKTOP=unity8

54−export DESKTOP_SESSION=$XDG_SESSION_DESKTOP

55−

56−set_greeter_var QT_IM_MODULE maliitphablet

57−set_greeter_var QT_QPA_PLATFORM ubuntumirclient

58−

59−# We disable ofono using pulse. It causes problems with racing with the user's

60−# pulse. We need to come up with a better long-term fix for this, because we

61−# eventually need the greeter to play ringtones for users that aren't logged in.

62−set_greeter_var PA_DISABLED 1

63−

64−# Normal unity8 sessions are entirely driven by Upstart. But greeters

65−# are special. They need access to the file descriptors that lightdm

66−# creates for them and don't want to start all the services that a normal

67−# session would. So it's inconvenient to live within an upstart session.

68−# But... we still want to use Upstart for some services. So launch here.

69−MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event &

70−INIT_PID=$!

71−while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done

72−. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"

73−export UPSTART_SESSION

74−

75−# Connect upstart to system, but do first command in a loop to avoid any

76−# race condition between the session file above being written and upstart being

77−# ready to handle requests.

78−while ! initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done

79−initctl start notify-cgmanager

80−

81−# Start any pre-greeter tasks if needed (like wizard)

82−initctl emit unity8-greeter-starting

83−

84−# Define language here for phone if available. When phone user switches their

85−# language, they expect that to affect the greeter too. But the user doesn't

86−# have permission to switch system language, only their own. So we notice if

87−# the phablet user exists and use their language if so. TODO: talk to design

88−# about whether we should switch language on fly as users are selected (this

89−# is very hard to do technically).

90−#

91−# Do this after unity8-greeter-starting, in case a customization upstart job

92−# changes language.

93−if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then

94− USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)

95− if [ -n "$USER_LANG" ]; then

96− set_greeter_var LANGUAGE "$USER_LANG"

97− fi

98− USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)

99− if [ -n "$USER_LOCALE" ]; then

100− set_greeter_var LANG "$USER_LOCALE"

101− set_greeter_var LC_ALL "$USER_LOCALE"

102− fi

103−fi

104−

105−# And finally actually start the greeter

106−exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

107−CMD_PID=$!

108−wait $CMD_PID

109−CMD_PID=

data/unity8-greeter.desktop.indeleted−7

@@ -1,7 +0,0 @@

1−[Desktop Entry]

2−Type=Application

3−Name=Unity 8 Greeter

4−Comment=The converged Unity shell's Greeter

5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter

6−X-LightDM-Session-Type=mir

7−X-Ubuntu-Touch=true

data/unity8-greeter.pkladeleted−44

@@ -1,44 +0,0 @@

1−# DO NOT EDIT THIS FILE, it will be overwritten on update

2−# Place your local configurations under /etc/polkit-1/localauthority/

3−

4−[Disable Controlling of Network Devices]

5−Identity=unix-user:lightdm

6−Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;

7−ResultActive=no

8−ResultInactive=no

9−ResultsAny=no

10−

11−[Disable Sleep and Wake]

12−Identity=unix-user:lightdm

13−Action=org.freedesktop.NetworkManager.sleep-wake

14−ResultActive=no

15−ResultInactive=no

16−ResultsAny=no

17−

18−[Disable WiFi Sharing]

19−Identity=unix-user:lightdm

20−Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open

21−ResultActive=no

22−ResultInactive=no

23−ResultsAny=no

24−

25−[Disable Settings Modifications]

26−Identity=unix-user:lightdm

27−Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname

28−ResultActive=no

29−ResultInactive=no

30−ResultsAny=no

31−

32−[Disable User Connections]

33−Identity=unix-user:lightdm

34−Action=org.freedesktop.NetworkManager.use-user-connections

35−ResultActive=no

36−ResultInactive=no

37−ResultsAny=no

38−

39−[Enable Controlling of Network Connections]

40−Identity=unix-user:lightdm

41−Action=org.freedesktop.NetworkManager.network-control

42−ResultActive=yes

43−ResultInactive=no

44−ResultsAny=no

data/unity8.confdeleted−99

@@ -1,99 +0,0 @@

1−description "Unity Shell v8"

2−author "Ricardo Mendoza <ricmm@ubuntu.com>"

3−

4−emits indicator-services-start

5−emits indicator-services-end

6−

7−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus

8−stop on desktop-end

9−

10−kill timeout 120

11−

12−#

13−# Ensure the shell always gets unthrottled touch events, so that applications

14−# who want full speed low-latency input can get it (LP: #1497105) and so that

15−# apps can use QML touch compression safely (the QML touch compression

16−# algorithm does not support nesting well - LP: #1486341, LP: #1556763 - so

17−# must be fed by the raw input event stream from Unity8).

18−#

19−env QML_NO_TOUCH_COMPRESSION=1

20−

21−respawn

22−expect stop

23−

24−# FIXME Create an autopilot test that makes sure start+stop and restart

25−# work fine at least 2 times

26−

27−pre-start script

28− # Tell unity-mir to raise SIGSTOP after we start

29− initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

30−

31− # Save original value of MIR_SOCKET so that we can restore it when stopped,

32− # as we modify the variable for future jobs, including ourself.

33− initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET

34−

35− # Decide where we are going to put our own socket file

36− if [ -n "$SNAP" ]; then

37− # In snappy, we want to hard code our path because our apparmor profile

38− # only lets us put the socket in one place. And consumers expect it

39− # there.

40− MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket

41− else

42− MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket

43− fi

44− initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE

45−

46− # Point all future jobs in this session to our Mir socket instead of

47− # unity-system-compositor's socket.

48− initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE

49− gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"

50−

51− # Remove the normal and trusted sockets if still there

52− if [ -S "$MIR_SERVER_FILE" ]; then

53− rm "$MIR_SERVER_FILE"

54− fi

55−

56− if [ -S "${MIR_SERVER_FILE}_trusted" ]; then

57− rm "${MIR_SERVER_FILE}_trusted"

58− fi

59−

60− initctl set-env --global MIR_SERVER_PROMPT_FILE=1

61−

62− # Disable Qt's stuttering 'touch compression' to fix scrolling smoothness

63− # issues (LP: #1486341, LP: #1556763). As a bonus, this eliminates most of

64− # the lag seen in the indicator panel pull-down (LP: #1488327) and also

65− # reduces lag seen in apps:

66− initctl set-env --global QML_NO_TOUCH_COMPRESSION=1

67−

68− # Workaround for text not rendering correctly

69− initctl set-env --global QT_ENABLE_GLYPH_CACHE_WORKAROUND=1

70−

71− if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then

72− # On Ubuntu Touch, we currently use a trick where we auto-login the

73− # user without a LightDM greeter at all. In this case, we want to

74− # start with the lockscreen visible. Once we switch to using a

75− # proper greeter for the first login, we can remove this code path.

76− initctl set-env MODE=full-greeter

77− else

78− initctl set-env MODE=full-shell

79− fi

80−

81− # HACK! WORKAROUND FOR HALIUM MISSING UBUNTU_PLATFORM_API

82− if [ ! -f /system/lib/libubuntu_application_api.so ]; then

83− initctl set-env --global UBUNTU_PLATFORM_API_BACKEND=test.so.3

84− initctl set-env --global UBUNTU_PLATFORM_API_SENSOR_TEST=/etc/ubuntusensors/test.sensors

85− fi

86−end script

87−

88−exec ${BINARY:-unity8} --mode=$MODE $ARGS

89−

90−post-start script

91− initctl emit --no-wait indicator-services-start

92−end script

93−

94−post-stop script

95− initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

96− initctl unset-env --global MIR_SERVER_PROMPT_FILE

97− initctl emit application-end

98− initctl emit indicator-services-end

99−end script

debian/bileto_pre_release_hookdeleted−5

@@ -1,5 +0,0 @@

1−#!/bin/sh

2−

3−set -eux

4−

5−sh ./po/update-unity-pot

debian/changelog+16−6197

This diff is too big to show here.

debian/control+110−239

This diff is too big to show here.

debian/copyright+1−22

This diff is too big to show here.

debian/indicators-client.install−1

This diff is too big to show here.

debian/rules+13−31

This diff is too big to show here.

debian/scopes-recommends-generatornew file+27

This diff is too big to show here.

debian/shlibs.localdeleted−1

This diff is too big to show here.

debian/source/formatnew file+1

This diff is too big to show here.

debian/tests/autopilot.shdeleted−13

This diff is too big to show here.

debian/tests/controldeleted−11

This diff is too big to show here.

debian/tests/qmluitests.shdeleted−11

This diff is too big to show here.

debian/unity8-autopilot.install−1

This diff is too big to show here.

debian/unity8-common.installdeleted−5

This diff is too big to show here.

debian/unity8-common.udevdeleted−2

This diff is too big to show here.

debian/unity8-doc.installdeleted−2

This diff is too big to show here.

debian/unity8-fake-env.installnew file+1

This diff is too big to show here.

debian/unity8-greeter.install+4−4

This diff is too big to show here.

debian/unity8-private.install+5−9

This diff is too big to show here.

debian/unity8-schemas.installdeleted−1

This diff is too big to show here.

debian/unity8-tests.installdeleted−9

This diff is too big to show here.

debian/unity8-tests.lintian-overridesdeleted−1

This diff is too big to show here.

debian/unity8.install+10−14

This diff is too big to show here.

debian/unity8.maintscriptdeleted−1

This diff is too big to show here.

doc/CMakeLists.txtdeleted−40

This diff is too big to show here.

doc/Doxyfile.indeleted−2317

This diff is too big to show here.

doc/devices.confdeleted−45

This diff is too big to show here.

graphics/12_10_background_wide@12.pngnew file

Binary file not shown.

graphics/applicationIcons/angrybirds@18.pngnew file

Binary file not shown.

graphics/applicationIcons/browser@18.pngnew file

Binary file not shown.

graphics/applicationIcons/calendar@18.pngnew file

Binary file not shown.

graphics/applicationIcons/camera@18.pngnew file

Binary file not shown.

graphics/applicationIcons/contacts-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/dash@18.pngnew file

Binary file not shown.

graphics/applicationIcons/evernote@18.pngnew file

Binary file not shown.

graphics/applicationIcons/facebook@18.pngnew file

Binary file not shown.

graphics/applicationIcons/gallery@18.pngnew file

Binary file not shown.

graphics/applicationIcons/gmail@18.pngnew file

Binary file not shown.

graphics/applicationIcons/map@18.pngnew file

Binary file not shown.

graphics/applicationIcons/media-player@18.pngnew file

Binary file not shown.

graphics/applicationIcons/messages-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/music@18.pngnew file

Binary file not shown.

graphics/applicationIcons/notepad@18.pngnew file

Binary file not shown.

graphics/applicationIcons/phone-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/pinterest@18.pngnew file

Binary file not shown.

graphics/applicationIcons/ski_safari@18.pngnew file

Binary file not shown.

graphics/applicationIcons/skype@18.pngnew file

Binary file not shown.

graphics/applicationIcons/soundcloud@18.pngnew file

Binary file not shown.

graphics/applicationIcons/system-settings@18.pngnew file

Binary file not shown.

graphics/applicationIcons/twitter@18.pngnew file

Binary file not shown.

graphics/applicationIcons/weather@18.pngnew file

Binary file not shown.

graphics/applicationIcons/wikipedia@18.pngnew file

Binary file not shown.

graphics/applicationIcons/youtube@18.pngnew file

Binary file not shown.

graphics/avatars/amanda@12.pngnew file

Binary file not shown.

graphics/avatars/anna_olsson@12.pngnew file

Binary file not shown.

graphics/avatars/funky@12.pngnew file

Binary file not shown.

graphics/clock@18.pngnew file

Binary file not shown.

graphics/phone_background.jpgnew file

Binary file not shown.

graphics/tablet_background.jpgnew file

Binary file not shown.

include/CMakeLists.txtdeleted−1

This diff is too big to show here.

include/paths.h.indeleted−175

This diff is too big to show here.

main.cppnew file+227

This diff is too big to show here.

paths.h.innew file+87

This diff is too big to show here.

plugins/AccountsService/50-com.canonical.unity.AccountsService.pklanew file+6

This diff is too big to show here.

plugins/AccountsService/AccountsService.cpp+51−369

This diff is too big to show here.

plugins/AccountsService/AccountsService.h+19−96

This diff is too big to show here.

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+30−56

This diff is too big to show here.

plugins/AccountsService/AccountsServiceDBusAdaptor.h+6−10

This diff is too big to show here.

plugins/AccountsService/CMakeLists.txt+15−6

This diff is too big to show here.

plugins/AccountsService/com.canonical.unity.AccountsService.policynew file+24

This diff is too big to show here.

plugins/AccountsService/com.canonical.unity.AccountsService.xml+6−43

This diff is too big to show here.

plugins/AccountsService/plugin.cpp+1−2

This diff is too big to show here.

plugins/AccountsService/plugin.h+1−1

This diff is too big to show here.

plugins/AccountsService/qmldir+1−1

This diff is too big to show here.

plugins/CMakeLists.txt+3−21

This diff is too big to show here.

plugins/Cursor/3rd_party/CMakeLists.txtdeleted−1

This diff is too big to show here.

plugins/Cursor/3rd_party/xcursor/CMakeLists.txtdeleted−15

This diff is too big to show here.

plugins/Cursor/3rd_party/xcursor/xcursor.cdeleted−968

This diff is too big to show here.

plugins/Cursor/3rd_party/xcursor/xcursor.hdeleted−65

This diff is too big to show here.

plugins/Cursor/CMakeLists.txtdeleted−32

This diff is too big to show here.

plugins/Cursor/Cursor.qmldeleted−62

This diff is too big to show here.

plugins/Cursor/CursorImageInfo.cppdeleted−115

This diff is too big to show here.

plugins/Cursor/CursorImageInfo.hdeleted−82

This diff is too big to show here.

plugins/Cursor/CursorImageProvider.cppdeleted−337

This diff is too big to show here.

plugins/Cursor/CursorImageProvider.hdeleted−103

This diff is too big to show here.

plugins/Cursor/MousePointer.cppdeleted−235

This diff is too big to show here.

plugins/Cursor/MousePointer.hdeleted−92

This diff is too big to show here.

plugins/Cursor/plugin.cppdeleted−41

This diff is too big to show here.

plugins/Cursor/plugin.hdeleted−33

This diff is too big to show here.

plugins/Cursor/qmldirdeleted−3

This diff is too big to show here.

plugins/GlobalShortcut/CMakeLists.txtdeleted−10

This diff is too big to show here.

plugins/GlobalShortcut/globalshortcut.cppdeleted−91

This diff is too big to show here.

plugins/GlobalShortcut/globalshortcut.hdeleted−81

This diff is too big to show here.

plugins/GlobalShortcut/globalshortcutregistry.cppdeleted−125

This diff is too big to show here.

plugins/GlobalShortcut/globalshortcutregistry.hdeleted−70

This diff is too big to show here.

plugins/GlobalShortcut/plugin.hdeleted−32

This diff is too big to show here.

plugins/GlobalShortcut/qmldirdeleted−2

This diff is too big to show here.

plugins/Greeter/CMakeLists.txtdeleted−6

This diff is too big to show here.

plugins/Greeter/Unity/CMakeLists.txtdeleted−1

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/CMakeLists.txtdeleted−35

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/launcheritem.cppdeleted−218

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/launcheritem.hdeleted−84

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/launchermodelas.cppdeleted−303

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/launchermodelas.hdeleted−77

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/plugin.cppdeleted−46

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/qmldirdeleted−3

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistmodel.cppdeleted−72

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistmodel.hdeleted−55

This diff is too big to show here.

plugins/HudClient/CMakeLists.txtnew file+43

This diff is too big to show here.

plugins/HudClient/hudclient.cppnew file+309

This diff is too big to show here.

plugins/HudClient/hudclient.hnew file+71

This diff is too big to show here.

plugins/HudClient/hudtoolbarmodel.cppnew file+98

This diff is too big to show here.

tests/mocks/Biometryd/MockObserver.h → plugins/HudClient/hudtoolbarmodel.hrenamed+20−13

This diff is too big to show here.

tests/mocks/Lights/plugin.cpp → plugins/HudClient/plugin.cpprenamed+15−12

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.h → plugins/HudClient/plugin.hrenamed+7−7

This diff is too big to show here.

plugins/HudClient/qmldirnew file+3

This diff is too big to show here.

plugins/HudClient/volumepeakdetector.cppnew file+223

This diff is too big to show here.

plugins/HudClient/volumepeakdetector.hnew file+78

This diff is too big to show here.

plugins/LightDM/CMakeLists.txt+22−12

This diff is too big to show here.

plugins/LightDM/DBusGreeter.cppdeleted−50

This diff is too big to show here.

plugins/LightDM/DBusGreeter.hdeleted−52

This diff is too big to show here.

plugins/LightDM/DBusGreeterList.cppdeleted−56

This diff is too big to show here.

plugins/LightDM/DBusGreeterList.hdeleted−57

This diff is too big to show here.

plugins/LightDM/FullLightDM/CMakeLists.txtdeleted−32

This diff is too big to show here.

plugins/LightDM/FullLightDM/qmldirdeleted−3

This diff is too big to show here.

plugins/LightDM/Greeter.cpp+36−182

This diff is too big to show here.

plugins/LightDM/Greeter.h+13−35

This diff is too big to show here.

plugins/LightDM/GreeterPrivate.hdeleted−45

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/CMakeLists.txtdeleted−33

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtdeleted−54

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cppdeleted−309

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppdeleted−87

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hdeleted−72

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppdeleted−36

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hdeleted−54

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cppdeleted−94

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hdeleted−72

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/qmldirdeleted−3

This diff is too big to show here.

plugins/LightDM/PromptsModel.cppdeleted−97

This diff is too big to show here.

plugins/LightDM/PromptsModel.hdeleted−70

This diff is too big to show here.

plugins/LightDM/SessionsModel.cppdeleted−135

This diff is too big to show here.

plugins/LightDM/SessionsModel.hdeleted−66

This diff is too big to show here.

plugins/LightDM/UsersModel.cpp+15−183

This diff is too big to show here.

plugins/LightDM/UsersModel.h+10−8

This diff is too big to show here.

plugins/LightDM/plugin.cpp+8−46

This diff is too big to show here.

plugins/LightDM/plugin.h+6−4

This diff is too big to show here.

plugins/LightDM/qmldir+3−3

This diff is too big to show here.

plugins/Lights/CMakeLists.txtdeleted−23

This diff is too big to show here.

plugins/Lights/HfdLights.cppdeleted−62

This diff is too big to show here.

plugins/Lights/HfdLights.hdeleted−42

This diff is too big to show here.

plugins/Lights/LegacyLights.cppdeleted−91

This diff is too big to show here.

plugins/Lights/Lights.cppdeleted−101

This diff is too big to show here.

plugins/Lights/Lights.hdeleted−71

This diff is too big to show here.

plugins/Lights/plugin.cppdeleted−54

This diff is too big to show here.

plugins/Lights/qmldirdeleted−3

This diff is too big to show here.

plugins/ListViewWithPageHeader/CMakeLists.txtnew file+42

This diff is too big to show here.

plugins/ListViewWithPageHeader/listviewwithpageheader.cppnew file+1267

This diff is too big to show here.

plugins/ListViewWithPageHeader/listviewwithpageheader.hnew file+212

This diff is too big to show here.

plugins/Unity/Platform/plugin.cpp → plugins/ListViewWithPageHeader/plugin.cpprenamed+9−7

This diff is too big to show here.

plugins/Wizard/Utils/plugin.h → plugins/ListViewWithPageHeader/plugin.hrenamed+4−4

This diff is too big to show here.

plugins/ListViewWithPageHeader/qmldirnew file+3

This diff is too big to show here.

plugins/Powerd/CMakeLists.txt+4−8

This diff is too big to show here.

plugins/Powerd/Powerd.cpp+13−67

This diff is too big to show here.

plugins/Powerd/Powerd.h+9−25

This diff is too big to show here.

plugins/Powerd/plugin.h+1−1

This diff is too big to show here.

plugins/Powerd/qmldir+1−1

This diff is too big to show here.

plugins/ScreenshotDirectory/CMakeLists.txtdeleted−9

This diff is too big to show here.

plugins/ScreenshotDirectory/ScreenGrabber.qmltypesdeleted−17

This diff is too big to show here.

plugins/ScreenshotDirectory/ScreenshotDirectory.cppdeleted−64

This diff is too big to show here.

plugins/ScreenshotDirectory/ScreenshotDirectory.hdeleted−39

This diff is too big to show here.

plugins/ScreenshotDirectory/plugin.hdeleted−31

This diff is too big to show here.

plugins/ScreenshotDirectory/qmldirdeleted−2

This diff is too big to show here.

plugins/SessionBroadcast/CMakeLists.txt+5−6

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.cpp+27−26

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.h+6−6

This diff is too big to show here.

plugins/SessionBroadcast/plugin.cpp+1−1

This diff is too big to show here.

plugins/SessionBroadcast/plugin.h+1−1

This diff is too big to show here.

plugins/SessionBroadcast/qmldir+1−1

This diff is too big to show here.

plugins/SessionManager/CMakeLists.txtnew file+27

This diff is too big to show here.

plugins/SessionManager/SessionManager.cppnew file+107

This diff is too big to show here.

plugins/SessionManager/SessionManager.hnew file+58

This diff is too big to show here.

tests/mocks/Unity/Connectivity/plugin.cpp → plugins/SessionManager/plugin.cpprenamed+10−9

This diff is too big to show here.

tests/mocks/QtMultimedia/plugin.h → plugins/SessionManager/plugin.hrenamed+6−5

This diff is too big to show here.

plugins/SessionManager/qmldirnew file+2

This diff is too big to show here.

plugins/UInput/CMakeLists.txtdeleted−7

This diff is too big to show here.

plugins/UInput/plugin.cppdeleted−26

This diff is too big to show here.

plugins/UInput/qmldirdeleted−3

This diff is too big to show here.

plugins/UInput/uinput.cppdeleted−182

This diff is too big to show here.

plugins/UInput/uinput.hdeleted−61

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+9−7

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp+8−9

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+2−3

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp+2−2

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h+15−82

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h+6−3

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/plugin.h+2−2

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/qmldir+1−1

This diff is too big to show here.

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+18−9

This diff is too big to show here.

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+18−11

This diff is too big to show here.

plugins/Ubuntu/Gestures/CMakeLists.txt+10−32

This diff is too big to show here.

plugins/Ubuntu/Gestures/Damper.hnew file+87

This diff is too big to show here.

plugins/Ubuntu/Gestures/Direction.cpp+4−11

This diff is too big to show here.

plugins/Ubuntu/Gestures/Direction.h+5−8

This diff is too big to show here.

plugins/Ubuntu/Gestures/DirectionalDragArea.cppnew file+461

This diff is too big to show here.

plugins/Ubuntu/Gestures/DirectionalDragArea.hnew file+251

This diff is too big to show here.

plugins/Ubuntu/Gestures/MouseEventGenerator.cppdeleted−64

This diff is too big to show here.

plugins/Ubuntu/Gestures/MouseEventGenerator.hdeleted−48

This diff is too big to show here.

plugins/Ubuntu/Gestures/PressedOutsideNotifier.cppdeleted−119

This diff is too big to show here.

plugins/Ubuntu/Gestures/PressedOutsideNotifier.hdeleted−62

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchDispatcher.cppdeleted−398

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchDispatcher.hdeleted−96

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.cppdeleted−290

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGate.hdeleted−125

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGestureArea.cppdeleted−879

This diff is too big to show here.

plugins/Ubuntu/Gestures/TouchGestureArea.hdeleted−229

This diff is too big to show here.

plugins/Ubuntu/Gestures/UbuntuGesturesQmlGlobal.h → plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.hrenamed+3−3

This diff is too big to show here.

plugins/Ubuntu/Gestures/plugin.cpp+4−11

This diff is too big to show here.

plugins/Ubuntu/Gestures/plugin.h+2−2

This diff is too big to show here.

plugins/Ubuntu/Gestures/qmldir+2−2

This diff is too big to show here.

plugins/Unity/ApplicationMenu/CMakeLists.txtdeleted−19

This diff is too big to show here.

plugins/Unity/ApplicationMenu/applicationmenuregistry.cppdeleted−141

This diff is too big to show here.

plugins/Unity/ApplicationMenu/applicationmenuregistry.hdeleted−83

This diff is too big to show here.

plugins/Unity/ApplicationMenu/com.ubuntu.MenuRegistrar.xmldeleted−83

This diff is too big to show here.

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.cppdeleted−44

This diff is too big to show here.

plugins/Unity/ApplicationMenu/dbusapplicationmenuregistry.hdeleted−34

This diff is too big to show here.

plugins/Unity/ApplicationMenu/plugin.cppdeleted−42

This diff is too big to show here.

plugins/Unity/ApplicationMenu/plugin.hdeleted−32

This diff is too big to show here.

plugins/Unity/ApplicationMenu/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/CMakeLists.txt+69−5

This diff is too big to show here.

plugins/Unity/Connectivity/CMakeLists.txtdeleted−10

This diff is too big to show here.

plugins/Unity/Connectivity/Connectivity.cppdeleted−33

This diff is too big to show here.

plugins/Unity/Connectivity/plugin.hdeleted−31

This diff is too big to show here.

plugins/Unity/Connectivity/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/Indicators/CMakeLists.txt+28−14

This diff is too big to show here.

plugins/Unity/Indicators/Network/CMakeLists.txtnew file+45

This diff is too big to show here.

plugins/Unity/Indicators/Network/networkagent.cppnew file+146

This diff is too big to show here.

plugins/Unity/Indicators/Network/networkagent.hnew file+65

This diff is too big to show here.

plugins/ScreenshotDirectory/plugin.cpp → plugins/Unity/Indicators/Network/plugin.cpprenamed+11−6

This diff is too big to show here.

plugins/Lights/plugin.h → plugins/Unity/Indicators/Network/plugin.hrenamed+7−9

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/AccessPoint.qmlnew file+117

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/PasswordPage.qmlnew file+88

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/PasswordTextField.qmlnew file+68

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/qmldirnew file+8

This diff is too big to show here.

plugins/Unity/Indicators/Network/secret-agent.cnew file+382

This diff is too big to show here.

plugins/Unity/Indicators/Network/secret-agent.hnew file+102

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.cppdeleted−97

This diff is too big to show here.

plugins/Unity/Indicators/actionrootstate.hdeleted−55

This diff is too big to show here.

plugins/Unity/Indicators/indicator.cpp+20−26

This diff is too big to show here.

plugins/Unity/Indicators/indicator.h+1−5

This diff is too big to show here.

plugins/Unity/Indicators/indicators.h+11−6

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.cpp+56−45

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.h+5−9

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.cpp+72−50

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.h+15−20

This diff is too big to show here.

plugins/Unity/Indicators/menucontentactivator.cpp+7−6

This diff is too big to show here.

plugins/Unity/Indicators/menucontentactivator.h+2−2

This diff is too big to show here.

plugins/Unity/Indicators/modelactionrootstate.cppdeleted−204

This diff is too big to show here.

plugins/Unity/Indicators/modelactionrootstate.hdeleted−72

This diff is too big to show here.

plugins/Unity/Indicators/modelprinter.cpp+15−30

This diff is too big to show here.

plugins/Unity/Indicators/modelprinter.h+3−4

This diff is too big to show here.

plugins/Unity/Indicators/plugin.cpp+12−18

This diff is too big to show here.

plugins/Unity/Indicators/plugin.h+2−2

This diff is too big to show here.

plugins/Unity/Indicators/qml/BaseMenuItem.qmlnew file+38

This diff is too big to show here.

plugins/Unity/Indicators/qml/ButtonMenuItem.qmlnew file+44

This diff is too big to show here.

plugins/Unity/Indicators/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/Indicators/qml/CachedUnityMenuModel.qmlnew file+60

This diff is too big to show here.

plugins/Unity/Indicators/qml/DivMenuItem.qmlnew file+26

This diff is too big to show here.

plugins/Unity/Indicators/qml/FramedMenuItem.qmlnew file+39

This diff is too big to show here.

plugins/Unity/Indicators/qml/HLine.qmlnew file+29

This diff is too big to show here.

qml/Panel/Indicators/IndicatorBase.qml → plugins/Unity/Indicators/qml/IndicatorBase.qmlrenamed+15−14

This diff is too big to show here.

plugins/Unity/Indicators/qml/IndicatorPage.qmlnew file+155

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsTree.qml → plugins/Unity/Indicators/qml/IndicatorWidget.qmlrenamed+9−16

This diff is too big to show here.

plugins/Unity/Indicators/qml/MenuItemFactory.qmlnew file+197

This diff is too big to show here.

plugins/Unity/Indicators/qml/ProgressMenuItem.qmlnew file+38

This diff is too big to show here.

plugins/Unity/Indicators/qml/RemoveBackground.qmlnew file+55

This diff is too big to show here.

plugins/Unity/Indicators/qml/SectionMenuItem.qmlnew file+54

This diff is too big to show here.

plugins/Unity/Indicators/qml/SliderMenuItem.qmlnew file+105

This diff is too big to show here.

plugins/Unity/Indicators/qml/StandardMenuItem.qmlnew file+71

This diff is too big to show here.

plugins/Unity/Indicators/qml/SwitchMenuItem.qmlnew file+53

This diff is too big to show here.

plugins/Unity/Indicators/qml/qmldirnew file+23

This diff is too big to show here.

plugins/Unity/Indicators/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/Indicators/resources/artwork/network/secure.svgnew file+71

This diff is too big to show here.

plugins/Unity/Indicators/resources/indicators.qrcnew file+5

This diff is too big to show here.

plugins/Unity/Indicators/rootactionstate.cppnew file+279

This diff is too big to show here.

plugins/Unity/Indicators/rootstateparser.h → plugins/Unity/Indicators/rootactionstate.hrenamed+36−25

This diff is too big to show here.

plugins/Unity/Indicators/rootstateparser.cppdeleted−231

This diff is too big to show here.

plugins/Unity/Indicators/sharedunitymenumodel.cppdeleted−96

This diff is too big to show here.

plugins/Unity/Indicators/sharedunitymenumodel.hdeleted−66

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelcache.cpp+9−32

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelcache.h+6−12

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelstack.cpp+9−100

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelstack.h+3−11

This diff is too big to show here.

plugins/Unity/Indicators/visibleindicatorsmodel.cppnew file+94

This diff is too big to show here.

plugins/Unity/Indicators/visibleindicatorsmodel.hnew file+56

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/CMakeLists.txtnew file+49

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/CMakeLists.txtnew file+1

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/ActionButton.qml → plugins/Unity/IndicatorsLegacy/Messaging/qml/ActionButton.qmlrenamed

The content is the same.

plugins/Unity/IndicatorsLegacy/Messaging/qml/ActionTextField.qmlnew file+66

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/GroupedMessage.qmlnew file+96

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessage.qmlnew file+120

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessageHeader.qmlnew file+161

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/MessageMenuItem.qmlnew file+96

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/QuickReply.qmlnew file+160

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/SimpleTextMessage.qmlnew file+97

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/SnapDecision.qmlnew file+142

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.cpp → plugins/Unity/IndicatorsLegacy/Messaging/qml/TextMessage.qmlrenamed+15−13

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/qmldirnew file+12

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Messaging/qml/utils.jsnew file+27

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/CMakeLists.txtnew file+45

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/networkagent.cppnew file+146

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/networkagent.hnew file+65

This diff is too big to show here.

plugins/GlobalShortcut/plugin.cpp → plugins/Unity/IndicatorsLegacy/Network/plugin.cpprenamed+11−7

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/plugin.hnew file+32

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qmlnew file+68

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordPage.qmlnew file+88

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/qml/PasswordTextField.qmlnew file+68

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.h → plugins/Unity/IndicatorsLegacy/Network/qml/WifiSection.qmlrenamed+14−14

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/qml/qmldirnew file+9

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/secret-agent.cnew file+382

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/Network/secret-agent.hnew file+102

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.cppnew file+288

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.hnew file+93

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/modelprinter.cppnew file+114

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.h → plugins/Unity/IndicatorsLegacy/modelprinter.hrenamed+21−22

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/plugin.cppnew file+42

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/plugin.h → plugins/Unity/IndicatorsLegacy/plugin.hrenamed+8−8

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/BasicMenuItem.qmlnew file+48

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/ButtonMenuItem.qmlnew file+47

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/DivMenuItem.qmlnew file+26

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/HLine.qmlnew file+29

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/IndicatorBase.qmlnew file+59

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/IndicatorPage.qmlnew file+191

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/IndicatorWidget.qmlnew file+68

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/MenuAction.qmlnew file+86

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/MenuActionBinding.qmlnew file+106

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/MenuItem.qmlnew file+40

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/MenuItemFactory.qmlnew file+110

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/ProgressMenuItem.qmlnew file+65

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/RemoveBackground.qmlnew file+55

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/SectionMenuItem.qmlnew file+57

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/SliderMenuItem.qmlnew file+64

This diff is too big to show here.

plugins/Unity/Launcher/gsettings.h → plugins/Unity/IndicatorsLegacy/qml/SwitchMenuItem.qmlrenamed+21−25

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/qml/qmldirnew file+21

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/default_app.svgnew file+42

This diff is too big to show here.

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/default_contact.pngnew file

Binary file not shown.

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/message_sms01_54px.pngnew file

Binary file not shown.

plugins/Unity/IndicatorsLegacy/resources/indicators.qrcnew file+7

This diff is too big to show here.

plugins/Unity/InputInfo/CMakeLists.txtdeleted−38

This diff is too big to show here.

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cppdeleted−296

This diff is too big to show here.

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.hdeleted−96

This diff is too big to show here.

plugins/Unity/InputInfo/plugin.cppdeleted−32

This diff is too big to show here.

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cppdeleted−196

This diff is too big to show here.

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.hdeleted−102

This diff is too big to show here.

plugins/Unity/InputInfo/qinputinfo.cppdeleted−270

This diff is too big to show here.

plugins/Unity/InputInfo/qinputinfo.hdeleted−142

This diff is too big to show here.

plugins/Unity/InputInfo/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/Launcher/CMakeLists.txt+12−29

This diff is too big to show here.

plugins/Unity/Launcher/appdrawermodel.cppdeleted−192

This diff is too big to show here.

plugins/Unity/Launcher/appdrawermodel.hdeleted−64

This diff is too big to show here.

plugins/Unity/Launcher/asadapter.cppdeleted−67

This diff is too big to show here.

plugins/Unity/Launcher/asadapter.hdeleted−46

This diff is too big to show here.

plugins/Unity/Launcher/backend/launcherbackend.cppnew file+353

This diff is too big to show here.

plugins/Unity/Launcher/backend/launcherbackend.hnew file+163

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistentry.cpp → plugins/Unity/Launcher/common/quicklistentry.cpprenamed+4−1

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistentry.h → plugins/Unity/Launcher/common/quicklistentry.hrenamed+4−1

This diff is too big to show here.

plugins/Unity/Launcher/dbusinterface.cppdeleted−226

This diff is too big to show here.

plugins/Unity/Launcher/dbusinterface.hdeleted−49

This diff is too big to show here.

plugins/Unity/Launcher/gsettings.cppdeleted−80

This diff is too big to show here.

plugins/Unity/Launcher/launcheritem.cpp+6−135

This diff is too big to show here.

plugins/Unity/Launcher/launcheritem.h+22−36

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.cpp+73−367

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.h+25−41

This diff is too big to show here.

plugins/Unity/Launcher/plugin.cpp+6−7

This diff is too big to show here.

plugins/Unity/Launcher/plugin.h+1−1

This diff is too big to show here.

plugins/Unity/Launcher/qmldir+1−1

This diff is too big to show here.

plugins/Unity/Launcher/quicklistentry.cppdeleted−85

This diff is too big to show here.

plugins/Unity/Launcher/quicklistentry.hdeleted−56

This diff is too big to show here.

plugins/Unity/Launcher/quicklistmodel.cpp+2−24

This diff is too big to show here.

plugins/Unity/Launcher/quicklistmodel.h+4−7

This diff is too big to show here.

plugins/Unity/Launcher/ualwrapper.cppdeleted−74

This diff is too big to show here.

plugins/Unity/Launcher/ualwrapper.hdeleted−36

This diff is too big to show here.

plugins/Unity/Launcher/xdgwatcher.cppdeleted−129

This diff is too big to show here.

plugins/Unity/Launcher/xdgwatcher.hdeleted−46

This diff is too big to show here.

plugins/Unity/Platform/CMakeLists.txtdeleted−11

This diff is too big to show here.

plugins/Unity/Platform/platform.cppdeleted−66

This diff is too big to show here.

plugins/Unity/Platform/platform.hdeleted−64

This diff is too big to show here.

plugins/Unity/Platform/qmldirdeleted−2

This diff is too big to show here.

plugins/Unity/Session/CMakeLists.txtdeleted−29

This diff is too big to show here.

plugins/Unity/Session/dbusunitysessionservice.cppdeleted−647

This diff is too big to show here.

plugins/Unity/Session/dbusunitysessionservice.hdeleted−377

This diff is too big to show here.

plugins/Unity/Session/orientationlock.cppdeleted−74

This diff is too big to show here.

plugins/Unity/Session/orientationlock.hdeleted−60

This diff is too big to show here.

plugins/Unity/Session/plugin.cppdeleted−48

This diff is too big to show here.

plugins/Unity/Session/qmldirdeleted−3

This diff is too big to show here.

plugins/Unity/abstractfilteroption.cppnew file+25

This diff is too big to show here.

plugins/Unity/abstractfilteroption.hnew file+58

This diff is too big to show here.

plugins/Unity/applicationpreview.cppnew file+100

This diff is too big to show here.

plugins/Unity/applicationpreview.hnew file+66

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.cpp → plugins/Unity/bottombarvisibilitycommunicatorshell.cpprenamed+11−10

This diff is too big to show here.

plugins/Unity/bottombarvisibilitycommunicatorshell.hnew file+53

This diff is too big to show here.

plugins/Unity/categories.cppnew file+238

This diff is too big to show here.

plugins/Unity/categories.hnew file+85

This diff is too big to show here.

plugins/Unity/categoryresults.cppnew file+99

This diff is too big to show here.

plugins/Unity/categoryresults.hnew file+67

This diff is too big to show here.

plugins/Unity/checkoptionfilter.cppnew file+65

This diff is too big to show here.

plugins/Unity/checkoptionfilter.hnew file+57

This diff is too big to show here.

plugins/Unity/filter.cppnew file+129

This diff is too big to show here.

plugins/Unity/filter.hnew file+75

This diff is too big to show here.

plugins/Unity/filteroption.cppnew file+91

This diff is too big to show here.

plugins/Unity/filteroption.hnew file+61

This diff is too big to show here.

plugins/Unity/filters.cppnew file+165

This diff is too big to show here.

plugins/Unity/filters.hnew file+77

This diff is too big to show here.

plugins/Unity/genericoptionsmodel.cppnew file+187

This diff is too big to show here.

plugins/Unity/genericoptionsmodel.hnew file+79

This diff is too big to show here.

tests/mocks/QMenuModel/UnityMenuAction.qml → plugins/Unity/genericpreview.cpprenamed+12−11

This diff is too big to show here.

tests/mocks/QMenuModel/actionstateparser.h → plugins/Unity/genericpreview.hrenamed+22−11

This diff is too big to show here.

plugins/Unity/iconutils.cppnew file+91

This diff is too big to show here.

plugins/WindowManager/WindowManagerGlobal.h → plugins/Unity/iconutils.hrenamed+10−6

This diff is too big to show here.

plugins/Unity/moviepreview.cppnew file+67

This diff is too big to show here.

plugins/Unity/moviepreview.hnew file+60

This diff is too big to show here.

plugins/Unity/multirangefilter.cppnew file+65

This diff is too big to show here.

plugins/Unity/multirangefilter.hnew file+60

This diff is too big to show here.

plugins/Unity/musicpreview.cppnew file+54

This diff is too big to show here.

plugins/Unity/musicpreview.hnew file+62

This diff is too big to show here.

plugins/Unity/plugin.cppnew file+72

This diff is too big to show here.

plugins/Unity/Session/plugin.h → plugins/Unity/plugin.hrenamed+7−6

This diff is too big to show here.

plugins/Unity/preview.cppnew file+188

This diff is too big to show here.

plugins/Unity/preview.hnew file+84

This diff is too big to show here.

plugins/Unity/previewaction.cppnew file+75

This diff is too big to show here.

plugins/Unity/previewaction.hnew file+71

This diff is too big to show here.

plugins/Unity/previewinfohint.cppnew file+67

This diff is too big to show here.

plugins/Unity/previewinfohint.hnew file+58

This diff is too big to show here.

plugins/Unity/qmldirnew file+3

This diff is too big to show here.

plugins/Unity/radiooptionfilter.cppnew file+61

This diff is too big to show here.

plugins/Unity/radiooptionfilter.hnew file+59

This diff is too big to show here.

plugins/Unity/ratingfilteroption.cppnew file+62

This diff is too big to show here.

plugins/Unity/ratingfilteroption.hnew file+53

This diff is too big to show here.

plugins/Unity/ratingoptionsmodel.cppnew file+33

This diff is too big to show here.

plugins/Unity/ratingoptionsmodel.hnew file+33

This diff is too big to show here.

plugins/Unity/ratingsfilter.cppnew file+73

This diff is too big to show here.

plugins/Unity/ratingsfilter.hnew file+66

This diff is too big to show here.

plugins/Unity/scope.cppnew file+334

This diff is too big to show here.

plugins/Unity/scope.hnew file+138

This diff is too big to show here.

plugins/Unity/scopes.cppnew file+176

This diff is too big to show here.

plugins/Unity/scopes.hnew file+94

This diff is too big to show here.

plugins/Unity/showallfilteroption.cppnew file+60

This diff is too big to show here.

tests/mocks/QMenuModel/actiondata.h → plugins/Unity/showallfilteroption.hrenamed+26−29

This diff is too big to show here.

plugins/Unity/signalslist.cppnew file+39

This diff is too big to show here.

plugins/Unity/signalslist.hnew file+38

This diff is too big to show here.

plugins/Unity/socialpreview.cppnew file+87

This diff is too big to show here.

plugins/Unity/socialpreview.hnew file+63

This diff is too big to show here.

plugins/Unity/socialpreviewcomment.cppnew file+63

This diff is too big to show here.

plugins/Unity/socialpreviewcomment.hnew file+57

This diff is too big to show here.

plugins/Unity/unityoptionsmodel.cppnew file+68

This diff is too big to show here.

plugins/Unity/unityoptionsmodel.hnew file+50

This diff is too big to show here.

plugins/Unity/variantutils.cppnew file+42

This diff is too big to show here.

plugins/Unity/variantutils.hnew file+32

This diff is too big to show here.

plugins/Utils/CMakeLists.txt+8−36

This diff is too big to show here.

plugins/Utils/EdgeBarrierSettings.qmldeleted−66

This diff is too big to show here.

plugins/Utils/ElapsedTimer.hdeleted−51

This diff is too big to show here.

plugins/Utils/Style.jsdeleted−37

This diff is too big to show here.

plugins/Utils/Timer.cppdeleted−62

This diff is too big to show here.

plugins/Utils/Timer.hdeleted−78

This diff is too big to show here.

plugins/Utils/URLDispatcher.cppdeleted−80

This diff is too big to show here.

plugins/Utils/URLDispatcher.hdeleted−47

This diff is too big to show here.

plugins/Utils/WindowInputMonitor.cppdeleted−126

This diff is too big to show here.

plugins/Utils/WindowInputMonitor.hdeleted−97

This diff is too big to show here.

plugins/Utils/activefocuslogger.cppdeleted−61

This diff is too big to show here.

plugins/Utils/activefocuslogger.hdeleted−37

This diff is too big to show here.

plugins/Utils/appdrawerproxymodel.cppdeleted−189

This diff is too big to show here.

plugins/Utils/appdrawerproxymodel.hdeleted−87

This diff is too big to show here.

plugins/Utils/applicationpaths.hnew file+38

This diff is too big to show here.

plugins/Utils/applicationsfiltermodel.cppdeleted−101

This diff is too big to show here.

plugins/Utils/applicationsfiltermodel.hdeleted−69

This diff is too big to show here.

plugins/Utils/constants.cppdeleted−32

This diff is too big to show here.

plugins/Utils/constants.hdeleted−43

This diff is too big to show here.

plugins/Utils/deviceconfigparser.cppdeleted−176

This diff is too big to show here.

plugins/Utils/deviceconfigparser.hdeleted−66

This diff is too big to show here.

plugins/Utils/easingcurve.cppdeleted−73

This diff is too big to show here.

plugins/Utils/easingcurve.hdeleted−69

This diff is too big to show here.

plugins/Utils/expressionfiltermodel.cppdeleted−49

This diff is too big to show here.

plugins/Utils/expressionfiltermodel.hdeleted−42

This diff is too big to show here.

plugins/Utils/globalfunctions.cppdeleted−58

This diff is too big to show here.

plugins/Utils/globalfunctions.hdeleted−44

This diff is too big to show here.

plugins/Utils/inputeventgenerator.cppdeleted−34

This diff is too big to show here.

plugins/Utils/inputeventgenerator.hdeleted−40

This diff is too big to show here.

plugins/Utils/inputwatcher.cppdeleted−118

This diff is too big to show here.

plugins/Utils/inputwatcher.hdeleted−58

This diff is too big to show here.

plugins/Utils/plugin.cpp+14−61

This diff is too big to show here.

plugins/Utils/plugin.h+1−1

This diff is too big to show here.

plugins/Utils/qlimitproxymodelqml.cpp+17−17

This diff is too big to show here.

plugins/Utils/qlimitproxymodelqml.h+2−2

This diff is too big to show here.

plugins/Utils/qmldir+1−3

This diff is too big to show here.

plugins/Wizard/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/qsortfilterproxymodelqml.cpprenamed−12

This diff is too big to show here.

plugins/Wizard/Utils/qsortfilterproxymodelqml.h → plugins/Utils/qsortfilterproxymodelqml.hrenamed−1

This diff is too big to show here.

plugins/Utils/quicklistproxymodel.cppdeleted−72

This diff is too big to show here.

plugins/Utils/quicklistproxymodel.hdeleted−52

This diff is too big to show here.

plugins/Utils/qvariantlistmodel.h+6−6

This diff is too big to show here.

plugins/Utils/tabfocusfence.cppdeleted−72

This diff is too big to show here.

plugins/Utils/tabfocusfence.hdeleted−38

This diff is too big to show here.

plugins/Utils/timezoneFormatter.cppdeleted−45

This diff is too big to show here.

plugins/Utils/timezoneFormatter.hdeleted−33

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp → plugins/Utils/ubuntuwindow.cpprenamed+11−10

This diff is too big to show here.

plugins/Lights/LegacyLights.h → plugins/Utils/ubuntuwindow.hrenamed+15−18

This diff is too big to show here.

plugins/Utils/unitymenumodelpaths.cppdeleted−182

This diff is too big to show here.

plugins/Utils/unitymenumodelpaths.hdeleted−82

This diff is too big to show here.

plugins/Utils/unitysortfilterproxymodelqml.cppdeleted−167

This diff is too big to show here.

plugins/Utils/unitysortfilterproxymodelqml.hdeleted−68

This diff is too big to show here.

plugins/Utils/windowinputfilter.cppdeleted−70

This diff is too big to show here.

plugins/Utils/windowinputfilter.hdeleted−58

This diff is too big to show here.

plugins/Utils/windowstatestorage.cppdeleted−383

This diff is too big to show here.

plugins/Utils/windowstatestorage.hdeleted−74

This diff is too big to show here.

plugins/WindowManager/AvailableDesktopArea.cppdeleted−50

This diff is too big to show here.

plugins/WindowManager/AvailableDesktopArea.hdeleted−38

This diff is too big to show here.

plugins/WindowManager/CMakeLists.txtdeleted−26

This diff is too big to show here.

plugins/WindowManager/InputMethodManager.cppdeleted−56

This diff is too big to show here.

plugins/WindowManager/InputMethodManager.hdeleted−55

This diff is too big to show here.

plugins/WindowManager/TopLevelWindowModel.cppdeleted−782

This diff is too big to show here.

plugins/WindowManager/TopLevelWindowModel.hdeleted−308

This diff is too big to show here.

plugins/WindowManager/Window.cppdeleted−277

This diff is too big to show here.

plugins/WindowManager/Window.hdeleted−176

This diff is too big to show here.

plugins/WindowManager/WindowManagerPlugin.cppdeleted−44

This diff is too big to show here.

plugins/WindowManager/WindowManagerPlugin.hdeleted−32

This diff is too big to show here.

plugins/WindowManager/WindowMargins.cppdeleted−74

This diff is too big to show here.

plugins/WindowManager/WindowMargins.hdeleted−59

This diff is too big to show here.

plugins/WindowManager/qmldirdeleted−2

This diff is too big to show here.

plugins/Wizard/50-com.canonical.unity.wizard.pkladeleted−6

This diff is too big to show here.

plugins/Wizard/CMakeLists.txtdeleted−23

This diff is too big to show here.

plugins/Wizard/Changelog.cppdeleted−58

This diff is too big to show here.

plugins/Wizard/Changelog.hdeleted−52

This diff is too big to show here.

plugins/Wizard/LocalePlugin.cppdeleted−291

This diff is too big to show here.

plugins/Wizard/LocalePlugin.hdeleted−58

This diff is too big to show here.

plugins/Wizard/PageList.cppdeleted−127

This diff is too big to show here.

plugins/Wizard/PageList.hdeleted−53

This diff is too big to show here.

plugins/Wizard/Status.cppdeleted−143

This diff is too big to show here.

plugins/Wizard/Status.hdeleted−60

This diff is too big to show here.

plugins/Wizard/System.cppdeleted−182

This diff is too big to show here.

plugins/Wizard/System.hdeleted−75

This diff is too big to show here.

plugins/Wizard/Unity/Application/CMakeLists.txtdeleted−3

This diff is too big to show here.

plugins/Wizard/Unity/Application/qmldirdeleted−2

This diff is too big to show here.

plugins/Wizard/Unity/CMakeLists.txtdeleted−1

This diff is too big to show here.

plugins/Wizard/Utils/CMakeLists.txtdeleted−27

This diff is too big to show here.

plugins/Wizard/Utils/plugin.cppdeleted−41

This diff is too big to show here.

plugins/Wizard/Utils/qmldirdeleted−2

This diff is too big to show here.

plugins/Wizard/keyboardLayoutsModel.cppdeleted−163

This diff is too big to show here.

plugins/Wizard/keyboardLayoutsModel.hdeleted−66

This diff is too big to show here.

plugins/Wizard/main.cppdeleted−93

This diff is too big to show here.

plugins/Wizard/plugin.cppdeleted−38

This diff is too big to show here.

plugins/Wizard/plugin.hdeleted−31

This diff is too big to show here.

plugins/Wizard/qmldirdeleted−2

This diff is too big to show here.

plugins/Wizard/timezonemodel.cppdeleted−244

This diff is too big to show here.

plugins/Wizard/timezonemodel.hdeleted−80

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard-cleanup.confdeleted−20

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard-set-lang.confdeleted−30

This diff is too big to show here.

plugins/Wizard/ubuntu-system-settings-wizard.confdeleted−75

This diff is too big to show here.

po/aa.podeleted−880

This diff is too big to show here.

po/am.podeleted−1406

This diff is too big to show here.

po/ar.po+180−1186

This diff is too big to show here.

po/ast.podeleted−1408

This diff is too big to show here.

po/az.po+133−846

This diff is too big to show here.

po/be.podeleted−1253

This diff is too big to show here.

po/bg.po+147−773

This diff is too big to show here.

po/bn.podeleted−1062

This diff is too big to show here.

po/br.podeleted−1348

This diff is too big to show here.

po/bs.podeleted−1146

This diff is too big to show here.

po/ca.po+171−1372

This diff is too big to show here.

po/ca@valencia.podeleted−1125

This diff is too big to show here.

po/ce.podeleted−816

This diff is too big to show here.

po/ckb.podeleted−870

This diff is too big to show here.

po/co.podeleted−1061

This diff is too big to show here.

po/cs.podeleted−1332

This diff is too big to show here.

po/cy.podeleted−1165

This diff is too big to show here.

po/da.podeleted−1216

This diff is too big to show here.

po/de.po+172−1369

This diff is too big to show here.

po/el.po+169−1247

This diff is too big to show here.

po/en_AU.po+174−1362

This diff is too big to show here.

po/en_GB.po+172−1321

This diff is too big to show here.

po/en_US.podeleted−814

This diff is too big to show here.

po/eo.po+124−793

This diff is too big to show here.

po/es.po+183−1367

This diff is too big to show here.

po/et.podeleted−816

This diff is too big to show here.

po/eu.podeleted−1246

This diff is too big to show here.

po/fa.podeleted−1453

This diff is too big to show here.

po/fi.po+176−1358

This diff is too big to show here.

po/fo.po+133−788

This diff is too big to show here.

po/fr.po+169−1386

This diff is too big to show here.

po/ga.podeleted−1109

This diff is too big to show here.

po/gd.podeleted−1461

This diff is too big to show here.

po/gl.po+176−1356

This diff is too big to show here.

po/gu.podeleted−814

This diff is too big to show here.

po/gv.podeleted−918

This diff is too big to show here.

po/he.po+181−1016

This diff is too big to show here.

po/hi.podeleted−850

This diff is too big to show here.

po/hr.po+177−1303

This diff is too big to show here.

po/hu.po+176−1357

This diff is too big to show here.

po/hy.po+139−835

This diff is too big to show here.

po/ia.podeleted−1409

This diff is too big to show here.

po/id.po+125−878

This diff is too big to show here.

po/is.po+178−921

This diff is too big to show here.

po/it.po+174−1368

This diff is too big to show here.

po/ja.po+129−886

This diff is too big to show here.

po/kk.podeleted−841

This diff is too big to show here.

po/km.podeleted−1071

This diff is too big to show here.

po/kn.po+131−708

This diff is too big to show here.

po/ko.po+178−1168

This diff is too big to show here.

po/ku.podeleted−978

This diff is too big to show here.

po/ky.po+131−708

This diff is too big to show here.

po/lo.podeleted−834

This diff is too big to show here.

po/lt.podeleted−1034

This diff is too big to show here.

po/lv.po+136−1082

This diff is too big to show here.

po/ml.podeleted−871

This diff is too big to show here.

po/mr.podeleted−864

This diff is too big to show here.

po/ms.podeleted−1376

This diff is too big to show here.

po/my.po+133−783

This diff is too big to show here.

po/nb.po+177−1347

This diff is too big to show here.

po/ne.podeleted−834

This diff is too big to show here.

po/nl.po+176−1358

This diff is too big to show here.

po/nn.podeleted−816

This diff is too big to show here.

po/oc.podeleted−1276

This diff is too big to show here.

po/or.podeleted−816

This diff is too big to show here.

po/pa.podeleted−1153

This diff is too big to show here.

po/pl.po+178−1353

This diff is too big to show here.

po/pt.podeleted−1435

This diff is too big to show here.

po/pt_BR.po+169−1146

This diff is too big to show here.

po/ro.po+134−1130

This diff is too big to show here.

po/ru.po+175−1357

This diff is too big to show here.

po/sc.podeleted−904

This diff is too big to show here.

po/shn.podeleted−816

This diff is too big to show here.

po/si.po+124−754

This diff is too big to show here.

po/sk.podeleted−1352

This diff is too big to show here.

po/sl.po+186−1328

This diff is too big to show here.

po/sq.podeleted−1048

This diff is too big to show here.

po/sr.po+165−1322

This diff is too big to show here.

po/sv.po+179−1355

This diff is too big to show here.

po/sw.podeleted−1087

This diff is too big to show here.

po/ta.podeleted−872

This diff is too big to show here.

po/te.po+124−738

This diff is too big to show here.

po/th.po+112−709

This diff is too big to show here.

po/tr.po+172−1345

This diff is too big to show here.

po/ug.po+158−1168

This diff is too big to show here.

po/uk.po+170−1348

This diff is too big to show here.

po/unity8.pot+120−680

This diff is too big to show here.

po/update-unity-pot+5−31

This diff is too big to show here.

po/ur.podeleted−819

This diff is too big to show here.

po/uz.podeleted−816

This diff is too big to show here.

po/vi.podeleted−816

This diff is too big to show here.

po/wo.podeleted−1232

This diff is too big to show here.

po/xh.podeleted−816

This diff is too big to show here.

po/zh_CN.po+180−1305

This diff is too big to show here.

po/zh_HK.podeleted−897

This diff is too big to show here.

po/zh_TW.po+181−1253

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenuItemFactory.qmldeleted−135

This diff is too big to show here.

qml/ApplicationMenus/ApplicationMenusLimits.qmldeleted−24

This diff is too big to show here.

qml/ApplicationMenus/MenuBar.qmldeleted−513

This diff is too big to show here.

qml/ApplicationMenus/MenuItem.qmldeleted−146

This diff is too big to show here.

qml/ApplicationMenus/MenuNavigator.qmldeleted−101

This diff is too big to show here.

qml/ApplicationMenus/MenuPopup.qmldeleted−510

This diff is too big to show here.

qml/ApplicationMenus/RegisteredApplicationMenuModel.qmldeleted−56

This diff is too big to show here.

qml/ApplicationMenus/qmldirdeleted−1

This diff is too big to show here.

qml/CMakeLists.txtdeleted−23

This diff is too big to show here.

qml/Components/Background.qmldeleted−87

This diff is too big to show here.

qml/Components/BrightnessControl.qmldeleted−54

This diff is too big to show here.

qml/Components/Dialogs.qmldeleted−328

This diff is too big to show here.

qml/Components/EdgeBarrier.qmldeleted−114

This diff is too big to show here.

qml/Components/EdgeBarrierController.qmldeleted−74

This diff is too big to show here.

qml/Components/FadingLabel.qmldeleted−42

This diff is too big to show here.

qml/Components/Flickable.qmldeleted−24

This diff is too big to show here.

qml/Components/FloatingFlickable.qmldeleted−63

This diff is too big to show here.

qml/Components/GridView.qmldeleted−24

This diff is too big to show here.

qml/Components/Handle.qmldeleted−44

This diff is too big to show here.

qml/Components/InputMethod.qmldeleted−58

This diff is too big to show here.

qml/Components/ItemGrabber.qmldeleted−86

This diff is too big to show here.

qml/Components/KeyboardShortcutsOverlay.qmldeleted−336

This diff is too big to show here.

qml/Components/KeymapSwitcher.qmldeleted−102

This diff is too big to show here.

qml/Components/LazyImage.qmldeleted−202

This diff is too big to show here.

qml/Components/ListView.qmldeleted−24

This diff is too big to show here.

qml/Components/ListViewOSKScroller.qmldeleted−53

This diff is too big to show here.

qml/Components/Lockscreen.qmldeleted−256

This diff is too big to show here.

qml/Components/MediaServices/MediaServices.qmldeleted−386

This diff is too big to show here.

qml/Components/MediaServices/MediaServicesControls.qmldeleted−192

This diff is too big to show here.

qml/Components/MediaServices/MediaServicesHeader.qmldeleted−71

This diff is too big to show here.

qml/Components/MediaServices/VideoPlayer.qmldeleted−155

This diff is too big to show here.

qml/Components/MediaServices/VideoPlayerControls.qmldeleted−158

This diff is too big to show here.

qml/Components/ModeSwitchWarningDialog.qmldeleted−101

This diff is too big to show here.

qml/Components/NotificationAudio.qmldeleted−60

This diff is too big to show here.

qml/Components/Orientations.qmldeleted−57

This diff is too big to show here.

qml/Components/PanelState/PanelState.qmldeleted−36

This diff is too big to show here.

qml/Components/PanelState/qmldirdeleted−1

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qmldeleted−150

This diff is too big to show here.

qml/Components/PhysicalKeysMapper.qmldeleted−163

This diff is too big to show here.

qml/Components/PinLockscreen.qmldeleted−258

This diff is too big to show here.

qml/Components/PinPadButton.qmldeleted−78

This diff is too big to show here.

qml/Components/Rating.qmldeleted−49

This diff is too big to show here.

qml/Components/RatingStyle.qmldeleted−50

This diff is too big to show here.

qml/Components/ScrollCalculator.qmldeleted−100

This diff is too big to show here.

qml/Components/SearchHistoryModel/qmldirdeleted−1

This diff is too big to show here.

qml/Components/SharingPicker.qmldeleted−102

This diff is too big to show here.

qml/Components/ShellDialog.qmldeleted−68

This diff is too big to show here.

qml/Components/VirtualTouchPad.qmldeleted−406

This diff is too big to show here.

qml/Components/VolumeControl.qmldeleted−63

This diff is too big to show here.

qml/Components/Wallpaper.qmldeleted−96

This diff is too big to show here.

qml/Components/WallpaperResolver.qmldeleted−60

This diff is too big to show here.

qml/Components/WindowControlButtons.qmldeleted−121

This diff is too big to show here.

qml/Components/ZoomableImage.qmldeleted−157

This diff is too big to show here.

qml/Components/flickableUtils.jsdeleted−28

This diff is too big to show here.

qml/Components/graphics/close@20.pngdeleted

Binary file not shown.

qml/Components/graphics/icon_star_empty@20.pngdeleted

Binary file not shown.

qml/Components/graphics/icon_star_full@20.pngdeleted

Binary file not shown.

qml/Components/graphics/icon_star_half@20.pngdeleted

Binary file not shown.

qml/Components/graphics/icon_star_off@20.pngdeleted

Binary file not shown.

qml/Components/graphics/icon_star_on@20.pngdeleted

Binary file not shown.

qml/Components/graphics/non-selected@18.pngdeleted

Binary file not shown.

qml/Components/graphics/window-close.svgdeleted−164

This diff is too big to show here.

qml/Components/graphics/window-maximize.svgdeleted−164

This diff is too big to show here.

qml/Components/graphics/window-minimize.svgdeleted−164

This diff is too big to show here.

qml/Components/graphics/window-window.svgdeleted−41

This diff is too big to show here.

qml/DeviceConfiguration.qmldeleted−161

This diff is too big to show here.

qml/DisabledScreenNotice.qmldeleted−81

This diff is too big to show here.

qml/Greeter/ButtonPrompt.qmldeleted−51

This diff is too big to show here.

qml/Greeter/Circle.qmldeleted−57

This diff is too big to show here.

qml/Greeter/Clock.qmldeleted−91

This diff is too big to show here.

qml/Greeter/CoverPage.qmldeleted−271

This diff is too big to show here.

qml/Greeter/DelayedLockscreen.qmldeleted−86

This diff is too big to show here.

qml/Greeter/FullLightDMImpl.qmldeleted−31

This diff is too big to show here.

qml/Greeter/Greeter.qmldeleted−632

This diff is too big to show here.

qml/Greeter/GreeterPrompt.qmldeleted−127

This diff is too big to show here.

qml/Greeter/GreeterView.qmldeleted−534

This diff is too big to show here.

qml/Greeter/IntegratedLightDMImpl.qmldeleted−30

This diff is too big to show here.

qml/Greeter/LightDMService.qmldeleted−54

This diff is too big to show here.

qml/Greeter/LoginList.qmldeleted−292

This diff is too big to show here.

qml/Greeter/PinPrompt.qmldeleted−184

This diff is too big to show here.

qml/Greeter/PromptList.qmldeleted−151

This diff is too big to show here.

qml/Greeter/SessionIcon.qmldeleted−47

This diff is too big to show here.

qml/Greeter/SessionsList.qmldeleted−205

This diff is too big to show here.

qml/Greeter/ShimGreeter.qmldeleted−47

This diff is too big to show here.

qml/Greeter/TextPrompt.qmldeleted−198

This diff is too big to show here.

qml/Greeter/graphics/dot_empty.pngdeleted

Binary file not shown.

qml/Greeter/graphics/dot_filled.pngdeleted

Binary file not shown.

qml/Greeter/graphics/dot_pointer.pngdeleted

Binary file not shown.

qml/Greeter/graphics/icon_arrow.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/gnome_badge.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/kde_badge.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/recovery_console_badge.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/ubuntu_badge.pngdeleted

Binary file not shown.

qml/Greeter/graphics/session_icons/unknown_badge.pngdeleted

Binary file not shown.

qml/Greeter/qmldirdeleted−1

This diff is too big to show here.

qml/Launcher/BackgroundBlur.qmldeleted−81

This diff is too big to show here.

qml/Launcher/Drawer.qmldeleted−413

This diff is too big to show here.

qml/Launcher/DrawerGridView.qmldeleted−85

This diff is too big to show here.

qml/Launcher/Launcher.qmldeleted−661

This diff is too big to show here.

qml/Launcher/LauncherPanel.qmldeleted−961

This diff is too big to show here.

qml/Launcher/PullToRefreshScopeStyle.qmldeleted−83

This diff is too big to show here.

qml/Launcher/Tooltip.qmldeleted−72

This diff is too big to show here.

qml/Launcher/graphics/divider-line.pngdeleted

Binary file not shown.

qml/Launcher/graphics/focused_app_arrow@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/home.svgdeleted−243

This diff is too big to show here.

qml/Launcher/graphics/quicklist_tooltip@30.pngdeleted

Binary file not shown.

qml/Notifications/Notification.qmldeleted−600

This diff is too big to show here.

qml/Notifications/NotificationButton.qmldeleted−73

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qmldeleted−230

This diff is too big to show here.

qml/Notifications/Notifications.qmldeleted−115

This diff is too big to show here.

qml/Notifications/OptionToggle.qmldeleted−125

This diff is too big to show here.

qml/Notifications/ShapedIcon.qmldeleted−43

This diff is too big to show here.

qml/Notifications/SwipeToAct.qmldeleted−275

This diff is too big to show here.

qml/OrientedShell.qmldeleted−336

This diff is too big to show here.

qml/Panel/ActiveCallHint.qmldeleted−211

This diff is too big to show here.

qml/Panel/FakePanelMenu.qmldeleted−26

This diff is too big to show here.

qml/Panel/Indicators/IndicatorItem.qmldeleted−310

This diff is too big to show here.

qml/Panel/Indicators/IndicatorMenuItemFactory.qmldeleted−1113

This diff is too big to show here.

qml/Panel/Indicators/IndicatorsLight.qmldeleted−234

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qmldeleted−244

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorRepresentation.qmldeleted−121

This diff is too big to show here.

qml/Panel/MenuContent.qmldeleted−83

This diff is too big to show here.

qml/Panel/Panel.qmldeleted−522

This diff is too big to show here.

qml/Panel/PanelBar.qmldeleted−330

This diff is too big to show here.

qml/Panel/PanelItemRow.qmldeleted−270

This diff is too big to show here.

qml/Panel/PanelMenu.qmldeleted−414

This diff is too big to show here.

qml/Panel/PanelMenuPage.qmldeleted−226

This diff is too big to show here.

qml/Panel/PanelVelocityCalculator.qmldeleted−54

This diff is too big to show here.

qml/Panel/graphics/rectangular_dropshadow@30.pngdeleted

Binary file not shown.

qml/Rotation/HalfLoopRotationAnimation.qmldeleted−47

This diff is too big to show here.

qml/Rotation/ImmediateRotationAction.qmldeleted−34

This diff is too big to show here.

qml/Rotation/NinetyRotationAnimation.qmldeleted−88

This diff is too big to show here.

qml/Rotation/RotationStates.qmldeleted−289

This diff is too big to show here.

qml/Rotation/UpdateShellTransformations.qmldeleted−42

This diff is too big to show here.

qml/Shell.qmldeleted−951

This diff is too big to show here.

qml/Stage/ApplicationWindow.qmldeleted−416

This diff is too big to show here.

qml/Stage/ChildWindow.qmldeleted−203

This diff is too big to show here.

qml/Stage/ChildWindowRepeater.qmldeleted−39

This diff is too big to show here.

qml/Stage/ChildWindowTree.qmldeleted−138

This diff is too big to show here.

qml/Stage/DecoratedWindow.qmldeleted−319

This diff is too big to show here.

qml/Stage/FakeMaximizeDelegate.qmldeleted−233

This diff is too big to show here.

qml/Stage/MainViewStyle.qmldeleted−87

This diff is too big to show here.

qml/Stage/MoveHandler.qmldeleted−201

This diff is too big to show here.

qml/Stage/OrientationChangeAnimation.qmldeleted−265

This diff is too big to show here.

qml/Stage/PromptSurfaceAnimations.qmldeleted−80

This diff is too big to show here.

qml/Stage/SideStage.qmldeleted−121

This diff is too big to show here.

qml/Stage/Splash.qmldeleted−150

This diff is too big to show here.

qml/Stage/Spread/BezierCurve.qmldeleted−45

This diff is too big to show here.

qml/Stage/Spread/KeySpline.jsdeleted−66

This diff is too big to show here.

qml/Stage/Spread/MathUtils.jsdeleted−95

This diff is too big to show here.

qml/Stage/Spread/OpacityMask.qmldeleted−82

This diff is too big to show here.

qml/Stage/Spread/Spread.qmldeleted−173

This diff is too big to show here.

qml/Stage/Spread/SpreadDelegateInputArea.qmldeleted−189

This diff is too big to show here.

qml/Stage/Spread/SpreadMaths.qmldeleted−78

This diff is too big to show here.

qml/Stage/Spread/StagedRightEdgeMaths.qmldeleted−174

This diff is too big to show here.

qml/Stage/Spread/WindowedRightEdgeMaths.qmldeleted−96

This diff is too big to show here.

qml/Stage/Spread/cubic-bezier.jsdeleted−39

This diff is too big to show here.

qml/Stage/Stage.qmldeleted−2241

This diff is too big to show here.

qml/Stage/StageMaths.qmldeleted−93

This diff is too big to show here.

qml/Stage/StagedFullscreenPolicy.qmldeleted−50

This diff is too big to show here.

qml/Stage/SurfaceContainer.qmldeleted−108

This diff is too big to show here.

qml/Stage/TabletSideStageTouchGesture.qmldeleted−157

This diff is too big to show here.

qml/Stage/WindowControlsOverlay.qmldeleted−254

This diff is too big to show here.

qml/Stage/WindowDecoration.qmldeleted−163

This diff is too big to show here.

qml/Stage/WindowInfoItem.qmldeleted−69

This diff is too big to show here.

qml/Stage/WindowResizeArea.qmldeleted−300

This diff is too big to show here.

qml/Stage/WindowStateSaver.qmldeleted−64

This diff is too big to show here.

qml/Stage/WindowedFullscreenPolicy.qmldeleted−31

This diff is too big to show here.

qml/Stage/graphics/PageHeaderBaseDividerBottom@18.pngdeleted

Binary file not shown.

qml/Stage/graphics/PageHeaderBaseDividerLight@18.pngdeleted

Binary file not shown.

qml/Stage/graphics/PageHeaderBaseDividerLight@18.scideleted−5

This diff is too big to show here.

qml/Stage/graphics/arrows-centre.pngdeleted

Binary file not shown.

qml/Stage/graphics/arrows.pngdeleted

Binary file not shown.

qml/Stage/graphics/sidestage_drag.svgdeleted−207

This diff is too big to show here.

qml/Stage/graphics/sidestage_handle@20.pngdeleted

Binary file not shown.

qml/Stage/graphics/sidestage_open.svgdeleted−181

This diff is too big to show here.

qml/Stage/graphics/window-close.svgdeleted−64

This diff is too big to show here.

qml/Tutorial/InactivityTimer.qmldeleted−78

This diff is too big to show here.

qml/Tutorial/Tutorial.qmldeleted−105

This diff is too big to show here.

qml/Tutorial/TutorialContent.qmldeleted−225

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qmldeleted−54

This diff is too big to show here.

qml/Tutorial/TutorialLeftLong.qmldeleted−56

This diff is too big to show here.

qml/Tutorial/TutorialPage.qmldeleted−121

This diff is too big to show here.

qml/Tutorial/TutorialRight.qmldeleted−61

This diff is too big to show here.

qml/Tutorial/TutorialTop.qmldeleted−60

This diff is too big to show here.

qml/Tutorial/graphics/arrow.svgdeleted−19

This diff is too big to show here.

qml/Tutorial/graphics/background1.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/background2.pngdeleted

Binary file not shown.

qml/Wizard/CheckableSetting.qmldeleted−92

This diff is too big to show here.

qml/Wizard/Components/InputMethod.qmldeleted−113

This diff is too big to show here.

qml/Wizard/Page.qmldeleted−340

This diff is too big to show here.

qml/Wizard/Pages.qmldeleted−269

This diff is too big to show here.

qml/Wizard/Pages/10-welcome-update.qmldeleted−137

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qmldeleted−197

This diff is too big to show here.

qml/Wizard/Pages/11-changelog.qmldeleted−95

This diff is too big to show here.

qml/Wizard/Pages/20-keyboard.qmldeleted−161

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qmldeleted−219

This diff is too big to show here.

qml/Wizard/Pages/50-timezone.qmldeleted−278

This diff is too big to show here.

qml/Wizard/Pages/60-account.qmldeleted−76

This diff is too big to show here.

qml/Wizard/Pages/70-passwd-type.qmldeleted−168

This diff is too big to show here.

qml/Wizard/Pages/78-firmware-update.qml.disableddeleted−246

This diff is too big to show here.

qml/Wizard/Pages/79-system-update.qmldeleted−148

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qmldeleted−137

This diff is too big to show here.

qml/Wizard/Pages/data/Desktop_header_bkg.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/Desktop_splash_screen_bkg.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/Phone_header_bkg.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/Phone_splash_screen_bkg.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/Tick@30.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/map.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/pin.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-1.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-10.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-11.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-2.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-6.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-7.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-8.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_0.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_1.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_11.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.75.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_13.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_2.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.75.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_7.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.5.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.pngdeleted

Binary file not shown.

qml/Wizard/Pages/passcode-confirm.qmldeleted−69

This diff is too big to show here.

qml/Wizard/Pages/passcode-desktop.qmldeleted−159

This diff is too big to show here.

qml/Wizard/Pages/passcode-set.qmldeleted−78

This diff is too big to show here.

qml/Wizard/Pages/password-set.qmldeleted−158

This diff is too big to show here.

qml/Wizard/Pages/sim.qmldeleted−108

This diff is too big to show here.

qml/Wizard/PasswordMeter.qmldeleted−108

This diff is too big to show here.

qml/Wizard/StackButton.qmldeleted−42

This diff is too big to show here.

qml/Wizard/Wizard.qmldeleted−58

This diff is too big to show here.

qml/Wizard/WizardItemSelector.qmldeleted−129

This diff is too big to show here.

qml/graphics/dropshadow2gu@30.pngdeleted

Binary file not shown.

qml/graphics/dropshadow2gu@30.scideleted−5

This diff is too big to show here.

qml/graphics/dropshadow_left@20.pngdeleted

Binary file not shown.

qml/graphics/dropshadow_right@20.pngdeleted

Binary file not shown.

runnew file+74

This diff is too big to show here.

run_on_devicenew file+146

This diff is too big to show here.

runtests.sh+14−5

This diff is too big to show here.

src/ApplicationArguments.hdeleted−58

This diff is too big to show here.

src/CMakeLists.txt+1−64

This diff is too big to show here.

src/CachingNetworkManagerFactory.cppdeleted−54

This diff is too big to show here.

src/CachingNetworkManagerFactory.hdeleted−47

This diff is too big to show here.

src/DebuggingController.cppdeleted−92

This diff is too big to show here.

src/DebuggingController.hdeleted−57

This diff is too big to show here.

src/MouseTouchAdaptor.cppdeleted−419

This diff is too big to show here.

src/Panel/CMakeLists.txtnew file+1

This diff is too big to show here.

src/Panel/Indicators/CMakeLists.txtnew file+2

This diff is too big to show here.

tools/indicatorsclient/CMakeLists.txt → src/Panel/Indicators/client/CMakeLists.txtrenamed+7−1

This diff is too big to show here.

tools/indicatorsclient/indicatorsclient.cpp → src/Panel/Indicators/client/indicatorsclient.cpprenamed+50−22

This diff is too big to show here.

tools/indicatorsclient/indicatorsclient.h → src/Panel/Indicators/client/indicatorsclient.hrenamed+2

This diff is too big to show here.

tools/indicatorsclient/main.cpp → src/Panel/Indicators/client/main.cpprenamed

The content is the same.

src/Panel/Indicators/servicefiles/CMakeLists.txtnew file+14

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.indicator.messagesnew file+10

This diff is too big to show here.

src/SecondaryWindow.cppdeleted−40

This diff is too big to show here.

src/ShellApplication.cppdeleted−231

This diff is too big to show here.

src/ShellApplication.hdeleted−61

This diff is too big to show here.

src/ShellView.cppdeleted−85

This diff is too big to show here.

src/UnityCommandLineParser.cppdeleted−130

This diff is too big to show here.

src/UnityCommandLineParser.hdeleted−60

This diff is too big to show here.

src/UnixSignalHandler.cppdeleted−139

This diff is too big to show here.

src/UnixSignalHandler.hdeleted−54

This diff is too big to show here.

src/libunity8-private/CMakeLists.txtdeleted−27

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.cppdeleted−100

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.hdeleted−70

This diff is too big to show here.

src/libunity8-private/unitydbusobject.cppdeleted−86

This diff is too big to show here.

src/libunity8-private/unitydbusobject.hdeleted−46

This diff is too big to show here.

src/libunity8-private/unitydbusvirtualobject.cppdeleted−83

This diff is too big to show here.

src/libunity8-private/unitydbusvirtualobject.hdeleted−47

This diff is too big to show here.

src/main.cppdeleted−67

This diff is too big to show here.

src/qmldebuggerutils.hdeleted−33

This diff is too big to show here.

tests/CMakeLists.txt+9−148

This diff is too big to show here.

tests/autopilot/setup.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/__init__.py+4−60

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/__init__.py−49

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+84−89

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.pydeleted−51

This diff is too big to show here.

tests/autopilot/unity8/fixture_setup.pydeleted−329

This diff is too big to show here.

tests/autopilot/unity8/greeter/__init__.pydeleted−97

This diff is too big to show here.

tests/autopilot/unity8/greeter/tests/test_args.pydeleted−49

This diff is too big to show here.

tests/autopilot/unity8/indicators/__init__.pydeleted−203

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/__init__.pydeleted−42

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_action_latency.pydeleted−237

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_display_indicator.pydeleted−52

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.pydeleted−88

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/__init__.pynew file+8

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/emulators/__init__.pynew file+31

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/emulators/common.pynew file+14

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/emulators/main_window.pynew file+27

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/tests/__init__.pynew file+91

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/tests/test_battery.pynew file+114

This diff is too big to show here.

tests/autopilot/unity8/launcher.pydeleted−66

This diff is too big to show here.

tests/autopilot/unity8/process_helpers.pydeleted−191

This diff is too big to show here.

tests/autopilot/unity8/sensors.pydeleted−93

This diff is too big to show here.

tests/autopilot/unity8/shell/__init__.py+14−231

This diff is too big to show here.

tests/autopilot/unity8/greeter/tests/__init__.py → tests/autopilot/unity8/shell/emulators/__init__.pyrenamed+5−8

This diff is too big to show here.

tests/autopilot/unity8/shell/create_interactive_notification.py → tests/autopilot/unity8/shell/emulators/create_interactive_notification.pyrenamed+4−3

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.pynew file+52

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/greeter.pynew file+43

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/hud.pynew file+80

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators.py → tests/autopilot/unity8/shell/emulators/launcher.pyrenamed+15−27

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.pynew file+92

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.pydeleted−65

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+103−218

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_helpers.pydeleted−44

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_hud.pynew file+150

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+83−51

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+209−217

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_rotation.pydeleted−113

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_system_integration.pydeleted−48

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_upstart.pydeleted−137

This diff is too big to show here.

tests/copyright/CMakeLists.txt+1−1

This diff is too big to show here.

tests/copyright/check_copyright.sh+4−35

This diff is too big to show here.

tests/data/unity/backgrounds/20x30.pngdeleted

Binary file not shown.

tests/data/unity/backgrounds/black.pngdeleted

Binary file not shown.

tests/data/unity/backgrounds/blue.png

Binary file not shown.

tests/data/unity/backgrounds/red.png

Binary file not shown.

tests/data/unity/indicators/com.canonical.indicator.fake1+4−4

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake2+4−4

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake3+4−4

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake4+4−4

This diff is too big to show here.

tests/graphics/applicationIcons/browser@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/calendar@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/camera@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/contacts-app@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/dash@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/dialer-app@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/evernote@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/facebook@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/gallery@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/gmail@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/libreoffice@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/map@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/messages-app@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/notepad@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/pinterest@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/soundcloud@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/system-settings@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/twitter@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/weather@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/wikipedia@18.pngdeleted

Binary file not shown.

tests/graphics/applicationIcons/youtube@18.pngdeleted

Binary file not shown.

tests/graphics/avatars/amanda@12.pngdeleted

Binary file not shown.

tests/graphics/avatars/anna_olsson@12.pngdeleted

Binary file not shown.

tests/graphics/avatars/funky@12.pngdeleted

Binary file not shown.

tests/graphics/clock@18.pngdeleted

Binary file not shown.

tests/imports/CMakeLists.txtdeleted−5

This diff is too big to show here.

tests/imports/check_imports.pydeleted−183

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+12−161

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+15−94

This diff is too big to show here.

tests/mocks/AccountsService/CMakeLists.txt+12−15

This diff is too big to show here.

tests/mocks/AccountsService/plugin.cpp+1−2

This diff is too big to show here.

tests/mocks/AccountsService/plugin.h+1−1

This diff is too big to show here.

tests/mocks/AccountsService/qmldir−1

This diff is too big to show here.

tests/mocks/Biometryd/CMakeLists.txtdeleted−14

This diff is too big to show here.

tests/mocks/Biometryd/MockBiometryd.cppdeleted−43

This diff is too big to show here.

tests/mocks/Biometryd/MockBiometryd.hdeleted−50

This diff is too big to show here.

tests/mocks/Biometryd/MockDevice.cppdeleted−29

This diff is too big to show here.

tests/mocks/Biometryd/MockDevice.hdeleted−40

This diff is too big to show here.

tests/mocks/Biometryd/MockIdentifier.hdeleted−36

This diff is too big to show here.

tests/mocks/Biometryd/MockOperation.cppdeleted−56

This diff is too big to show here.

tests/mocks/Biometryd/MockOperation.hdeleted−47

This diff is too big to show here.

tests/mocks/Biometryd/plugin.cppdeleted−41

This diff is too big to show here.

tests/mocks/Biometryd/plugin.hdeleted−31

This diff is too big to show here.

tests/mocks/Biometryd/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/CMakeLists.txt+2−45

This diff is too big to show here.

tests/mocks/Cursor/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Cursor/Cursor.qmldeleted−34

This diff is too big to show here.

tests/mocks/Cursor/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/GSettings.1.0/CMakeLists.txt+6−2

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.cpp+20−335

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.h+13−103

This diff is too big to show here.

tests/mocks/GSettings.1.0/plugin.h+1−1

This diff is too big to show here.

tests/mocks/GSettings.1.0/qmldir−1

This diff is too big to show here.

tests/mocks/HudClient/CMakeLists.txtnew file+41

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.h → tests/mocks/HudClient/fake_hud_plugin.cpprenamed+18−22

This diff is too big to show here.

tests/mocks/LightDMController/plugin.h → tests/mocks/HudClient/fake_hud_plugin.hrenamed+8−6

This diff is too big to show here.

tests/mocks/HudClient/fake_libhud_client.cppnew file+240

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.cppnew file+93

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.hnew file+64

This diff is too big to show here.

tests/mocks/HudClient/qmldirnew file+1

This diff is too big to show here.

tests/mocks/LightDMController/CMakeLists.txtdeleted−14

This diff is too big to show here.

tests/mocks/LightDMController/plugin.cppdeleted−35

This diff is too big to show here.

tests/mocks/LightDMController/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Lights/CMakeLists.txtdeleted−8

This diff is too big to show here.

tests/mocks/Lights/Lights.cppdeleted−84

This diff is too big to show here.

tests/mocks/Lights/Lights.hdeleted−66

This diff is too big to show here.

tests/mocks/Lights/plugin.hdeleted−32

This diff is too big to show here.

tests/mocks/Lights/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/MeeGo/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/CMakeLists.txtdeleted−11

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qmldeleted−53

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.cppdeleted−90

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.hdeleted−61

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cppdeleted−66

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.hdeleted−49

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.cppdeleted−35

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Powerd/CMakeLists.txt+13−2

This diff is too big to show here.

tests/mocks/Powerd/Powerd.cpp+1−15

This diff is too big to show here.

tests/mocks/Powerd/Powerd.h+8−17

This diff is too big to show here.

tests/mocks/Powerd/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Powerd/qmldir−1

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+8−22

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+5−30

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cppdeleted−43

This diff is too big to show here.

tests/mocks/QMenuModel/qmldir−4

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.cppdeleted−310

This diff is too big to show here.

tests/mocks/QMenuModel/unitymenumodel.hdeleted−115

This diff is too big to show here.

tests/mocks/QtMultimedia/CMakeLists.txtdeleted−15

This diff is too big to show here.

tests/mocks/QtMultimedia/VideoSurface.qmldeleted−111

This diff is too big to show here.

tests/mocks/QtMultimedia/declarativeplaylist.cppdeleted−73

This diff is too big to show here.

tests/mocks/QtMultimedia/declarativeplaylist.hdeleted−54

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.cppdeleted−319

This diff is too big to show here.

tests/mocks/QtMultimedia/mediaplayer.hdeleted−224

This diff is too big to show here.

tests/mocks/QtMultimedia/plugin.cppdeleted−35

This diff is too big to show here.

tests/mocks/QtMultimedia/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/QtMultimedia/videooutput.cppdeleted−127

This diff is too big to show here.

tests/mocks/QtMultimedia/videooutput.hdeleted−52

This diff is too big to show here.

tests/mocks/SessionBroadcast/CMakeLists.txtdeleted−8

This diff is too big to show here.

tests/mocks/SessionBroadcast/plugin.cppdeleted−31

This diff is too big to show here.

tests/mocks/SessionBroadcast/plugin.hdeleted−32

This diff is too big to show here.

tests/mocks/SessionBroadcast/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/SessionManager/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/Biometryd/MockIdentifier.cpp → tests/mocks/SessionManager/SessionManager.cpprenamed+12−7

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.h → tests/mocks/SessionManager/SessionManager.hrenamed+11−9

This diff is too big to show here.

plugins/Unity/Connectivity/plugin.cpp → tests/mocks/SessionManager/plugin.cpprenamed+9−8

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.h → tests/mocks/SessionManager/plugin.hrenamed+6−6

This diff is too big to show here.

tests/mocks/SessionManager/qmldirnew file+2

This diff is too big to show here.

tests/mocks/UInput/CMakeLists.txtdeleted−7

This diff is too big to show here.

tests/mocks/UInput/mockuinput.cppdeleted−73

This diff is too big to show here.

tests/mocks/UInput/mockuinput.hdeleted−63

This diff is too big to show here.

tests/mocks/UInput/plugin.cppdeleted−26

This diff is too big to show here.

tests/mocks/UInput/plugin.hdeleted−32

This diff is too big to show here.

tests/mocks/UInput/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt−5

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/CMakeLists.txtdeleted−10

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.cppdeleted−70

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.hdeleted−74

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.cppdeleted−47

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.hdeleted−35

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+10−2

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp+1−3

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h+1−2

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/qmldir−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txtdeleted−5

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qmldeleted−24

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txtdeleted−10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.hdeleted−50

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cppdeleted−26

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hdeleted−31

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qmldeleted−37

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Update/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/CMakeLists.txtdeleted−14

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/ContactWatcherData.cppdeleted−43

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/ContactWatcherData.hdeleted−46

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallEntry.cppdeleted−91

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallEntry.hdeleted−65

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallManager.cppdeleted−80

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallManager.hdeleted−60

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockContactWatcher.cppdeleted−50

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockContactWatcher.hdeleted−49

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cppdeleted−62

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.hdeleted−58

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/plugin.cppdeleted−52

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/plugin.hdeleted−37

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/Thumbnailer/qmldirdeleted−4

This diff is too big to show here.

tests/mocks/Ubuntu/Web/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Ubuntu/Web/qmldirdeleted−4

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationImage.cppnew file+123

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationImage.hnew file+79

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+47−362

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+62−123

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+239−323

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h+66−56

This diff is too big to show here.

tests/mocks/Unity/Application/CMakeLists.txt+25−23

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qml → tests/mocks/Unity/Application/InputFilterArea.qmlrenamed+3−3

This diff is too big to show here.

tests/mocks/Unity/Application/MirMock.cppdeleted−62

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.cppdeleted−559

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.hdeleted−237

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cppdeleted−415

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.hdeleted−138

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.cppdeleted−136

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceListModel.hdeleted−54

This diff is too big to show here.

plugins/Wizard/Unity/Application/OSKController.qml → tests/mocks/Unity/Application/OSKController.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/ObjectListModel.hdeleted−108

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.cppdeleted−281

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.hdeleted−116

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.cppdeleted−58

This diff is too big to show here.

tests/mocks/Unity/Application/VirtualKeyboard.hdeleted−37

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.cpp+9−38

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.h+1−2

This diff is too big to show here.

tests/mocks/Unity/Application/qmldir+2−1

This diff is too big to show here.

tests/mocks/Unity/Application/resources/Kate.qmldeleted−49

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateDialog.qmldeleted−48

This diff is too big to show here.

tests/mocks/Unity/Application/resources/MirSurfaceItem.qmldeleted−126

This diff is too big to show here.

tests/mocks/Unity/Application/resources/VirtualKeyboard.qmldeleted−41

This diff is too big to show here.

tests/mocks/Unity/Application/resources/screenshots/browser@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/camera@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/dialer@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/facebook@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/gallery@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/gmail-webapp.svgdeleted−343

This diff is too big to show here.

tests/mocks/Unity/Application/resources/screenshots/libreoffice@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/map@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/music@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/twitter@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/ubuntu-weather-app.svgdeleted−201

This diff is too big to show here.

tests/mocks/Unity/Application/resources/screenshots/unity8-dash@12.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/screenshots/vkb_portrait.pngdeleted

Binary file not shown.

tests/mocks/Unity/Application/resources/surfaces.qrcdeleted−23

This diff is too big to show here.

tests/mocks/Unity/Application/resources/vkb_portrait.pngdeleted

Binary file not shown.

tests/mocks/Unity/ApplicationMenu/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cppdeleted−47

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.hdeleted−41

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/plugin.cppdeleted−42

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/plugin.hdeleted−32

This diff is too big to show here.

tests/mocks/Unity/ApplicationMenu/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+42−5

This diff is too big to show here.

tests/mocks/Unity/Connectivity/CMakeLists.txtdeleted−10

This diff is too big to show here.

tests/mocks/Unity/Connectivity/MockConnectivity.cppdeleted−27

This diff is too big to show here.

tests/mocks/Unity/Connectivity/plugin.hdeleted−31

This diff is too big to show here.

tests/mocks/Unity/Connectivity/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/Unity/Indicators/ActionRootState.qmldeleted−46

This diff is too big to show here.

tests/mocks/Unity/Indicators/CMakeLists.txt+24−13

This diff is too big to show here.

tests/mocks/Unity/Indicators/IndicatorsModel.qml+51−237

This diff is too big to show here.

tests/mocks/Unity/Indicators/ModelActionRootState.qmldeleted−81

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cppdeleted−157

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.hdeleted−70

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.jsdeleted−1328

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeplugin.cpp+3−24

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeplugin.h+1−1

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cppdeleted−59

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeunitymenumodelcache.hdeleted−45

This diff is too big to show here.

tests/mocks/Unity/Indicators/indicators_fake.qrcnew file+14

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/FakeMenuPage.qmlnew file+37

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page1.qmlnew file+36

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page2.qmlnew file+36

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page3.qmlnew file+36

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page4.qmlnew file+36

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page5.qmlnew file+36

This diff is too big to show here.

plugins/Lights/android-hardware.h → tests/mocks/Unity/Indicators/qml/fake_menu_widget1.qmlrenamed+8−4

This diff is too big to show here.

tests/mocks/Biometryd/MockObserver.cpp → tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qmlrenamed+8−5

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/QLightDM/Greeter → tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qmlrenamed+8−2

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel → tests/mocks/Unity/Indicators/qml/fake_menu_widget4.qmlrenamed+8−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_widget5.qmlnew file+23

This diff is too big to show here.

tests/mocks/Unity/Indicators/qmldir+1−3

This diff is too big to show here.

tests/mocks/Unity/InputInfo/CMakeLists.txtdeleted−31

This diff is too big to show here.

tests/mocks/Unity/InputInfo/mockcontroller.cppdeleted−35

This diff is too big to show here.

tests/mocks/Unity/InputInfo/mockcontroller.hdeleted−34

This diff is too big to show here.

tests/mocks/Unity/InputInfo/plugin.cppdeleted−46

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cppdeleted−56

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock_p.hdeleted−58

This diff is too big to show here.

tests/mocks/Unity/InputInfo/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Unity/Launcher/CMakeLists.txt+11−7

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.cppdeleted−98

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockAppDrawerModel.hdeleted−43

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1−79

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h+17−34

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+5−112

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+11−22

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockQuickListModel.cpp+2−6

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockQuickListModel.h+2−4

This diff is too big to show here.

tests/mocks/Unity/Launcher/plugin.cpp−4

This diff is too big to show here.

tests/mocks/Unity/Launcher/plugin.h+1−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/qmldir−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/CMakeLists.txt+8−13

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cppdeleted−74

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.hdeleted−53

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.cppdeleted−198

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.hdeleted−101

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.cppdeleted−169

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.hdeleted−70

This diff is too big to show here.

src/ApplicationArguments.cpp → tests/mocks/Unity/Notifications/notification.jsrenamed+7−6

This diff is too big to show here.

tests/mocks/Unity/Notifications/qmldir+1−3

This diff is too big to show here.

tests/mocks/Unity/Platform/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/mocks/Unity/Platform/MockPlatform.qmldeleted−25

This diff is too big to show here.

tests/mocks/Unity/Platform/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Unity/Screens/CMakeLists.txtdeleted−14

This diff is too big to show here.

tests/mocks/Unity/Screens/plugin.cppdeleted−29

This diff is too big to show here.

tests/mocks/Unity/Screens/plugin.hdeleted−25

This diff is too big to show here.

tests/mocks/Unity/Screens/qmldirdeleted−2

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.cppdeleted−71

This diff is too big to show here.

tests/mocks/Unity/Screens/screens.hdeleted−82

This diff is too big to show here.

tests/mocks/Unity/fake_applications_scope.cppnew file+68

This diff is too big to show here.

plugins/Unity/Platform/plugin.h → tests/mocks/Unity/fake_applications_scope.hrenamed+10−9

This diff is too big to show here.

tests/mocks/Unity/fake_categories.cppnew file+253

This diff is too big to show here.

tests/mocks/Unity/fake_categories.hnew file+74

This diff is too big to show here.

tests/mocks/Unity/fake_preview.cppnew file+66

This diff is too big to show here.

tests/mocks/Unity/fake_preview.hnew file+62

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cppnew file+224

This diff is too big to show here.

tests/mocks/Unity/fake_scope.hnew file+111

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cppnew file+149

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.hnew file+79

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.cppnew file+44

This diff is too big to show here.

plugins/UInput/plugin.h → tests/mocks/Unity/fake_unity_plugin.hrenamed+8−6

This diff is too big to show here.

tests/mocks/Unity/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Utils/CMakeLists.txtdeleted−61

This diff is too big to show here.

tests/mocks/Utils/Style.jsdeleted−37

This diff is too big to show here.

tests/mocks/Utils/URLDispatcher.hdeleted−47

This diff is too big to show here.

tests/mocks/Utils/WindowInputMonitor.qmldeleted−23

This diff is too big to show here.

tests/mocks/Utils/constants.cppdeleted−24

This diff is too big to show here.

tests/mocks/Utils/constants.hdeleted−43

This diff is too big to show here.

tests/mocks/Utils/plugin.cppdeleted−93

This diff is too big to show here.

tests/mocks/Utils/plugin.hdeleted−32

This diff is too big to show here.

tests/mocks/Utils/qmldirdeleted−6

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.cppdeleted−100

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.hdeleted−77

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txtdeleted−20

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cppdeleted−64

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.hdeleted−61

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cppdeleted−38

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.hdeleted−32

This diff is too big to show here.

tests/mocks/Wizard/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/data/applications/webbrowser-app.desktopdeleted

No changes to the content.

tests/mocks/data/unity/indicators/com.canonical.indicator.mockdeleted−10

This diff is too big to show here.

tests/mocks/indicator-service/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/mocks/indicator-service/mock-indicator-service.cdeleted−325

This diff is too big to show here.

tests/mocks/liblightdm/CMakeLists.txt+4−18

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp → tests/mocks/liblightdm/Greeter.cpprenamed+14−29

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h → tests/mocks/liblightdm/Greeter.hrenamed+6−9

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.h+3−7

This diff is too big to show here.

tests/mocks/liblightdm/MockController.cppdeleted−192

This diff is too big to show here.

tests/mocks/liblightdm/MockController.hdeleted−106

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.cppdeleted−316

This diff is too big to show here.

tests/mocks/liblightdm/MockGreeter.hdeleted−102

This diff is too big to show here.

tests/mocks/liblightdm/MockSessionsModel.cppdeleted−118

This diff is too big to show here.

tests/mocks/liblightdm/MockSessionsModel.hdeleted−64

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.cppdeleted−220

This diff is too big to show here.

tests/mocks/liblightdm/MockUsersModel.hdeleted−61

This diff is too big to show here.

tests/mocks/liblightdm/QLightDM/Greeternew file+1

This diff is too big to show here.

tests/mocks/liblightdm/QLightDM/InfographicModelnew file+1

This diff is too big to show here.

tests/mocks/liblightdm/QLightDM/UsersModelnew file+1

This diff is too big to show here.

tests/mocks/liblightdm/SessionsModelPrivate.cppdeleted−83

This diff is too big to show here.

tests/mocks/liblightdm/SessionsModelPrivate.hdeleted−63

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp → tests/mocks/liblightdm/UsersModel.cpprenamed+21−14

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h → tests/mocks/liblightdm/UsersModel.hrenamed+6−10

This diff is too big to show here.

tests/mocks/liblightdm/UsersModelPrivate.cppdeleted−124

This diff is too big to show here.

tests/mocks/liblightdm/UsersModelPrivate.h+3−8

This diff is too big to show here.

tests/mocks/liblightdm/demo/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/liblightdm/demo/GreeterPrivate.cpp+2−6

This diff is too big to show here.

tests/mocks/liblightdm/demo/InfographicModelPrivate.cppnew file+91

This diff is too big to show here.

tests/mocks/liblightdm/demo/UsersModelPrivate.cpp+3−11

This diff is too big to show here.

tests/mocks/liblightdm/full/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.cpp → tests/mocks/liblightdm/full/GreeterPrivate.cpprenamed+10−44

This diff is too big to show here.

tests/mocks/liblightdm/full/InfographicModelPrivate.cppnew file+182

This diff is too big to show here.

tests/mocks/liblightdm/full/UsersModelPrivate.cppnew file+52

This diff is too big to show here.

tests/mocks/liblightdm/qmldir−1

This diff is too big to show here.

tests/mocks/liblightdm/single-passphrase/CMakeLists.txtnew file+20

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h → tests/mocks/liblightdm/single-passphrase/GreeterPrivate.cpprenamed+23−22

This diff is too big to show here.

tests/mocks/liblightdm/single-passphrase/InfographicModelPrivate.cppnew file+61

This diff is too big to show here.

tests/mocks/liblightdm/single-passphrase/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/liblightdm/single-pin/CMakeLists.txtnew file+20

This diff is too big to show here.

tests/mocks/liblightdm/single-pin/GreeterPrivate.cppnew file+53

This diff is too big to show here.

tests/mocks/liblightdm/single-pin/InfographicModelPrivate.cppnew file+61

This diff is too big to show here.

tests/mocks/liblightdm/single-pin/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/liblightdm/single/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/liblightdm/single/GreeterPrivate.cppnew file+46

This diff is too big to show here.

tests/mocks/liblightdm/single/InfographicModelPrivate.cppnew file+28

This diff is too big to show here.

tests/mocks/liblightdm/single/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/libusermetrics/CMakeLists.txt+2−7

This diff is too big to show here.

tests/mocks/libusermetrics/ColorTheme.cpp−4

This diff is too big to show here.

tests/mocks/libusermetrics/ColorTheme.h+1−2

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.cpp+21−55

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.h−2

This diff is too big to show here.

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.hnew file+1

This diff is too big to show here.

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.hnew file+1

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.cpp+6−28

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.h−5

This diff is too big to show here.

tests/plugins/AccountsService/CMakeLists.txt+7−33

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cpp+7−104

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.h+3−17

This diff is too big to show here.

tests/plugins/AccountsService/client.cpp+9−303

This diff is too big to show here.

tests/plugins/AccountsService/interfaces.xml−50

This diff is too big to show here.

tests/plugins/AccountsService/server.cpp+6−17

This diff is too big to show here.

tests/plugins/AccountsService/types.hdeleted−25

This diff is too big to show here.

tests/plugins/CMakeLists.txt+2−7

This diff is too big to show here.

tests/plugins/Cursor/CMakeLists.txtdeleted−8

This diff is too big to show here.

tests/plugins/Cursor/TextEntry.qmldeleted−34

This diff is too big to show here.

tests/plugins/Cursor/tst_Cursor.qmldeleted−151

This diff is too big to show here.

tests/plugins/GlobalShortcut/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/plugins/GlobalShortcut/GlobalShortcutTest.cppdeleted−78

This diff is too big to show here.

tests/plugins/GlobalShortcut/shortcut.qmldeleted−39

This diff is too big to show here.

tests/plugins/Greeter/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/plugins/Greeter/Unity/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txtdeleted−42

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cppdeleted−240

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txtdeleted−1

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txtdeleted−157

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/dbus.cppdeleted−223

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/greeter.qmldeleted−22

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/integrated.cppdeleted−88

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/pam.cppdeleted−54

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cppdeleted−175

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cppdeleted−134

This diff is too big to show here.

tests/plugins/LightDM/IntegratedLightDM/usersmodel.cppdeleted−168

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/CMakeLists.txtnew file+42

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cppnew file+1716

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cppnew file+2092

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsectionexternalmodel.cppnew file+251

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/test.qmlnew file+96

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/test_section.qmlnew file+106

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/test_sectionexternalmodel.qmlnew file+74

This diff is too big to show here.

tests/plugins/SessionBroadcast/BroadcastServer.cppdeleted−33

This diff is too big to show here.

tests/plugins/SessionBroadcast/CMakeLists.txtdeleted−51

This diff is too big to show here.

tests/plugins/SessionBroadcast/interfaces.xmldeleted−18

This diff is too big to show here.

tests/plugins/SessionBroadcast/server.cppdeleted−37

This diff is too big to show here.

tests/plugins/SessionBroadcast/sessionbroadcasttest.cppdeleted−111

This diff is too big to show here.

tests/plugins/SessionManager/CMakeLists.txtnew file+48

This diff is too big to show here.

tests/plugins/SessionManager/LightDMSessionServer.cppnew file+38

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.h → tests/plugins/SessionManager/LightDMSessionServer.hrenamed+12−11

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.cpp → tests/plugins/SessionManager/LoginManagerServer.cpprenamed+11−6

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.h → tests/plugins/SessionManager/LoginManagerServer.hrenamed+10−11

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.cpp → tests/plugins/SessionManager/LoginSessionServer.cpprenamed+5−8

This diff is too big to show here.

tests/plugins/SessionBroadcast/BroadcastServer.h → tests/plugins/SessionManager/LoginSessionServer.hrenamed+12−13

This diff is too big to show here.

tests/plugins/SessionManager/client.cpp+88

This diff is too big to show here.

tests/plugins/SessionManager/interfaces.xml+22

This diff is too big to show here.

tests/plugins/SessionManager/server.cpp+24−17

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+37−52

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml+87

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp−193

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h−102

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml+90

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml+87

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.cpp−30

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.h−33

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml+90

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/edgeDragExample.qml+16−17

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+5−5

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_Damper.cpp+18−12

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+551

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp−131

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml−81

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp−150

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml−62

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp−148

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−392

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cpp−300

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qml−90

This diff is too big to show here.

tests/plugins/Unity/CMakeLists.txt+51−2

This diff is too big to show here.

tests/plugins/Unity/Indicators/CMakeLists.txt+23−41

This diff is too big to show here.

tests/plugins/Unity/Indicators/IndicatorsModelTest.cpp−141

This diff is too big to show here.

tests/plugins/Unity/Indicators/RootActionStateTest.cpp−95

This diff is too big to show here.

tests/plugins/Unity/Indicators/SharedUnityMenuModelTest.cpp−102

This diff is too big to show here.

tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp−201

This diff is too big to show here.

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp+9−54

This diff is too big to show here.

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+109

This diff is too big to show here.

tests/plugins/Unity/Indicators/menucontentactivatortest.cpp+4−4

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+44−78

This diff is too big to show here.

tests/plugins/Unity/Launcher/abs-icon.desktop−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/appdrawermodeltest.cpp−68

This diff is too big to show here.

tests/plugins/Unity/Launcher/click-icon.desktop−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/click-icon.svg

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.cpp−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.h−47

This diff is too big to show here.

tests/plugins/Unity/Launcher/launcherbackendtest.cpp+93

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+29−590

This diff is too big to show here.

tests/plugins/Unity/Launcher/no-icon.desktop+2

This diff is too big to show here.

tests/plugins/Unity/Launcher/no-name.desktop−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/rel-icon.desktop−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/rel-icon.svg

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.cpp−58

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.h−55

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.cpp−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.h−39

This diff is too big to show here.

tests/plugins/Unity/Platform/CMakeLists.txt−30

This diff is too big to show here.

tests/plugins/Unity/Platform/platformtest.cpp−142

This diff is too big to show here.

tests/plugins/Unity/Session/CMakeLists.txt−72

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.cpp−43

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.h−48

This diff is too big to show here.

tests/plugins/Unity/Session/interfaces.xml−29

This diff is too big to show here.

tests/plugins/Unity/Session/preload.c−43

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cpp−289

This diff is too big to show here.

tests/plugins/Unity/filtersbindingstest.cpp+515

This diff is too big to show here.

tests/plugins/Unity/filtersbindingstest.h+47

This diff is too big to show here.

tests/plugins/Unity/previewbindingstest.cpp+167

This diff is too big to show here.

tests/plugins/Unity/previewbindingstest.h+12−13

This diff is too big to show here.

tests/plugins/Unity/resultstest.cpp+105

This diff is too big to show here.

tests/plugins/Unity/resultstest.h+12−11

This diff is too big to show here.

tests/plugins/Unity/signalslisttest.cpp+57

This diff is too big to show here.

tests/plugins/Unity/signalslisttest.h+8−8

This diff is too big to show here.

tests/plugins/Utils/CMakeLists.txt+19−34

This diff is too big to show here.

tests/plugins/Utils/DeviceConfigParserTest.cpp−76

This diff is too big to show here.

tests/plugins/Utils/URLDispatcherTest.cpp−78

This diff is too big to show here.

tests/plugins/Utils/WindowInputMonitorTest.cpp−461

This diff is too big to show here.

tests/plugins/Utils/WindowStateStorageTest.cpp−121

This diff is too big to show here.

tests/plugins/Utils/modeltest.cpp+42−25

This diff is too big to show here.

tests/plugins/Utils/modeltest.h

This diff is too big to show here.

tests/plugins/Utils/qlimitproxymodeltest.cpp+31−31

This diff is too big to show here.

tests/plugins/Utils/qsortfilterproxymodeltest.cpp+25−25

This diff is too big to show here.

tests/plugins/Utils/tst_UtilsStyle.qml−47

This diff is too big to show here.

tests/plugins/WindowManager/CMakeLists.txt−36

This diff is too big to show here.

tests/plugins/WindowManager/UnityApplicationMocks.h−211

This diff is too big to show here.

tests/plugins/WindowManager/tst_TopLevelWindowModel.cpp−193

This diff is too big to show here.

tests/plugins/Wizard/CMakeLists.txt−24

This diff is too big to show here.

tests/plugins/Wizard/tst_pagelist.cpp−183

This diff is too big to show here.

tests/plugins/Wizard/tst_system.cpp−124

This diff is too big to show here.

tests/qmltests/ApplicationMenuDataLoader.qml−99

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuBar.qml−437

This diff is too big to show here.

tests/qmltests/ApplicationMenus/tst_MenuPopup.qml−361

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+62−71

This diff is too big to show here.

tests/qmltests/Components/CMakeLists.txt+13−41

This diff is too big to show here.

tests/qmltests/Components/RevealingRectangle.qml+78

This diff is too big to show here.

tests/qmltests/Components/tst_AnimationControllerWithSignals.qml+142

This diff is too big to show here.

tests/qmltests/Components/tst_Background.qml−91

This diff is too big to show here.

tests/qmltests/Components/tst_Carousel.qml+194

This diff is too big to show here.

tests/qmltests/Components/tst_Dialogs.qml−112

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+66−175

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.qml+57−133

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml−69

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BottomEdgeShowable.qml−108

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+8−8

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/RightEdgeShowable.qml−108

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/TestButton.qml+41

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/UnityLogo.png

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+15−15

This diff is too big to show here.

tests/qmltests/Components/tst_DraggingArea.qml+8−8

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDemoOverlay.qml+123

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDragEvaluator.cpp−166

This diff is too big to show here.

tests/qmltests/Components/tst_FilterGrid.qml+151

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage.qml−210

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/ImageControls.qml−67

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/portrait.png

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/square.png

This diff is too big to show here.

tests/qmltests/Components/tst_LazyImage/wide.png

This diff is too big to show here.

tests/qmltests/Components/tst_Lockscreen.qml−474

This diff is too big to show here.

tests/qmltests/Components/tst_MathLocal.qml+91

This diff is too big to show here.

tests/qmltests/Components/tst_MediaServices.qml−231

This diff is too big to show here.

tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml−75

This diff is too big to show here.

tests/qmltests/Components/tst_OpenEffect.qml+71

This diff is too big to show here.

tests/qmltests/Components/tst_PageHeader.qml+186

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml−174

This diff is too big to show here.

tests/qmltests/Components/tst_Rating.qml−86

This diff is too big to show here.

tests/qmltests/Components/tst_RatingStars.qml+62

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveFlowView.qml+192

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveGridView.qml+193

This diff is too big to show here.

tests/qmltests/Components/tst_Revealer.qml+262

This diff is too big to show here.

tests/qmltests/Components/tst_SharingPicker.qml−73

This diff is too big to show here.

tests/qmltests/Components/tst_Showable.qml+3−43

This diff is too big to show here.

tests/qmltests/Components/tst_Stage.qml+278

This diff is too big to show here.

tests/qmltests/Components/tst_Stage/AppControl.qml+17−23

This diff is too big to show here.

tests/qmltests/Components/tst_Stage/FakeApplicationScreenshot.qml+53

This diff is too big to show here.

tests/qmltests/Components/tst_Tile.qml+71

This diff is too big to show here.

tests/qmltests/Components/tst_TimeLocal.qml+117

This diff is too big to show here.

tests/qmltests/Components/tst_VirtualTouchPad.qml−197

This diff is too big to show here.

tests/qmltests/Components/tst_Wallpaper.qml−118

This diff is too big to show here.

tests/qmltests/Components/tst_WallpaperResolver.qml−161

This diff is too big to show here.

tests/qmltests/Components/tst_ZoomableImage.qml−204

This diff is too big to show here.

tests/qmltests/Dash/Apps/tst_AppPreview.qml+239

This diff is too big to show here.

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml+222

This diff is too big to show here.

tests/qmltests/Dash/Video/tst_VideoPreview.qml+63

This diff is too big to show here.

tests/qmltests/Dash/qml/FakeScopeView.qml+120

This diff is too big to show here.

tests/qmltests/Dash/qml/fake_generic_scopeView.qml+6−7

This diff is too big to show here.

tests/qmltests/Dash/qml/fake_scopeView1.qml+24

This diff is too big to show here.

tests/qmltests/Dash/qml/fake_scopeView2.qml+24

This diff is too big to show here.

tests/qmltests/Dash/qml/fake_scopeView3.qml+24

This diff is too big to show here.

tests/qmltests/Dash/qml/fake_scopeView4.qml+24

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+133

This diff is too big to show here.

tests/qmltests/Dash/tst_DashBar.qml+111

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+209

This diff is too big to show here.

tests/qmltests/Dash/tst_DashPreview.qml+155

This diff is too big to show here.

tests/qmltests/Dash/tst_FilterGrids.qml+144

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+71

This diff is too big to show here.

tests/qmltests/Dash/tst_ScopeView.qml+52

This diff is too big to show here.

tests/qmltests/EdgeBarrierControls.qml−97

This diff is too big to show here.

tests/qmltests/Greeter/TestView.qml−101

This diff is too big to show here.

tests/qmltests/Greeter/tst_Clock.qml+43−60

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml−683

This diff is too big to show here.

tests/qmltests/Greeter/tst_GreeterView.qml−1366

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+18−83

This diff is too big to show here.

tests/qmltests/Greeter/tst_Lockscreen.qml+212

This diff is too big to show here.

tests/qmltests/Greeter/tst_Phone.qml+105

This diff is too big to show here.

tests/qmltests/Greeter/tst_Tablet.qml+328

This diff is too big to show here.

tests/qmltests/Hud/tst_Hud.qml+239

This diff is too big to show here.

tests/qmltests/Hud/tst_Result.qml+98

This diff is too big to show here.

tests/qmltests/Launcher/tst_Drawer.qml−520

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+154−1375

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+326−796

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml−290

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml−326

This diff is too big to show here.

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml−232

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorItem.qml−205

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qml−828

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml−292

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml−171

This diff is too big to show here.

tests/qmltests/Panel/PanelTest.qml−70

This diff is too big to show here.

tests/qmltests/Panel/PanelUI.qml−286

This diff is too big to show here.

tests/qmltests/Panel/tst_ActiveCallHint.qml−198

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorItem.qml+61

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorRow.qml+244

This diff is too big to show here.

tests/qmltests/Panel/tst_Indicators.qml+181

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+91−37

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+161−600

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelBar.qml−240

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelItemRow.qml−318

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenu.qml−364

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelMenuPage.qml−200

This diff is too big to show here.

tests/qmltests/Panel/tst_PanelSmallScreen.qml−133

This diff is too big to show here.

tests/qmltests/Panel/tst_SearchIndicator.qml+62

This diff is too big to show here.

tests/qmltests/SideStage/tst_SideStage.qml+52

This diff is too big to show here.

tests/qmltests/Stage/ApplicationCheckBox.qml−189

This diff is too big to show here.

tests/qmltests/Stage/SizeHintField.qml−33

This diff is too big to show here.

tests/qmltests/Stage/SurfaceManagerControls.qml−32

This diff is too big to show here.

tests/qmltests/Stage/SurfaceManagerField.qml−40

This diff is too big to show here.

tests/qmltests/Stage/tst_ApplicationWindow.qml−513

This diff is too big to show here.

tests/qmltests/Stage/tst_DecoratedWindow.qml−267

This diff is too big to show here.

tests/qmltests/Stage/tst_DesktopStage.qml−1085

This diff is too big to show here.

tests/qmltests/Stage/tst_PhoneStage.qml−624

This diff is too big to show here.

tests/qmltests/Stage/tst_QMLTopLevelWindowModel.qml−191

This diff is too big to show here.

tests/qmltests/Stage/tst_Splash.qml−131

This diff is too big to show here.

tests/qmltests/Stage/tst_SurfaceContainer.qml−258

This diff is too big to show here.

tests/qmltests/Stage/tst_TabletStage.qml−764

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowDecoration.qml−244

This diff is too big to show here.

tests/qmltests/Stage/tst_WindowResizeArea.qml−465

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml−813

This diff is too big to show here.

tests/qmltests/UnityLogo.png

This diff is too big to show here.

tests/qmltests/Wizard/licenses/en_US.html−1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_CA.html−1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_FR.html−1

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml−487

This diff is too big to show here.

tests/qmltests/tst_DeviceConfiguration.qml−49

This diff is too big to show here.

tests/qmltests/tst_DisabledScreenNotice.qml−133

This diff is too big to show here.

tests/qmltests/tst_GreeterShell.qml+78

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml−1705

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+209−3253

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml−549

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml+1−1

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml+1−1

This diff is too big to show here.

tests/qmltests/utils/Unity/Test/tst_UnityTest.qml+8−36

This diff is too big to show here.

tests/scripts/README−9

This diff is too big to show here.

tests/scripts/alert-launcher-icon.sh−19

This diff is too big to show here.

tests/scripts/get-progress.sh−19

This diff is too big to show here.

tests/scripts/list-launcher-icons.sh−19

This diff is too big to show here.

tests/scripts/set-count-visible.sh−19

This diff is too big to show here.

tests/scripts/set-count.sh−19

This diff is too big to show here.

tests/scripts/set-progress.sh−19

This diff is too big to show here.

tests/uqmlscene/CMakeLists.txt+2−21

This diff is too big to show here.

tests/uqmlscene/README+1−3

This diff is too big to show here.

tests/uqmlscene/main.cpp+12−39

This diff is too big to show here.

tests/utils/modules/Unity/Test/CMakeLists.txt+7−27

This diff is too big to show here.

tests/utils/modules/Unity/Test/StageTestCase.qml−64

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+2−23

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+2−7

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+119−464

This diff is too big to show here.

tests/utils/modules/Unity/Test/plugin.cpp+2−25

This diff is too big to show here.

tests/utils/modules/Unity/Test/plugin.h+1−1

This diff is too big to show here.

tests/utils/modules/Unity/Test/qmldir−4

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.cpp+6−49

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.h+2−4

This diff is too big to show here.

tests/whitespace/CMakeLists.txt+1−1

This diff is too big to show here.

tests/whitespace/check_whitespace.py+12−22

This diff is too big to show here.

tools/CMakeLists.txt−4

This diff is too big to show here.

tools/menutool/CMakeLists.txt−5

This diff is too big to show here.

tools/menutool/README−11

This diff is too big to show here.

tools/menutool/menutool.cpp−62

This diff is too big to show here.

tools/menutool/menutool.qml−118

This diff is too big to show here.

tools/unlock-device−51

This diff is too big to show here.

unity8-greeter.desktop.in+6

This diff is too big to show here.

unity8.desktop.in+2−1

This diff is too big to show here.

unity8.qmlproject+25

This diff is too big to show here.