xenial..57720af · unity8

.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

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

3# QtCreator project files

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>

ApplicationArguments.hnew file+49

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

1+/*

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+/*

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 Ubuntu.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+/*

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+106

@@ -0,0 +1,106 @@

1+/*

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 Ubuntu.Gestures 0.1

22+

23+Item {

24+ id: bottombar

25+

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

27+ property bool applicationIsOnForeground

28+

29+ property variant theHud

30+ property bool enabled: false

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

32+

33+ state: dragArea.status === DirectionalDragArea.Recognized ? "shown" : "hidden"

34+

35+ HudButton {

36+ id: hudButton

37+

38+ x: MathLocal.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)

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

40+

41+ mouseOver: {

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

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

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

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

46+ } else {

47+ return false

48+ }

49+ }

50+

51+ onClicked: theHud.show()

52+

53+ Behavior on bottomMargin {

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

55+ }

56+

57+ Behavior on opacity {

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

59+ }

60+ }

61+

62+ Connections {

63+ target: theHud

64+ onShownChanged: bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown

65+ }

66+

67+ EdgeDragArea {

68+ id: dragArea

69+ width: parent.width

70+ height: distanceThreshold

71+ anchors.bottom: parent.bottom

72+

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

74+ direction: Direction.Upwards

75+

76+ property int previousStatus: -1

77+ property real touchStartX: -1

78+

79+ onStatusChanged: {

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

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

82+ if (hudButton.mouseOver) {

83+ hudButton.clicked()

84+ }

85+ }

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

87+ touchStartX = touchX

88+ }

89+ previousStatus = status

90+ }

91+ }

92+

93+ states: [

94+ State {

95+ name: "hidden"

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

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

98+ },

99+ State {

100+ name: "shown"

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

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

103+ }

104+ ]

105+

106+}

Bottombar/HudButton.qmlnew file+64

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

1+/*

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+ property alias actionButton: actionButton

37+

38+ anchors.centerIn: parent

39+ height: units.gu(12)

40+ width: height

41+ opacity: item.mouseOver ? 1 : 0.7

42+ scale: item.mouseOver ? scaleOnMouseOver : 1

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

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

45+

46+ UbuntuShape {

47+ id: actionButton

48+ anchors.fill: parent

49+

50+ borderSource: ""

51+ image: Image {

52+ source: "graphics/hud_invoke_button_active.png"

53+ }

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+73−112

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

13

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

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)

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,10 @@ 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(Qt5Qml)

66−find_package(Qt5Qml 5.6 REQUIRED)

67−find_package(Qt5Quick 5.6 REQUIRED)

52+find_package(Qt5Quick)

68−find_package(Qt5Gui 5.6 REQUIRED)

53+find_package(Qt5Gui)

69−find_package(Qt5DBus 5.6 REQUIRED)

54+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

55

101# Standard install paths

56# Standard install paths

102include(GNUInstallDirs)

57include(GNUInstallDirs)

@@ -104,23 +59,16 @@ include(GNUInstallDirs)

104set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

59set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)

105set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

60set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

106

61

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

62+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

63

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

64+include_directories(

113−if(SHELL_INSTALL_QML STREQUAL "")

65+ ${CMAKE_CURRENT_BINARY_DIR}

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

66+ ${CMAKE_CURRENT_SOURCE_DIR}

115−endif()

67+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

68+ )

116

69

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

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

118

71

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

120−if(SHELL_PLUGINDIR STREQUAL "")

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

122−endif()

123−

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

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

125

73

126if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")

74if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")

@@ -137,72 +85,85 @@ endif()

137# "signals" and "slots"

85# "signals" and "slots"

138add_definitions(-DQT_NO_KEYWORDS)

86add_definitions(-DQT_NO_KEYWORDS)

139

87

140−# Save a few container detach and conversions

88+# Tests

141−add_definitions(-DQT_STRICT_ITERATORS)

89+include(CTest)

142−

90+enable_testing()

143−# Use the fast string builder

144−add_definitions(-DQT_USE_QSTRINGBUILDER)

145

91

146# Autopilot tests

92# Autopilot tests

147include(autopilot)

93include(autopilot)

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

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

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

149

96

150set(SHELL_APP unity8)

97set(SHELL_APP unity8)

151−set(INDICATORS_CLIENT_APP indicators-client)

152−set(GREETER_APP unity8-greeter)

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

154

98

155−include_directories(

99+set(shell_app_HDRS

156− ${CMAKE_SOURCE_DIR}/include

100+ )

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

101

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

102+add_executable(${SHELL_APP}

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

103+ ${shellapplication_MOC_SRCS}

169− set(ENABLE_TOUCH_EMULATION true)

104+ ApplicationArguments.h

170− add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)

105+ main.cpp

106+ MouseTouchAdaptor.cpp

107+ )

108+

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

171− pkg_check_modules(MOUSETOUCHADAPTOR_LIBS REQUIRED x11 xcb xi)

110+pkg_check_modules(XCB REQUIRED xcb)

172−else()

111+

173− set(ENABLE_TOUCH_EMULATION false)

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

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

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

175endif()

114endif()

176

115

116+target_link_libraries(${SHELL_APP}

117+ ${Qt5Qml_LIBRARIES}

118+ ${Qt5Quick_LIBRARIES}

119+ ${XCB_LDFLAGS}

120+ )

121+

122+# install binaries

123+install(TARGETS ${SHELL_APP}

124+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

125+ )

126+

127+# install top level qml and js files

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

129+

130+install(FILES ${QML_JS_FILES}

131+ DESTINATION ${SHELL_APP_DIR}

132+ )

133+

177# add subdirectories to build

134# add subdirectories to build

178−add_subdirectory(include)

135+add_subdirectory(tests)

136+add_subdirectory(plugins)

179add_subdirectory(src)

137add_subdirectory(src)

180−add_subdirectory(tools)

181−add_subdirectory(qml)

182

138

183−# Tests

139+# install subdirectories

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

140+set(QML_DIRS

185−if (NOT NO_TESTS)

141+ Applications

186− include(CTest)

142+ Bottombar

187− enable_testing()

143+ Components

188− add_subdirectory(tests)

144+ Dash

189−else()

145+ graphics

190− message(STATUS "Tests disabled")

146+ Greeter

191−endif()

147+ Hud

148+ Panel

149+ Launcher

150+ SideStage

151+ Notifications

152+ )

192

153

193−add_subdirectory(plugins)

154+install(DIRECTORY ${QML_DIRS}

155+ DESTINATION ${SHELL_APP_DIR}

156+ )

194

157

195−#

158+# generate desktop file

196−# Data files

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

197−#

160+

198−add_subdirectory(data)

161+# install desktop file

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

163+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

164+ )

199

165

200#

166#

201# Translation

167# Translation

202#

168#

203add_subdirectory(po)

169add_subdirectory(po)

204−

205−#

206−# Documentation

207−#

208−add_subdirectory(doc)

CODING+69−119

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

1Building Unity 8

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

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

6download source

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

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

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

16 $ cd ~/unity8/trunk

17

18−install dependencies and build Unity 8

18+install dependencies

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:

26+ - add ppa:ubuntu-unity/next

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

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

25− build it.

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

29+ are technically "recommends", not strict dependencies

30+

31+Note, once the PPA is added, the script runs apt-get update, if you have

32+any failures associated with it, the build script will bail out of the setup

33+and fail to install all the required dependencies.

26

34

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

35+

28− are technically "recommends", not strict dependencies

36+build Unity 8

37+-------------

38+

39+$ cd ~/unity8/trunk

40+$ ./build

29

41

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

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

31directory.

43directory.

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

37run the Unity 8 shell

49run the Unity 8 shell

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

50---------------------

39$ cd ~/unity8/trunk

51$ cd ~/unity8/trunk

40−$ cd builddir

52+$ ./run

41

53

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

54+Options can be passed to test the lock screen

43−For example:

55+$ ./run -p OR -k

44−$ make tryShell

45−$ make tryLauncher

46−$ make tryLockscreen

47

56

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

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

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

49

59

50Notes

60Notes

51-----

61-----

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

62- 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

63- 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

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

57 later.

65 later.

@@ -66,15 +74,53 @@ Notes

66

74

67Running Unity 8 on devices

75Running Unity 8 on devices

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

76==========================

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

78+- supported hardware should match one those listed here

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

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

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

82+- make sure your device is connected to a WiFi network

83+- If you haven’t already or if you’ve just freshly flashed your device

84+ make sure you run phablet-network-setup which will allow package updates to

85+ the device

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

87+ on the device yourself)

88+

89+$ cd ~/unity/trunk

90+$ ./run_on_device --setup

91+ this will:

92+ - install your public SSH key on the device

93+ - install the needed dependencies

94+

95+$ ./run_on_device

96+ this will:

97+ - rsync the code to the device

98+ - build on the device

99+ - replace the running shell

100+

101+Options can be passed to test the lock screen

102+$ ./run_on_device -p OR -k

69

103

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

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

71−Go to

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

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

106+

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

107+Notes

74−for more details on crossbuilder.

108+-----

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

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

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

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

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

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

115+ the screen

116+- exporting ANDROID_SERIAL=$your_device_serial or

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

118+ multiple devices

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

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

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

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

75

123

76−unity8 will automatically restart on the phone once deployment

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

78

124

79Coding guidelines

125Coding guidelines

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

126=================

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

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

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

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

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

92

138

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+/*

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+130

@@ -0,0 +1,130 @@

1+/*

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.Application 0.1

19+

20+Item {

21+ id: applicationManager

22+

23+ property var mainStageApplications: ApplicationManager.mainStageApplications

24+ property var sideStageApplications: ApplicationManager.sideStageApplications

25+ property var mainStageFocusedApplication: ApplicationManager.mainStageFocusedApplication

26+ property var sideStageFocusedApplication: ApplicationManager.sideStageFocusedApplication

27+ property bool sideStageEnabled: true

28+ signal focusRequested(string desktopFile)

29+ property bool keyboardVisible: ApplicationManager.keyboardVisible

30+ property int keyboardHeight: ApplicationManager.keyboardHeight

31+

32+ Component.onCompleted: {

33+ // Start the watcher so that the ApplicationManager applications model can be populated.

34+ ApplicationManager.startWatcher();

35+ }

36+

37+ function activateApplication(desktopFile, argument) {

38+ var application;

39+ application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.MainStage);

40+ if (application == null) {

41+ application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.SideStage);

42+ }

43+ if (application != null) {

44+ return application;

45+ }

46+

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

48+

49+ if (argument) {

50+ return ApplicationManager.startProcess(desktopFile, execFlags, [argument]);

51+ } else {

52+ return ApplicationManager.startProcess(desktopFile, execFlags);

53+ }

54+ }

55+

56+ function stopProcess(application) {

57+ ApplicationManager.stopProcess(application)

58+ }

59+

60+ function focusApplication(application) {

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

62+ return;

63+ }

64+

65+ ApplicationManager.focusApplication(application.handle);

66+ }

67+

68+ function unfocusCurrentApplication() {

69+ ApplicationManager.unfocusCurrentApplication(ApplicationInfo.MainStage);

70+ }

71+

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

73+ var applications;

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

75+ applications = ApplicationManager.sideStageApplications;

76+ } else {

77+ applications = ApplicationManager.mainStageApplications;

78+ }

79+ // FIXME: applications.move(0, 0) crashes

80+ if (from !== to && from >= 0 && to >= 0) applications.move(from, to);

81+ }

82+

83+ function getApplicationFromDesktopFile(desktopFile, stage) {

84+ var foundSideStageApp, foundMainStageApp;

85+

86+ foundMainStageApp = __find(desktopFile, ApplicationManager.mainStageApplications)

87+ if (stage == ApplicationInfo.MainStage) {

88+ return foundMainStageApp;

89+ }

90+ foundSideStageApp = __find(desktopFile, ApplicationManager.sideStageApplications)

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

92+ return foundSideStageApp;

93+ }

94+

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

96+ return (foundMainStageApp) ? foundMainStageApp : foundSideStageApp;

97+

98+

99+ function __find(desktopFile, applications) {

100+ for (var i = 0; i < applications.count; i++ ) {

101+ var application = applications.get(i);

102+ if (application.desktopFile == desktopFile) {

103+ return application;

104+ }

105+ }

106+ return null;

107+ }

108+ }

109+

110+ Connections {

111+ target: ApplicationManager

112+ onFocusRequested: {

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

114+ // enum to desktop files

115+ var desktopFile

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

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

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

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

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

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

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

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

124+ } else if (favoriteApplication == 4) { // ApplicationManager.PhoneApplication

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

126+ }

127+ applicationManager.focusRequested(desktopFile);

128+ }

129+ }

130+}

Components/ApplicationScreenshot.qmlnew file+61

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

1+/*

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.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: applicationScreenshot.application

60+ }

61+}

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

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

1/*

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

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

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

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Gestures 0.1

18+import Ubuntu.Components 0.1

19

20Item {

21− width: 720; height: 720

21+ property bool explicitlyScaled

22+ property var model

22}

23}

Components/Carousel.qmlnew file+323

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

1+/*

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 *

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− * 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+ }

Components/CrossFadeImage.qmlnew file+149

@@ -0,0 +1,149 @@

1+/*

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+ property url source

21+

22+ /*

23+ * true: fade out old image in parallel with fading in the new one.

24+ * false: fade in new image above old one.

25+ *

26+ * The reason why this is required is that crossfading has the isse that in

27+ * the middle of the animation, both images are only 50% opaque which make

28+ * any background shine through. Not wanted for background images etc, but

29+ * wanted for overlays.

30+ */

31+ property bool crossFade: true

32+

33+ /*

34+ * true: the very first source url should be faded in already.

35+ * false: the very first source url should just be shown without animation.

36+ */

37+ property bool fadeInFirst: true

38+

39+ readonly property size sourceSize: __currentImage.sourceSize

40+ readonly property var status: __currentImage ? __currentImage.status : Image.Null

41+ readonly property bool running: crossFadeImages.running || nextImageFadeIn.running

42+

43+ property Image __currentImage: image1

44+ property Image __nextImage: image2

45+

46+ function swapImages() {

47+ __currentImage.z = 0

48+ __nextImage.z = 1

49+ if (crossFade) {

50+ crossFadeImages.start();

51+ } else {

52+ nextImageFadeIn.start();

53+ }

54+

55+ var tmpImage = __currentImage

56+ __currentImage = __nextImage

57+ __nextImage = tmpImage

58+ }

59+

60+ onSourceChanged: {

61+ // On creation, the souce handler is called before image pointers are set.

62+ if (__currentImage === null) {

63+ __currentImage = image1;

64+ __nextImage = image2;

65+ }

66+

67+ crossFadeImages.stop();

68+ nextImageFadeIn.stop();

69+

70+ // Don't fade in initial picture, only fade changes

71+ if (__currentImage.source == "" && !fadeInFirst) {

72+ __currentImage.source = source;

73+ } else {

74+ nextImageFadeIn.stop();

75+ __nextImage.opacity = 0.0;

76+ __nextImage.source = source;

77+

78+ // If case the image is still in QML's cache, status will be "Ready" immediately

79+ if (__nextImage.status == Image.Ready || __nextImage.source == "") {

80+ swapImages();

81+ }

82+ }

83+ }

84+

85+ Connections {

86+ target: __nextImage

87+ onStatusChanged: {

88+ if (__nextImage.status == Image.Ready) {

89+ swapImages();

90+ }

91+ }

92+ }

93+

94+ Image {

95+ id: image1

96+ anchors.fill: parent

97+ cache: false

98+ asynchronous: true

99+ z: 1

100+ }

101+

102+ Image {

103+ id: image2

104+ anchors.fill: parent

105+ cache: false

106+ asynchronous: true

107+ z: 0

108+ }

109+

110+ NumberAnimation {

111+ id: nextImageFadeIn

112+ target: __nextImage

113+ property: "opacity"

114+ duration: 400

115+ to: 1.0

116+ easing.type: Easing.InOutQuad

117+

118+ onRunningChanged: {

119+ if (!running) {

120+ __nextImage.source = "";

121+ }

122+ }

123+ }

124+

125+ ParallelAnimation {

126+ id: crossFadeImages

127+ NumberAnimation {

128+ target: __nextImage

129+ property: "opacity"

130+ duration: 400

131+ to: 1.0

132+ easing.type: Easing.InOutQuad

133+ }

134+

135+ NumberAnimation {

136+ target: __currentImage

137+ property: "opacity"

138+ duration: 400

139+ to: 0

140+ easing.type: Easing.InOutQuad

141+ }

142+

143+ onRunningChanged: {

144+ if (!running) {

145+ __nextImage.source = "";

146+ }

147+ }

148+ }

149+}

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

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

1/*

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

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

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

15 */

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

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 }

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

78 onTargetValueChanged: {

79 if (!running) {

80 return;

81 }

82

83− if (d.incrementTargetProp) {

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

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

85 parent[d.targetProp] = targetValue;

86 }

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

95 // Private stuff

96 QtObject {

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/>.

15 */

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/EdgeDragArea.qmlnew file+36

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

1+/*

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/>.

15 */

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

20

21/*

@@ -53,20 +53,20 @@ AxisVelocityCalculator {

53 // Returns whether the drag should continue by itself until completed.

54 function shouldAutoComplete() {

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();

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 {

69− return velocity <= minVelocity;

69+ return false;

70 }

71 }

72

@@ -75,20 +75,11 @@ AxisVelocityCalculator {

75 // speedThreshold in pixels per millisecond

76 property real __speedThresholdMs: speedThreshold / 1000.0

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+137

@@ -0,0 +1,137 @@

1+/*

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+ property bool expandable: true

39+

40+ property var model: null

41+

42+ /* Maximum number of rows to be show when filter=true. */

43+ property int collapsedRowCount: 2

44+

45+ property alias minimumHorizontalSpacing: iconTileGrid.minimumHorizontalSpacing

46+ property alias maximumNumberOfColumns: iconTileGrid.maximumNumberOfColumns

47+ property alias columns: iconTileGrid.columns

48+ property alias delegateWidth: iconTileGrid.delegateWidth

49+ property alias delegateHeight: iconTileGrid.delegateHeight

50+ property alias verticalSpacing: iconTileGrid.verticalSpacing

51+ property alias delegate: iconTileGrid.delegate

52+ property alias cellWidth: iconTileGrid.cellWidth

53+ property alias cellHeight: iconTileGrid.cellHeight

54+ readonly property alias flicking: iconTileGrid.flicking

55+ readonly property alias moving: iconTileGrid.moving

56+ readonly property alias pressDelay: iconTileGrid.pressDelay

57+

58+ height: childrenRect.height

59+

60+ ResponsiveGridView {

61+ id: iconTileGrid

62+

63+ anchors { left: parent.left; right: parent.right }

64+ height: totalContentHeight

65+ interactive: false

66+

67+ minimumHorizontalSpacing: units.gu(0.5)

68+ maximumNumberOfColumns: 6

69+ delegateWidth: units.gu(11)

70+ delegateHeight: units.gu(9.5)

71+ verticalSpacing: units.gu(2)

72+

73+ model: LimitProxyModel {

74+ model: root.model

75+ limit: (filter) ? collapsedRowCount * iconTileGrid.columns : -1

76+ }

77+

78+ }

79+

80+ Item {

81+ anchors {

82+ left: parent.left

83+ right: parent.right

84+ top: iconTileGrid.bottom

85+ }

86+ visible: (expandable && filter && model.count > collapsedRowCount * iconTileGrid.columns)

87+ height: (visible) ? childrenRect.height + units.gu(2) : 0

88+

89+ AbstractButton {

90+ id: button

91+ objectName: "filterToggleButton"

92+

93+ anchors {

94+ top: parent.top

95+ horizontalCenter: parent.horizontalCenter

96+ }

97+ width: units.gu(22)

98+ height: units.gu(4)

99+

100+ UbuntuShape {

101+ anchors.fill: parent

102+ color: "#33ffffff" // FIXME no palette

103+ radius: "small"

104+ }

105+

106+ UbuntuShape {

107+ id: borderPressed

108+

109+ anchors.fill: parent

110+ radius: "small"

111+ borderSource: "radius_pressed.sci"

112+ opacity: button.pressed ? 1.0 : 0.0

113+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

114+ }

115+

116+ Label {

117+ anchors {

118+ verticalCenter: parent.verticalCenter

119+ left: parent.left

120+ right: parent.right

121+ leftMargin: units.gu(1)

122+ rightMargin: units.gu(1)

123+ }

124+ text: (filter) ? "+ View all (" + model.count + ")" : "- Show fewer"

125+ fontSize: "small"

126+ color: Theme.palette.selected.backgroundText

127+ opacity: 0.6

128+ style: Text.Raised

129+ styleColor: "black"

130+ elide: Text.ElideMiddle

131+ horizontalAlignment: Text.AlignHCenter

132+ }

133+

134+ onClicked: filter = !filter

135+ }

136+ }

137+}

Components/IconUtil.jsnew file+42

@@ -0,0 +1,42 @@

1+/*

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+// FIXME: a quick hack to get icons out of gicons and fallback to

20+// base icon for annotated icons. Doesn't correctly handle all icons.

21+// Proper global solution needed.

22+function from_gicon(name) {

23+ var icon_name = name;

24+ var annotated_re = /^. UnityProtocolAnnotatedIcon/;

25+ if (annotated_re.test(name)) {

26+ var base_icon_re = /'base-icon':.+?'(.+?)'/;

27+ var base_icon = name.toString().match(base_icon_re);

28+ icon_name = base_icon[1];

29+ } else {

30+ var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;

31+ var themed = name.match(themed_re);

32+ if (themed) {

33+ return "image://gicon/" + themed[1];

34+ }

35+ }

36+ var name_re = /^[a-z0-9\._-]+$/;

37+ if (name_re.test(icon_name)) {

38+ return "image://gicon/" + icon_name;

39+ } else {

40+ return icon_name;

41+ }

42+}

Components/ListItems/Base.qmlnew file+125

@@ -0,0 +1,125 @@

1+/*

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+67

@@ -0,0 +1,67 @@

1+/*

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+

28+ height: units.gu(4.5)

29+

30+ Item {

31+ anchors {

32+ left: parent.left

33+ right: parent.right

34+ top: parent.top

35+ bottom: bottomBorder.top

36+ }

37+

38+ Label {

39+ id: label

40+ anchors {

41+ left: parent.left

42+ leftMargin: units.gu(2)

43+ right: parent.right

44+ rightMargin: units.gu(0.5)

45+ verticalCenter: parent.verticalCenter

46+ }

47+

48+ color: Theme.palette.selected.backgroundText //at 60%

49+ opacity: 0.6

50+ font.family: "Ubuntu"

51+ fontSize: "medium"

52+ elide: Text.ElideRight

53+ textFormat: Text.PlainText

54+ style: Text.Raised

55+ styleColor: "black"

56+ }

57+ }

58+

59+ ThinDivider {

60+ id: bottomBorder

61+ anchors {

62+ left: parent.left

63+ right: parent.right

64+ bottom: parent.bottom

65+ }

66+ }

67+}

Components/ListItems/Highlight.qmlnew file+46

@@ -0,0 +1,46 @@

1+/*

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+}

tests/qmltests/Components/tst_EdgeDragEvaluator.qml → Components/ListItems/ThinDivider.qmlrenamed+9−9

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

1/*

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

@@ -14,14 +14,14 @@

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

15 */

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+ left: (parent) ? parent.left : null

23−

22+ right: (parent) ? parent.right : null

24− EdgeDragEvaluator {

25− objectName: "edgeDragEvaluator"

26 }

23 }

24+ height: (visible) ? units.dp(2) : 0

25+

26+ source: "graphics/ListItemDividerHorizontal.png"

27}

tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qml → Components/ListItems/VerticalThinDivider.qmlrenamed+8−6

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

1/*

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

@@ -14,11 +14,13 @@

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

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

19−Item {

19+Image {

20− property bool reportCrashes: true

20+ anchors {

21− function setReportCrashes(report) {

21+ top: (parent) ? parent.top : null

22− reportCrashes = report;

22+ bottom: (parent) ? parent.bottom : null

23 }

24+ width: (visible) ? units.dp(2) : 0

25+ source: "graphics/ListItemDividerVertical.png"

24}

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/DownloadDaemonListener/plugin.cpp → Components/Math.jsrenamed+8−9

@@ -14,14 +14,13 @@

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

15 */

16

17−#include "plugin.h"

17+.pragma library

18−#include "MockDownloadTracker.h"

19

18

20−#include <QtQml/QQmlContext>

19+function clamp(value, min, max) {

21−#include <qqml.h>

20+ if (min <= max) {

22−

21+ return Math.max(min, Math.min(max, value))

23−

22+ } else {

24−void FakeUbuntuDownloadDaemonListenerQmlPlugin::registerTypes(const char *uri)

23+ // swap min/max if min > max

25−{

24+ return clamp(value, max, min)

26− qmlRegisterType<MockDownloadTracker>(uri, 0, 1, "DownloadTracker");

25+ }

27}

26}

Components/OpenEffect.qmlnew file+138

@@ -0,0 +1,138 @@

1+/*

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+345

@@ -0,0 +1,345 @@

1+/*

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+

22+Item {

23+ /*!

24+ \preliminary

25+ The text that is shown inside the Page Header

26+ \qmlproperty string text

27+ */

28+ property alias text: label.text

29+

30+ property bool searchEntryEnabled: false

31+ property alias searchQuery: searchField.text

32+ property ListModel searchHistory: SearchHistoryModel {}

33+

34+ height: units.gu(8.5)

35+ implicitHeight: units.gu(8.5)

36+

37+ function triggerSearch() {

38+ if (searchEntryEnabled) searchField.forceActiveFocus()

39+ }

40+

41+ function resetSearch() {

42+ if (!searchHistory) return;

43+

44+ searchHistory.addQuery(searchField.text);

45+ searchField.text = "";

46+ searchField.focus = false;

47+ }

48+

49+ Connections {

50+ target: greeter

51+ onShownChanged: if (shown) resetSearch()

52+ }

53+

54+ Flickable {

55+ id: header

56+ anchors {

57+ left: parent.left

58+ right: parent.right

59+ top: parent.top

60+ }

61+ height: units.gu(6.5)

62+

63+ interactive: false

64+ contentHeight: headerContainer.height

65+ clip: true

66+

67+ contentY: searchField.activeFocus || searchField.text != "" ? searchContainer.y : headerContainer.y

68+

69+ Behavior on contentY { NumberAnimation { duration: 200; easing.type: Easing.OutQuad } }

70+

71+ // FIXME this could potentially be simplified to avoid all the containers

72+ Item {

73+ id: headerContainer

74+

75+ width: parent.width

76+ height: childrenRect.height

77+

78+ Item {

79+ id: textContainer

80+

81+ width: header.width

82+ height: header.height

83+

84+ Label {

85+ id: label

86+ anchors {

87+ left: parent.left

88+ leftMargin: units.gu(2)

89+ right: parent.right

90+ verticalCenter: parent.verticalCenter

91+ }

92+

93+ color: Theme.palette.selected.backgroundText

94+ opacity: 0.8

95+ font.family: "Ubuntu"

96+ font.weight: Font.Light

97+ fontSize: "x-large"

98+ elide: Text.ElideRight

99+ style: Text.Raised

100+ styleColor: "black"

101+ }

102+ }

103+

104+ Item {

105+ id: searchContainer

106+ objectName: "searchContainer"

107+

108+ visible: searchEntryEnabled

109+

110+ property bool narrowMode: parent.width < label.contentWidth + units.gu(50)

111+

112+ property bool active: searchField.text != "" || searchField.activeFocus

113+ property var popover: null

114+

115+ anchors.right: textContainer.right

116+ height: header.height

117+

118+ state:

119+ if (active && narrowMode) "narrowActive"

120+ else if (!active && narrowMode) "narrowInactive"

121+ else if (active && !narrowMode) "active"

122+ else if (!active && !narrowMode) "inactive"

123+

124+ function openPopover() {

125+ if (searchHistory.count > 0) {

126+ searchContainer.popover = PopupUtils.open(popoverComponent, searchField,

127+ {

128+ "pointerTarget": pointerPositioner,

129+ "contentWidth": searchField.width,

130+ "edgeMargins": units.gu(1)

131+ }

132+ )

133+ }

134+ }

135+

136+ function closePopover() {

137+ if (searchContainer.popover) PopupUtils.close(searchContainer.popover)

138+ }

139+

140+ onActiveFocusChanged: if (!activeFocus) { searchHistory.addQuery(searchField.text) }

141+

142+ TextField {

143+ id: searchField

144+

145+ anchors.fill: parent

146+ anchors.margins: units.gu(1)

147+

148+ hasClearButton: false

149+

150+ primaryItem: AbstractButton {

151+ enabled: searchField.text != ""

152+ onClicked: {

153+ if (searchField.text != "") {

154+ searchHistory.addQuery(searchField.text)

155+ searchField.text = ""

156+ }

157+ }

158+ height: parent.height

159+ width: height

160+

161+ Image {

162+ id: primaryImage

163+ anchors {

164+ verticalCenter: parent.verticalCenter

165+ left: parent.left

166+ leftMargin: units.gu(0.5)

167+ }

168+ width: units.gu(3)

169+ height: units.gu(3)

170+ }

171+

172+ Item {

173+ id: pointerPositioner

174+ anchors.left: parent.right

175+ anchors.leftMargin: units.gu(0.5)

176+ anchors.top: parent.bottom

177+ }

178+ }

179+

180+ onTextChanged: {

181+ if (text != "") searchContainer.closePopover()

182+ else if (text == "" && activeFocus) searchContainer.openPopover()

183+ }

184+

185+ onActiveFocusChanged: {

186+ if (!activeFocus) searchContainer.closePopover()

187+ }

188+ }

189+

190+ states: [

191+ State {

192+ name: "wide"

193+ AnchorChanges { target: textContainer; anchors.top: headerContainer.top }

194+ AnchorChanges { target: searchContainer; anchors.left: undefined; anchors.top: textContainer.top }

195+ },

196+ State {

197+ name: "narrow"

198+ PropertyChanges { target: searchField; highlighted: true }

199+ AnchorChanges { target: textContainer; anchors.top: searchContainer.bottom }

200+ AnchorChanges { target: searchContainer; anchors.left: headerContainer.left; anchors.top: headerContainer.top }

201+ },

202+ State {

203+ name: "active"

204+ extend: "wide"

205+ PropertyChanges { target: searchContainer; width: units.gu(40) }

206+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

207+ PropertyChanges { target: searchField; highlighted: true }

208+ },

209+ State {

210+ name: "inactive"

211+ extend: "wide"

212+ PropertyChanges { target: searchContainer; width: units.gu(25) }

213+ PropertyChanges { target: primaryImage; source: "../Dash/graphics/icon_search_inactive.png" }

214+ PropertyChanges { target: searchField; highlighted: false }

215+ },

216+ State {

217+ name: "narrowActive"

218+ extend: "narrow"

219+ PropertyChanges { target: header; contentY: 0 }

220+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

221+ },

222+ State {

223+ name: "narrowInactive"

224+ extend: "narrow"

225+ PropertyChanges { target: header; contentY: header.height }

226+ PropertyChanges { target: primaryImage; source: searchField.text ? "../Dash/graphics/icon_clear.png" : "../Dash/graphics/icon_search_active.png" }

227+ }

228+ ]

229+

230+ transitions: [

231+ Transition {

232+ to: "active"

233+ SequentialAnimation {

234+ ParallelAnimation {

235+ NumberAnimation { targets: [searchContainer, searchField]; property: "width"; duration: 200; easing.type: Easing.InOutQuad }

236+ PropertyAction { target: primaryImage; property: "source" }

237+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

238+ }

239+ ScriptAction { script: searchContainer.openPopover() }

240+ }

241+ },

242+ Transition {

243+ to: "inactive"

244+ ScriptAction { script: searchContainer.closePopover() }

245+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.InOutQuad }

246+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

247+ },

248+ Transition {

249+ to: "narrowActive"

250+ SequentialAnimation {

251+ ParallelAnimation {

252+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }

253+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

254+ }

255+ ScriptAction { script: searchContainer.openPopover() }

256+ }

257+ },

258+ Transition {

259+ to: "narrowInactive"

260+ ScriptAction { script: searchContainer.closePopover() }

261+ NumberAnimation { targets: [searchContainer, searchField] ; property: "width"; duration: 200; easing.type: Easing.OutQuad }

262+ AnchorAnimation { targets: [searchContainer, textContainer]; duration: 200; easing.type: Easing.InOutQuad }

263+ }

264+ ]

265+

266+ Component {

267+ id: popoverComponent

268+ Popover {

269+ id: popover

270+

271+ // FIXME: this should go into the first item below, but enable: false

272+ // prevents mouse events propagation

273+ AbstractButton {

274+ anchors {

275+ top: parent.top

276+ right: parent.right

277+ }

278+ height: units.gu(6)

279+ width: height

280+

281+ onClicked: searchContainer.closePopover()

282+

283+ Image {

284+ anchors.centerIn: parent

285+ width: units.gu(2)

286+ height: units.gu(2)

287+ source: "../Dash/graphics/icon_listview_clear.png"

288+ }

289+ }

290+

291+ Column {

292+ anchors {

293+ top: parent.top

294+ left: parent.left

295+ right: parent.right

296+ }

297+

298+ ListItem.Standard { enabled: false; text: i18n.tr("Recent searches") }

299+

300+ Repeater {

301+ id: recentSearches

302+ model: searchHistory

303+

304+ delegate: ListItem.Standard {

305+ showDivider: index < recentSearches.count - 1

306+ text: query

307+ onClicked: {

308+ searchHistory.addQuery(text)

309+ searchField.text = text

310+ }

311+ }

312+ }

313+ }

314+ }

315+ }

316+

317+ InverseMouseArea {

318+ enabled: searchField.activeFocus

319+

320+ anchors {

321+ top: parent.top

322+ left: parent.left

323+ right: parent.right

324+ }

325+

326+ height: searchContainer.popover ? parent.height + searchContainer.popover.contentHeight + units.gu(2) : parent.height

327+

328+ onPressed: searchField.focus = false

329+ }

330+ }

331+ }

332+ }

333+

334+ BorderImage {

335+ id: bottomBorder

336+ anchors {

337+ top: header.bottom

338+ left: parent.left

339+ right: parent.right

340+ bottom: parent.bottom

341+ }

342+

343+ source: "graphics/PageHeaderBaseDivider.sci"

344+ }

345+}

Components/RatingStars.qmlnew file+41

@@ -0,0 +1,41 @@

1+/*

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+/*

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+76

@@ -0,0 +1,76 @@

1+/*

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: Math.ceil(gridView.model.count / columns) * cellHeight + verticalSpacing

36+ property alias interactive: gridView.interactive

37+ readonly property alias flicking: gridView.flicking

38+ readonly property alias moving: gridView.moving

39+ readonly property alias pressDelay: gridView.pressDelay

40+

41+ GridView {

42+ id: gridView

43+ objectName: "responsiveGridViewGrid"

44+ anchors {

45+ fill: parent

46+ leftMargin: margin/2

47+ rightMargin: margin/2

48+ topMargin: verticalSpacing

49+ }

50+ clip: parent.height != totalContentHeight

51+

52+ function pixelToGU(value) {

53+ return Math.floor(value / units.gu(1));

54+ }

55+

56+ function spacingForColumns(columns) {

57+ // spacing between columns as an integer number of GU, the remainder goes in the margins

58+ var spacingGU = pixelToGU(allocatableHorizontalSpace / columns);

59+ return units.gu(spacingGU);

60+ }

61+

62+ function columnsForSpacing(spacing) {

63+ // minimum margin is half of the spacing

64+ return Math.floor((parent.width - spacing/2) / (delegateWidth + spacing));

65+ }

66+

67+ property real allocatableHorizontalSpace: parent.width - columns * delegateWidth

68+ property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)

69+ property real horizontalSpacing: spacingForColumns(columns)

70+ property real verticalSpacing: horizontalSpacing

71+ property int margin: allocatableHorizontalSpace - columns * horizontalSpacing

72+

73+ cellWidth: delegateWidth + horizontalSpacing

74+ cellHeight: delegateHeight + verticalSpacing

75+ }

76+}

Components/Revealer.qmlnew file+242

@@ -0,0 +1,242 @@

1+/*

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/>.

15 */

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/*

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+540

@@ -0,0 +1,540 @@

1+/*

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.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+ readonly property var focusedApplication:

43+ type == ApplicationInfo.MainStage ? applicationManager.mainStageFocusedApplication

44+ : applicationManager.sideStageFocusedApplication

45+ property bool shouldUseScreenshots: true

46+

47+ /* Will be true whenever application screenshots are being shown.

48+ i.e. during application window transitions */

49+ readonly property bool usingScreenshots: {

50+ if (newApplicationScreenshot.application != null && oldApplicationScreenshot.application != null) {

51+ return newApplicationScreenshot.ready && oldApplicationScreenshot.ready;

52+ } else {

53+ return newApplicationScreenshot.ready || oldApplicationScreenshot.ready;

54+ }

55+ }

56+

57+ property bool rightEdgeEnabled: true

58+ property bool switchingFromFullscreenToFullscreen: false

59+

60+ property alias rightEdgeDraggingAreaWidth: rightEdgeDraggingArea.width

61+

62+ // Y coordinate for non-fullscreen applications

63+ property int normalApplicationY: 0

64+

65+ function activateApplication(desktopFile, addDelay) {

66+ var application = applicationManager.getApplicationFromDesktopFile(desktopFile, stage.type);

67+ if (application != null && application == stage.focusedApplication) {

68+ stage.show();

69+ return;

70+ }

71+

72+ showStartingApplicationAnimation.prepare(application);

73+ if (!stage.fullyShown) {

74+ // if launching this app reveals the stage, make new application screenshot visible

75+ newApplicationScreenshot.visible = true;

76+ stage.show();

77+ } else {

78+ showStartingApplicationAnimation.start();

79+ }

80+

81+ if (addDelay) {

82+ stage.__startingApplicationDesktopFile = desktopFile;

83+ }

84+ }

85+

86+ /* Keep a reference to the focused application so that we can safely

87+ unfocus it when the stage is not fully shown and refocus it when the stage

88+ is fully shown again.

89+ */

90+ property var focusedApplicationWhenUsingScreenshots

91+ onShouldUseScreenshotsChanged: {

92+ if (showStartingApplicationAnimation.running || switchToApplicationAnimation.running) {

93+ return;

94+ }

95+

96+ if (shouldUseScreenshots) {

97+ stage.__focusApplicationUsingScreenshots(stage.focusedApplication);

98+ } else {

99+ stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);

100+ }

101+ }

102+

103+

104+ property Item newApplicationScreenshot: ApplicationScreenshot {

105+ parent: stage

106+ width: stage.width

107+ height: stage.height - y

108+ }

109+ property Item oldApplicationScreenshot: ApplicationScreenshot {

110+ parent: stage

111+ width: stage.width

112+ height: stage.height - y

113+ }

114+

115+ function __getApplicationIndex(application) {

116+ if (!application)

117+ return -1

118+ for (var i = 0; i < stage.applications.count; i++ ) {

119+ if (stage.applications.get(i).desktopFile == application.desktopFile) {

120+ return i

121+ }

122+ }

123+ return -1

124+ }

125+

126+

127+ property string __startingApplicationDesktopFile

128+

129+ Timer {

130+ id: delayedHideScreenshots

131+ interval: 500 // on Galaxy Nexus, Telephony app is slowest application to draw a frame so needs this delay

132+ onTriggered: {

133+ __hideScreenshots();

134+ }

135+ }

136+

137+ function __hideScreenshots() {

138+ newApplicationScreenshot.clearApplication();

139+ oldApplicationScreenshot.clearApplication();

140+ newApplicationScreenshot.visible = false;

141+ oldApplicationScreenshot.visible = false;

142+ }

143+

144+ function __focusApplication(application) {

145+ if (!application) return

146+ if (shouldUseScreenshots) {

147+ stage.__focusApplicationUsingScreenshots(application);

148+ } else {

149+ stage.__focusActualApplication(application);

150+ }

151+ }

152+

153+

154+ function __focusActualApplication(application) {

155+ if (application == null) {

156+ return;

157+ }

158+

159+ if (stage.focusedApplication == application) {

160+ /* FIXME: this case is reached when showing the sidestage, we

161+ need to refocus the side stage app in order to show it.

162+ FIXME: this case is reached when doing a right edge swipe

163+ while in the dash to bring back the stage.

164+ FIXME: this case is reached when showStartingApplicationAnimation

165+ finishes after the newly started application has been focused

166+ automatically by the ApplicationManager.

167+ */

168+ if (stage.type == ApplicationInfo.SideStage) {

169+ applicationManager.focusApplication(application);

170+ }

171+ if (!delayedHideScreenshots.running) {

172+ stage.__hideScreenshots();

173+ }

174+ } else {

175+ /* FIXME: calling ApplicationManager::focusApplication does not focus

176+ the application immediately nor show the application's surface

177+ immediately. Delay hiding the screenshots until it has done so.

178+ */

179+ delayedHideScreenshots.stop();

180+ applicationManager.focusApplication(application);

181+ }

182+ stage.focusedApplicationWhenUsingScreenshots = null;

183+ }

184+

185+ function __focusApplicationUsingScreenshots(application) {

186+ delayedHideScreenshots.stop();

187+ if (application == null) {

188+ return;

189+ }

190+

191+ if (newApplicationScreenshot.application != null) {

192+ stage.focusedApplicationWhenUsingScreenshots = application;

193+ return;

194+ }

195+

196+ newApplicationScreenshot.setApplication(application);

197+ newApplicationScreenshot.scheduleUpdate();

198+ newApplicationScreenshot.opacity = 1.0;

199+ newApplicationScreenshot.x = 0.0;

200+ newApplicationScreenshot.y = __getApplicationY(application);

201+ newApplicationScreenshot.scale = 1.0;

202+ newApplicationScreenshot.visible = true;

203+ stage.focusedApplicationWhenUsingScreenshots = application;

204+ stage.switchingFromFullscreenToFullscreen = false;

205+ }

206+

207+ function __getApplicationY(application) {

208+ return Qt.binding( function(){

209+ return (application && application.fullscreen

210+ && application.stage !== ApplicationInfo.SideStage)

211+ ? 0 : normalApplicationY;

212+ } )

213+ }

214+

215+ /* FIXME: should hide the screenshots when the focused application's surface

216+ is visible. There is no API in QtUbuntu to support that yet.

217+ */

218+ Connections {

219+ target: stage

220+ onFocusedApplicationChanged: {

221+ if (stage.focusedApplication != null) {

222+ /* Move application to the beginning of the list of running applications */

223+ var index = stage.__getApplicationIndex(stage.focusedApplication);

224+ applicationManager.moveRunningApplicationStackPosition(index, 0, stage.type);

225+

226+ var startingApplication = applicationManager.getApplicationFromDesktopFile(

227+ stage.__startingApplicationDesktopFile, stage.type);

228+

229+ if (stage.focusedApplication == startingApplication) {

230+ stage.__startingApplicationDesktopFile = "";

231+

232+ /* Screenshots might still be in use at this point and their

233+ use can be stopped before delayedHideScreenshots is complete.

234+ Prepare for that case by setting appropriately

235+ stage.focusedApplicationWhenUsingScreenshots.

236+ */

237+ stage.focusedApplicationWhenUsingScreenshots = stage.focusedApplication;

238+

239+ /* FIXME: should hide the screenshots when the focused application's window

240+ is visible. There is no API in qtubuntu to support that yet. Therefore

241+ we delay their hiding to avoid a state where neither the screenshot nor

242+ the application's window is visible.

243+ */

244+ delayedHideScreenshots.start();

245+ } else {

246+ stage.__hideScreenshots();

247+ }

248+ }

249+ }

250+ }

251+

252+

253+ SequentialAnimation {

254+ id: showStartingApplicationAnimation

255+

256+ function prepare(newApplication) {

257+ var oldApplication = stage.focusedApplication;

258+ newApplicationScreenshot.setApplication(newApplication);

259+ newApplicationScreenshot.updateFromCache();

260+ oldApplicationScreenshot.setApplication(oldApplication);

261+ oldApplicationScreenshot.scheduleUpdate();

262+ newApplicationScreenshot.withBackground = true; // FIXME: should be withBackground = newApplication.state == Application.Starting

263+ newApplicationScreenshot.y = __getApplicationY(newApplication);

264+ oldApplicationScreenshot.y = __getApplicationY(oldApplication);

265+ stage.focusedApplicationWhenUsingScreenshots = newApplication;

266+ stage.switchingFromFullscreenToFullscreen = false;

267+ }

268+

269+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: false}

270+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: false}

271+ PropertyAction {target: newApplicationScreenshot; property: "z"; value: 0}

272+ PropertyAction {target: oldApplicationScreenshot; property: "z"; value: 1}

273+ PropertyAction {target: newApplicationScreenshot; property: "scale"; value: 0.8}

274+ PropertyAction {target: oldApplicationScreenshot; property: "scale"; value: 1.0}

275+ PropertyAction {target: newApplicationScreenshot; property: "opacity"; value: 0.0}

276+ PropertyAction {target: oldApplicationScreenshot; property: "opacity"; value: 1.0}

277+ PropertyAction {target: newApplicationScreenshot; property: "x"; value: 0.0}

278+ PropertyAction {target: oldApplicationScreenshot; property: "x"; value: 0.0}

279+

280+ ParallelAnimation {

281+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: true}

282+ NumberAnimation {

283+ target: newApplicationScreenshot

284+ property: "scale"

285+ duration: 500

286+ easing.type: Easing.OutQuad

287+ to: 1.0

288+ }

289+ NumberAnimation {

290+ target: newApplicationScreenshot

291+ property: "opacity"

292+ duration: 500

293+ easing.type: Easing.OutQuad

294+ to: 1.0

295+ }

296+

297+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: true}

298+

299+ NumberAnimation {

300+ target: oldApplicationScreenshot

301+ property: "x"

302+ duration: 400

303+ easing.type: Easing.OutQuad

304+ to: stage.width

305+ }

306+ }

307+

308+ ScriptAction {

309+ script: {

310+ if (!stage.focusedApplicationWhenUsingScreenshots) {

311+ // FIXME: only here to support case where application does

312+ // not exist yet but is about to

313+ return;

314+ }

315+

316+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

317+ }

318+ }

319+ }

320+

321+

322+ SequentialAnimation {

323+ id: switchToApplicationAnimation

324+

325+ function prepare(newApplication) {

326+ var oldApplication = stage.focusedApplication;

327+ newApplicationScreenshot.setApplication(newApplication);

328+ newApplicationScreenshot.updateFromCache();

329+ oldApplicationScreenshot.setApplication(oldApplication);

330+ oldApplicationScreenshot.scheduleUpdate();

331+ newApplicationScreenshot.withBackground = false;

332+ newApplicationScreenshot.y = __getApplicationY(newApplication);

333+ oldApplicationScreenshot.y = __getApplicationY(oldApplication);

334+ stage.focusedApplicationWhenUsingScreenshots = newApplication;

335+ stage.switchingFromFullscreenToFullscreen = newApplication && newApplication.fullscreen;

336+ }

337+

338+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: false}

339+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: false}

340+ PropertyAction {target: newApplicationScreenshot; property: "z"; value: 1}

341+ PropertyAction {target: oldApplicationScreenshot; property: "z"; value: 0}

342+ PropertyAction {target: newApplicationScreenshot; property: "scale"; value: 1.0}

343+ PropertyAction {target: oldApplicationScreenshot; property: "scale"; value: 1.0}

344+ PropertyAction {target: newApplicationScreenshot; property: "opacity"; value: 1.0}

345+ PropertyAction {target: oldApplicationScreenshot; property: "opacity"; value: 1.0}

346+ PropertyAction {target: newApplicationScreenshot; property: "x"; value: stage.width}

347+ PropertyAction {target: oldApplicationScreenshot; property: "x"; value: 0.0}

348+ PropertyAction {target: newApplicationScreenshot; property: "visible"; value: true}

349+ PropertyAction {target: oldApplicationScreenshot; property: "visible"; value: true}

350+

351+ ParallelAnimation {

352+ NumberAnimation {

353+ target: oldApplicationScreenshot

354+ property: "scale"

355+ duration: 500

356+ easing.type: Easing.OutQuad

357+ to: 0.8

358+ }

359+ NumberAnimation {

360+ target: oldApplicationScreenshot

361+ property: "opacity"

362+ duration: 500

363+ easing.type: Easing.OutQuad

364+ to: 0.0

365+ }

366+

367+ NumberAnimation {

368+ target: newApplicationScreenshot

369+ property: "x"

370+ duration: 500

371+ easing.type: Easing.OutQuad

372+ to: 0

373+ }

374+ }

375+

376+ ScriptAction {

377+ script: {

378+ // move previously focused application to the end of the list of running applications

379+ var oldApplication = oldApplicationScreenshot.application;

380+ if (oldApplication != null) {

381+ var oldApplicationIndex = stage.__getApplicationIndex(oldApplicationScreenshot.application);

382+ applicationManager.moveRunningApplicationStackPosition(

383+ oldApplicationIndex, stage.applications.count - 1, stage.type);

384+ }

385+

386+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

387+ }

388+ }

389+ }

390+

391+

392+ function __dragValueToProgress(dragValue, startValue, applicationsCount) {

393+ if (applicationsCount == 0) {

394+ return 0;

395+ } else if (applicationsCount == 1) {

396+ // prevent the current app from moving more than 1/4 of the screen

397+ var elasticValue = __elastic(dragValue, startValue/4);

398+ return elasticValue / startValue;

399+ } else {

400+ return dragValue / startValue;

401+ }

402+ }

403+

404+ function __elastic(x, limit) {

405+ return limit * ( 1 - Math.pow( ( limit - 1 ) / limit, x ) )

406+ }

407+

408+ property real __startValue: stage.width

409+

410+ AnimationControllerWithSignals {

411+ id: switchToApplicationAnimationController

412+

413+ onAnimationCompletedAtBeginning: {

414+ animation = null;

415+ stage.__focusApplication(oldApplicationScreenshot.application);

416+ }

417+ }

418+

419+ EdgeDragEvaluator {

420+ id: dragEvaluator

421+ trackedPosition: rightEdgeDraggingArea.touchX

422+ direction: rightEdgeDraggingArea.direction

423+ maxDragDistance: stage.width

424+ }

425+

426+ EdgeDragArea {

427+ id: rightEdgeDraggingArea

428+

429+ enabled: {

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

431+ return switchToApplicationAnimationController.completed

432+ && stage.applications.count > 0 && stage.rightEdgeEnabled

433+ && !delayedHideScreenshots.running

434+ } else {

435+ return true

436+ }

437+ }

438+ width: units.gu(2)

439+ anchors.top: parent.top

440+ anchors.bottom: parent.bottom

441+ anchors.right: parent.right

442+

443+ direction: Direction.Leftwards

444+

445+ onDistanceChanged: {

446+ if (status !== DirectionalDragArea.Recognized)

447+ return

448+

449+ var targetProgress = __dragValueToProgress(-distance, __startValue,

450+ stage.applications.count)

451+ var delta = targetProgress - switchToApplicationAnimationController.progress

452+

453+ // When the gesture finally gets recognized, the finger will likely be

454+ // reasonably far from the edge. If we made the progress immediately

455+ // follow the finger position it would be visually unpleasant as there

456+ // would be a jump to meet the finger's current position.

457+ //

458+ // The trick is not to go all the way (1.0) as it would cause the

459+ // aforementioned jump.

460+ switchToApplicationAnimationController.progress += 0.4 * delta

461+ }

462+

463+ property bool gotRejected: false

464+

465+ onStatusChanged: {

466+ if (status == DirectionalDragArea.Undecided) {

467+ gotRejected = false

468+ onUndecided();

469+ } else if (status == DirectionalDragArea.Rejected) {

470+ switchToApplicationAnimationController.completeToBeginningWithSignal();

471+ gotRejected = true;

472+ } else if (status == DirectionalDragArea.WaitingForTouch) {

473+ if (!gotRejected)

474+ onGestureEnded()

475+ }

476+ }

477+

478+ function onUndecided() {

479+ dragEvaluator.reset();

480+

481+ var nextApplication = null;

482+ if (stage.applications.count > 1) {

483+ nextApplication = stage.applications.get(1);

484+ }

485+ switchToApplicationAnimationController.progress = 0

486+ switchToApplicationAnimation.prepare(nextApplication);

487+ switchToApplicationAnimationController.animation = switchToApplicationAnimation;

488+

489+ }

490+

491+ function onGestureEnded() {

492+ if (stage.applications.count > 1 && dragEvaluator.shouldAutoComplete()) {

493+ switchToApplicationAnimationController.completeToEndWithSignal();

494+ } else {

495+ switchToApplicationAnimationController.completeToBeginningWithSignal();

496+ }

497+ }

498+ }

499+

500+

501+ // FIXME: very bad hack to detect when an application was closed or crashed

502+ property var __previouslyFocusedApplication

503+ Connections {

504+ target: stage

505+ onFocusedApplicationChanged: {

506+ if (stage.focusedApplication == null

507+ && __getApplicationIndex(stage.__previouslyFocusedApplication) == -1) {

508+ stage.__onFocusedApplicationClosed();

509+ }

510+ stage.__previouslyFocusedApplication = stage.focusedApplication;

511+ }

512+ }

513+

514+ function __onFocusedApplicationClosed() {

515+ if (!stage.shown) {

516+ return;

517+ }

518+

519+ if (stage.applications.count > 0) {

520+ // Do not change the focused application from within onFocusedApplicationChanged.

521+ // This causes binding loop warnings besides being a bad practice in general

522+ // (setting a property from within its "changed" signal handling)

523+ // Hence the timer.

524+ focusTopmostAppTimer.start();

525+ } else {

526+ stage.hide();

527+ }

528+ }

529+

530+ Timer {

531+ id: focusTopmostAppTimer

532+ interval: 1; repeat: false

533+ onTriggered: {

534+ if (stage.applications.count > 0) {

535+ stage.__focusApplication(stage.applications.get(0));

536+ }

537+ }

538+ }

539+

540+}

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/>.

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

19NumberAnimation {

20 duration: 200

Components/Tile.qmlnew file+93

@@ -0,0 +1,93 @@

1+/*

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+

88+ GridView.onRemove: SequentialAnimation {

89+ PropertyAction { target: root; property: "GridView.delayRemove"; value: true }

90+ NumberAnimation { target: root; property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.InOutQuad }

91+ PropertyAction { target: root; property: "GridView.delayRemove"; value: false }

92+ }

93+}

Components/Time.jsnew file+49

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

1+/*

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/*

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

@@ -14,26 +14,32 @@

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

15 */

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}

Components/VolumeControl.qmlnew file+58

@@ -0,0 +1,58 @@

1+/*

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 QMenuModel 0.1

19+

20+Item {

21+ id: root

22+ objectName: "volumeControl"

23+ visible: false

24+ property int volume

25+

26+ QDBusActionGroup {

27+ id: actionGroup

28+ busType: 1

29+ busName: "com.canonical.settings.sound"

30+ objectPath: "/com/canonical/settings/sound"

31+

32+ property variant actionObject: action("volume")

33+ property variant serverVolume: actionObject.valid ? actionObject.state: 0

34+ }

35+

36+ Binding {

37+ target: root

38+ property: "volume"

39+ value: actionGroup.serverVolume * 100

40+ }

41+

42+ onVolumeChanged: {

43+ if (actionGroup.serverVolume != volume) {

44+ var targetVolume = Math.min(1, Math.max(0, volume / 100));

45+ actionGroup.actionObject.updateState(targetVolume);

46+ }

47+ }

48+

49+ function volumeUp() {

50+ actionGroup.actionObject.updateState(Math.min(1, volume/100 + 0.10));

51+ }

52+

53+ function volumeDown() {

54+ actionGroup.actionObject.updateState(Math.max(0, volume/100 - 0.10));

55+ }

56+

57+ Component.onCompleted: actionGroup.start()

58+}

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/>.

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

19SequentialAnimation {

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/ApplicationsFilterGrid.qmlnew file+57

@@ -0,0 +1,57 @@

1+/*

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+import "../../Components/IconUtil.js" as IconUtil

21+

22+FilterGrid {

23+ id: filterGrid

24+

25+ filter: false

26+ expandable: false

27+ minimumHorizontalSpacing: units.gu(0.5)

28+ maximumNumberOfColumns: 6

29+ delegateWidth: units.gu(11)

30+ delegateHeight: units.gu(9.5)

31+ verticalSpacing: units.gu(2)

32+

33+ signal clicked(int index, variant data)

34+

35+ delegate: Tile {

36+ objectName: "delegate" + index

37+ Application {

38+ id: application

39+ desktopFile: model.dndUri ? stripProtocol(model.dndUri) : model.desktopFile // FIXME: this is temporary

40+

41+ function stripProtocol(uri) {

42+ var chunks = uri.split('file://')

43+ return chunks[chunks.length-1]

44+ }

45+ }

46+

47+ property string icon: model.icon ? model.icon : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary

48+

49+ width: filterGrid.cellWidth

50+ height: filterGrid.cellHeight

51+ text: model.title ? model.title : application.name // FIXME: this is temporary

52+ imageWidth: units.gu(8)

53+ imageHeight: units.gu(7.5)

54+ source: IconUtil.from_gicon(icon)

55+ onClicked: filterGrid.clicked(index, application.desktopFile);

56+ }

57+}

Dash/Apps/AppsAvailableForDownloadModel.qmlnew file+26

@@ -0,0 +1,26 @@

1+/*

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 { desktopFile: "/usr/share/applications/evernote.desktop"; }

21+ ListElement { desktopFile: "/usr/share/applications/map.desktop"; }

22+ ListElement { desktopFile: "/usr/share/applications/pinterest.desktop"; }

23+ ListElement { desktopFile: "/usr/share/applications/soundcloud.desktop"; }

24+ ListElement { desktopFile: "/usr/share/applications/wikipedia.desktop"; }

25+ ListElement { desktopFile: "/usr/share/applications/youtube.desktop"; }

26+}

Dash/Apps/CloseIcon.qmlnew file+62

@@ -0,0 +1,62 @@

1+/*

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+}

plugins/SessionBroadcast/plugin.cpp → Dash/Apps/FrequentlyUsedAppsModel.qmlrenamed+8−17

@@ -12,24 +12,15 @@

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− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19−#include "plugin.h"

17+import QtQuick 2.0

20−#include "SessionBroadcast.h"

21−

22−#include <QtQml/qqml.h>

23−

24−static QObject *broadcast_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25−{

26− Q_UNUSED(engine)

27− Q_UNUSED(scriptEngine)

28− return new SessionBroadcast();

29−}

30

18

31−void SessionBroadcastPlugin::registerTypes(const char *uri)

19+ListModel {

32−{

20+ ListElement { desktopFile: "/usr/share/applications/camera-app.desktop"; }

33− Q_ASSERT(uri == QLatin1String("SessionBroadcast"));

21+ ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }

34− qmlRegisterSingletonType<SessionBroadcast>(uri, 0, 1, "SessionBroadcast", broadcast_provider);

22+ ListElement { desktopFile: "/usr/share/applications/gallery-app.desktop"; }

23+ ListElement { desktopFile: "/usr/share/applications/facebook-webapp.desktop"; }

24+ ListElement { desktopFile: "/usr/share/applications/webbrowser-app.desktop"; }

25+ ListElement { desktopFile: "/usr/share/applications/gmail-webapp.desktop"; }

35}

26}

Dash/Apps/RunningApplicationTile.qmlnew file+138

@@ -0,0 +1,138 @@

1+/*

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.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: application

80+ width: shapedApplicationImage.width

81+ height: shapedApplicationImage.height

82+ fillMode: ApplicationImage.PreserveAspectCrop

83+ }

84+

85+ UbuntuShape {

86+ id: borderPressed

87+

88+ anchors.fill: shapedApplicationImage

89+ radius: "medium"

90+ borderSource: "radius_pressed.sci"

91+ opacity: root.pressed ? 1.0 : 0.0

92+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }

93+ }

94+

95+ // FIXME: label code duplicated with Tile

96+ Item {

97+ id: labelContainer

98+ anchors {

99+ left: parent.left

100+ right: parent.right

101+ top: shapedApplicationImage.bottom

102+ }

103+ height: units.gu(2)

104+

105+ Label {

106+ id: label

107+ anchors {

108+ baseline: parent.bottom

109+ left: parent.left

110+ right: parent.right

111+ leftMargin: units.gu(1)

112+ rightMargin: units.gu(1)

113+ }

114+ text: (application) ? application.name : ""

115+

116+ color: Theme.palette.selected.backgroundText

117+ opacity: 0.9

118+ style: Text.Raised

119+ styleColor: "black"

120+ fontSize: "small"

121+ elide: Text.ElideMiddle

122+ horizontalAlignment: Text.AlignHCenter

123+ }

124+ }

125+

126+ CloseIcon {

127+ anchors {

128+ right: shapedApplicationImage.right

129+ rightMargin: -units.gu(1)

130+ top: parent.top

131+ topMargin: -units.gu(1)

132+ }

133+ height: units.gu(6)

134+ width: units.gu(6)

135+ id: closeIcon

136+ enabled: root.terminationModeEnabled

137+ }

138+}

Dash/Apps/RunningApplicationsGrid.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

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.application.name

56+ anchors {

57+ top: parent.top

58+ horizontalCenter: parent.horizontalCenter

59+ }

60+ application: model.application

61+ onRequestedActivationMode: { root.terminationModeEnabled = false }

62+ onRequestedTerminationMode: {

63+ if (canEnableTerminationMode)

64+ root.terminationModeEnabled = true

65+ }

66+ onRequestedApplicationTermination: {

67+ shell.applicationManager.stopProcess(application)

68+ }

69+ onRequestedApplicationActivation: {

70+ shell.activateApplication(application.desktopFile)

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+/*

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+173

@@ -0,0 +1,173 @@

1+/*

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+ScopeView {

25+ id: scopeView

26+

27+ // FIXME: a way to aggregate these models would be ideal

28+ property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications

29+ property var sideStageApplicationModel: shell.applicationManager.sideStageApplications

30+

31+ onMovementStarted: categoryView.showHeader()

32+ onPositionedAtBeginning: {

33+ if (isCurrent) {

34+ categoryView.positionAtBeginning()

35+ }

36+ }

37+

38+ onIsCurrentChanged: {

39+ pageHeader.resetSearch();

40+ }

41+

42+ Binding {

43+ target: scopeView.scope

44+ property: "searchQuery"

45+ value: pageHeader.searchQuery

46+ }

47+

48+ Connections {

49+ target: panel

50+ onSearchClicked: if (isCurrent) {

51+ pageHeader.triggerSearch()

52+ categoryView.showHeader()

53+ }

54+ }

55+

56+ ListModel {

57+ id: categoryListModel

58+ // specifies app categories, type of delegate and model used in each category

59+ ListElement { category: "Running apps"; component: "Apps/RunningApplicationsGrid.qml"; modelName: "RunningApplicationsModel" }

60+ ListElement { category: "Frequently used"; component: "Apps/ApplicationsFilterGrid.qml"; modelName: "FrequentlyUsedAppsModel" }

61+ ListElement { category: "Installed"; component: "Apps/ApplicationsFilterGrid.qml"; modelName: "InstalledApplicationsModel" }

62+ ListElement { category: "Available for download"; component: "Apps/ApplicationsFilterGrid.qml"; modelName: "AppsAvailableForDownloadModel" }

63+ function getCategory(category1) {

64+ if (category1 === "Running apps") {

65+ return i18n.tr("Running apps");

66+ }

67+ if (category1 === "Frequently used") {

68+ return i18n.tr("Frequently used");

69+ }

70+ if (category1 === "Installed") {

71+ return i18n.tr("Installed");

72+ }

73+ if (category1 === "Available for download") {

74+ return i18n.tr("Available for download");

75+ }

76+ return ""

77+ }

78+ }

79+

80+ FrequentlyUsedAppsModel { id: frequentlyUsedAppsModel }

81+ AppsAvailableForDownloadModel { id: appsAvailableForDownloadModel }

82+

83+ // FIXME this should not be needed, the backend should handle all that itself

84+ property var installedModel: null

85+

86+ Repeater {

87+ model: scopeView.scope.categories

88+

89+ delegate: Item {

90+ Component.onCompleted: if (index == 3) scopeView.installedModel = Qt.binding(function() { return model.results; });

91+ }

92+ }

93+

94+ property var categoryModels: {

95+ "FrequentlyUsedAppsModel": frequentlyUsedAppsModel,

96+ "InstalledApplicationsModel": installedModel,

97+ "AppsAvailableForDownloadModel": appsAvailableForDownloadModel,

98+ }

99+

100+ ScopeListView {

101+ id: categoryView

102+ anchors.fill: parent

103+ model: SortFilterProxyModel {

104+ model: categoryListModel

105+ filterRole: 0 // 0 == modelName

106+ // FIXME: need to use invertMatch here, otherwise the filter won't update correctly

107+ // if filterRegExp is set before invertMatch. Bug in SortFilterProxyModel?

108+ filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0

109+ && sideStageApplicationModel.count === 0) ? RegExp("RunningApplicationsModel") : RegExp("")) :

110+ RegExp("InstalledApplicationsModel")

111+ invertMatch: pageHeader.searchQuery.length == 0

112+ }

113+

114+ onAtYEndChanged: if (atYEnd) endReached()

115+ onMovingChanged: if (moving && atYEnd) endReached()

116+

117+ delegate: Base {

118+ id: container

119+ highlightWhenPressed: false

120+

121+ Loader {

122+ anchors {

123+ top: parent.top

124+ left: parent.left

125+ right: parent.right

126+ }

127+ source: component

128+ onLoaded: {

129+ if (modelName == "RunningApplicationsModel") {

130+ item.firstModel = mainStageApplicationsModel

131+ item.secondModel = sideStageApplicationModel

132+ item.canEnableTerminationMode =

133+ Qt.binding(function() { return isCurrent; })

134+ } else {

135+ function activateApplication(index, data) {

136+ shell.activateApplication(data);

137+ }

138+

139+ item.model = Qt.binding(function() { return categoryModels[modelName]; });

140+ item.clicked.connect(activateApplication);

141+

142+ }

143+ }

144+ }

145+

146+ ListView.onRemove: SequentialAnimation {

147+ PropertyAction {

148+ target: container; property: "ListView.delayRemove"; value: true

149+ }

150+ NumberAnimation {

151+ target: container; property: "height"; to: 0;

152+ duration: 250; easing.type: Easing.InOutQuad

153+ }

154+ PropertyAction {

155+ target: container; property: "ListView.delayRemove"; value: false

156+ }

157+ }

158+ }

159+

160+ sectionProperty: "category"

161+ sectionDelegate: Header {

162+ width: categoryView.width

163+ text: categoryListModel.getCategory(section)

164+ }

165+ pageHeader: PageHeader {

166+ id: pageHeader

167+ width: categoryView.width

168+ text: i18n.tr("Apps")

169+ searchEntryEnabled: true

170+ searchHistory: scopeView.searchHistory

171+ }

172+ }

173+}

Dash/DashBar.qmlnew file+129

@@ -0,0 +1,129 @@

1+/*

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+ Item {

87+ signal clicked()

88+

89+ width: itemSize

90+ height: dashBar.height

91+ anchors.top: parent.top

92+

93+ onClicked: {

94+ dashBar.itemSelected(index)

95+ timeout.restart()

96+ }

97+

98+ Image {

99+ anchors.centerIn: parent

100+ source: scope.iconHint

101+ sourceSize { width: iconSize; height: iconSize }

102+ // opacity: index == currentIndex ? 1 : 1 // same opacity for now

103+ }

104+ }

105+ }

106+ }

107+ }

108+

109+ Rectangle {

110+ anchors {

111+ left: parent.left

112+ right: parent.right

113+ bottom: parent.bottom

114+ }

115+ height: dashBar.lineHeight

116+ color: "black"

117+

118+ Rectangle {

119+ id: highlightLine

120+ color: Theme.palette.selected.foreground

121+ height: parent.height

122+ anchors.bottom: parent.bottom

123+ z: 1

124+

125+ Behavior on x {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}

126+ Behavior on width {NumberAnimation { duration: 150; easing.type: Easing.OutCubic}}

127+ }

128+ }

129+}

Dash/DashContent.qmlnew file+143

@@ -0,0 +1,143 @@

1+/*

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+ onLoaded: {

119+ item.scope = Qt.binding(function() { return scope })

120+ item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })

121+ item.searchHistory = Qt.binding(function() { return shell.searchHistory })

122+ dashContentList.movementStarted.connect(item.movementStarted)

123+ dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

124+ dashContent.scopeLoaded(item.scope.id)

125+ }

126+ Connections {

127+ target: item

128+ ignoreUnknownSignals: true

129+ onEndReached: contentEndReached()

130+ onPreviewShownChanged: {

131+ if (item.previewShown) {

132+ previewShown()

133+ dashContentList.interactive = false

134+ } else {

135+ dashContentList.interactive = true

136+ }

137+ }

138+ }

139+

140+ Component.onDestruction: active = false

141+ }

142+ }

143+}

Dash/DashHome.qmlnew file+153

@@ -0,0 +1,153 @@

1+/*

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+import "Video"

25+import "Music"

26+

27+ScopeView {

28+ id: root

29+

30+ onMovementStarted: listView.showHeader()

31+

32+ ListModel {

33+ id: categoryListModel

34+ // specifies page's content categories, type of delegate and model used in each category

35+ ListElement { category: "Frequent Apps"; component: "Apps/ApplicationsFilterGrid.qml"; modelName: "AppsModel" }

36+ ListElement { category: "Recent Music"; component: "Music/MusicFilterGrid.qml"; modelName: "MusicModel" }

37+ ListElement { category: "Videos Popular Online"; component: "Video/VideosFilterGrid.qml"; modelName: "VideosModel" }

38+ function getCategory(category1) {

39+ if (category1 === "Frequent Apps") {

40+ return i18n.tr("Frequent Apps");

41+ }

42+ if (category1 === "Recent Music") {

43+ return i18n.tr("Recent Music");

44+ }

45+ if (category1 === "Videos Popular Online") {

46+ return i18n.tr("Videos Popular Online");

47+ }

48+ return ""

49+ }

50+ }

51+

52+ FrequentlyUsedAppsModel { id: appsModel }

53+

54+ // FIXME this should be handled by the backends by populating the global search model

55+ property var musicModel: null

56+ property var videosModel: null

57+

58+ Repeater {

59+ id: musicRepeater

60+

61+ delegate: Item {

62+ Component.onCompleted: if (index == 1) musicModel = Qt.binding(function() { return model.results; });

63+ }

64+ }

65+

66+ Repeater {

67+ id: videosRepeater

68+

69+ delegate: Item {

70+ Component.onCompleted: if (index == 3) videosModel = Qt.binding(function() { return model.results; });

71+ }

72+ }

73+

74+ Component.onCompleted: {

75+ var scope = dashContent.scopes.get("mockmusicmaster.scope")

76+ if (scope) {

77+ musicRepeater.model = dashContent.scopes.get("mockmusicmaster.scope").categories

78+ }

79+ scope = dashContent.scopes.get("mockvideosmaster.scope")

80+ if (scope) {

81+ videosRepeater.model = dashContent.scopes.get("mockvideosmaster.scope").categories

82+ }

83+ }

84+

85+ Connections {

86+ target: dashContent

87+ onScopeLoaded: switch (scopeId) {

88+ case "mockmusicmaster.scope":

89+ musicRepeater.model = dashContent.scopes.get("mockmusicmaster.scope").categories

90+ break;

91+ case "mockvideosmaster.scope":

92+ videosRepeater.model = dashContent.scopes.get("mockvideosmaster.scope").categories

93+ break;

94+ }

95+ }

96+

97+ property var categoryModels: {"AppsModel": appsModel,

98+ "MusicModel": musicModel,

99+ "VideosModel": videosModel,

100+ }

101+

102+ ScopeListView {

103+ id: listView

104+ anchors.fill: parent

105+ model: categoryListModel

106+

107+ onAtYEndChanged: if (atYEnd) endReached()

108+ onMovingChanged: if (moving && atYEnd) endReached()

109+

110+ delegate: Base {

111+ id: container

112+ highlightWhenPressed: false

113+ width: listView.width

114+

115+ Loader {

116+ anchors { top: parent.top; left: parent.left; right: parent.right }

117+ source: component

118+ onLoaded: {

119+ item.model = Qt.binding(function() { return categoryModels[modelName]; });

120+

121+ //FIXME: workaround for lack of previews for videos in Home scope.

122+ //Need to connect to the clicked() signal here and act upon it here instead.

123+ if (modelName === "VideosModel") {

124+ function playVideo(index, data) {

125+ if (data.fileUri) {

126+ shell.activateApplication('/usr/share/applications/mediaplayer-app.desktop', "/usr/share/demo-assets/videos/" + data.fileUri);

127+ }

128+ }

129+

130+ item.clicked.connect(playVideo);

131+ } else if (modelName === "AppsModel") {

132+ function activateApplication(index, data) {

133+ shell.activateApplication(data);

134+ }

135+

136+ item.objectName = "dashHomeApplicationsGrid";

137+ item.clicked.connect(activateApplication);

138+ }

139+ }

140+ }

141+ }

142+

143+ sectionProperty: "category"

144+ sectionDelegate: Header {

145+ width: listView.width

146+ text: listView.model.getCategory(section)

147+ }

148+ pageHeader: PageHeader {

149+ width: listView.width

150+ text: i18n.tr("Home")

151+ }

152+ }

153+}

Dash/DashMusic.qmlnew file+96

@@ -0,0 +1,96 @@

1+/*

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 1: 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 int categoryId: id

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+218

@@ -0,0 +1,218 @@

1+/*

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+ property string title: ""

23+ property url url: ""

24+ property real previewWidthRatio: 0.5

25+ property bool playable: false

26+ property bool forceSquare: false

27+ property Component buttons

28+ property Component caption

29+ property Component description

30+

31+ readonly property bool narrowMode: width <= height

32+ readonly property int contentSpacing: units.gu(3)

33+

34+ signal close()

35+ signal previewImageClicked()

36+

37+ color: Qt.rgba(0, 0, 0, .3)

38+ clip: true

39+

40+ Connections {

41+ target: shell.applicationManager

42+ onMainStageFocusedApplicationChanged: {

43+ root.close();

44+ }

45+ onSideStageFocusedApplicationChanged: {

46+ root.close();

47+ }

48+ }

49+

50+ MouseArea {

51+ anchors.fill: parent

52+ }

53+

54+ Item {

55+ id: headerRow

56+ height: units.gu(4)

57+ anchors {

58+ top: parent.top

59+ left: parent.left

60+ right: parent.right

61+ margins: root.contentSpacing

62+ }

63+

64+ MouseArea {

65+ anchors {

66+ fill: parent

67+ leftMargin: -root.contentSpacing

68+ rightMargin: -root.contentSpacing

69+ topMargin: -root.contentSpacing

70+ }

71+

72+ onClicked: root.close();

73+ }

74+

75+ Item {

76+ id: labelItem

77+ anchors {

78+ fill: parent

79+ rightMargin: closePreviewImage.width + spacing

80+ }

81+

82+ property int spacing: units.gu(2)

83+

84+ Label {

85+ id: title

86+ objectName: "titleLabel"

87+ anchors {

88+ left: parent.left

89+ right: parent.right

90+ }

91+

92+ elide: Text.ElideRight

93+ fontSize: "x-large"

94+ font.weight: Font.Light

95+ color: Theme.palette.selected.backgroundText

96+ opacity: 0.9

97+ text: root.title

98+ style: Text.Raised

99+ styleColor: "black"

100+ }

101+ Image {

102+ id: closePreviewImage

103+ source: "graphics/tablet/icon_close_preview.png"

104+ width: units.gu(4)

105+ height: units.gu(1.5)

106+ anchors {

107+ bottom: title.bottom

108+ bottomMargin: units.dp(7)

109+ left: parent.left

110+ leftMargin: title.paintedWidth + labelItem.spacing

111+ }

112+ }

113+ }

114+ }

115+

116+ Row {

117+ id: contentRow

118+ anchors {

119+ left: parent.left

120+ right: parent.right

121+ top: headerRow.bottom

122+ bottom: parent.bottom

123+ margins: root.contentSpacing

124+ }

125+

126+ spacing: units.gu(2)

127+

128+ Flickable {

129+ id: leftFlickable

130+ anchors.top: parent.top

131+ anchors.bottom: parent.bottom

132+ width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio

133+ contentHeight: leftColumn.height

134+ clip: true

135+

136+ Column {

137+ id: leftColumn

138+ objectName: "leftColumn"

139+ anchors {

140+ left: parent.left

141+ right: parent.right

142+ }

143+ height: childrenRect.height

144+ spacing: root.contentSpacing

145+

146+ // TODO: replace this UbuntuShape with the Video component once that lands

147+ // with the player.

148+ UbuntuShape {

149+ id: urlLoader

150+ anchors.left: parent.left

151+ anchors.right: parent.right

152+ height: root.forceSquare ? width : width * previewImage.sourceSize.height / previewImage.sourceSize.width

153+ radius: "medium"

154+ image: Image {

155+ id: previewImage

156+ asynchronous: true

157+ source: root.url

158+ fillMode: Image.PreserveAspectCrop

159+ }

160+

161+ Image {

162+ objectName: "playButton"

163+ anchors.centerIn: parent

164+ visible: root.playable

165+ readonly property bool bigButton: parent.width > units.gu(40)

166+ width: bigButton ? units.gu(8) : units.gu(4.5)

167+ height: width

168+ source: "graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")

169+ }

170+

171+ MouseArea {

172+ id: previewImageMouseArea

173+ anchors.fill: parent

174+ onClicked: root.previewImageClicked()

175+ }

176+ }

177+ Loader {

178+ id: buttonLoader

179+ anchors.left: parent.left

180+ anchors.right: parent.right

181+ sourceComponent: root.buttons

182+ }

183+ Loader {

184+ id: captionLoader

185+ anchors.left: parent.left

186+ anchors.right: parent.right

187+ sourceComponent: root.caption

188+ }

189+ }

190+ }

191+

192+ Flickable {

193+ id: rightFlickable

194+ anchors.top: parent.top

195+ anchors.bottom: parent.bottom

196+ width: narrowMode ? 0 : (contentRow.width - leftColumn.width - contentRow.spacing)

197+ contentHeight: rightColumn.height

198+ clip: true

199+

200+ Column {

201+ id: rightColumn

202+ objectName: "rightColumn"

203+ height: childrenRect.height

204+ anchors {

205+ left: parent.left

206+ right: parent.right

207+ }

208+ }

209+ }

210+ }

211+

212+ Loader {

213+ parent: root.narrowMode ? leftColumn : rightColumn

214+ anchors.left: parent.left

215+ anchors.right: parent.right

216+ sourceComponent: root.description

217+ }

218+}

Dash/DashVideos.qmlnew file+202

@@ -0,0 +1,202 @@

1+/*

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 1: 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 int categoryIndex: index

106+ property int categoryId: id

107+

108+ Loader {

109+ id: loader

110+ anchors { top: parent.top; left: parent.left; right: parent.right }

111+ source: scopeView.getRenderer(base.categoryId)

112+ onLoaded: {

113+ item.model = results

114+ }

115+

116+ Connections {

117+ target: loader.item

118+ onClicked: {

119+ var dataItem;

120+ // VideosCarousel and VideosFilterGrid have different

121+ // clicked signals, accomodate for that

122+ if (categoryId == 1) {

123+ var fileUri = delegateItem.model.uri.replace(/^[^:]+:/, "")

124+ dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.comment}

125+ } else {

126+ dataItem = data;

127+ }

128+ if (dataItem.nfoUri != "") {

129+ previewLoader.videoData = dataItem;

130+ previewLoader.open = true;

131+ effect.positionPx = mapToItem(categoryView, 0, itemY).y;

132+ }

133+ }

134+ }

135+ }

136+ }

137+

138+ sectionProperty: "name"

139+ sectionDelegate: ListItems.Header {

140+ width: categoryView.width

141+ text: i18n.tr(section)

142+ }

143+

144+ pageHeader: PageHeader {

145+ id: pageHeader

146+ width: categoryView.width

147+ text: i18n.tr("Videos")

148+ searchEntryEnabled: true

149+ searchHistory: scopeView.searchHistory

150+ }

151+ }

152+

153+ Loader {

154+ id: previewLoader

155+ height: effect.bottomGapPx - effect.topGapPx

156+ anchors {

157+ top: parent.top

158+ topMargin: effect.topGapPx

159+ left: parent.left

160+ right: parent.right

161+ }

162+ sourceComponent: onScreen ? previewComponent : undefined

163+

164+ property bool open: false

165+ property bool onScreen: false

166+ property var videoData

167+

168+

169+ onOpenChanged: {

170+ if (open) {

171+ onScreen = true;

172+ }

173+ }

174+

175+ onLoaded: {

176+ item.item = videoData;

177+ }

178+ }

179+

180+ Component {

181+ id: previewComponent

182+

183+ VideoPreview {

184+ id: preview

185+ anchors.fill: parent

186+ onClose: open = false;

187+ }

188+ }

189+

190+ // TODO: Move as InverseMouseArea to DashPreview

191+ MouseArea {

192+ enabled: previewLoader.onScreen

193+ anchors {

194+ fill: parent

195+ topMargin: effect.bottomGapPx

196+ }

197+ onClicked: {

198+ previewLoader.open = false;

199+ }

200+ }

201+

202+}

Dash/Generic/GenericCarousel.qmlnew file+58

@@ -0,0 +1,58 @@

1+/*

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/IconUtil.js" as IconUtil

21+

22+Carousel {

23+ id: genericCarousel

24+

25+ tileAspectRatio: 198 / 288

26+ minimumTileWidth: units.gu(13)

27+ itemComponent: carouselDelegateGeneric

28+ selectedItemScaleFactor: 1.14

29+ cacheBuffer: 1404 // 18px * 13gu * 6

30+ height: implicitHeight + units.gu(6)

31+

32+ Component {

33+ id: carouselDelegateGeneric

34+

35+ BaseCarouselDelegate {

36+ id: item

37+

38+ UbuntuShape {

39+ anchors.fill: parent

40+ radius: "medium"

41+ borderSource: ""

42+ image: Image {

43+ asynchronous: true

44+ sourceSize { width: item.width; height: item.height }

45+ source: model ? IconUtil.from_gicon(model.icon) : ""

46+ }

47+ }

48+

49+ BorderImage {

50+ anchors.centerIn: parent

51+ opacity: 0.6

52+ source: "../../Components/graphics/non-selected.sci"

53+ width: parent.width + units.gu(1.5)

54+ height: parent.height + units.gu(1.5)

55+ }

56+ }

57+ }

58+}

Dash/Generic/GenericFilterGrid.qmlnew file+59

@@ -0,0 +1,59 @@

1+/*

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/IconUtil.js" as IconUtil

20+

21+FilterGrid {

22+ id: filtergrid

23+

24+ filter: false

25+ minimumHorizontalSpacing: units.gu(0.5)

26+ delegateWidth: units.gu(11)

27+ delegateHeight: units.gu(9.5)

28+ verticalSpacing: units.gu(2)

29+

30+ property int iconWidth: units.gu(8)

31+ property int iconHeight: units.gu(7.5)

32+

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

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

35+

36+ delegate: Tile {

37+ id: tile

38+ objectName: "delegate" + index

39+ width: filtergrid.cellWidth

40+ height: filtergrid.cellHeight

41+ text: model.title

42+ imageWidth: filtergrid.iconWidth

43+ imageHeight: filtergrid.iconHeight

44+

45+ source: IconUtil.from_gicon(model.icon)

46+

47+ fillMode: Image.PreserveAspectCrop

48+

49+ onClicked: {

50+ var data = { model: model }

51+ filtergrid.clicked(index, data, tile.y)

52+ }

53+

54+ onPressAndHold: {

55+ var data = { model: model }

56+ filtergrid.pressAndHold(index, data, tile.y)

57+ }

58+ }

59+}

Dash/Generic/GenericFilterGridPotrait.qmlnew file+30

@@ -0,0 +1,30 @@

1+/*

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+GenericFilterGrid {

21+ id: filtergrid

22+

23+ minimumHorizontalSpacing: units.gu(0.5)

24+ delegateWidth: units.gu(11)

25+ delegateHeight: units.gu(18)

26+ verticalSpacing: units.gu(2)

27+

28+ iconWidth: (width / columns) * 0.8

29+ iconHeight: iconWidth * 16 / 11

30+}

Dash/Generic/GenericPreview.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

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 "../../Components/IconUtil.js" as IconUtil

22+import ".."

23+

24+DashPreview {

25+ id: genericPreview

26+ property var previewData

27+

28+ title: previewData.title

29+ url: IconUtil.from_gicon(previewData.image)

30+ previewWidthRatio: 0.6

31+

32+ buttons: GridView {

33+ id: buttons

34+ model: genericPreview.previewData.actions

35+

36+ property int numOfRows: (count + 1) / 2

37+ property int spacing: units.gu(1)

38+ height: Math.max(units.gu(4), units.gu(4)*numOfRows + spacing*(numOfRows - 1))

39+

40+ cellWidth: Math.max(units.gu(9), width / 2)

41+ cellHeight: buttonHeight + spacing

42+ property int buttonWidth: Math.max(0, width / 2 - spacing)

43+ property int buttonHeight: units.gu(4)

44+

45+ delegate: Button {

46+ width: Math.max(units.gu(4), buttons.buttonWidth)

47+ height: buttons.buttonHeight

48+ color: "#dd4814"

49+ text: modelData.displayName

50+ iconSource: modelData.iconHint

51+ iconPosition: "right"

52+ visible: true

53+ onClicked: {

54+ genericPreview.previewData.execute(modelData.id, { })

55+ }

56+ }

57+ focus: false

58+ }

59+ description: Column {

60+ spacing: units.gu(2)

61+

62+ Label {

63+ visible: text != ""

64+ fontSize: "medium"

65+ opacity: 0.6

66+ color: "white"

67+ text: previewData.subtitle

68+ style: Text.Raised

69+ styleColor: "black"

70+ wrapMode: Text.WordWrap

71+ }

72+

73+ Label {

74+ visible: text != ""

75+ fontSize: "small"

76+ opacity: 0.6

77+ color: "white"

78+ text: previewData.description

79+ style: Text.Raised

80+ styleColor: "black"

81+ wrapMode: Text.WordWrap

82+ }

83+ }

84+}

Dash/GenericScopeView.qmlnew file+220

@@ -0,0 +1,220 @@

1+/*

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 "../Components/IconUtil.js" as IconUtil

22+

23+ScopeView {

24+ id: scopeView

25+ property alias previewShown: previewLoader.onScreen

26+

27+ onIsCurrentChanged: {

28+ pageHeader.resetSearch();

29+ }

30+

31+ onMovementStarted: categoryView.showHeader()

32+

33+ Binding {

34+ target: scopeView.scope

35+ property: "searchQuery"

36+ value: pageHeader.searchQuery

37+ }

38+

39+ Connections {

40+ target: panel

41+ onSearchClicked: if (isCurrent) {

42+ pageHeader.triggerSearch()

43+ categoryView.showHeader()

44+ }

45+ }

46+

47+ ScopeListView {

48+ id: categoryView

49+ anchors.fill: parent

50+ model: scopeView.categories

51+ forceNoClip: previewLoader.onScreen

52+

53+ onAtYEndChanged: if (atYEnd) endReached()

54+ onMovingChanged: if (moving && atYEnd) endReached()

55+

56+ delegate: ListItems.Base {

57+ highlightWhenPressed: false

58+

59+ Loader {

60+ id: rendererLoader

61+ anchors {

62+ top: parent.top

63+ left: parent.left

64+ right: parent.right

65+ }

66+

67+ source: getRenderer(model.renderer, model.contentType)

68+

69+ onLoaded: {

70+ item.model = results

71+ }

72+

73+ Connections {

74+ target: rendererLoader.item

75+ onClicked: {

76+ effect.positionPx = mapToItem(categoryView, 0, itemY).y

77+ scopeView.scope.activate(delegateItem.model.uri,

78+ delegateItem.model.icon,

79+ delegateItem.model.category,

80+ 0,

81+ delegateItem.model.mimetype,

82+ delegateItem.model.title,

83+ delegateItem.model.comment,

84+ delegateItem.model.dndUri,

85+ delegateItem.model.metadata)

86+ }

87+ onPressAndHold: {

88+ effect.positionPx = mapToItem(categoryView, 0, itemY).y

89+ scopeView.scope.preview( delegateItem.model.uri,

90+ delegateItem.model.icon,

91+ delegateItem.model.category,

92+ 0,

93+ delegateItem.model.mimetype,

94+ delegateItem.model.title,

95+ delegateItem.model.comment,

96+ delegateItem.model.dndUri,

97+ delegateItem.model.metadata)

98+ }

99+ }

100+ }

101+ }

102+

103+ sectionProperty: "name"

104+ sectionDelegate: ListItems.Header {

105+ width: categoryView.width

106+ text: section

107+ }

108+ pageHeader: PageHeader {

109+ id: pageHeader

110+ objectName: "pageHeader"

111+ width: categoryView.width

112+ text: scopeView.scope.name

113+ searchEntryEnabled: true

114+ }

115+ }

116+

117+ function getRenderer(rendererId, contentType) {

118+ switch (rendererId) {

119+ case "grid": {

120+ switch (contentType) {

121+ case "video": return "Generic/GenericFilterGridPotrait.qml";

122+ default: return "Generic/GenericFilterGrid.qml";

123+ }

124+ }

125+ case "carousel": return "Generic/GenericCarousel.qml";

126+ default: return "Generic/GenericFilterGrid.qml";

127+ }

128+ }

129+

130+ OpenEffect {

131+ id: effect

132+ anchors {

133+ fill: parent

134+ bottomMargin: -bottomOverflow

135+ }

136+ sourceItem: categoryView

137+

138+ enabled: gap > 0.0

139+

140+ topGapPx: (1 - gap) * positionPx

141+ topOpacity: (1 - gap * 1.2)

142+ bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)

143+ bottomOverflow: units.gu(20)

144+ bottomOpacity: 1 - (gap * 0.8)

145+

146+ property int targetBottomGapPx: height - units.gu(8) - bottomOverflow

147+ property real gap: previewLoader.open ? 1.0 : 0.0

148+

149+ Behavior on gap {

150+ NumberAnimation {

151+ duration: 200

152+ easing.type: Easing.InOutQuad

153+ onRunningChanged: {

154+ if (!previewLoader.open && !running) {

155+ previewLoader.onScreen = false

156+ }

157+ }

158+ }

159+ }

160+ }

161+

162+ Connections {

163+ target: scopeView.scope

164+ onPreviewReady: {

165+ previewLoader.previewData = preview

166+ previewLoader.open = true

167+ }

168+ }

169+

170+ PreviewDelegateMapper {

171+ id: previewDelegateMapper

172+ }

173+

174+ Connections {

175+ ignoreUnknownSignals: true

176+ target: previewLoader.valid ? previewLoader.item : null

177+ onClose: {

178+ previewLoader.open = false

179+ }

180+ }

181+

182+ Loader {

183+ id: previewLoader

184+ property var previewData

185+ height: effect.bottomGapPx - effect.topGapPx

186+ anchors {

187+ top: parent.top

188+ topMargin: effect.topGapPx

189+ left: parent.left

190+ right: parent.right

191+ }

192+ source: onScreen ? previewDelegateMapper.map(previewLoader.previewData.rendererName) : ""

193+

194+ property bool open: false

195+ property bool onScreen: false

196+ property bool valid: item !== null

197+

198+ onOpenChanged: {

199+ if (open) {

200+ onScreen = true

201+ }

202+ }

203+

204+ onLoaded: {

205+ item.previewData = previewLoader.previewData

206+ }

207+ }

208+

209+ // TODO: Move as InverseMouseArea to DashPreview

210+ MouseArea {

211+ enabled: previewLoader.onScreen

212+ anchors {

213+ fill: parent

214+ topMargin: effect.bottomGapPx

215+ }

216+ onClicked: {

217+ previewLoader.open = false;

218+ }

219+ }

220+}

Dash/Music/AlbumTile.qmlnew file+116

@@ -0,0 +1,116 @@

1+/*

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/*

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

@@ -14,25 +14,29 @@

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

15 */

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+/*

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+48

@@ -0,0 +1,48 @@

1+/*

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+ expandable: false

24+ minimumHorizontalSpacing: units.gu(2)

25+ maximumNumberOfColumns: 5

26+ delegateWidth: units.gu(17)

27+ delegateHeight: iconHeight + units.gu(3.5)

28+ verticalSpacing: units.gu(2)

29+

30+ readonly property int iconWidth: (width / columns) * 0.8

31+ readonly property int iconHeight: iconWidth

32+

33+ signal clicked(int index)

34+

35+ delegate: AlbumTile {

36+ objectName: "delegate" + index

37+ width: filterGrid.cellWidth

38+ height: filterGrid.cellHeight

39+ iconWidth: filterGrid.iconWidth

40+ iconHeight: filterGrid.iconHeight

41+ artist: model.title

42+ album: model.comment

43+ source: model.icon

44+ onClicked: {

45+ filterGrid.clicked(index);

46+ }

47+ }

48+}

Dash/PreviewDelegateMapper.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

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+ property var previewDelegateMapping: {"preview-generic": genericPreview,

23+ }

24+ }

25+

26+ function map(rendererName) {

27+ var customPreview = d.previewDelegateMapping[rendererName]

28+ if (customPreview != undefined) {

29+ return customPreview

30+ }

31+ console.debug("Renderer "+rendererName+" not found, using preview-generic")

32+ return d.genericPreview

33+ }

34+}

Dash/ScopeDelegateMapper.qmlnew file+34

@@ -0,0 +1,34 @@

1+/*

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+/*

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+48

@@ -0,0 +1,48 @@

1+/*

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

32+ onScopeChanged: timer.restart()

33+

34+ Timer {

35+ id: timer

36+ interval: 2000

37+ onTriggered: scope.searchQuery = ""

38+ }

39+

40+ SortFilterProxyModel {

41+ id: categoryFilter

42+ model: scope.categories

43+ dynamicSortFilter: true

44+ filterRole: Categories.RoleCount

45+ filterRegExp: /^0$/

46+ invertMatch: true

47+ }

48+}

tests/qmltests/Components/tst_DragHandle/SimpleButton.qml → Dash/Video/CarouselDelegateVideo.qmlrenamed+22−16

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

1/*

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

@@ -14,23 +14,29 @@

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

15 */

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

21+BaseCarouselDelegate {

22+ id: item

20

23

21−Rectangle {

24+ UbuntuShape {

22− id: root

23− property alias text: textItem.text

24− signal clicked()

25− width: textItem.width + units.gu(1.5)

26− height: textItem.height + units.gu(1.5)

27− Text {

28− id: textItem

29− anchors.centerIn: parent

30− font.pixelSize: units.gu(1.5)

31− }

32− MouseArea {

33 anchors.fill: parent

25 anchors.fill: parent

34− onClicked: root.clicked()

26+ radius: "medium"

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)

35 }

41 }

36}

42}

Dash/Video/VideoInfo.qmlnew file+84

@@ -0,0 +1,84 @@

1+/*

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+178

@@ -0,0 +1,178 @@

1+/*

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+ readonly property url fileUri: item ? item.fileUri : ""

28+

29+ VideoInfo {

30+ id: nfo

31+ source: item ? item.nfoUri : ""

32+ }

33+

34+ title: nfo.ready ? nfo.video.title : ""

35+ url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""

36+ previewWidthRatio: 0.6

37+ playable: fileUri != ""

38+

39+ onPreviewImageClicked: {

40+ if (playable) {

41+ shell.activateApplication('/usr/share/applications/mediaplayer-app.desktop', root.fileUri);

42+ }

43+ }

44+

45+ buttons: Row {

46+ spacing: units.gu(2)

47+

48+ property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)

49+ Button {

50+ width: parent.buttonWidth

51+ color: Theme.palette.selected.foreground

52+ text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""

53+ visible: text != ""

54+ iconSource: "graphics/icon_button_amazon.png"

55+ iconPosition: "right"

56+ }

57+ Button {

58+ width: parent.buttonWidth

59+ color: Theme.palette.selected.foreground

60+ text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""

61+ visible: text != ""

62+ iconSource: "graphics/icon_button_u1.png"

63+ iconPosition: "right"

64+ }

65+ }

66+

67+ description: Column {

68+ spacing: units.gu(2)

69+ RatingStars {

70+ maximumRating: 10 // FIXME: this should happen on the backend side

71+ rating: nfo.ready ? nfo.video.rating: 0

72+ }

73+

74+ Label {

75+ text: nfo.ready ? nfo.video.plot : ""

76+ color: Theme.palette.selected.backgroundText

77+ opacity: .6

78+ fontSize: "medium"

79+ width: parent.width

80+ wrapMode: Text.WordWrap

81+ style: Text.Raised

82+ styleColor: "black"

83+ }

84+

85+ Grid {

86+ columns: 2

87+ spacing: units.gu(1)

88+ width: parent.width

89+ property int firstColWidth: units.gu(9)

90+ property int secondColWidth: width - firstColWidth - spacing

91+ Label {

92+ visible: directedLabel.visible

93+ fontSize: "small"

94+ opacity: 0.9

95+ color: "white"

96+ horizontalAlignment: Text.AlignRight

97+ width: parent.firstColWidth

98+ text: i18n.tr("Directed by:")

99+ style: Text.Raised

100+ styleColor: "black"

101+ }

102+ Label {

103+ id: directedLabel

104+ visible: text != ""

105+ fontSize: "small"

106+ opacity: 0.6

107+ color: "white"

108+ width: parent.secondColWidth

109+ text: nfo.ready ? nfo.video.director : ""

110+ style: Text.Raised

111+ styleColor: "black"

112+ wrapMode: Text.WordWrap

113+ }

114+ Label {

115+ visible: starringLabel.visible

116+ fontSize: "small"

117+ opacity: 0.9

118+ horizontalAlignment: Text.AlignRight

119+ color: "white"

120+ width: parent.firstColWidth

121+ text: i18n.tr("Starring:")

122+ style: Text.Raised

123+ styleColor: "black"

124+ }

125+ Label {

126+ id: starringLabel

127+ visible: text != ""

128+ fontSize: "small"

129+ opacity: 0.6

130+ color: "white"

131+ width: parent.secondColWidth

132+ text: nfo.ready ? nfo.getActors().join(", ") : ""

133+ wrapMode: Text.WordWrap

134+ style: Text.Raised

135+ styleColor: "black"

136+ }

137+ Label {

138+ visible: authorLabel.visible

139+ fontSize: "small"

140+ opacity: 0.9

141+ horizontalAlignment: Text.AlignRight

142+ color: "white"

143+ width: parent.firstColWidth

144+ text: i18n.tr("Author:")

145+ style: Text.Raised

146+ styleColor: "black"

147+ }

148+ Label {

149+ id: authorLabel

150+ visible: text != ""

151+ fontSize: "small"

152+ opacity: 0.6

153+ color: "white"

154+ width: parent.secondColWidth

155+ text: nfo.ready ? nfo.video.author : ""

156+ wrapMode: Text.WordWrap

157+ style: Text.Raised

158+ styleColor: "black"

159+ }

160+ }

161+

162+ Label {

163+ fontSize: "small"

164+ opacity: 0.6

165+ color: "white"

166+ text: {

167+ var parts = []

168+ if (nfo.ready) {

169+ if (nfo.video.year) parts.push(nfo.video.year)

170+ if (nfo.video.runtime) parts.push("%1 minutes".arg(nfo.video.runtime))

171+ }

172+ return parts.join(", ");

173+ }

174+ style: Text.Raised

175+ styleColor: "black"

176+ }

177+ }

178+}

plugins/SessionBroadcast/plugin.h → Dash/Video/VideosCarousel.qmlrenamed+16−15

@@ -12,22 +12,23 @@

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− * Authors: Michael Terry <michael.terry@canonical.com>

17 */

15 */

18

16

19−#ifndef UNITY_SESSIONBROADCAST_PLUGIN_H

17+import QtQuick 2.0

20−#define UNITY_SESSIONBROADCAST_PLUGIN_H

18+import "../../Components"

21−

22−#include <QQmlExtensionPlugin>

23−

24−class SessionBroadcastPlugin : public QQmlExtensionPlugin

25−{

26− Q_OBJECT

27− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

28

19

29−public:

20+Carousel {

30− void registerTypes(const char *uri) override;

21+ id: videosCarousel

31−};

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)

32

28

33−#endif

29+ Component {

30+ id: carouselDelegateVideo

31+ CarouselDelegateVideo {

32+ }

33+ }

34+}

Dash/Video/VideosFilterGrid.qmlnew file+51

@@ -0,0 +1,51 @@

1+/*

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+ expandable: false

24+ minimumHorizontalSpacing: units.gu(0.5)

25+ maximumNumberOfColumns: 5

26+ delegateWidth: units.gu(11)

27+ delegateHeight: iconHeight + units.gu(2.5)

28+ verticalSpacing: units.gu(2)

29+

30+ readonly property int iconWidth: (width / columns) * 0.8

31+ readonly property int iconHeight: iconWidth * 16 / 11

32+

33+ signal clicked(int index, var data, real itemY)

34+

35+ delegate: Tile {

36+ id: tile

37+ objectName: "delegate" + index

38+ width: filtergrid.cellWidth

39+ height: filtergrid.cellHeight

40+ text: model.title

41+ imageWidth: filtergrid.iconWidth

42+ imageHeight: filtergrid.iconHeight

43+ source: model.icon

44+ fillMode: Image.PreserveAspectCrop

45+ onClicked: {

46+ var fileUri = model.uri.replace(/^[^:]+:/, "")

47+ var data = {fileUri: fileUri, nfoUri: model.comment}

48+ filtergrid.clicked(index, data, tile.y);

49+ }

50+ }

51+}

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/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/home.pngnew file

Binary file not shown.

Dash/graphics/phone/music.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/phone/videos.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/apps.pngnew file

Binary file not shown.

Dash/graphics/tablet/home.pngnew file

Binary file not shown.

Dash/graphics/tablet/icon_close_preview@20.pngnew file

Binary file not shown.

Dash/graphics/tablet/music.pngnew file

Binary file not shown.

Dash/graphics/tablet/people.pngnew file

Binary file not shown.

Dash/graphics/tablet/videos.pngnew file

Binary file not shown.

Greeter/Clock.qmlnew file+66

@@ -0,0 +1,66 @@

1+/*

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/>.

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18

19Image {

20 states: [

qml/Greeter/Gradient.js → Greeter/Gradient.jsrenamed+3−7

@@ -15,12 +15,8 @@

15 */

16

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+120

@@ -0,0 +1,120 @@

1+/*

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 && greeterContentLoader.item.ready

28+

29+ // 1 when fully shown and 0 when fully hidden

30+ property real showProgress: MathLocal.clamp((width + x) / width, 0, 1)

31+

32+ showAnimation: StandardAnimation { property: "x"; to: 0 }

33+ hideAnimation: StandardAnimation { property: "x"; to: -width }

34+

35+ property alias dragHandleWidth: dragHandle.width

36+ property alias model: greeterContentLoader.model

37+ property bool locked: shown && multiUser && !greeterContentLoader.promptless

38+

39+ readonly property bool narrowMode: !multiUser && width <= units.gu(60)

40+ readonly property bool multiUser: LightDM.Users.count > 1

41+

42+ readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&

43+ greeterContentLoader.item.leftTeaserPressed

44+ readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&

45+ greeterContentLoader.item.rightTeaserPressed

46+

47+ signal selected(int uid)

48+ signal unlocked(int uid)

49+

50+ onRightTeaserPressedChanged: {

51+ if (rightTeaserPressed && !locked) {

52+ teasingTimer.start();

53+ }

54+ }

55+

56+ Loader {

57+ id: greeterContentLoader

58+ objectName: "greeterContentLoader"

59+ anchors.fill: parent

60+ property var model: LightDM.Users

61+ property int currentIndex: 0

62+ property bool promptless: item ? item.promptless : false

63+ property var infographicModel: LightDM.Infographic

64+

65+ source: required ? "GreeterContent.qml" : ""

66+

67+

68+ Connections {

69+ target: greeterContentLoader.item

70+

71+ onSelected: greeter.selected(uid);

72+ onUnlocked: greeter.unlocked(uid);

73+ }

74+ }

75+

76+ Timer {

77+ id: teasingTimer

78+ interval: 200

79+ }

80+

81+ states: [

82+ State {

83+ name: "teasing"

84+ when: teasingTimer.running

85+ PropertyChanges {

86+ target: greeter

87+ x: -units.gu(2)

88+ }

89+ }

90+ ]

91+ transitions: [

92+ Transition {

93+ from: "*"

94+ to: "*"

95+ NumberAnimation {

96+ target: greeter

97+ property: "x"

98+ duration: 300

99+ easing.type: Easing.OutCubic

100+ }

101+ }

102+ ]

103+

104+ DragHandle {

105+ id: dragHandle

106+

107+ anchors.top: parent.top

108+ anchors.bottom: parent.bottom

109+ anchors.right: parent.right

110+

111+ // no need for requiring a directional drag since we are covering the screen

112+ // anyway (i.e., no change user could be trying to interact with some other

113+ // UI element)

114+ distanceThreshold: 0

115+

116+ enabled: !greeter.locked

117+

118+ direction: Direction.Leftwards

119+ }

120+}

Greeter/GreeterContent.qmlnew file+136

@@ -0,0 +1,136 @@

1+/*

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+MouseArea {

23+ id: root

24+ anchors.fill: parent

25+

26+ property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless

27+ property bool ready: wallpaper.status == Image.Ready

28+ property bool leftTeaserPressed: teasingMouseArea.pressed &&

29+ teasingMouseArea.mouseX < teasingMouseArea.width / 2

30+ property bool rightTeaserPressed: teasingMouseArea.pressed &&

31+ teasingMouseArea.mouseX > teasingMouseArea.width / 2

32+

33+ signal selected(int uid)

34+ signal unlocked(int uid)

35+

36+ CrossFadeImage {

37+ id: wallpaper

38+

39+ source: shell.background

40+ anchors.fill: parent

41+ crossFade: false

42+ fadeInFirst: false

43+ }

44+

45+ Rectangle {

46+ anchors.fill: parent

47+ color: "black"

48+ opacity: 0.4

49+ }

50+

51+ Clock {

52+ id: clock

53+ visible: narrowMode

54+

55+ anchors {

56+ top: parent.top

57+ topMargin: units.gu(2)

58+ horizontalCenter: parent.horizontalCenter

59+ }

60+ }

61+

62+ MouseArea {

63+ id: teasingMouseArea

64+ anchors.fill: parent

65+ }

66+

67+ Loader {

68+ id: loginLoader

69+ objectName: "loginLoader"

70+ anchors {

71+ left: parent.left

72+ leftMargin: Math.min(parent.width * 0.16, units.gu(20))

73+ verticalCenter: parent.verticalCenter

74+ }

75+ width: units.gu(29)

76+ height: parent.height

77+

78+ // TODO: Once we have a system API for determining which mode we are

79+ // in, tablet/phone/desktop, that should be used instead of narrowMode.

80+ source: greeter.narrowMode ? "" : "LoginList.qml"

81+

82+ onLoaded: {

83+ item.currentIndex = greeterContentLoader.currentIndex;

84+ selected(item.currentIndex);

85+ item.resetAuthentication();

86+ }

87+

88+ Binding {

89+ target: loginLoader.item

90+ property: "model"

91+ value: greeterContentLoader.model

92+ }

93+

94+ Connections {

95+ target: loginLoader.item

96+

97+ onSelected: {

98+ root.selected(uid);

99+ }

100+

101+ onUnlocked: {

102+ root.unlocked(uid);

103+ }

104+

105+ onCurrentIndexChanged: {

106+ if (greeterContentLoader.currentIndex !== loginLoader.item.currentIndex) {

107+ greeterContentLoader.currentIndex = loginLoader.item.currentIndex;

108+ }

109+ }

110+ }

111+ }

112+

113+ Infographics {

114+ id: infographics

115+ height: narrowMode ? parent.height : 0.75 * parent.height

116+ model: greeterContentLoader.infographicModel

117+

118+ Component.onCompleted: infographics.updateUsername(greeterContentLoader.currentIndex)

119+

120+ Connections {

121+ target: root

122+ onSelected: infographics.updateUsername(uid)

123+ }

124+

125+ function updateUsername(uid) {

126+ greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)

127+ greeterContentLoader.infographicModel.readyForDataChangeSlot();

128+ }

129+

130+ anchors {

131+ verticalCenter: parent.verticalCenter

132+ left: narrowMode ? root.left : loginLoader.right

133+ right: root.right

134+ }

135+ }

136+}

qml/Greeter/Infographics.qml → Greeter/Infographics.qmlrenamed+137−117

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

1/*

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

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

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

15 */

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,16 @@ Item {

270 }

281 }

271 }

282 }

272

283

284+ Image {

285+ id: backgroundCircle

286+ objectName: "backgroundCircle"

287+

288+ anchors.fill: parent

289+ opacity: 0.9

290+

291+ source: "graphics/infographic_circle.png"

292+ }

293+

273 Timer {

294 Timer {

274 id: dotShowAnimTimer

295 id: dotShowAnimTimer

275

296

@@ -278,16 +299,14 @@ Item {

278 interval: animDuration * 0.5; running: false; repeat: true

299 interval: animDuration * 0.5; running: false; repeat: true

279 onTriggered: {

300 onTriggered: {

280 if (dotCounter < dots.count) {

301 if (dotCounter < dots.count) {

281− var nextDot = dots.itemAt(dotCounter);

302+ var nextDot = dots.itemAt(dotCounter++)

282− if (nextDot) {

283− nextDot.unlockAnimation.start();

303+ nextDot.unlockAnimation.start()

284− if (++dotCounter == Math.round(dots.count / 2)) {

285− circleChangeAnimTimer.startFromBeginning();

286− }

287− }

288 } else {

304 } else {

289 stop()

305 stop()

290 }

306 }

307+ if (dotCounter == Math.round(dots.count / 2)) {

308+ circleGrowAnimTimer.startFromBeginning()

309+ }

291 }

310 }

292

311

293 function startFromBeginning() {

312 function startFromBeginning() {

@@ -313,8 +332,8 @@ Item {

313 } else {

332 } else {

314 stop()

333 stop()

315 }

334 }

316− if (dotCounter == 0) {

335+ if (dotCounter == Math.round(dots.count / 2)) {

317− infographic.model.readyForDataChange()

336+ circleShrinkAnimTimer.startFromBeginning()

318 }

337 }

319 }

338 }

320

339

@@ -340,7 +359,7 @@ Item {

340

359

341 index: model.index

360 index: model.index

342 count: dots.count

361 count: dots.count

343− radius: dataCircle.width / 2

362+ radius: backgroundCircle.width / 2

344 halfSize: dot.width / 2

363 halfSize: dot.width / 2

345 posOffset: radius / dot.width / 3

364 posOffset: radius / dot.width / 3

346 state: dot.state

365 state: dot.state

@@ -349,7 +368,7 @@ Item {

349 id: dot

368 id: dot

350 objectName: "dot" + index

369 objectName: "dot" + index

351

370

352− property real baseOpacity: 1

371+ property real baseOpacity: 0.4

353

372

354 width: units.dp(5) * parent.radius / 200

373 width: units.dp(5) * parent.radius / 200

355 height: units.dp(5) * parent.radius / 200

374 height: units.dp(5) * parent.radius / 200

@@ -378,26 +397,27 @@ Item {

378 }

397 }

379 }

398 }

380

399

381− Label {

400+ Text {

382 id: notification

401 id: notification

383 objectName: "label"

402 objectName: "label"

384

403

385 property alias hideAnim: decreaseOpacity

404 property alias hideAnim: decreaseOpacity

386 property alias showAnim: increaseOpacity

405 property alias showAnim: increaseOpacity

387

406

388− property real baseOpacity: 1

407+ property real baseOpacity: 0.6

389− property real duration: dotShowAnimTimer.interval * 5

390

408

391− height: 0.7 * dataCircle.width

409+ height: 0.7 * backgroundCircle.width

392 width: notification.height

410 width: notification.height

393 anchors.centerIn: parent

411 anchors.centerIn: parent

394

412

395 text: infographic.model.label

413 text: infographic.model.label

414+ font.pixelSize: notification.height / 12

396

415

397 wrapMode: Text.WordWrap

416 wrapMode: Text.WordWrap

398 horizontalAlignment: Text.AlignHCenter

417 horizontalAlignment: Text.AlignHCenter

399 verticalAlignment: Text.AlignVCenter

418 verticalAlignment: Text.AlignVCenter

400 color: "white"

419 color: "white"

420+ font.weight: Font.Light

401

421

402 PropertyAnimation {

422 PropertyAnimation {

403 id: increaseOpacity

423 id: increaseOpacity

@@ -406,7 +426,7 @@ Item {

406 property: "opacity"

426 property: "opacity"

407 from: 0.0

427 from: 0.0

408 to: notification.baseOpacity

428 to: notification.baseOpacity

409− duration: notification.duration * dots.count

429+ duration: dotShowAnimTimer.interval * dots.count * 5

410 }

430 }

411

431

412 PropertyAnimation {

432 PropertyAnimation {

@@ -416,20 +436,20 @@ Item {

416 property: "opacity"

436 property: "opacity"

417 from: notification.baseOpacity

437 from: notification.baseOpacity

418 to: 0.0

438 to: 0.0

419− duration: notification.duration * dots.count

439+ duration: dotShowAnimTimer.interval * dots.count * 5

420− onStopped: if (!d.useDotAnimation) infographic.model.readyForDataChange()

421 }

440 }

422 }

441 }

423 }

442 }

424

443

425 MouseArea {

444 MouseArea {

426 anchors.fill: dataCircle

445 anchors.fill: dataCircle

427− enabled: notification.text != ""

428

446

429 onDoubleClicked: {

447 onDoubleClicked: {

430− if (!d.animating) {

448+ if (!dotHideAnimTimer.running &&

431− reloadUserData()

449+ !dotShowAnimTimer.running &&

432− }

450+ !circleShrinkAnimTimer.running &&

451+ !circleGrowAnimTimer.running)

452+ infographic.model.nextDataSource()

433 }

453 }

434 }

454 }

435}

455}

Greeter/Lockscreen.qmlnew file+155

@@ -0,0 +1,155 @@

1+/*

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+ anchors.fill: parent

58+ source: root.required ? root.background : ""

59+ }

60+

61+ MouseArea {

62+ anchors.fill: root

63+ }

64+

65+ Loader {

66+ id: pinPadLoader

67+ objectName: "pinPadLoader"

68+ anchors {

69+ left: parent.left

70+ right: parent.right

71+ verticalCenter: parent.verticalCenter

72+ verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : 0

73+ }

74+ property bool resetting: false

75+

76+ source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""

77+

78+ Connections {

79+ target: pinPadLoader.item

80+

81+ onEntered: {

82+ LightDM.Greeter.respond(passphrase);

83+ }

84+

85+ onCancel: {

86+ root.cancel()

87+ }

88+ }

89+

90+ Binding {

91+ target: pinPadLoader.item

92+ property: "pinLength"

93+ value: root.pinLength

94+ }

95+ Binding {

96+ target: pinPadLoader.item

97+ property: "placeholderText"

98+ value: root.placeholderText

99+ }

100+ Binding {

101+ target: pinPadLoader.item

102+ property: "username"

103+ value: root.username

104+ }

105+ }

106+

107+ Column {

108+ anchors {

109+ left: parent.left

110+ top: pinPadLoader.bottom

111+ topMargin: units.gu(4)

112+ right: parent.right

113+ bottom: parent.bottom

114+ }

115+ spacing: units.gu(1)

116+

117+ Icon {

118+ objectName: "emergencyCallIcon"

119+ height: units.gu(3)

120+ width: height

121+ anchors.horizontalCenter: parent.horizontalCenter

122+ name: "phone-app-call-symbolic"

123+ color: "white"

124+ opacity: 0.9

125+

126+ MouseArea {

127+ anchors.fill: parent

128+ onClicked: root.emergencyCall()

129+ }

130+ }

131+

132+ Label {

133+ text: i18n.tr("Emergency call")

134+ color: "white"

135+ opacity: 0.9

136+ fontSize: "medium"

137+ anchors.horizontalCenter: parent.horizontalCenter

138+ }

139+ }

140+

141+ Connections {

142+ target: LightDM.Greeter

143+

144+ onAuthenticationComplete: {

145+ if (LightDM.Greeter.promptless) {

146+ return;

147+ }

148+ if (LightDM.Greeter.authenticated) {

149+ root.unlocked();

150+ } else {

151+ pinPadLoader.item.clear(true);

152+ }

153+ }

154+ }

155+}

Greeter/LoginList.qmlnew file+293

@@ -0,0 +1,293 @@

1+/*

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, "&").replace(/</g, "<").replace(/>/g, ">").replace(/\n/g, " ");

260+ if (isError)

261+ text = "" + text + ""

262+ if (infoLabel.text == "")

263+ infoLabel.text = text;

264+ else

265+ infoLabel.text = infoLabel.text + " " + 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/>.

15 */

16

17−import QtQuick 2.4

17+import QtQuick 2.0

18−import Ubuntu.Components 1.3

18+import Ubuntu.Components 0.1

19

20Item {

21 property int count

Greeter/PassphraseLockscreen.qmlnew file+87

@@ -0,0 +1,87 @@

1+/*

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+111

@@ -0,0 +1,111 @@

1+/*

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+Column {

22+ id: root

23+ anchors.centerIn: parent

24+ spacing: units.gu(2.5)

25+

26+ property alias placeholderText: pinentryField.placeholderText

27+ property int padWidth: units.gu(32)

28+ property int pinLength: 4

29+

30+ signal entered(string passphrase)

31+ signal cancel()

32+

33+ function clear(playAnimation) {

34+ pinentryField.text = "";

35+ if (playAnimation) {

36+ wrongPasswordAnimation.start();

37+ }

38+ }

39+

40+ TextField {

41+ id: pinentryField

42+ objectName: "pinentryField"

43+ anchors.horizontalCenter: parent.horizontalCenter

44+ width: units.gu(32)

45+ height: units.gu(5)

46+ echoMode: TextInput.Password

47+ font.pixelSize: units.dp(44)

48+ color: "white"

49+ opacity: 0.9

50+ hasClearButton: false

51+ horizontalAlignment: Text.AlignHCenter

52+

53+ onTextChanged: {

54+ if (pinentryField.text.length === root.pinLength) {

55+ root.entered(pinentryField.text);

56+ }

57+ }

58+

59+ // Using a MouseArea to eat clicks. We don't want to disable the TextField for styling reasons

60+ MouseArea {

61+ anchors.fill: parent

62+ }

63+ }

64+

65+ Grid {

66+ anchors {

67+ left: parent.left

68+ right: parent.right

69+ margins: (parent.width - root.padWidth) / 2

70+ }

71+

72+ columns: 3

73+ spacing: units.gu(1)

74+

75+ Repeater {

76+ model: 9

77+

78+ PinPadButton {

79+ objectName: "pinPadButton" + (index + 1)

80+ text: index + 1

81+

82+ onClicked: {

83+ pinentryField.text = pinentryField.text + text

84+ }

85+ }

86+ }

87+

88+ PinPadButton {

89+ objectName: "pinPadButtonBack"

90+ iconName: "back"

91+ onClicked: root.cancel();

92+

93+ }

94+ PinPadButton {

95+ objectName: "pinPadButton0"

96+ text: "0"

97+ onClicked: pinentryField.text = pinentryField.text + text

98+

99+ }

100+ PinPadButton {

101+ objectName: "pinPadButtonErase"

102+ iconName: "erase"

103+ onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)

104+ }

105+ }

106+

107+ WrongPasswordAnimation {

108+ id: wrongPasswordAnimation

109+ target: pinentryField

110+ }

111+}

Greeter/PinPadButton.qmlnew file+59

@@ -0,0 +1,59 @@

1+/*

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+UbuntuShape {

21+ id: root

22+ width: units.gu(10)

23+ height: units.gu(7)

24+ radius: "medium"

25+

26+ property alias text: label.text

27+ property alias iconName: icon.name

28+

29+ signal clicked()

30+

31+ Behavior on color {

32+ ColorAnimation { duration: 100 }

33+ }

34+

35+ Label {

36+ id: label

37+ anchors.centerIn: parent

38+ color: "white"

39+ fontSize: "x-large"

40+ font.weight: Font.Light

41+ opacity: 0.9

42+ }

43+

44+ Icon {

45+ id: icon

46+ height: units.gu(3)

47+ width: height

48+ anchors.centerIn: parent

49+ color: "white"

50+ opacity: 0.9

51+ }

52+

53+ MouseArea {

54+ anchors.fill: parent

55+ onClicked: root.clicked()

56+ onPressed: root.color = Qt.rgba(0, 0, 0, 0.3)

57+ onReleased: root.color = Qt.rgba(0, 0, 0, 0)

58+ }

59+}

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.pngnew file

Binary file not shown.

Hud/Hud.qmlnew file+496

@@ -0,0 +1,496 @@

1+/*

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 (greeter.shown) {

231+ showAnimation.duration = 0

232+ hideAnimation.duration = 0

233+ } else if (!showAnimation.running && !hideAnimation.running) {

234+ if (parent.height > 0) {

235+ showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)

236+ hideAnimation.duration = showableAnimationDuration - showAnimation.duration

237+ }

238+ }

239+ }

240+

241+ MouseArea {

242+ // Eat everything that doesn't go to other places

243+ anchors.fill: parent

244+ }

245+

246+ Image {

247+ anchors.fill: parent

248+ fillMode: Image.Tile

249+ source: "graphics/hud_bg.png"

250+ }

251+

252+ Connections {

253+ target: hideAnimation

254+ onRunningChanged: {

255+ if (!hideAnimation.running) {

256+ showAnimation.duration = showableAnimationDuration

257+ hud.resetToInitialState()

258+ }

259+ }

260+ }

261+

262+ Connections {

263+ target: showAnimation

264+ onRunningChanged: {

265+ if (!showAnimation.running) {

266+ hideAnimation.duration = showableAnimationDuration

267+ }

268+ }

269+ }

270+ }

271+

272+ Item {

273+ id: handle

274+ objectName: "handle"

275+

276+ y: hudShowable.y

277+ anchors {

278+ left: parent.left

279+ right: parent.right

280+ }

281+ height: handleImage.height

282+

283+ Image {

284+ id: handleImage

285+ anchors {

286+ left: parent.left

287+ right: parent.right

288+ }

289+ source: "graphics/hud_handlebar.png"

290+ }

291+

292+ Image {

293+ id: handleArrow

294+ y: units.gu(1)

295+ anchors.horizontalCenter: parent.horizontalCenter

296+ source: "graphics/hud_handlearrow.png"

297+ cache: false

298+ }

299+ }

300+

301+ Item {

302+ id: hudContentClipper

303+

304+ anchors {

305+ left: parent.left

306+ right: parent.right

307+ bottom: parent.bottom

308+ top: handle.bottom

309+ }

310+ clip: visible && hudContent.height !== height

311+ visible: hudContent.height >= 0

312+

313+ Item {

314+ id: hudContent

315+ anchors {

316+ left: parent.left

317+ right: parent.right

318+ bottom: parent.bottom

319+ }

320+ height: hud.height

321+

322+ Item {

323+ id: mainPage

324+ x: parametrizedActionsPage.x - width

325+ height: hud.height

326+ width: hud.width

327+

328+ ShowingAnimation {

329+ id: toolBarAnimator

330+ objectName: "toolBarAnimator"

331+ anchors {

332+ left: parent.left

333+ right: parent.right

334+ bottom: searchBarAnimator.top

335+ margins: 2*elementsPadding //ensures positioning correct

336+ }

337+ progress: MathUtils.clamp((y - hudShowable.y - anchors.margins)/elementsYSliding, 0, 1)

338+

339+ ToolBar {

340+ id: toolBar

341+ objectName: "toolBar"

342+ model: hudClient.toolBarModel

343+ anchors.horizontalCenter: parent.horizontalCenter

344+ onActionTriggered: {

345+ hudClient.executeToolBarAction(action)

346+ }

347+ }

348+ }

349+

350+ ShowingAnimation {

351+ id: searchBarAnimator

352+ objectName: "searchBarAnimator"

353+ anchors {

354+ left: parent.left

355+ right: parent.right

356+ bottom: parent.bottom

357+ margins: elementsPadding

358+ topMargin: handle.height + units.dp(1) + elementsPadding

359+ }

360+ progress: MathUtils.clamp((y - hudShowable.y - anchors.margins)/elementsYSliding, 0, 1)

361+

362+ SearchBar {

363+ id: searchBar

364+ objectName: "searchBar"

365+

366+ property bool ignoreNextTextChange: false

367+

368+ anchors.left: parent.left

369+ anchors.right: parent.right

370+ height: units.gu(5)

371+

372+ placeholderText: i18n.tr("Type or say a command")

373+ activityIndicatorVisible: hud.state == "voice_recognition_processing"

374+

375+ onMicrophoneClicked: hudClient.startVoiceQuery()

376+

377+ onTextChanged: {

378+ if (ignoreNextTextChange) {

379+ ignoreNextTextChange = false

380+ } else {

381+ hudClient.setQuery(searchBar.text)

382+ }

383+ }

384+

385+ onTextFocused: {

386+ hud.state = "showing_results"

387+ }

388+ }

389+ }

390+

391+ ShowingAnimation {

392+ id: resultsCardAnimator

393+ objectName: "resultsCardAnimator"

394+

395+ anchors {

396+ left: parent.left

397+ right: parent.right

398+ top: searchBarAnimator.bottom

399+ margins: elementsPadding

400+ }

401+ progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)

402+

403+ Flickable {

404+ anchors.left: parent.left

405+ anchors.right: parent.right

406+ contentHeight: resultList.height

407+ contentWidth: width

408+ clip: height < contentHeight

409+ interactive: height < contentHeight

410+

411+ height: {

412+ if (hud.state == "showing_results") {

413+ return shell.applicationManager.keyboardVisible ? Math.min(hud.height - searchBarAnimator.y - searchBarAnimator.height - units.gu(2) - shell.applicationManager.keyboardHeight, contentHeight) : contentHeight

414+ } else {

415+ return contentHeight

416+ }

417+ }

418+

419+

420+ ResultList {

421+ id: resultList

422+

423+ anchors.left: parent.left

424+ anchors.right: parent.right

425+ height: childrenRect.height

426+

427+ onActivated: {

428+ hudClient.executeCommand(index)

429+ }

430+

431+ model: hudClient.results

432+ }

433+ }

434+ }

435+

436+ ShowingAnimation {

437+ id: soundAmplitudeVisualAnimator

438+

439+ anchors {

440+ horizontalCenter: parent.horizontalCenter

441+ verticalCenter: parent.verticalCenter

442+ verticalCenterOffset: (searchBar.height + 2*elementsPadding)/2

443+ }

444+ visible: false

445+ width: units.gu(33)

446+ progress: MathUtils.clamp((y - hudShowable.y - anchors.verticalCenterOffset)/elementsYSliding, 0, 1)

447+

448+ SoundAmplitudeVisual {

449+ id: soundAmplitudeVisual

450+ width: units.gu(33)

451+ height: width

452+ }

453+ }

454+ }

455+

456+ HudParametrizedActionsPage {

457+ id: parametrizedActionsPage

458+ objectName: "parametrizedActionsPage"

459+ property bool shown: false

460+

461+ anchors.bottom: parent.bottom

462+ height: hud.height - handle.height - units.dp(1)

463+ width: parent.width

464+ x: shown ? 0 : width

465+ onConfirmPressed: {

466+ hudClient.executeParametrizedAction(values())

467+ }

468+ onValuesUpdated: {

469+ hudClient.updateParametrizedAction(values())

470+ }

471+ onBackPressed: {

472+ shown = false

473+ }

474+ onShownChanged: {

475+ if (!shown) {

476+ hudClient.cancelParametrizedAction()

477+ }

478+ }

479+ Behavior on x {

480+ NumberAnimation {

481+ easing.type: outEasing

482+ duration: animationDuration

483+ }

484+ }

485+ }

486+ }

487+ }

488+

489+ Image {

490+ anchors.left: hudContentClipper.right

491+ anchors.top: hudContentClipper.top

492+ anchors.bottom: hudContentClipper.bottom

493+ fillMode: Image.Tile

494+ source: "graphics/dropshadow_right.png"

495+ }

496+}

Hud/HudParametrizedActionsPage.qmlnew file+172

@@ -0,0 +1,172 @@

1+/*

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+/*

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 += "" + text.substr(highlightStart, highlightEnd - highlightStart + 1) + "";

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+/*

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+/*

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+/*

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+/*

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+/*

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+/*

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/Ubuntu/SystemSettings/Update/MockSystemImage.qml → Hud/ToolBar.qmlrenamed+14−11

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

1/*

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

@@ -14,17 +14,20 @@

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

15 */

16

17−pragma Singleton

18import QtQuick 2.0

17import QtQuick 2.0

18+import HudClient 0.1

19

20−Item {

20+Row {

21− id: root

21+ signal actionTriggered(int action)

22+ property alias model: repeater.model

22

23

23− property int targetBuildNumber: 0

24+ spacing: units.gu(3)

24− property bool checkingForUpdates: false

25+ Repeater {

25− property bool updateAvailable: false

26+ id: repeater

26−

27+ ToolBarIcon {

27− signal updateDownloaded()

28+ source: model.iconPath

28− signal applyUpdate()

29+ onClicked: actionTriggered(model.action)

29− signal checkForUpdate()

30+ enabled: model.enabled

31+ }

32+ }

30}

33}

Hud/ToolBarIcon.qmlnew file+32

@@ -0,0 +1,32 @@

1+/*

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()

Launcher/Launcher.qmlnew file+243

@@ -0,0 +1,243 @@

1+/*

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.5)

30+ property int dragAreaWidth: units.gu(1)

31+ property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0

32+

33+ readonly property bool shown: panel.x > -panel.width

34+

35+ // emitted when an application is selected

36+ signal launcherApplicationSelected(string desktopFile)

37+

38+ // emitted when the apps dash should be shown because of a swipe gesture

39+ signal dash()

40+

41+ // emitted when the dash icon in the launcher has been tapped

42+ signal dashItemSelected()

43+

44+ onStateChanged: {

45+ if (state == "") {

46+ dismissTimer.stop()

47+ } else {

48+ dismissTimer.restart()

49+ }

50+ }

51+

52+ function hide() {

53+ switchToNextState("")

54+ }

55+

56+ function switchToNextState(state) {

57+ animateTimer.nextState = state

58+ animateTimer.start();

59+ }

60+

61+ function tease() {

62+ if (available) {

63+ teaseTimer.start();

64+ }

65+ }

66+

67+ Timer {

68+ id: teaseTimer

69+ interval: 200

70+ }

71+

72+ Timer {

73+ id: dismissTimer

74+ interval: 5000

75+ onTriggered: {

76+ if (!panel.moving) {

77+ root.state = ""

78+ } else {

79+ dismissTimer.restart()

80+ }

81+ }

82+ }

83+

84+ // Because the animation on x is disabled while dragging

85+ // switching state directly in the drag handlers would not animate

86+ // the completion of the hide/reveal gesture. Lets update the state

87+ // machine and switch to the final state in the next event loop run

88+ Timer {

89+ id: animateTimer

90+ interval: 1

91+ property string nextState: ""

92+ onTriggered: {

93+ // switching to an intermediate state here to make sure all the

94+ // values are restored, even if we were already in the target state

95+ root.state = "tmp"

96+ root.state = nextState

97+ }

98+ }

99+

100+ MouseArea {

101+ id: launcherDragArea

102+ enabled: root.state == "visible"

103+ anchors.fill: panel

104+ anchors.rightMargin: -units.gu(2)

105+ drag {

106+ axis: Drag.XAxis

107+ maximumX: 0

108+ target: panel

109+ }

110+

111+ onReleased: {

112+ if (panel.x < -panel.width/3) {

113+ root.switchToNextState("")

114+ } else {

115+ root.switchToNextState("visible")

116+ }

117+ }

118+

119+ }

120+ MouseArea {

121+ id: closeMouseArea

122+ anchors {

123+ left: launcherDragArea.right

124+ top: parent.top

125+ right: parent.right

126+ bottom: parent.bottom

127+ }

128+ enabled: root.state == "visible"

129+ onPressed: {

130+ root.state = ""

131+ }

132+ }

133+

134+ Rectangle {

135+ id: backgroundShade

136+ anchors.fill: parent

137+ color: "black"

138+ opacity: root.state == "visible" ? 0.4 : 0

139+

140+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuad} }

141+ }

142+

143+ LauncherPanel {

144+ id: panel

145+ objectName: "launcherPanel"

146+ width: root.panelWidth

147+ anchors {

148+ top: parent.top

149+ bottom: parent.bottom

150+ }

151+ x: -width

152+ model: LauncherModel

153+

154+ property bool animate: true

155+

156+ onApplicationSelected: {

157+ root.state = ""

158+ launcherApplicationSelected(desktopFile)

159+ }

160+ onDashItemSelected: {

161+ root.state = ""

162+ root.dashItemSelected(index)

163+ }

164+

165+ onMovingChanged: {

166+ if (dismissTimer.running) {

167+ dismissTimer.restart();

168+ }

169+ }

170+

171+ Behavior on x {

172+ NumberAnimation {

173+ // Disabling animation when dragging

174+ duration: dragArea.dragging || launcherDragArea.drag.active ? 0 : 300;

175+ easing.type: Easing.OutCubic

176+ }

177+ }

178+ }

179+

180+ EdgeDragArea {

181+ id: dragArea

182+

183+ direction: Direction.Rightwards

184+

185+ enabled: root.available && root.state !== "visible"

186+ width: root.dragAreaWidth

187+ height: root.height

188+

189+ onTouchXChanged: {

190+ if (status !== DirectionalDragArea.Recognized)

191+ return;

192+

193+ // When the gesture finally gets recognized, the finger will likely be

194+ // reasonably far from the edge. If we made the panel immediately

195+ // follow the finger position it would be visually unpleasant as it

196+ // would appear right next to the user's finger out of nowhere.

197+ // Instead, we make the panel go towards the user's finger in several

198+ // steps. ie., in an animated way.

199+ var targetPanelX = Math.min(0, touchX - panel.width)

200+ var delta = targetPanelX - panel.x

201+ // the trick is not to go all the way (1.0) as it would cause a sudden jump

202+ panel.x += 0.4 * delta

203+ }

204+

205+ onDraggingChanged: {

206+ if (!dragging) {

207+ if (distance > panel.width / 2) {

208+ root.switchToNextState("visible")

209+ if (distance > panel.width * 2) {

210+ root.dash()

211+ }

212+ } else {

213+ root.switchToNextState("")

214+ }

215+ }

216+ }

217+ }

218+

219+ states: [

220+ State {

221+ name: "" // hidden state. Must be the default state ("") because "when:" falls back to this.

222+ PropertyChanges {

223+ target: panel

224+ x: -root.panelWidth

225+ }

226+ },

227+ State {

228+ name: "visible"

229+ PropertyChanges {

230+ target: panel

231+ x: 0

232+ }

233+ },

234+ State {

235+ name: "teasing"

236+ when: teaseTimer.running

237+ PropertyChanges {

238+ target: panel

239+ x: -root.panelWidth + units.gu(2)

240+ }

241+ }

242+ ]

243+}

Launcher/LauncherDelegate.qmlnew file+289

@@ -0,0 +1,289 @@

1+/*

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 string iconName

24+

25+ property real angle: 0

26+ property bool highlighted: false

27+ property real offset: 0

28+ property alias brightness: transformEffect.brightness

29+ property real itemOpacity: 1

30+

31+ property real maxAngle: 0

32+ property bool inverted: false

33+

34+ readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height

35+ readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height

36+

37+ property bool dragging:false

38+

39+ signal clicked()

40+ signal longtap()

41+ signal released()

42+

43+ Item {

44+ id: iconItem

45+ width: parent.width

46+ height: parent.height

47+ anchors.centerIn: parent

48+

49+ UbuntuShape {

50+ id: iconShape

51+ anchors.fill: parent

52+ anchors.margins: units.gu(0.5)

53+ radius: "medium"

54+

55+ image: Image {

56+ id: iconImage

57+ sourceSize.width: iconShape.width

58+ sourceSize.height: iconShape.height

59+ source: "../graphics/applicationIcons/" + root.iconName + ".png"

60+ }

61+

62+ MouseArea {

63+ id: mouseArea

64+ anchors.fill: parent

65+ onClicked: root.clicked()

66+ onCanceled: root.released()

67+ preventStealing: false

68+

69+ onPressAndHold: {

70+ root.state = "moving"

71+ }

72+ onReleased: {

73+ root.state = "docked"

74+ }

75+ }

76+ }

77+ BorderImage {

78+ id: overlayHighlight

79+ anchors.centerIn: iconItem

80+ rotation: inverted ? 180 : 0

81+ source: isSelected ? "graphics/selected.sci" : "graphics/non-selected.sci"

82+ width: root.width + units.gu(0.5)

83+ height: width

84+ property bool isSelected: root.highlighted || mouseArea.pressed

85+ onIsSelectedChanged: shaderEffectSource.scheduleUpdate();

86+ }

87+ }

88+

89+ ShaderEffect {

90+ id: transformEffect

91+ anchors.centerIn: parent

92+ anchors.verticalCenterOffset: root.offset

93+ width: parent.width

94+ height: parent.height

95+ property real itemOpacity: root.itemOpacity

96+ property real brightness: 0

97+ property real angle: root.angle

98+ rotation: root.inverted ? 180 : 0

99+

100+

101+ property variant source: ShaderEffectSource {

102+ id: shaderEffectSource

103+ sourceItem: iconItem

104+ hideSource: true

105+ live: false

106+ }

107+

108+ transform: [

109+ // Rotating 3 times at top/bottom because that increases the perspective.

110+ // This is a hack, but as QML does not support real 3D coordinates

111+ // getting a higher perspective can only be done by a hack. This is the most

112+ // readable/understandable one I could come up with.

113+ Rotation {

114+ axis { x: 1; y: 0; z: 0 }

115+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }

116+ angle: root.angle * 0.7

117+ },

118+ Rotation {

119+ axis { x: 1; y: 0; z: 0 }

120+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }

121+ angle: root.angle * 0.7

122+ },

123+ Rotation {

124+ axis { x: 1; y: 0; z: 0 }

125+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }

126+ angle: root.angle * 0.7

127+ },

128+ // Because rotating it 3 times moves it more to the front/back, i.e. it gets

129+ // bigger/smaller and we need a scale to compensate that again.

130+ Scale {

131+ xScale: 1 - (Math.abs(angle) / 500)

132+ yScale: 1 - (Math.abs(angle) / 500)

133+ origin { x: iconItem.width / 2; y: iconItem.height / 2}

134+ }

135+ ]

136+

137+ // Using a fragment shader instead of QML's opacity and BrightnessContrast

138+ // to be able to do both in one step which gives quite some better performance

139+ fragmentShader: "

140+ varying highp vec2 qt_TexCoord0;

141+ uniform sampler2D source;

142+ uniform lowp float brightness;

143+ uniform lowp float itemOpacity;

144+ void main(void)

145+ {

146+ highp vec4 sourceColor = texture2D(source, qt_TexCoord0);

147+ sourceColor.rgb = mix(sourceColor.rgb, vec3(step(0.0, brightness)), abs(brightness));

148+ sourceColor *= itemOpacity;

149+ gl_FragColor = sourceColor;

150+ }"

151+ }

152+

153+ QtObject {

154+ id: priv

155+

156+ property ListView listView: root.ListView.view

157+ property real totalUnfoldedHeight: listView.itemSize + listView.spacing

158+ property real totalEffectiveHeight: effectiveHeight + listView.spacing

159+ property real effectiveContentY: listView.contentY - listView.originY

160+ property real effectiveY: y - listView.originY

161+ property real distanceFromTopEdge: -(effectiveContentY + listView.topMargin - index*totalUnfoldedHeight)

162+ property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (effectiveY+height) + effectiveContentY

163+

164+ property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge

165+ property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1

166+

167+ property real overlapWithFoldingArea: listView.foldingAreaHeight - distanceFromEdge

168+ }

169+

170+ states: [

171+ State {

172+ name: "docked"

173+ PropertyChanges {

174+ target: root

175+

176+ // This is the offset that keeps the items inside the panel

177+ offset: {

178+ // First/last items are special

179+ if (index == 0 || index == priv.listView.count-1) {

180+ // Just keep them bound to the edges in case they're outside of the visible area

181+ if (priv.distanceFromEdge < 0) {

182+ return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;

183+ }

184+ return 0;

185+ }

186+

187+ // Are we already completely outside the flickable? Stop the icon here.

188+ if (priv.distanceFromEdge < -priv.totalUnfoldedHeight) {

189+ return (-priv.distanceFromEdge - (root.height - effectiveHeight)) * priv.orientationFlag;

190+ }

191+

192+ // We're touching the edge, move slower than the actual flicking speed.

193+ if (priv.distanceFromEdge < 0) {

194+ return (Math.abs(priv.distanceFromEdge) * priv.totalEffectiveHeight / priv.totalUnfoldedHeight) * priv.orientationFlag

195+ }

196+ return 0;

197+ }

198+

199+ // The angle used for rotating

200+ angle: {

201+ // First/last items are special

202+ if (index == 0 || index == priv.listView.count-1) {

203+ if (priv.distanceFromEdge < 0) {

204+ // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle

205+ return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingAreaHeight)) * priv.orientationFlag

206+ }

207+ return 0; // Don't fold first/last item as long as inside the view

208+ }

209+

210+ // Are we in the already completely outside the flickable? Fold for the last 5 degrees

211+ if (priv.distanceFromEdge < 0) {

212+ // proportion equation: -distanceFromTopEdge : angle = totalUnfoldedHeight : 5

213+ return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.listView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag

214+ }

215+

216+ // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees

217+ if (priv.overlapWithFoldingArea > 0) {

218+ // proportion equation: overlap: totalHeight = angle : (maxAngle - 5)

219+ return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.listView.foldingAreaHeight * priv.orientationFlag;

220+ }

221+ return 0;

222+ }

223+

224+ itemOpacity: {

225+ // First/last items are special

226+ if (index == 0 || index == priv.listView.count-1) {

227+ if (priv.distanceFromEdge < 0) {

228+ // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)

229+ return 1.0 - (-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))

230+ }

231+ return 1; // Don't make first/last item transparent as long as inside the view

232+ }

233+

234+ // Are we already completely outside the flickable? Fade from 0.75 to 0 in 2 items height

235+ if (priv.distanceFromEdge < 0) {

236+ // proportion equation: -distanceFromEdge : 1-opacity = totalUnfoldedHeight : 0.75

237+ return 0.75 - (-priv.distanceFromEdge * 0.75 / (priv.totalUnfoldedHeight*2))

238+ }

239+

240+ // We are overlapping with the folding area, fade out to 0.75

241+ if (priv.overlapWithFoldingArea > 0) {

242+ // proportion equation: overlap : totalHeight = 1-opacity : 0.25

243+ return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.listView.foldingAreaHeight)

244+ }

245+ return 1;

246+ }

247+

248+ brightness: {

249+ // First/last items are special

250+ if (index == 0 || index == priv.listView.count-1) {

251+ if (priv.distanceFromEdge < 0) {

252+ return -(-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))

253+ }

254+ return 0;

255+ }

256+ // Are we already completely outside the flickable? Fade from 0.7 to 0 in 2 items height

257+ if (priv.distanceFromEdge < 0) {

258+ return -0.3 - (-priv.distanceFromEdge * 0.1 / (priv.totalUnfoldedHeight*2))

259+ }

260+

261+ // We are overlapping with the folding area, fade out to 0.7

262+ if (priv.overlapWithFoldingArea > 0) {

263+ return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingAreaHeight)

264+ }

265+ return 0;

266+ }

267+ }

268+ },

269+

270+ State {

271+ name: "moving"

272+ PropertyChanges {

273+ target: launcherDelegate;

274+ offset: 0

275+ angle: 0

276+ }

277+ PropertyChanges {

278+ target: root

279+ highlighted: true

280+ dragging: true

281+ }

282+ PropertyChanges {

283+ target: mouseArea

284+ preventStealing: true

285+ drag.target: root

286+ }

287+ }

288+ ]

289+}

Launcher/LauncherPanel.qmlnew file+188

@@ -0,0 +1,188 @@

1+/*

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 Unity.Launcher 0.1

21+import "../Components/ListItems"

22+

23+Item {

24+ id: root

25+

26+ rotation: inverted ? 180 : 0

27+

28+ property var model

29+ property bool inverted: true

30+ property bool dragging: false

31+ property bool moving: launcherListView.moving || launcherListView.flicking

32+ property int dragPosition: 0

33+ property int highlightIndex: -1

34+

35+ signal applicationSelected(string desktopFile)

36+ signal dashItemSelected(int index)

37+

38+ onDragPositionChanged: {

39+ var effectiveDragPosition = root.inverted ? launcherListView.height - dragPosition : dragPosition - mainColumn.anchors.margins

40+

41+ var hiddenContentHeight = launcherListView.contentHeight - launcherListView.height

42+ // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom

43+ var scrollableHeight = launcherListView.height - (launcherListView.itemSize + launcherColumn.spacing) *2

44+ // As we shortened the scrollableHeight, lets move everything down by the itemSize

45+ var shortenedEffectiveDragPosition = effectiveDragPosition - launcherListView.itemSize - launcherColumn.spacing

46+ var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight

47+

48+ // limit top/bottom to prevent overshooting

49+ launcherListView.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));

50+

51+ // Now calculate the current index:

52+ // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view

53+ // > adjust that removing all the margins

54+ // > divide by itemSize to get index

55+ highlightIndex = (effectiveDragPosition + launcherListView.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherListView.itemSize + launcherColumn.spacing)

56+ }

57+

58+ BorderImage {

59+ id: background

60+ source: "graphics/launcher_bg.sci"

61+ anchors.fill: parent

62+ }

63+

64+ Column {

65+ id: mainColumn

66+ anchors {

67+ fill: parent

68+ topMargin: units.gu(0.5)

69+ bottomMargin: units.gu(1)

70+ leftMargin: units.gu(0.5)

71+ rightMargin: units.gu(0.5)

72+ }

73+ spacing: units.gu(0.5)

74+

75+ MouseArea {

76+ id: dashItem

77+ width: parent.width

78+ height: units.gu(6.5)

79+ onClicked: root.dashItemSelected(0)

80+ z: 1

81+ Image {

82+ objectName: "dashItem"

83+ width: units.gu(5.5)

84+ height: width

85+ anchors.centerIn: parent

86+ source: "graphics/home.png"

87+ rotation: root.rotation

88+ }

89+ }

90+ ThinDivider {

91+ anchors {

92+ left: parent.left

93+ right: parent.right

94+ margins: -mainColumn.anchors.leftMargin

95+ }

96+ rotation: root.rotation

97+ }

98+

99+ Item {

100+ anchors.left: parent.left

101+ anchors.right: parent.right

102+ height: parent.height - dashItem.height - parent.spacing*2

103+ ListView {

104+ id: launcherListView

105+ objectName: "launcherListView"

106+ anchors.fill: parent

107+ anchors.topMargin: -itemSize

108+ anchors.bottomMargin: -itemSize

109+ topMargin: itemSize

110+ bottomMargin: itemSize

111+ height: parent.height - dashItem.height - parent.spacing*2

112+ model: root.model

113+ cacheBuffer: itemSize * 3

114+ snapMode: ListView.SnapToItem

115+ highlightRangeMode: ListView.ApplyRange

116+ preferredHighlightBegin: (height - itemSize) / 2

117+ preferredHighlightEnd: (height + itemSize) / 2

118+

119+ // The height of the area where icons start getting folded

120+ property int foldingAreaHeight: itemSize * 0.75

121+ property int itemSize: width

122+ property int clickFlickSpeed: units.gu(60)

123+

124+ delegate: LauncherDelegate {

125+ id: launcherDelegate

126+ objectName: "launcherDelegate" + index

127+ width: launcherListView.itemSize

128+ height: launcherListView.itemSize

129+ iconName: model.icon

130+ inverted: root.inverted

131+ highlighted: root.dragging && index === root.highlightIndex

132+ z: -Math.abs(offset)

133+ state: "docked"

134+ maxAngle: 60

135+

136+ onClicked: {

137+ // First/last item do the scrolling at more than 12 degrees

138+ if (index == 0 || index == launcherListView.count -1) {

139+ if (angle > 12) {

140+ launcherListView.flick(0, -launcherListView.clickFlickSpeed);

141+ } else if (angle < -12) {

142+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

143+ } else {

144+ root.applicationSelected(LauncherModel.get(index).desktopFile);

145+ }

146+ return;

147+ }

148+

149+ // the rest launches apps up to an angle of 30 degrees

150+ if (angle > 30) {

151+ launcherListView.flick(0, -launcherListView.clickFlickSpeed);

152+ } else if (angle < -30) {

153+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

154+ } else {

155+ root.applicationSelected(LauncherModel.get(index).desktopFile);

156+ }

157+ }

158+ }

159+

160+ MouseArea {

161+ id: topFoldingArea

162+ anchors {

163+ left: parent.left

164+ right: parent.right

165+ top: parent.top

166+ topMargin: launcherListView.topMargin

167+ }

168+ height: launcherListView.itemSize / 2

169+ enabled: launcherListView.contentY > -launcherListView.topMargin

170+ onClicked: launcherListView.flick(0, launcherListView.clickFlickSpeed)

171+ }

172+

173+ MouseArea {

174+ id: bottomFoldingArea

175+ anchors {

176+ left: parent.left

177+ right: parent.right

178+ bottom: parent.bottom

179+ bottomMargin: launcherListView.bottomMargin

180+ }

181+ height: launcherListView.itemSize / 2

182+ enabled: launcherListView.contentHeight - launcherListView.height - launcherListView.contentY > -launcherListView.bottomMargin

183+ onClicked: launcherListView.flick(0, -launcherListView.clickFlickSpeed)

184+ }

185+ }

186+ }

187+ }

188+}

Launcher/graphics/highlight@18.pngnew file

Binary file not shown.

Launcher/graphics/home@18.pngnew file

Binary file not shown.

Launcher/graphics/launcher_bg@18.pngnew file

Binary file not shown.

Launcher/graphics/launcher_bg@18.scinew file+5

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

1+border.left: 0

2+border.top: 0

3+border.bottom: 0

4+border.right: 24

5+source: launcher_bg@18.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/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+136

@@ -0,0 +1,136 @@

1+/*

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_targetWindow(0)

43+ , m_leftButtonIsPressed(false)

44+{

45+ m_touchDevice = new QTouchDevice;

46+ m_touchDevice->setType(QTouchDevice::TouchScreen);

47+ QWindowSystemInterface::registerTouchDevice(m_touchDevice);

48+}

49+

50+void MouseTouchAdaptor::setTargetWindow(QWindow *window)

51+{

52+ m_targetWindow = window;

53+}

54+

55+bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,

56+ void * message, long * /*result*/)

57+{

58+ Q_ASSERT(m_targetWindow);

59+

60+ if (eventType != "xcb_generic_event_t") {

61+ // wrong backend.

62+ qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");

63+ return false;

64+ }

65+

66+ xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);

67+

68+ switch (xcbEvent->response_type & ~0x80) {

69+ case XCB_BUTTON_PRESS:

70+ return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));

71+ break;

72+ case XCB_BUTTON_RELEASE:

73+ return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));

74+ break;

75+ case XCB_MOTION_NOTIFY:

76+ return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));

77+ break;

78+ default:

79+ return false;

80+ break;

81+ };

82+}

83+

84+bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)

85+{

86+ Qt::MouseButton button = translateMouseButton(pressEvent->detail);

87+

88+ // Just eat the event if it wasn't a left mouse press

89+ if (button != Qt::LeftButton)

90+ return true;

91+

92+ QPoint windowPos(pressEvent->event_x, pressEvent->event_y);

93+

94+ QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

95+ false /* autoCommit */);

96+ touchEvent.press(0 /* touchId */, windowPos);

97+ touchEvent.commit(false /* processEvents */);

98+

99+ m_leftButtonIsPressed = true;

100+ return true;

101+}

102+

103+bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)

104+{

105+ Qt::MouseButton button = translateMouseButton(releaseEvent->detail);

106+

107+ // Just eat the event if it wasn't a left mouse release

108+ if (button != Qt::LeftButton)

109+ return true;

110+

111+ QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);

112+

113+ QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

114+ false /* autoCommit */);

115+ touchEvent.release(0 /* touchId */, windowPos);

116+ touchEvent.commit(false /* processEvents */);

117+

118+ m_leftButtonIsPressed = false;

119+ return true;

120+}

121+

122+bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)

123+{

124+ if (!m_leftButtonIsPressed) {

125+ return true;

126+ }

127+

128+ QPoint windowPos(event->event_x, event->event_y);

129+

130+ QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

131+ false /* autoCommit */);

132+ touchEvent.move(0 /* touchId */, windowPos);

133+ touchEvent.commit(false /* processEvents */);

134+

135+ return true;

136+}

src/MouseTouchAdaptor.h → MouseTouchAdaptor.hrenamed+12−32

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

1/*

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

@@ -20,53 +20,33 @@

20#define MOUSE_TOUCH_ADAPTOR_H

21

22#include <QtCore/QAbstractNativeEventFilter>

23−#include <QWindow>

24−

25#include <xcb/xcb.h>

23#include <xcb/xcb.h>

26

24

27class QMouseEvent;

25class QMouseEvent;

28class QTouchDevice;

26class QTouchDevice;

27+class QWindow;

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

31+

33public:

32public:

34− virtual ~MouseTouchAdaptor();

33+ MouseTouchAdaptor();

35

34

36− static MouseTouchAdaptor* instance();

35+ // The window that will receive the generated QTouchEvents

36+ void setTargetWindow(QWindow *window);

37

38 // Filters mouse events and posts the equivalent QTouchEvents.

39− bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;

39+ 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

40

49private:

41private:

50− MouseTouchAdaptor();

51− void fetchXInput2Info();

52− bool xi2HandleEvent(xcb_ge_event_t *event);

53

42

54− bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);

43+ bool handleButtonPress(xcb_button_press_event_t *pressEvent);

55− bool handleButtonRelease(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);

44+ bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);

56− bool handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y);

45+ bool handleMotionNotify(xcb_motion_notify_event_t *event);

57− QWindow *findQWindowWithXWindowID(WId windowId);

58

46

47+ QWindow *m_targetWindow;

59 QTouchDevice *m_touchDevice;

48 QTouchDevice *m_touchDevice;

60 bool m_leftButtonIsPressed;

49 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};

50};

71

51

72#endif // MOUSE_TOUCH_ADAPTOR_H

52#endif // MOUSE_TOUCH_ADAPTOR_H

Notifications/Notification.qmlnew file+254

@@ -0,0 +1,254 @@

1+/*

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+/*

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+57

@@ -0,0 +1,57 @@

1+/*

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+

21+Item {

22+ id: indicatorItem

23+

24+ property alias widgetSource: loader.source

25+ property bool highlighted: false

26+ property bool dimmed: false

27+ property var indicatorProperties: undefined

28+

29+ opacity: dimmed ? 0.4 : 1

30+

31+ // only visible when non-empty

32+ visible: loader.item != undefined && loader.status == Loader.Ready ? loader.item.enabled : false

33+ width: visible ? loader.item.width : 0

34+

35+ Loader {

36+ id: loader

37+

38+ onLoaded: {

39+ item.height = Qt.binding(function() { return indicatorItem.height; });

40+

41+ for(var pName in indicatorProperties) {

42+ if (item.hasOwnProperty(pName)) {

43+ item[pName] = indicatorProperties[pName];

44+ }

45+ }

46+ }

47+ }

48+

49+ Rectangle {

50+ color: Theme.palette.selected.foreground

51+ objectName: "highlight"

52+ height: units.dp(2)

53+ width: parent.width

54+ anchors.top: parent.bottom

55+ visible: highlighted

56+ }

57+}

Panel/IndicatorRow.qmlnew file+105

@@ -0,0 +1,105 @@

1+/*

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: indicatorRow

22+

23+ property QtObject currentItem : null

24+ readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1

25+ property alias row: row

26+ property QtObject indicatorsModel: null

27+

28+ Behavior on y {NumberAnimation {duration: 300; easing.type: Easing.OutCubic} }

29+

30+ width: units.gu(40)

31+ height: units.gu(3)

32+

33+ Component.onCompleted: setDefaultItem()

34+

35+ function setDefaultItem() {

36+ // The leftmost indicator

37+ var defaultItemIndex = 0

38+ setItem(defaultItemIndex)

39+ }

40+

41+ function setItem(index) {

42+ currentItem = rowRepeater.itemAt(index)

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+ IndicatorItem {

58+ id: indicatorItem

59+

60+ property int ownIndex: index

61+

62+ widgetSource: model.widgetSource

63+

64+ indicatorProperties : model.indicatorProperties

65+ highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false

66+ dimmed: { //See FIXME in Indicators regarding the "states" change

67+ if (indicatorRow.state == "initial" || indicatorRow.state == "") {

68+ return false;

69+ } else if (indicatorRow.state == "hint") {

70+ return true

71+ } else {

72+ return ownIndex != indicatorRow.currentItemIndex

73+ }

74+ }

75+ height: indicatorRow.height

76+ y: {

77+ //FIXME: all indicators will be initial for now.

78+ if (!highlighted && (indicatorRow.state == "locked" || indicatorRow.state == "commit")) {

79+ return -indicatorRow.height

80+ } else {

81+ return 0

82+ }

83+ }

84+ Behavior on y {

85+ NumberAnimation{

86+ duration: {

87+ if (index == 0) {

88+ return 250

89+ } else if (index == 1) {

90+ return 150

91+ } else if (index == 2) {

92+ return 550

93+ } else if (index == 3) {

94+ return 400

95+ } else {

96+ return 100 + Math.random() * 200

97+ }

98+ }

99+ easing.type: Easing.OutCubic

100+ }

101+ }

102+ }

103+ }

104+ }

105+}

Panel/Indicators.qmlnew file+387

@@ -0,0 +1,387 @@

1+/*

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 int referenceOpenedHeight: units.gu(71)

29+ property real openedHeight: pinnedMode ? referenceOpenedHeight - panelHeight

30+ : referenceOpenedHeight

31+ property int panelHeight: units.gu(3)

32+ property bool pinnedMode: true //should be set true if indicators menu can cover whole screen

33+

34+ property int hintValue

35+ readonly property int lockThreshold: referenceOpenedHeight / 2

36+ property bool fullyOpened: height == openedHeight

37+ property bool partiallyOpened: height > panelHeight && !fullyOpened

38+

39+ // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

40+ // use its own values. Need to ask design about this.

41+ showAnimation: StandardAnimation {

42+ property: "height"

43+ duration: 350

44+ to: openedHeight

45+ easing.type: Easing.OutCubic

46+ }

47+

48+ hideAnimation: StandardAnimation {

49+ property: "height"

50+ duration: 350

51+ to: panelHeight

52+ easing.type: Easing.OutCubic

53+ }

54+

55+ height: panelHeight

56+

57+ onHeightChanged: {

58+ // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)

59+ var contentProgress = indicators.height - handle.get_height();

60+ if (!showAnimation.running && !hideAnimation.running) {

61+ if (contentProgress <= hintValue && indicators.state == "reveal") {

62+ indicators.state = "hint";

63+ } else if (contentProgress > hintValue && contentProgress < lockThreshold) {

64+ indicators.state = "reveal";

65+ } else if (contentProgress >= lockThreshold && lockThreshold > 0) {

66+ indicators.state = "locked";

67+ }

68+ }

69+

70+ if (contentProgress == 0) {

71+ menuContent.releaseContent();

72+ }

73+ }

74+

75+ function calculateCurrentItem(xValue, useBuffer) {

76+ var rowCoordinates

77+ var itemCoordinates

78+ var currentItem

79+ var distanceFromRightEdge

80+ var bufferExceeded = false

81+

82+ if (indicators.state == "commit" || indicators.state == "locked" || showAnimation.running || hideAnimation.running) return;

83+

84+ /*

85+ If user drags the indicator handle bar down a distance hintValue or less, this is 0.

86+ If bar is dragged down a distance greater than or equal to lockThreshold, this is 1.

87+ Otherwise it contains the bar's location as a fraction of the distance between hintValue (is 0) and lockThreshold (is 1).

88+ */

89+ var verticalProgress =

90+ MathLocal.clamp((indicators.height - handle.height - hintValue) /

91+ (lockThreshold - hintValue), 0, 1);

92+

93+ /*

94+ Percentage of an indicator icon's width the user's press can stray horizontally from the

95+ focused icon before we change focus to another icon. E.g. a value of 0.5 means you must

96+ go right a distance of half an icon's width before focus moves to the icon on the right

97+ */

98+ var maxBufferThreshold = 0.5;

99+

100+ /*

101+ To help users find the indicator of their choice while opening the indicators, we add logic to add a

102+ left/right buffer to each icon so it is harder for the focus to be moved accidentally to another icon,

103+ as the user moves their finger down, but yet allows them to switch indicator if they want.

104+ This buffer is wider the further the user's finger is from the top of the screen.

105+ */

106+ var effectiveBufferThreshold = maxBufferThreshold * verticalProgress;

107+

108+ rowCoordinates = indicatorRow.mapToItem(indicatorRow.row, xValue, 0);

109+ // get the current delegate

110+ currentItem = indicatorRow.row.childAt(rowCoordinates.x, 0);

111+ if (currentItem && currentItem != indicatorRow.currentItem ) {

112+ itemCoordinates = indicatorRow.row.mapToItem(currentItem, rowCoordinates.x, 0);

113+ distanceFromRightEdge = (currentItem.width - itemCoordinates.x) / (currentItem.width)

114+ if (Math.abs(currentItem.ownIndex - indicatorRow.currentItemIndex) > 1) {

115+ bufferExceeded = true;

116+ } else {

117+ if (indicatorRow.currentItemIndex < currentItem.ownIndex && distanceFromRightEdge < (1 - effectiveBufferThreshold)) {

118+ bufferExceeded = true;

119+ } else if (indicatorRow.currentItemIndex > currentItem.ownIndex && distanceFromRightEdge > effectiveBufferThreshold) {

120+ bufferExceeded = true;

121+ }

122+ }

123+ if ((!useBuffer || (useBuffer && bufferExceeded)) || indicatorRow.currentItem < 0 || indicatorRow.currentItem == null) {

124+ indicatorRow.currentItem = currentItem;

125+ }

126+ }

127+ }

128+

129+ // eater

130+ MouseArea {

131+ anchors {

132+ top: parent.top

133+ bottom: handle.bottom

134+ left: parent.left

135+ right: parent.right

136+ }

137+ }

138+

139+ VerticalThinDivider {

140+ anchors {

141+ top: indicators.top

142+ topMargin: panelHeight

143+ bottom: handle.bottom

144+ right: indicators.left

145+ }

146+ width: units.dp(2)

147+ source: "graphics/VerticalDivider.png"

148+ }

149+

150+ MenuContent {

151+ id: menuContent

152+ objectName: "menuContent"

153+

154+ anchors {

155+ left: parent.left

156+ right: parent.right

157+ top: indicatorRow.bottom

158+ bottom: parent.bottom

159+ }

160+ indicatorsModel: indicatorsModel

161+ clip: !indicators.fullyOpened

162+

163+ onMenuSelected: {

164+ indicatorRow.setItem(index)

165+ }

166+

167+ //small shadow gradient at bottom of menu

168+ Rectangle {

169+ anchors {

170+ left: parent.left

171+ right: parent.right

172+ bottom: parent.bottom

173+ }

174+ height: units.gu(0.5)

175+ gradient: Gradient {

176+ GradientStop { position: 0.0; color: "transparent" }

177+ GradientStop { position: 1.0; color: "black" }

178+ }

179+ opacity: 0.4

180+ }

181+ }

182+

183+ Rectangle {

184+ id: handle

185+

186+ color: menuContent.backgroundColor

187+

188+ anchors {

189+ left: parent.left

190+ right: parent.right

191+ top: menuContent.bottom

192+ }

193+ height: get_height()

194+ clip: height < handleImage.height

195+

196+ function get_height() {

197+ return Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0);

198+ }

199+

200+ BorderImage {

201+ id: handleImage

202+ source: "graphics/handle.sci"

203+ height: panelHeight

204+ anchors {

205+ left: parent.left

206+ right: parent.right

207+ bottom: parent.bottom

208+ }

209+ }

210+ MouseArea { //prevent clicks passing through

211+ anchors.fill: parent

212+ }

213+ }

214+

215+ PanelSeparatorLine {

216+ id: indicatorsSeparatorLine

217+ visible: true

218+ anchors {

219+ top: handle.bottom

220+ left: indicators.left

221+ right: indicators.right

222+ }

223+ }

224+

225+ BorderImage {

226+ id: dropShadow

227+ anchors {

228+ top: indicators.top

229+ bottom: indicatorsSeparatorLine.bottom

230+ left: indicators.left

231+ right: indicators.right

232+ margins: -units.gu(1)

233+ }

234+ visible: indicators.height > panelHeight

235+ source: "graphics/rectangular_dropshadow.sci"

236+ }

237+

238+ PanelBackground {

239+ anchors.fill: indicatorRow

240+ }

241+

242+ IndicatorRow {

243+ id: indicatorRow

244+ objectName: "indicatorRow"

245+ anchors {

246+ left: parent.left

247+ right: parent.right

248+ }

249+ height: indicators.panelHeight

250+ indicatorsModel: indicatorsModel

251+ state: indicators.state

252+

253+ onCurrentItemIndexChanged: menuContent.currentIndex = currentItemIndex

254+

255+ }

256+

257+ IndicatorsDataModel {

258+ id: indicatorsModel

259+ }

260+

261+ Connections {

262+ target: hideAnimation

263+ onRunningChanged: {

264+ if (hideAnimation.running) {

265+ indicators.state = "initial"

266+ } else {

267+ if (state == "initial") {

268+ indicatorRow.setDefaultItem();

269+ menuContent.releaseContent();

270+ }

271+ }

272+ }

273+ }

274+ Connections {

275+ target: showAnimation

276+ onRunningChanged: {

277+ if (showAnimation.running) {

278+ indicators.calculateCurrentItem(dragHandle.touchX, false);

279+ indicators.state = "commit";

280+ }

281+ }

282+ }

283+

284+ Connections {

285+ target: dragHandle

286+ onTouchXChanged: {

287+ var buffer = dragHandle.dragging ? true : false;

288+ indicators.calculateCurrentItem(dragHandle.touchX, buffer);

289+ }

290+ }

291+

292+ // We start with pinned states. (default pinnedMode: true)

293+ states: pinnedModeStates

294+ // because of dynamic assignment of states, we need to assign state after completion.

295+ Component.onCompleted: state = "initial"

296+

297+ // changing states will reset state to "".

298+ onPinnedModeChanged: {

299+ var last_state = state;

300+ states = (pinnedMode) ? pinnedModeStates : offScreenModeStates;

301+ state = last_state;

302+ }

303+

304+ property var dragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle

305+ DragHandle {

306+ id: showDragHandle

307+ anchors.bottom: parent.bottom

308+ // go beyond parent so that it stays reachable, at the top of the screen.

309+ anchors.bottomMargin: pinnedMode ? 0 : -panelHeight

310+ anchors.left: parent.left

311+ anchors.right: parent.right

312+ height: panelHeight

313+ direction: Direction.Downwards

314+ enabled: !indicators.shown

315+ hintDisplacement: pinnedMode ? indicators.hintValue : 0

316+ autoCompleteDragThreshold: maxTotalDragDistance / 2

317+ stretch: true

318+ maxTotalDragDistance: openedHeight - handle.height

319+ distanceThreshold: pinnedMode ? 0 : units.gu(3)

320+

321+ onStatusChanged: {

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

323+ menuContent.activateContent();

324+ }

325+ }

326+ }

327+ DragHandle {

328+ id: hideDragHandle

329+ anchors.fill: handle

330+ height: panelHeight

331+ direction: Direction.Upwards

332+ enabled: indicators.shown

333+ hintDisplacement: units.gu(2)

334+ autoCompleteDragThreshold: maxTotalDragDistance / 6

335+ stretch: true

336+ maxTotalDragDistance: referenceOpenedHeight - 2*panelHeight

337+ distanceThreshold: 0

338+ }

339+

340+ property list<State> offScreenModeStates: [

341+ State {

342+ name: "initial"

343+ },

344+ State {

345+ name: "hint"

346+ PropertyChanges { target: indicatorRow; y: panelHeight }

347+ },

348+ State {

349+ name: "reveal"

350+ extend: "hint"

351+ StateChangeScript { script: calculateCurrentItem(dragHandle.touchX, false); }

352+ },

353+ State {

354+ name: "locked"

355+ extend: "hint"

356+ },

357+ State {

358+ name: "commit"

359+ extend: "hint"

360+ }

361+ ]

362+

363+ property list<State> pinnedModeStates: [

364+ State {

365+ name: "initial"

366+ },

367+ State {

368+ name: "hint"

369+ },

370+ State {

371+ name: "reveal"

372+ StateChangeScript { script: calculateCurrentItem(dragHandle.touchX, false); }

373+ },

374+ State {

375+ name: "locked"

376+ },

377+ State {

378+ name: "commit"

379+ }

380+ ]

381+

382+ transitions: [

383+ Transition {

384+ NumberAnimation {targets: [indicatorRow, menuContent]; property: "y"; duration: 300; easing.type: Easing.OutCubic}

385+ }

386+ ]

387+}

Panel/Indicators/DatetimeIndicatorPage.qmlnew file+97

@@ -0,0 +1,97 @@

1+/*

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+65

@@ -0,0 +1,65 @@

1+/*

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: timeLabel.width + units.gu(1)

28+

29+ property alias label: timeLabel.text

30+

31+ Label {

32+ id: timeLabel

33+ objectName: "timeLabel"

34+ color: Theme.palette.selected.backgroundText

35+ opacity: 0.8

36+ font.family: "Ubuntu"

37+ fontSize: "medium"

38+ anchors.centerIn: parent

39+ text: Qt.formatTime(timer.dateNow)

40+ }

41+

42+ Timer {

43+ id: timer

44+ interval: 1000 * 10

45+ running: indicatorWidget.visible

46+ repeat: true

47+ triggeredOnStart: true

48+ property date dateNow

49+

50+ onTriggered: dateNow = new Date

51+ }

52+

53+ onActionStateChanged: {

54+ if (action == undefined || !action.valid) {

55+ return;

56+ }

57+

58+ if (action.state == undefined) {

59+ visible = false;

60+ return;

61+ }

62+

63+ indicatorWidget.visible = action.state[3];

64+ }

65+}

qml/Panel/Indicators/IndicatorDelegate.qml → Panel/Indicators/DefaultIndicatorPage.qmlrenamed+4−4

@@ -17,9 +17,9 @@

17 * Nick Dedekind <nick.dedekind@canonical.com>

18 */

19

20−import QtQuick 2.4

20+import QtQuick 2.0

21+import Unity.Indicators 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}

Panel/Indicators/DefaultIndicatorWidget.qmlnew file+80

@@ -0,0 +1,80 @@

1+/*

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(1)

28+

29+ property alias label: itemLabel.text

30+ property alias iconSource: itemImage.source

31+

32+ Row {

33+ id: itemRow

34+ objectName: "itemRow"

35+ anchors {

36+ top: parent.top

37+ bottom: parent.bottom

38+ horizontalCenter: parent.horizontalCenter

39+ }

40+ spacing: units.gu(0.5)

41+

42+ // FIXME : Should us Ubuntu.Icon . results in low res images

43+ Image {

44+ id: itemImage

45+ objectName: "itemImage"

46+ visible: source != ""

47+ height: indicatorWidget.iconSize

48+ width: indicatorWidget.iconSize

49+ anchors.verticalCenter: parent.verticalCenter

50+ }

51+

52+ Label {

53+ id: itemLabel

54+ objectName: "itemLabel"

55+ color: Theme.palette.selected.backgroundText

56+ opacity: 0.8

57+ font.family: "Ubuntu"

58+ fontSize: "medium"

59+ anchors.verticalCenter: parent.verticalCenter

60+ visible: text != ""

61+ }

62+ }

63+

64+ onActionStateChanged: {

65+ if (action == undefined || !action.valid) {

66+ return;

67+ }

68+

69+ if (action.state == undefined) {

70+ label = "";

71+ iconSource = "";

72+ enabled = false;

73+ return;

74+ }

75+

76+ label = action.state[Indicators.ActionState.Label];

77+ iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];

78+ enabled = action.state[Indicators.ActionState.Visible];

79+ }

80+}

tests/mocks/Unity/Notifications/plugin.cpp → Panel/Indicators/MessagingIndicatorPage.qmlrenamed+15−13

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

1/*

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

@@ -14,20 +14,22 @@

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

15 *

16 * Authors:

17− * Mirco Mueller <mirco.mueller@canonical.com>

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18 */

19

20−#include "plugin.h"

20+import QtQuick 2.0

21−#include "MockActionModel.h"

21+import Ubuntu.Components 0.1

22−#include "MockNotification.h"

22+import Unity.Indicators 0.1 as Indicators

23−#include "MockNotificationModel.h"

24

23

25−#include <QtQml/qqml.h>

24+Indicators.IndicatorPage {

25+ anchors.fill: parent

26

27−void TestNotificationPlugin::registerTypes(const char* uri)

27+ highlightFollowsCurrentItem: false

28−{

28+ emptyText: "You have no more outstanding messages."

29− // @uri Unity.Notifications

29+

30− qmlRegisterType<MockNotification>(uri, 1, 0, "Notification");

30+ function stop() {

31− qmlRegisterType<MockNotificationModel>(uri, 1, 0, "NotificationModel");

31+ // never stops the service

32− qmlRegisterType<ActionModel>(uri, 1, 0, "ActionModel");

32+ // this will keep all objects in memory, consume more memory

33+ // but will optimize the menu contruction on the screen

34+ }

33}

35}

tests/qmltests/Notifications/Notification.qml → Panel/Indicators/MessagingIndicatorWidget.qmlrenamed+6−13

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

1/*

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

@@ -14,19 +14,12 @@

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

15 *

16 * Authors:

17− * Mirco Mueller <mirco.mueller@canonical.com>

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18 */

19

20−import Unity.Notifications 1.0

20+import QtQuick 2.0

21

22−Notification {

22+DefaultIndicatorWidget {

23− nid: 0

23+ // default the icon so we have something to show when we don't have the bus.

24− type: Notification.PlaceHolder

24+ iconSource: "image://gicon/indicator-messages"

25− summary: ""

26− body: ""

27− icon: ""

28− secondaryIcon: ""

29− value: 0

30− rawActions: []

31− fullscreen: false

32}

25}

Panel/Indicators/NetworkIndicatorPage.qmlnew file+79

@@ -0,0 +1,79 @@

1+/*

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: _network

27+

28+ property alias title: _mainPage.title

29+ property alias emptyText: _pluginItem.emptyText

30+ property alias busType: _pluginItem.busType

31+ property alias busName: _pluginItem.busName

32+ property alias actionsObjectPath : _pluginItem.actionsObjectPath

33+ property alias menuObjectPaths : _pluginItem.menuObjectPaths

34+

35+ __showHeader: false

36+ anchors.fill: parent

37+

38+ Page {

39+ id: _mainPage

40+

41+ Indicators.IndicatorPage {

42+ id: _pluginItem

43+ anchors.fill: parent

44+ }

45+ }

46+

47+ Component {

48+ id: passwordPageComponent

49+

50+ ICNetwork.PasswordPage {

51+ agent: networkAgent

52+ }

53+ }

54+

55+ ICNetwork.NetworkAgent {

56+ id: networkAgent

57+

58+ onSecretRequested: {

59+ _network.push(passwordPageComponent, {"token": token});

60+ }

61+ }

62+

63+ function start()

64+ {

65+ push(_mainPage);

66+ _pluginItem.start();

67+ }

68+

69+ function stop()

70+ {

71+ clear();

72+ _pluginItem.stop();

73+ }

74+

75+ function reset()

76+ {

77+ _pluginItem.reset();

78+ }

79+}

Panel/Indicators/NetworkIndicatorWidget.qmlnew file+109

@@ -0,0 +1,109 @@

1+/*

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: networkIcon.width + units.gu(1)

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+ return;

47+ }

48+

49+ if (action.state == undefined) {

50+ connectionState = 0;

51+ return;

52+ }

53+

54+ connectionState = action.state[Indicators.NetworkActionState.Connection];

55+ if (connectionState == Indicators.NetworkConnection.Activated) {

56+ signalStrength = action.state[Indicators.NetworkActionState.SignalStrength];

57+ }

58+ }

59+

60+ NumberAnimation {

61+ id: activation_animation

62+ target: indicatorWidget

63+ property: "signalStrength"

64+ from: 0

65+ to: 100

66+ duration: 2500 // 5 states in 2.5 seconds

67+ loops: Animation.Infinite

68+ }

69+

70+ states: [

71+ State {

72+ name: "unknown"

73+ when: connectionState < Indicators.NetworkConnection.Activating || connectionState > Indicators.NetworkConnection.Deactivating

74+ PropertyChanges { target: activation_animation; running: false }

75+ },

76+ State {

77+ name: "activating"

78+ when: connectionState == Indicators.NetworkConnection.Activating

79+ PropertyChanges { target: activation_animation; running: true }

80+ },

81+ State {

82+ name: "activated"

83+ when: connectionState == Indicators.NetworkConnection.Activated

84+ PropertyChanges { target: activation_animation; running: false }

85+ },

86+ State {

87+ name: "deactivating"

88+ when: connectionState == Indicators.NetworkConnection.Deactivating

89+ PropertyChanges { target: activation_animation; running: true }

90+ }

91+ ]

92+

93+

94+ function get_icon_for_signal(con_state, value) {

95+ if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {

96+ if (value == 0) {

97+ return "image://gicon/nm-signal-00";

98+ } else if (value <= 25) {

99+ return "image://gicon/nm-signal-25";

100+ } else if (value <= 50) {

101+ return "image://gicon/nm-signal-50";

102+ } else if (value <= 75) {

103+ return "image://gicon/nm-signal-75";

104+ }

105+ return "image://gicon/nm-signal-100";

106+ }

107+ return "image://gicon/wifi-none";

108+ }

109+}

plugins/Unity/InputInfo/plugin.h → Panel/Indicators/SoundIndicatorWidget.qmlrenamed+9−14

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

1/*

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

@@ -12,19 +12,14 @@

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>

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://gicon/audio-volume-high"

25+}

qml/Panel/Indicators/client/IndicatorsClient.qml → Panel/Indicators/client/IndicatorsClient.qmlrenamed+13−21

@@ -17,34 +17,26 @@

17 * Renato Araujo Oliveira Filho <renato@canonical.com>

18 */

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

33− anchors.fill: parent

34− Component.onCompleted: reset()

35

30

36− function reset() {

31+ anchors.fill: parent

37− clear();

32+ Component.onCompleted: root.reset()

38− 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− }

33+ }

45

34

46− var page = component.createObject(pages, {"profile": indicatorProfile});

35+ function reset() {

36+ pages.clear();

37+ var component = Qt.createComponent("IndicatorsList.qml");

38+ var page = component.createObject(pages);

39+ console.log(component.errorString());

47− push(page);

40+ pages.push(page);

48− }

49 }

41 }

50}

42}

qml/Panel/Indicators/client/IndicatorsList.qml → Panel/Indicators/client/IndicatorsList.qmlrenamed+18−24

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

1/*

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

@@ -15,27 +15,21 @@

15 *

16 * Authors:

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

23import Unity.Indicators 0.1 as Indicators

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+49

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

1+/*

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 Ubuntu.Components 0.1

22+

23+Page {

24+ id: _page

25+

26+ title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title : ""

27+ property variant indicatorProperties

28+ property alias pageSource : page_loader.source

29+

30+ anchors.fill: parent

31+

32+ Loader {

33+ id: page_loader

34+ objectName: "page_loader"

35+

36+ anchors.fill: parent

37+

38+ onStatusChanged: {

39+ if (status == Loader.Ready) {

40+ for(var pName in indicatorProperties) {

41+ if (item.hasOwnProperty(pName)) {

42+ item[pName] = indicatorProperties[pName];

43+ }

44+ }

45+ item.start();

46+ }

47+ }

48+ }

49+}

Panel/IndicatorsDataModel.qmlnew file+66

@@ -0,0 +1,66 @@

1+/*

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-messaging' : {

31+ 'title': 'Messaging',

32+ 'description' : '',

33+ 'priority': 10,

34+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',

35+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'

36+ },

37+ 'indicator-sound' : {

38+ 'title': 'Sound',

39+ 'description' : '',

40+ 'priority': 20,

41+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/SoundIndicatorWidget.qml',

42+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

43+ },

44+ 'indicator-network' : {

45+ 'title': 'Networks',

46+ 'description' : '',

47+ 'priority': 30,

48+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorWidget.qml',

49+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

50+ },

51+ 'indicator-battery' : {

52+ 'title': 'Battery',

53+ 'description' : '',

54+ 'priority': 40,

55+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',

56+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

57+ },

58+ 'indicator-time' : {

59+ 'title': 'Date and Time',

60+ 'description' : '',

61+ 'priority': 100,

62+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorWidget.qml',

63+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorPage.qml'

64+ }

65+ }

66+}

Panel/MenuContent.qmlnew file+152

@@ -0,0 +1,152 @@

1+/*

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+Rectangle {

23+ id: content

24+

25+ property QtObject indicatorsModel: null

26+ property bool __contentActive: false

27+ property alias currentIndex : menus.currentIndex

28+ property color backgroundColor: "#221e1c" // FIXME not in palette yet

29+ property int contentReleaseInterval: 20000

30+

31+ width: units.gu(40)

32+ height: units.gu(42)

33+ color: backgroundColor

34+

35+ signal menuSelected(int index)

36+

37+ function activateContent() {

38+ contentReleaseTimer.stop();

39+ __contentActive = true;

40+ }

41+

42+ function releaseContent() {

43+ if (__contentActive)

44+ contentReleaseTimer.restart();

45+ }

46+

47+ ListView {

48+ id: menus

49+ objectName: "menus"

50+

51+ anchors.bottom: parent.bottom

52+ anchors.top: header.bottom

53+ width: parent.width

54+

55+ spacing: units.gu(0.5)

56+ enabled: opacity != 0

57+ orientation: ListView.Horizontal

58+ model: indicatorsModel

59+ interactive: false

60+ //FIXME: This will make sure that all plugins still alive

61+ //check bug https://bugs.launchpad.net/manhattan/+bug/1088945 for more details

62+ cacheBuffer: 2147483647

63+

64+ delegate: Loader {

65+ clip: true

66+ property bool contentActive: content.__contentActive && menuActivator.content[index].active

67+

68+ onContentActiveChanged: {

69+ if (contentActive && item) {

70+ item.start();

71+ } else if (!contentActive && item) {

72+ item.stop();

73+ }

74+ }

75+

76+ width: menus.width

77+ height: menus.height

78+ source: pageSource

79+ onVisibleChanged: {

80+ // Reset the indicator states

81+ if (!visible && item && item["reset"]) {

82+ item.reset();

83+ }

84+ }

85+ asynchronous: true

86+

87+ onLoaded: {

88+ for(var pName in indicatorProperties) {

89+ if (item.hasOwnProperty(pName)) {

90+ item[pName] = indicatorProperties[pName];

91+ }

92+ }

93+ if (contentActive && menus.visible) {

94+ item.start();

95+ }

96+ }

97+

98+ // Need to use a binding because the handle height changes.

99+ // FIXME: Dont know why we're using handle height (introduces dep).. Check with design about bottom margin

100+ Binding {

101+ target: item

102+ property: "anchors.bottomMargin"

103+ value: handle.height

104+ }

105+ }

106+ }

107+

108+ Rectangle {

109+ id: header

110+ objectName: "header"

111+

112+ property alias title: pageHeader.text

113+

114+ color: backgroundColor

115+ opacity: pageHeader.opacity

116+ anchors {

117+ left: parent.left

118+ right: parent.right

119+ }

120+ height: childrenRect.height

121+

122+ PageHeader {

123+ id: pageHeader

124+ anchors {

125+ left: parent.left

126+ right: parent.right

127+ }

128+ text: {

129+ if (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count)

130+ return indicatorsModel.data(menus.currentIndex, Indicators.IndicatorsModelRole.Title);

131+ return "";

132+ }

133+ }

134+ }

135+

136+ Timer {

137+ id: contentReleaseTimer

138+

139+ interval: contentReleaseInterval

140+ onTriggered: {

141+ __contentActive = false;

142+ menuActivator.clear();

143+ }

144+ }

145+

146+ Indicators.MenuContentActivator {

147+ id: menuActivator

148+ running: content.__contentActive

149+ baseIndex: content.currentIndex

150+ count: indicatorsModel.count

151+ }

152+}

Panel/Panel.qmlnew file+133

@@ -0,0 +1,133 @@

1+/*

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+ onYChanged: indicatorsMenu.y = y;

43+

44+ Behavior on y {

45+ NumberAnimation { duration: 200 }

46+ }

47+ }

48+

49+ PanelSeparatorLine {

50+ id: leftSeparatorLine

51+ anchors {

52+ top: panelBackground.bottom

53+ left: parent.left

54+ right: indicatorsMenu.left

55+ }

56+ saturation: 1 - indicatorsMenu.unitProgress

57+ }

58+

59+ Rectangle {

60+ id: darkenedArea

61+ property real darkenedOpacity: 0.6

62+ anchors {

63+ left: parent.left

64+ right: parent.right

65+ top: panelBackground.bottom

66+ bottom: parent.bottom

67+ }

68+ color: "black"

69+ opacity: indicatorsMenu.unitProgress * darkenedOpacity

70+ MouseArea {

71+ anchors.fill: parent

72+ enabled: indicatorsMenu.shown

73+ onClicked: if (indicatorsMenu.fullyOpened) indicatorsMenu.hide();

74+ }

75+ }

76+

77+ Indicators {

78+ id: indicatorsMenu

79+

80+ anchors.right: parent.right

81+ y: 0

82+ width: root.indicatorsMenuWidth

83+ shown: false

84+ hintValue: __panelMinusSeparatorLineHeight * 3

85+ panelHeight: __panelMinusSeparatorLineHeight

86+ referenceOpenedHeight: parent.height

87+

88+ pinnedMode: !fullscreenMode

89+

90+ property real unitProgress: (height - panelHeight) / (openedHeight - panelHeight)

91+ }

92+

93+ SearchIndicator {

94+ id: search

95+ objectName: "search"

96+ enabled: root.searchVisible

97+

98+ state: {

99+ if (parent.width < indicatorsMenu.width + width) {

100+ if (indicatorsMenu.state != "initial") {

101+ return "hiddenUp";

102+ }

103+ }

104+ if (root.searchVisible) {

105+ return "visible";

106+ }

107+

108+ return "hiddenUp";

109+ }

110+

111+ width: units.gu(13)

112+ height: __panelMinusSeparatorLineHeight

113+ anchors {

114+ top: panelBackground.top

115+ left: panelBackground.left

116+ }

117+

118+ onClicked: root.searchClicked()

119+ }

120+

121+ states: [

122+ State {

123+ name: "in" //fully opaque and visible at top edge of screen

124+ when: !fullscreenMode

125+ PropertyChanges { target: panelBackground; y: 0 }

126+ },

127+ State {

128+ name: "out" //pushed off screen

129+ when: fullscreenMode

130+ PropertyChanges { target: panelBackground; y: -panelHeight }

131+ }

132+ ]

133+}

plugins/LightDM/IntegratedLightDM/QLightDM/Greeter → Panel/PanelBackground.qmlrenamed+6−2

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

1/*

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

@@ -14,4 +14,8 @@

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

15 */

16

17−#include "../liblightdm/Greeter.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/*

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

@@ -14,14 +14,12 @@

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

15 */

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+83

@@ -0,0 +1,83 @@

1+/*

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: search

22+

23+ width: units.gu(9)

24+ height: units.gu(3)

25+

26+ property string headerText: i18n.tr("Search")

27+

28+ signal clicked

29+

30+ // eater

31+ MouseArea {

32+ anchors.fill: parent

33+ onClicked: search.clicked()

34+ }

35+

36+ Item {

37+ id: container

38+ objectName: "container"

39+

40+ width: parent.width

41+ height: parent.height

42+

43+ Behavior on opacity {NumberAnimation {}}

44+ Behavior on y {NumberAnimation {duration: 300; easing.type: Easing.OutCubic}}

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+ y: 0

71+ opacity: 1

72+ }

73+ },

74+ State {

75+ name: "hiddenUp"

76+ PropertyChanges {

77+ target: container

78+ y: -height

79+ opacity: 0

80+ }

81+ }

82+ ]

83+}

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+634

@@ -0,0 +1,634 @@

1+/*

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.Application 0.1

19+import Ubuntu.Components 0.1

20+import Ubuntu.Gestures 0.1

21+import LightDM 0.1 as LightDM

22+import "Dash"

23+import "Greeter"

24+import "Launcher"

25+import "Panel"

26+import "Hud"

27+import "Components"

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

29+import "Bottombar"

30+import "SideStage"

31+import "Notifications"

32+import Unity.Notifications 1.0 as NotificationBackend

33+

34+FocusScope {

35+ id: shell

36+

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

38+ property bool tablet: false

39+ width: tablet ? units.gu(160) : ApplicationArguments.hasGeometry() ? ApplicationArguments.width() : units.gu(40)

40+ height: tablet ? units.gu(100) : ApplicationArguments.hasGeometry() ? ApplicationArguments.height() : units.gu(71)

41+

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

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

44+ property url background: default_background

45+ readonly property real panelHeight: panel.panelHeight

46+

47+ property bool dashShown: dash.shown

48+ property bool stageScreenshotsReady: {

49+ if (sideStage.shown) {

50+ if (mainStage.applications.count > 0) {

51+ return mainStage.usingScreenshots && sideStage.usingScreenshots;

52+ } else {

53+ return sideStage.usingScreenshots;

54+ }

55+ } else {

56+ return mainStage.usingScreenshots;

57+ }

58+ }

59+

60+ property ListModel searchHistory: SearchHistoryModel {}

61+

62+ property var applicationManager: ApplicationManagerWrapper {}

63+

64+ Component.onCompleted: {

65+ Theme.name = "Ubuntu.Components.Themes.SuruGradient"

66+

67+ applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })

68+

69+ // FIXME: if application focused before shell starts, shell draws on top of it only.

70+ // We should detect already running applications on shell start and bring them to the front.

71+ applicationManager.unfocusCurrentApplication();

72+ }

73+

74+ readonly property bool fullscreenMode: {

75+ if (greeter.shown || lockscreen.shown) {

76+ return false;

77+ } else if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode

78+ return mainStage.switchingFromFullscreenToFullscreen;

79+ } else if (applicationManager.mainStageFocusedApplication) {

80+ return applicationManager.mainStageFocusedApplication.fullscreen;

81+ } else {

82+ return false;

83+ }

84+ }

85+

86+ Connections {

87+ target: applicationManager

88+ ignoreUnknownSignals: true

89+ onFocusRequested: {

90+ // TODO: this should be protected to only unlock for certain applications / certain usecases

91+ // potentially only in connection with a notification

92+ greeter.hide();

93+ shell.activateApplication(desktopFile);

94+ }

95+ }

96+

97+ function activateApplication(desktopFile, argument) {

98+ if (applicationManager) {

99+ // For newly started applications, as it takes them time to draw their first frame

100+ // we add a delay before we hide the animation screenshots to compensate.

101+ var addDelay = !applicationManager.getApplicationFromDesktopFile(desktopFile);

102+

103+ var application;

104+ application = applicationManager.activateApplication(desktopFile, argument);

105+ if (application == null) {

106+ return;

107+ }

108+ if (application.stage == ApplicationInfo.MainStage || !sideStage.enabled) {

109+ mainStage.activateApplication(desktopFile, addDelay);

110+ } else {

111+ sideStage.activateApplication(desktopFile, addDelay);

112+ }

113+ stages.show();

114+ }

115+ }

116+

117+ VolumeControl {

118+ id: volumeControl

119+ }

120+

121+ Keys.onVolumeUpPressed: volumeControl.volumeUp()

122+ Keys.onVolumeDownPressed: volumeControl.volumeDown()

123+

124+ Keys.onReleased: {

125+ if (event.key == Qt.Key_PowerOff) {

126+ greeter.show()

127+ }

128+ }

129+

130+ Item {

131+ id: underlay

132+ anchors.fill: parent

133+ visible: !(panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)

134+ && (stages.fullyHidden

135+ || (stages.fullyShown && mainStage.usingScreenshots)

136+ || !stages.fullyShown && (mainStage.usingScreenshots || (sideStage.shown && sideStage.usingScreenshots)))

137+

138+ Image {

139+ id: backgroundImage

140+ source: shell.background

141+ sourceSize.width: parent.width

142+ sourceSize.height: parent.height

143+ anchors.fill: parent

144+ }

145+

146+ Rectangle {

147+ anchors.fill: parent

148+ color: "black"

149+ opacity: dash.disappearingAnimationProgress

150+ }

151+

152+ Dash {

153+ id: dash

154+

155+ available: !greeter.shown && !lockscreen.shown

156+ hides: [stages, launcher, panel.indicators]

157+ shown: disappearingAnimationProgress !== 1.0

158+ enabled: disappearingAnimationProgress === 0.0

159+ // FIXME: unfocus all applications when going back to the dash

160+ onEnabledChanged: {

161+ if (enabled) {

162+ shell.applicationManager.unfocusCurrentApplication()

163+ }

164+ }

165+

166+ anchors {

167+ fill: parent

168+ topMargin: panel.panelHeight

169+ }

170+

171+ contentScale: 1.0 - 0.2 * disappearingAnimationProgress

172+ opacity: 1.0 - disappearingAnimationProgress

173+ property real disappearingAnimationProgress: {

174+ if (greeter.shown) {

175+ return greeter.showProgress;

176+ } else {

177+ return stagesOuterContainer.showProgress;

178+ }

179+ }

180+

181+ // FIXME: only necessary because stagesRevealer.animatedProgress and

182+ // greeterRevealer.animatedProgress are not animated

183+ Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

184+ }

185+ }

186+

187+

188+ Item {

189+ id: stagesOuterContainer

190+

191+ width: parent.width

192+ height: parent.height

193+ x: launcher.progress

194+ Behavior on x {SmoothedAnimation{velocity: 600}}

195+

196+ property real showProgress:

197+ MathLocal.clamp(1 - (x + stages.x) / shell.width, 0, 1)

198+

199+ Showable {

200+ id: stages

201+

202+ x: width

203+

204+ property bool fullyShown: shown && x == 0 && parent.x == 0

205+ property bool fullyHidden: !shown && x == width

206+ available: !greeter.shown

207+ hides: [launcher, panel.indicators]

208+ shown: false

209+ opacity: 1.0

210+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }

211+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: width; easing.type: Easing.OutCubic }

212+

213+ width: parent.width

214+ height: parent.height

215+

216+ // close the stages when no focused application remains

217+ Connections {

218+ target: shell.applicationManager

219+ onMainStageFocusedApplicationChanged: stages.closeIfNoApplications()

220+ onSideStageFocusedApplicationChanged: stages.closeIfNoApplications()

221+ ignoreUnknownSignals: true

222+ }

223+

224+ function closeIfNoApplications() {

225+ if (!shell.applicationManager.mainStageFocusedApplication

226+ && !shell.applicationManager.sideStageFocusedApplication

227+ && shell.applicationManager.mainStageApplications.count == 0

228+ && shell.applicationManager.sideStageApplications.count == 0) {

229+ stages.hide();

230+ }

231+ }

232+

233+ // show the stages when an application gets the focus

234+ Connections {

235+ target: shell.applicationManager

236+ onMainStageFocusedApplicationChanged: {

237+ if (shell.applicationManager.mainStageFocusedApplication) {

238+ mainStage.show();

239+ stages.show();

240+ }

241+ }

242+ onSideStageFocusedApplicationChanged: {

243+ if (shell.applicationManager.sideStageFocusedApplication) {

244+ sideStage.show();

245+ stages.show();

246+ }

247+ }

248+ ignoreUnknownSignals: true

249+ }

250+

251+

252+ Stage {

253+ id: mainStage

254+

255+ anchors.fill: parent

256+ fullyShown: stages.fullyShown

257+ shouldUseScreenshots: !fullyShown

258+ rightEdgeEnabled: !sideStage.enabled

259+

260+ applicationManager: shell.applicationManager

261+ rightEdgeDraggingAreaWidth: shell.edgeSize

262+ normalApplicationY: shell.panelHeight

263+

264+ shown: true

265+ function show() {

266+ stages.show();

267+ }

268+ function hide() {

269+ }

270+

271+ // FIXME: workaround the fact that focusing a main stage application

272+ // raises its surface on top of all other surfaces including the ones

273+ // that belong to side stage applications.

274+ onFocusedApplicationChanged: {

275+ if (focusedApplication && sideStage.focusedApplication && sideStage.fullyShown) {

276+ shell.applicationManager.focusApplication(sideStage.focusedApplication);

277+ }

278+ }

279+ }

280+

281+ SideStage {

282+ id: sideStage

283+

284+ applicationManager: shell.applicationManager

285+ rightEdgeDraggingAreaWidth: shell.edgeSize

286+ normalApplicationY: shell.panelHeight

287+

288+ onShownChanged: {

289+ if (!shown && mainStage.applications.count == 0) {

290+ stages.hide();

291+ }

292+ }

293+ // FIXME: when hiding the side stage, refocus the main stage

294+ // application so that it goes in front of the side stage

295+ // application and hides it

296+ onFullyShownChanged: {

297+ if (!fullyShown && stages.fullyShown && sideStage.focusedApplication != null) {

298+ shell.applicationManager.focusApplication(mainStage.focusedApplication);

299+ }

300+ }

301+

302+ enabled: shell.width >= units.gu(60)

303+ visible: enabled

304+ fullyShown: stages.fullyShown && shown

305+ && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue

306+ shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed

307+

308+ available: !greeter.shown && !lockscreen.shown && enabled

309+ hides: [launcher, panel.indicators]

310+ shown: false

311+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }

312+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.closedValue; easing.type: Easing.OutQuint }

313+

314+ width: units.gu(40)

315+ height: stages.height

316+ handleExpanded: sideStageRevealer.pressed

317+ }

318+

319+ Revealer {

320+ id: sideStageRevealer

321+

322+ enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0

323+ && sideStage.available

324+ direction: Qt.RightToLeft

325+ openedValue: parent.width - sideStage.width

326+ hintDisplacement: units.gu(3)

327+ /* The size of the sidestage handle needs to be bigger than the

328+ typical size used for edge detection otherwise it is really

329+ hard to grab.

330+ */

331+ handleSize: sideStage.shown ? units.gu(4) : shell.edgeSize

332+ closedValue: parent.width + sideStage.handleSizeCollapsed

333+ target: sideStage

334+ x: parent.width - width

335+ width: sideStage.width + handleSize * 0.7

336+ height: sideStage.height

337+ orientation: Qt.Horizontal

338+ }

339+

340+ DragHandle {

341+ id: stagesRevealer

342+

343+ anchors.top: parent.top

344+ anchors.bottom: parent.bottom

345+ anchors.right: parent.left

346+

347+ width: shell.edgeSize

348+ direction: Direction.Leftwards

349+ enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0

350+ }

351+ }

352+ }

353+

354+ Lockscreen {

355+ id: lockscreen

356+ hides: [launcher, panel.indicators, hud]

357+ shown: false

358+ enabled: true

359+ showAnimation: StandardAnimation { property: "opacity"; to: 1 }

360+ hideAnimation: StandardAnimation { property: "opacity"; to: 0 }

361+ y: panel.panelHeight

362+ x: required ? 0 : - width

363+ width: parent.width

364+ height: parent.height - panel.panelHeight

365+ background: shell.background

366+

367+ onUnlocked: lockscreen.hide()

368+ onCancel: greeter.show()

369+

370+ Component.onCompleted: {

371+ if (LightDM.Users.count == 1) {

372+ LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

373+ }

374+ }

375+ }

376+

377+ Connections {

378+ target: LightDM.Greeter

379+

380+ onShowPrompt: {

381+ if (LightDM.Users.count == 1) {

382+ // TODO: There's no better way for now to determine if its a PIN or a passphrase.

383+ if (text == "PIN") {

384+ lockscreen.alphaNumeric = false

385+ } else {

386+ lockscreen.alphaNumeric = true

387+ }

388+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);

389+ lockscreen.show();

390+ }

391+ }

392+ }

393+

394+ Greeter {

395+ id: greeter

396+

397+ available: true

398+ hides: [launcher, panel.indicators, hud]

399+ shown: true

400+

401+ y: panel.panelHeight

402+ width: parent.width

403+ height: parent.height - panel.panelHeight

404+

405+ dragHandleWidth: shell.edgeSize

406+

407+ property var previousMainApp: null

408+ property var previousSideApp: null

409+

410+ onShownChanged: {

411+ if (shown) {

412+ lockscreen.reset();

413+ // If there is only one user, we start authenticating with that one here.

414+ // If there are more users, the Greeter will handle that

415+ if (LightDM.Users.count == 1) {

416+ LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

417+ }

418+ greeter.forceActiveFocus();

419+ // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether

420+ // the stage was actually shown

421+ if (mainStage.fullyShown) greeter.previousMainApp = applicationManager.mainStageFocusedApplication;

422+ if (sideStage.fullyShown) greeter.previousSideApp = applicationManager.sideStageFocusedApplication;

423+ applicationManager.unfocusCurrentApplication();

424+ } else {

425+ if (greeter.previousMainApp) {

426+ applicationManager.focusApplication(greeter.previousMainApp);

427+ greeter.previousMainApp = null;

428+ }

429+ if (greeter.previousSideApp) {

430+ applicationManager.focusApplication(greeter.previousSideApp);

431+ greeter.previousSideApp = null;

432+ }

433+ }

434+ }

435+

436+ onUnlocked: greeter.hide()

437+ onSelected: {

438+ var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)

439+ shell.background = bgPath ? bgPath : default_background

440+ }

441+

442+ onLeftTeaserPressedChanged: {

443+ if (leftTeaserPressed) {

444+ launcher.tease();

445+ }

446+ }

447+ }

448+

449+ InputFilterArea {

450+ anchors.fill: parent

451+ blockInput: greeter.shown || lockscreen.shown

452+ }

453+

454+ Item {

455+ id: overlay

456+

457+ anchors.fill: parent

458+

459+ Panel {

460+ id: panel

461+ anchors.fill: parent //because this draws indicator menus

462+ indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width

463+ indicators {

464+ hides: [launcher]

465+ }

466+ fullscreenMode: shell.fullscreenMode

467+ searchVisible: !greeter.shown && !lockscreen.shown

468+

469+ InputFilterArea {

470+ anchors.fill: parent

471+ blockInput: panel.indicators.shown

472+ }

473+ }

474+

475+ Hud {

476+ id: hud

477+

478+ width: parent.width > units.gu(60) ? units.gu(40) : parent.width

479+ height: parent.height

480+

481+ available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown

482+ shown: false

483+ showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }

484+ hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

485+

486+ Connections {

487+ target: shell.applicationManager

488+ onMainStageFocusedApplicationChanged: hud.hide()

489+ onSideStageFocusedApplicationChanged: hud.hide()

490+ }

491+

492+ InputFilterArea {

493+ anchors.fill: parent

494+ blockInput: hud.shown

495+ }

496+ }

497+

498+ Revealer {

499+ id: hudRevealer

500+

501+ enabled: hud.shown

502+ width: hud.width

503+ anchors.left: hud.left

504+ height: parent.height

505+ target: hud.revealerTarget

506+ closedValue: height

507+ openedValue: 0

508+ direction: Qt.RightToLeft

509+ orientation: Qt.Vertical

510+ handleSize: hud.handleHeight

511+ onCloseClicked: target.hide()

512+ }

513+

514+ Bottombar {

515+ theHud: hud

516+ anchors.fill: parent

517+ enabled: !panel.indicators.shown

518+ applicationIsOnForeground: applicationManager.mainStageFocusedApplication

519+ || applicationManager.sideStageFocusedApplication

520+ }

521+

522+ InputFilterArea {

523+ blockInput: launcher.shown

524+ anchors {

525+ top: parent.top

526+ bottom: parent.bottom

527+ left: parent.left

528+ }

529+ width: launcher.width

530+ }

531+

532+ Launcher {

533+ id: launcher

534+

535+ anchors.top: parent.top

536+ anchors.bottom: parent.bottom

537+ width: parent.width

538+ dragAreaWidth: shell.edgeSize

539+ available: !greeter.locked

540+ onDashItemSelected: {

541+ greeter.hide()

542+ // Animate if moving between application and dash

543+ if (!stages.shown) {

544+ dash.setCurrentScope("home.scope", true, false)

545+ } else {

546+ dash.setCurrentScope("home.scope", false, false)

547+ }

548+ stages.hide();

549+ }

550+ onDash: {

551+ if (stages.shown) {

552+ dash.setCurrentScope("applications.scope", true, false)

553+ stages.hide();

554+ launcher.hide();

555+ }

556+ }

557+ onLauncherApplicationSelected:{

558+ greeter.hide()

559+ shell.activateApplication(desktopFile)

560+ }

561+ onShownChanged: {

562+ if (shown) {

563+ panel.indicators.hide()

564+ hud.hide()

565+ }

566+ }

567+ }

568+

569+ Notifications {

570+ id: notifications

571+

572+ model: NotificationBackend.Model

573+ anchors {

574+ top: parent.top

575+ right: parent.right

576+ bottom: parent.bottom

577+ leftMargin: units.gu(1)

578+ rightMargin: units.gu(1)

579+ topMargin: panel.panelHeight + units.gu(1)

580+ }

581+ states: [

582+ State {

583+ name: "narrow"

584+ when: overlay.width <= units.gu(60)

585+ AnchorChanges { target: notifications; anchors.left: parent.left }

586+ },

587+ State {

588+ name: "wide"

589+ when: overlay.width > units.gu(60)

590+ AnchorChanges { target: notifications; anchors.left: undefined }

591+ PropertyChanges { target: notifications; width: units.gu(38) }

592+ }

593+ ]

594+ }

595+ }

596+

597+ focus: true

598+

599+ InputFilterArea {

600+ anchors {

601+ top: parent.top

602+ bottom: parent.bottom

603+ left: parent.left

604+ }

605+ width: shell.edgeSize

606+ blockInput: true

607+ }

608+

609+ InputFilterArea {

610+ anchors {

611+ top: parent.top

612+ bottom: parent.bottom

613+ right: parent.right

614+ }

615+ width: shell.edgeSize

616+ blockInput: true

617+ }

618+

619+ Binding {

620+ target: i18n

621+ property: "domain"

622+ value: "unity8"

623+ }

624+

625+ //FIXME: This should be handled in the input stack, keyboard shouldnt propagate

626+ MouseArea {

627+ anchors.bottom: parent.bottom

628+ anchors.left: parent.left

629+ anchors.right: parent.right

630+ height: shell.applicationManager ? shell.applicationManager.keyboardHeight : 0

631+

632+ enabled: shell.applicationManager && shell.applicationManager.keyboardVisible

633+ }

634+}

SideStage/SideStage.qmlnew file+68

@@ -0,0 +1,68 @@

1+/*

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.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/Biometryd/MockObserver.cpp → SideStage/SidestageHandle.qmlrenamed+5−5

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

1/*

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

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

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

15 */

16

17−#include "MockObserver.h"

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

18

19

19−MockObserver::MockObserver(QObject *parent)

20+BorderImage {

20− : QObject(parent)

21+ source: "graphics/sidestage_handle.sci"

21−{

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+75

@@ -0,0 +1,75 @@

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+ [ -f /etc/apt/sources.list.d/ubuntu-unity-next-${DISTRIB_CODENAME}.list ] || sudo add-apt-repository ppa:ubuntu-unity/next || exit 1

40+ sudo apt-get update || exit 4

41+ echo "Installing Unity 8 dependencies.."

42+ sudo apt-get install devscripts \

43+ equivs \

44+ qmenumodel-qml \

45+ qtdeclarative5-ubuntu-ui-toolkit-plugin \

46+ qtdeclarative5-dee-plugin \

47+ ubuntu-mobile-icons \

48+ unity-notifications-impl-1 \

49+ unity-scope-home \

50+ unity-lens-applications \

51+ || exit 5

52+}

53+

54+mk_build_deps() {

55+ [ ! -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

56+}

57+

58+if [ -f "/usr/bin/ninja" ] ; then

59+ GENERATOR="-G Ninja"

60+ BUILD_COMMAND="ninja -j$NUM_JOBS"

61+else

62+ GENERATOR=

63+ BUILD_COMMAND="make -j$NUM_JOBS"

64+fi

65+

66+if $SETUP; then

67+ install_dependencies

68+else

69+ if $CLEAN; then rm -rf builddir; fi

70+ mkdir -p builddir

71+ cd builddir

72+ mk_build_deps

73+ cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CODE_DIR ${GENERATOR} || exit 6

74+ ${BUILD_COMMAND} || exit 7

75+fi

build.shdeleted−82

@@ -1,82 +0,0 @@

1−#!/bin/sh

2−

3−#

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+58

@@ -0,0 +1,58 @@

1+# Creates target for copying and installing qmlfiles

2+#

3+# export_qmlfiles(plugin sub_path)

4+#

5+#

6+# Target to be created:

7+# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.

8+

9+macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)

10+

11+ file(GLOB QMLFILES

12+ *.qml

13+ *.js

14+ qmldir

15+ )

16+

17+ # copy the qmldir file

18+ add_custom_target(${PLUGIN}-qmlfiles ALL

19+ COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}

20+ DEPENDS ${QMLFILES}

21+ )

22+

23+ # install the qmlfiles file.

24+ install(FILES ${QMLFILES}

25+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

26+ )

27+endmacro(export_qmlfiles)

28+

29+

30+# Creates target for generating the qmltypes file for a plugin and installs plugin files

31+#

32+# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])

33+#

34+# TARGETS additional install targets (eg the plugin shared object)

35+#

36+# Target to be created:

37+# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.

38+

39+macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)

40+ set(multi_value_keywords TARGETS)

41+ cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})

42+

43+ # create the plugin.qmltypes file

44+ add_custom_target(${PLUGIN}-qmltypes ALL

45+ COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

46+ )

47+ add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})

48+

49+ # install the qmltypes file.

50+ install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

51+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

52+ )

53+

54+ # install the additional targets

55+ install(TARGETS ${qmlplugin_TARGETS}

56+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

57+ )

58+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+1−7

@@ -2,15 +2,9 @@ add_custom_target(autopilot)

2

3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

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 autopilot run ${TEST_SUITE}

6 WORKING_DIRECTORY ${WORKING_DIR}

7− DEPENDS fake_install

8− )

9−

10− add_custom_target(fake_install

11− COMMAND cmake --build ${CMAKE_BINARY_DIR} --target install

12 )

7 )

13

8

14 add_dependencies(autopilot autopilot-${TEST_NAME})

9 add_dependencies(autopilot autopilot-${TEST_NAME})

15−

16endfunction()

10endfunction()

data/51-unity8-greeter.confdeleted−2

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

1−[Seat:*]

2−greeter-session=unity8-greeter

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−#

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−7084

This diff is too big to show here.

debian/control+84−240

This diff is too big to show here.

debian/copyright−21

This diff is too big to show here.

debian/indicators-client.install−1

This diff is too big to show here.

debian/rules+13−34

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.installdeleted−5

This diff is too big to show here.

debian/unity8-private.install+2−14

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−13

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/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/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/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+156

This diff is too big to show here.

paths.h.innew file+87

This diff is too big to show here.

plugins/AccountsService/AccountsService.cppdeleted−443

This diff is too big to show here.

plugins/AccountsService/AccountsService.hdeleted−156

This diff is too big to show here.

plugins/AccountsService/AccountsServiceDBusAdaptor.cppdeleted−152

This diff is too big to show here.

plugins/AccountsService/AccountsServiceDBusAdaptor.hdeleted−58

This diff is too big to show here.

plugins/AccountsService/CMakeLists.txtdeleted−28

This diff is too big to show here.

plugins/AccountsService/com.canonical.unity.AccountsService.xmldeleted−61

This diff is too big to show here.

plugins/AccountsService/plugin.cppdeleted−38

This diff is too big to show here.

plugins/AccountsService/plugin.hdeleted−34

This diff is too big to show here.

plugins/AccountsService/qmldirdeleted−3

This diff is too big to show here.

plugins/CMakeLists.txt+4−26

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/plugin.hdeleted−32

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.

plugins/HudClient/hudtoolbarmodel.hnew file+44

This diff is too big to show here.

tests/mocks/SessionBroadcast/plugin.cpp → plugins/HudClient/plugin.cpprenamed+15−10

This diff is too big to show here.

tests/mocks/GSettings.1.0/plugin.h → plugins/HudClient/plugin.hrenamed+5−5

This diff is too big to show here.

plugins/HudClient/qmldirnew file+2

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+26−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/QLightDM/UsersModeldeleted−17

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+9−47

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/android-hardware.hdeleted−19

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+38

This diff is too big to show here.

plugins/ListViewWithPageHeader/listviewwithpageheader.cppnew file+1078

This diff is too big to show here.

plugins/ListViewWithPageHeader/listviewwithpageheader.hnew file+183

This diff is too big to show here.

plugins/ListViewWithPageHeader/plugin.cppnew file+29

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.txtdeleted−17

This diff is too big to show here.

plugins/Powerd/Powerd.cppdeleted−90

This diff is too big to show here.

plugins/Powerd/Powerd.hdeleted−70

This diff is too big to show here.

plugins/Powerd/plugin.cppdeleted−36

This diff is too big to show here.

plugins/Powerd/plugin.hdeleted−35

This diff is too big to show here.

plugins/Powerd/qmldirdeleted−3

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.cppdeleted−26

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.txtdeleted−14

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.cppdeleted−71

This diff is too big to show here.

plugins/SessionBroadcast/SessionBroadcast.hdeleted−51

This diff is too big to show here.

plugins/SessionBroadcast/qmldirdeleted−3

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/CMakeLists.txt−1

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txtdeleted−20

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cppdeleted−85

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.hdeleted−70

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cppdeleted−25

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.hdeleted−192

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.hdeleted−25

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/plugin.cppdeleted−39

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/plugin.hdeleted−37

This diff is too big to show here.

plugins/Ubuntu/DownloadDaemonListener/qmldirdeleted−3

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+16−32

This diff is too big to show here.

plugins/Ubuntu/Gestures/Damper.hnew file+85

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+53−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/Connectivity.hdeleted−34

This diff is too big to show here.

plugins/Unity/Connectivity/plugin.cppdeleted−34

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+22−21

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/CMakeLists.txtnew file+1

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/ActionButton.qml+1−1

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/ActionTextField.qmlnew file+66

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qmlnew file+96

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/HeroMessage.qmlnew file+120

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qmlnew file+161

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qmlnew file+96

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/QuickReply.qmlnew file+160

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qmlnew file+97

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/SnapDecision.qmlnew file+142

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.h → plugins/Unity/Indicators/Messaging/qml/TextMessage.qmlrenamed+15−14

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/qmldirnew file+12

This diff is too big to show here.

plugins/Unity/Indicators/Messaging/qml/utils.jsnew file+27

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/GlobalShortcut/plugin.cpp → plugins/Unity/Indicators/Network/plugin.cpprenamed+11−7

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+68

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.

qml/Panel/Indicators/client/IndicatorsTree.qml → plugins/Unity/Indicators/Network/qml/WifiSection.qmlrenamed+10−17

This diff is too big to show here.

plugins/Unity/Indicators/Network/qml/qmldirnew file+9

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/flatmenuproxymodel.cppnew file+272

This diff is too big to show here.

plugins/Unity/Indicators/flatmenuproxymodel.hnew file+93

This diff is too big to show here.

plugins/Unity/Indicators/indicator.cpp+20−39

This diff is too big to show here.

plugins/Unity/Indicators/indicator.h+4−9

This diff is too big to show here.

plugins/Unity/Indicators/indicators.h+12−7

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.cpp+21−49

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmanager.h+2−9

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.cpp+78−58

This diff is too big to show here.

plugins/Unity/Indicators/indicatorsmodel.h+15−21

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.cppdeleted−152

This diff is too big to show here.

plugins/Unity/Indicators/modelprinter.hdeleted−56

This diff is too big to show here.

plugins/Unity/Indicators/plugin.cpp+16−36

This diff is too big to show here.

plugins/Unity/Indicators/plugin.h+9−10

This diff is too big to show here.

plugins/Unity/Indicators/qml/BasicMenuItem.qmlnew file+48

This diff is too big to show here.

plugins/Unity/Indicators/qml/ButtonMenuItem.qmlnew file+47

This diff is too big to show here.

plugins/Unity/Indicators/qml/CMakeLists.txtnew file+5

This diff is too big to show here.

tests/mocks/Unity/InputInfo/plugin.h → plugins/Unity/Indicators/qml/DivMenuItem.qmlrenamed+10−14

This diff is too big to show here.

plugins/Unity/Indicators/qml/HLine.qmlnew file+29

This diff is too big to show here.

plugins/Unity/Indicators/qml/IndicatorBase.qmlnew file+59

This diff is too big to show here.

plugins/Unity/Indicators/qml/IndicatorPage.qmlnew file+191

This diff is too big to show here.

plugins/Unity/Indicators/qml/IndicatorWidget.qmlnew file+68

This diff is too big to show here.

plugins/Unity/Indicators/qml/MenuAction.qmlnew file+86

This diff is too big to show here.

plugins/Unity/Indicators/qml/MenuActionBinding.qmlnew file+106

This diff is too big to show here.

plugins/Unity/Indicators/qml/MenuItem.qmlnew file+40

This diff is too big to show here.

plugins/Unity/Indicators/qml/MenuItemFactory.qmlnew file+110

This diff is too big to show here.

plugins/Unity/Indicators/qml/ProgressMenuItem.qmlnew file+65

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+57

This diff is too big to show here.

plugins/Unity/Indicators/qml/SliderMenuItem.qmlnew file+64

This diff is too big to show here.

plugins/Unity/Launcher/gsettings.h → plugins/Unity/Indicators/qml/SwitchMenuItem.qmlrenamed+21−25

This diff is too big to show here.

plugins/Unity/Indicators/qml/qmldirnew file+21

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/messaging/default_app.svgnew file+42

This diff is too big to show here.

plugins/Unity/Indicators/resources/artwork/messaging/default_contact.pngnew file

Binary file not shown.

plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.pngnew file

Binary file not shown.

plugins/Unity/Indicators/resources/indicators.qrcnew file+7

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/rootstateparser.hdeleted−74

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.cppdeleted−65

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelcache.hdeleted−50

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelstack.cppdeleted−160

This diff is too big to show here.

plugins/Unity/Indicators/unitymenumodelstack.hdeleted−68

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+8−34

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+145

This diff is too big to show here.

plugins/Unity/Launcher/backend/launcherbackend.hnew file+132

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistentry.cpp → plugins/Unity/Launcher/common/quicklistentry.cpprenamed+4−6

This diff is too big to show here.

plugins/Greeter/Unity/Launcher/quicklistentry.h → plugins/Unity/Launcher/common/quicklistentry.hrenamed+4−3

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−153

This diff is too big to show here.

plugins/Unity/Launcher/launcheritem.h+22−38

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.cpp+46−521

This diff is too big to show here.

plugins/Unity/Launcher/launchermodel.h+21−52

This diff is too big to show here.

plugins/Unity/Launcher/plugin.cpp+5−8

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−37

This diff is too big to show here.

plugins/Unity/Launcher/quicklistmodel.h+4−17

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/plugin.cppdeleted−27

This diff is too big to show here.

plugins/Unity/Platform/plugin.hdeleted−32

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/applicationpreview.cppnew file+96

This diff is too big to show here.

plugins/Unity/applicationpreview.hnew file+66

This diff is too big to show here.

tests/mocks/Utils/URLDispatcher.cpp → plugins/Unity/bottombarvisibilitycommunicatorshell.cpprenamed+10−13

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+155

This diff is too big to show here.

plugins/Unity/categories.hnew file+79

This diff is too big to show here.

plugins/Unity/categoryresults.cppnew file+96

This diff is too big to show here.

plugins/Unity/categoryresults.hnew file+67

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/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/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+69

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+177

This diff is too big to show here.

plugins/Unity/preview.hnew file+80

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/scope.cppnew file+303

This diff is too big to show here.

plugins/Unity/scope.hnew file+134

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/socialpreview.cppnew file+83

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/variantutils.cppnew file+158

This diff is too big to show here.

plugins/Unity/variantutils.hnew file+34

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+15−62

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+21−107

This diff is too big to show here.

plugins/Utils/qlimitproxymodelqml.h+2−4

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+1−45

This diff is too big to show here.

plugins/Wizard/Utils/qsortfilterproxymodelqml.h → plugins/Utils/qsortfilterproxymodelqml.hrenamed−5

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/WindowManagerGlobal.hdeleted−23

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+154−1196

This diff is too big to show here.

po/ast.podeleted−1408

This diff is too big to show here.

po/az.po+117−865

This diff is too big to show here.

po/be.podeleted−1253

This diff is too big to show here.

po/bg.po+133−794

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+146−1382

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+155−1387

This diff is too big to show here.

po/el.po+145−1258

This diff is too big to show here.

po/en_AU.po+153−1376

This diff is too big to show here.

po/en_GB.po+155−1339

This diff is too big to show here.

po/en_US.podeleted−814

This diff is too big to show here.

po/eo.po+107−811

This diff is too big to show here.

po/es.po+156−1377

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+154−1371

This diff is too big to show here.

po/fo.po+116−806

This diff is too big to show here.

po/fr.po+144−1396

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+152−1367

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+155−1025

This diff is too big to show here.

po/hi.podeleted−850

This diff is too big to show here.

po/hr.po+151−1313

This diff is too big to show here.

po/hu.po+152−1368

This diff is too big to show here.

po/hy.po+129−860

This diff is too big to show here.

po/ia.podeleted−1409

This diff is too big to show here.

po/id.po+107−895

This diff is too big to show here.

po/is.podeleted−999

This diff is too big to show here.

po/it.po+150−1379

This diff is too big to show here.

po/ja.po+108−900

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+115−727

This diff is too big to show here.

po/ko.po+153−1178

This diff is too big to show here.

po/ku.podeleted−978

This diff is too big to show here.

po/ky.po+115−727

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+119−1100

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+117−802

This diff is too big to show here.

po/nb.po+152−1357

This diff is too big to show here.

po/ne.podeleted−834

This diff is too big to show here.

po/nl.po+151−1368

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+157−1368

This diff is too big to show here.

po/pt.podeleted−1435

This diff is too big to show here.

po/pt_BR.po+145−1157

This diff is too big to show here.

po/ro.po+117−1149

This diff is too big to show here.

po/ru.po+151−1369

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+107−772

This diff is too big to show here.

po/sk.podeleted−1352

This diff is too big to show here.

po/sl.po+146−1329

This diff is too big to show here.

po/sq.podeleted−1048

This diff is too big to show here.

po/sr.po+139−1332

This diff is too big to show here.

po/sv.po+154−1365

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+108−757

This diff is too big to show here.

po/th.po+112−709

This diff is too big to show here.

po/tr.po+152−1360

This diff is too big to show here.

po/ug.po+149−1194

This diff is too big to show here.

po/uk.po+156−1370

This diff is too big to show here.

po/unity8.pot+103−698

This diff is too big to show here.

po/update-unity-pot+5−32

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+157−1317

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+156−1263

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/FoldingLauncherDelegate.qmldeleted−144

This diff is too big to show here.

qml/Launcher/Launcher.qmldeleted−661

This diff is too big to show here.

qml/Launcher/LauncherDelegate.qmldeleted−327

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/IndicatorBase.qmldeleted−47

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/ResizeGrip.qmldeleted−46

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/Wizard/WizardTextField.qmldeleted−25

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+72

This diff is too big to show here.

run_on_devicenew file+145

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+39−23

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+18

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.indicator.batterynew file+9

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.indicator.messagesnew file+9

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.indicator.timenew file+9

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.settings.networknew file+9

This diff is too big to show here.

src/Panel/Indicators/servicefiles/com.canonical.settings.soundnew file+9

This diff is too big to show here.

src/SecondaryWindow.cppdeleted−40

This diff is too big to show here.

src/SecondaryWindow.hdeleted−30

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/ShellView.hdeleted−34

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+7−18

This diff is too big to show here.

tests/autopilot/unity8/__init__.py+5−146

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/__init__.pydeleted−20

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/__init__.pydeleted−49

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.pydeleted−141

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/__init__.pydeleted−28

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+87

This diff is too big to show here.

tests/autopilot/unity8/indicators_client/tests/test_battery.pynew file+99

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+5−262

This diff is too big to show here.

tests/autopilot/unity8/shell/create_interactive_notification.pydeleted−101

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators.pydeleted−50

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/__init__.pynew file+6

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.pynew file+61

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+58−351

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/helpers.pynew file+161

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_lock_screen.pydeleted−150

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.pydeleted−725

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/autopilot/unity8/shell/tests/testbigscreen.pynew file+25

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/testhud.pynew file+145

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/testlockscreen.pynew file+118

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.pngdeleted

Binary file not shown.

tests/data/unity/backgrounds/red.pngdeleted

Binary file not shown.

tests/data/unity/indicators/com.canonical.indicator.fake1+4−5

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake2+4−5

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake3+4−5

This diff is too big to show here.

tests/data/unity/indicators/com.canonical.indicator.fake4+4−5

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.cppdeleted−214

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.hdeleted−148

This diff is too big to show here.

tests/mocks/AccountsService/CMakeLists.txtdeleted−24

This diff is too big to show here.

tests/mocks/AccountsService/plugin.cppdeleted−37

This diff is too big to show here.

tests/mocks/AccountsService/plugin.hdeleted−35

This diff is too big to show here.

tests/mocks/AccountsService/qmldirdeleted−3

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.cppdeleted−28

This diff is too big to show here.

tests/mocks/Biometryd/MockObserver.hdeleted−37

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−50

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.txtdeleted−19

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.cppdeleted−417

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.hdeleted−180

This diff is too big to show here.

tests/mocks/GSettings.1.0/plugin.cppdeleted−33

This diff is too big to show here.

tests/mocks/GSettings.1.0/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/HudClient/CMakeLists.txtnew file+46

This diff is too big to show here.

tests/mocks/SessionBroadcast/SessionBroadcast.h → tests/mocks/HudClient/fake_hud_plugin.cpprenamed+18−18

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/LightDM/CMakeLists.txtnew file+55

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp → tests/mocks/LightDM/Greeter.cpprenamed+14−29

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h → tests/mocks/LightDM/Greeter.hrenamed+6−9

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h → tests/mocks/LightDM/GreeterPrivate.hrenamed+2−4

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/Greeternew file+1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/InfographicModelnew file+1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/UsersModelnew file+1

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp → tests/mocks/LightDM/UsersModel.cpprenamed+21−14

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h → tests/mocks/LightDM/UsersModel.hrenamed+6−10

This diff is too big to show here.

tests/mocks/liblightdm/UsersModelPrivate.h → tests/mocks/LightDM/UsersModelPrivate.hrenamed+3−8

This diff is too big to show here.

tests/mocks/liblightdm/demo/CMakeLists.txt → tests/mocks/LightDM/demo/CMakeLists.txtrenamed+2−1

This diff is too big to show here.

tests/mocks/liblightdm/demo/GreeterPrivate.cpp → tests/mocks/LightDM/demo/GreeterPrivate.cpprenamed+2−6

This diff is too big to show here.

tests/mocks/LightDM/demo/InfographicModelPrivate.cppnew file+91

This diff is too big to show here.

tests/mocks/LightDM/demo/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/LightDM/full/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.cpp → tests/mocks/LightDM/full/GreeterPrivate.cpprenamed+10−44

This diff is too big to show here.

tests/mocks/LightDM/full/InfographicModelPrivate.cppnew file+182

This diff is too big to show here.

tests/mocks/LightDM/full/UsersModelPrivate.cppnew file+52

This diff is too big to show here.

tests/mocks/liblightdm/qmldir → tests/mocks/LightDM/qmldirrenamed−1

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/GreeterPrivate.cppnew file+53

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cppnew file+61

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/LightDM/single-pin/CMakeLists.txtnew file+19

This diff is too big to show here.

tests/mocks/liblightdm/demo/UsersModelPrivate.cpp → tests/mocks/LightDM/single-pin/GreeterPrivate.cpprenamed+26−14

This diff is too big to show here.

tests/mocks/LightDM/single-pin/InfographicModelPrivate.cppnew file+61

This diff is too big to show here.

tests/mocks/LightDM/single-pin/UsersModelPrivate.cppnew file+33

This diff is too big to show here.

tests/mocks/LightDM/single/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/Powerd/Powerd.cpp → tests/mocks/LightDM/single/GreeterPrivate.cpprenamed+20−10

This diff is too big to show here.

tests/mocks/LightDM/single/InfographicModelPrivate.cppnew file+28

This diff is too big to show here.

tests/mocks/LightDM/single/UsersModelPrivate.cppnew file+33

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.cppdeleted−33

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/plugin.hdeleted−31

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.txtdeleted−10

This diff is too big to show here.

tests/mocks/Powerd/Powerd.hdeleted−58

This diff is too big to show here.

tests/mocks/Powerd/plugin.cppdeleted−35

This diff is too big to show here.

tests/mocks/Powerd/plugin.hdeleted−34

This diff is too big to show here.

tests/mocks/Powerd/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txtdeleted−25

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qmldeleted−52

This diff is too big to show here.

tests/mocks/QMenuModel/actiondata.hdeleted−54

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.hdeleted−51

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/plugin.hdeleted−34

This diff is too big to show here.

tests/mocks/QMenuModel/qmldirdeleted−6

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/plugin.hdeleted−34

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/SessionBroadcast.cppdeleted−34

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/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/Application/ApplicationImage.cppnew file+123

This diff is too big to show here.

tests/mocks/Ubuntu/Application/ApplicationImage.hnew file+79

This diff is too big to show here.

tests/mocks/Ubuntu/Application/ApplicationInfo.cppnew file+91

This diff is too big to show here.

tests/mocks/Ubuntu/Application/ApplicationInfo.hnew file+103

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationListModel.cpp → tests/mocks/Ubuntu/Application/ApplicationListModel.cpprenamed

The content is the same.

tests/mocks/Unity/Application/ApplicationListModel.h → tests/mocks/Ubuntu/Application/ApplicationListModel.hrenamed

The content is the same.

tests/mocks/Ubuntu/Application/ApplicationManager.cppnew file+449

This diff is too big to show here.

tests/mocks/Ubuntu/Application/ApplicationManager.hnew file+123

This diff is too big to show here.

tests/mocks/Ubuntu/Application/CMakeLists.txtnew file+35

This diff is too big to show here.

plugins/Wizard/Unity/Application/OSKController.qml → tests/mocks/Ubuntu/Application/InputFilterArea.qmlrenamed+1

This diff is too big to show here.

tests/mocks/Ubuntu/Application/plugin.cppnew file+38

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h → tests/mocks/Ubuntu/Application/plugin.hrenamed+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/Application/qmldirnew file+3

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1−6

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.txtdeleted−10

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cppdeleted−74

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.hdeleted−67

This diff is too big to show here.

tests/mocks/Ubuntu/DownloadDaemonListener/qmldirdeleted−3

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/ApplicationInfo.cppdeleted−420

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.hdeleted−158

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cppdeleted−569

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.hdeleted−117

This diff is too big to show here.

tests/mocks/Unity/Application/CMakeLists.txtdeleted−35

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/MirMock.hdeleted−43

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.

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.cppdeleted−68

This diff is too big to show here.

tests/mocks/Unity/Application/qmldirdeleted−3

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+44−7

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/MockConnectivity.hdeleted−36

This diff is too big to show here.

tests/mocks/Unity/Connectivity/plugin.cppdeleted−34

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+23−13

This diff is too big to show here.

tests/mocks/Unity/Indicators/IndicatorsModel.qml+73−230

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+2−25

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.

qml/Components/ItemSnapshot.qml → tests/mocks/Unity/Indicators/qml/fake_menu_page1.qmlrenamed+21−22

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page2.qmlnew file+44

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page3.qmlnew file+44

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page4.qmlnew file+44

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_page5.qmlnew file+44

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qml → tests/mocks/Unity/Indicators/qml/fake_menu_widget1.qmlrenamed+6−4

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qmlnew file+23

This diff is too big to show here.

plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel → tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qmlrenamed+8−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/qml/fake_menu_widget4.qmlnew file+23

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+9−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+3−97

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h+15−36

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+22−171

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+8−26

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockQuickListModel.cpp+2−8

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−7

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.txtdeleted−16

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_categories.cppnew file+178

This diff is too big to show here.

tests/mocks/Unity/fake_categories.hnew file+69

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cppnew file+200

This diff is too big to show here.

tests/mocks/Unity/fake_scope.hnew file+95

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cppnew file+146

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+43

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.txtdeleted−18

This diff is too big to show here.

tests/mocks/liblightdm/GreeterPrivate.hdeleted−54

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/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.

tests/mocks/liblightdm/UsersModelPrivate.cppdeleted−124

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.cppdeleted−57

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.hdeleted−44

This diff is too big to show here.

tests/plugins/AccountsService/CMakeLists.txtdeleted−67

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cppdeleted−142

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.hdeleted−58

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.cppdeleted−28

This diff is too big to show here.

tests/plugins/AccountsService/UscServer.hdeleted−39

This diff is too big to show here.

tests/plugins/AccountsService/client.cppdeleted−355

This diff is too big to show here.

tests/plugins/AccountsService/interfaces.xmldeleted−70

This diff is too big to show here.

tests/plugins/AccountsService/server.cppdeleted−57

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−9

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+31

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cppnew file+1394

This diff is too big to show here.

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cppnew file+1646

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/SessionBroadcast/BroadcastServer.cppdeleted−33

This diff is too big to show here.

tests/plugins/SessionBroadcast/BroadcastServer.hdeleted−40

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/Ubuntu/Gestures/CMakeLists.txt+37−52

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qmlnew file+87

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cppdeleted−193

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.hdeleted−102

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qmlnew file+90

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qmlnew file+87

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.cppdeleted−30

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/TestItem.hdeleted−33

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qmlnew file+90

This diff is too big to show here.

tests/mocks/Unity/Application/resources/KateMenu.qml → tests/plugins/Ubuntu/Gestures/edgeDragExample.qmlrenamed+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/mocks/Unity/Application/plugin.h → tests/plugins/Ubuntu/Gestures/tst_Damper.cpprenamed+18−9

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cppnew file+551

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cppdeleted−131

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qmldeleted−81

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cppdeleted−150

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qmldeleted−62

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cppdeleted−148

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cppdeleted−392

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cppdeleted−300

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qmldeleted−90

This diff is too big to show here.

tests/plugins/Unity/CMakeLists.txt+39−3

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.cppdeleted−141

This diff is too big to show here.

tests/plugins/Unity/Indicators/RootActionStateTest.cppdeleted−95

This diff is too big to show here.

tests/plugins/Unity/Indicators/SharedUnityMenuModelTest.cppdeleted−102

This diff is too big to show here.

tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cppdeleted−201

This diff is too big to show here.

tests/plugins/Unity/Indicators/IndicatorsManagerTest.cpp → tests/plugins/Unity/Indicators/indicatorsmanagertest.cpprenamed+11−56

This diff is too big to show here.

tests/plugins/Unity/Indicators/indicatorsmodeltest.cppnew file+102

This diff is too big to show here.

tests/plugins/Unity/Indicators/MenuContentActivatorTest.cpp → tests/plugins/Unity/Indicators/menucontentactivatortest.cpprenamed+5−5

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txtdeleted−105

This diff is too big to show here.

tests/plugins/Unity/Launcher/appdrawermodeltest.cppdeleted−68

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/abs-icon.desktopdeleted−4

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/click-icon.desktopdeleted−5

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/click-icon.svgdeleted

No changes to the content.

tests/plugins/Unity/Launcher/applications/no-name.desktopdeleted−3

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/rel-icon.desktopdeleted−4

This diff is too big to show here.

tests/plugins/Unity/Launcher/applications/rel-icon.svgdeleted

No changes to the content.

tests/plugins/Unity/Launcher/gsettings.cppdeleted−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.hdeleted−47

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cppdeleted−836

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.cppdeleted−58

This diff is too big to show here.

tests/plugins/Unity/Launcher/ualwrapper.hdeleted−55

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.cppdeleted−45

This diff is too big to show here.

tests/plugins/Unity/Launcher/xdgwatcher.hdeleted−39

This diff is too big to show here.

tests/plugins/Unity/Platform/CMakeLists.txtdeleted−30

This diff is too big to show here.

tests/plugins/Unity/Platform/platformtest.cppdeleted−142

This diff is too big to show here.

tests/plugins/Unity/Session/CMakeLists.txtdeleted−72

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.cppdeleted−29

This diff is too big to show here.

tests/plugins/Unity/Session/LightDMServer.hdeleted−38

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.cppdeleted−43

This diff is too big to show here.

tests/plugins/Unity/Session/LogindServer.hdeleted−48

This diff is too big to show here.

tests/plugins/Unity/Session/interfaces.xmldeleted−29

This diff is too big to show here.

tests/plugins/Unity/Session/preload.cdeleted−43

This diff is too big to show here.

tests/plugins/Unity/Session/server.cppdeleted−50

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cppdeleted−289

This diff is too big to show here.

tests/plugins/Unity/previewbindingstest.cppnew file+167

This diff is too big to show here.

tests/mocks/Biometryd/MockIdentifier.h → tests/plugins/Unity/previewbindingstest.hrenamed+12−13

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.cppdeleted−76

This diff is too big to show here.

tests/plugins/Utils/URLDispatcherTest.cppdeleted−78

This diff is too big to show here.

tests/plugins/Utils/WindowInputMonitorTest.cppdeleted−461

This diff is too big to show here.

tests/plugins/Utils/WindowStateStorageTest.cppdeleted−121

This diff is too big to show here.

tests/plugins/Utils/ModelTest.cpp → tests/plugins/Utils/modeltest.cpprenamed+42−25

This diff is too big to show here.

tests/plugins/Utils/ModelTest.h → tests/plugins/Utils/modeltest.hrenamed

The content is the same.

tests/plugins/Utils/QLimitProxyModelTest.cpp → tests/plugins/Utils/qlimitproxymodeltest.cpprenamed+37−162

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+65−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_CrossFadeImage.qml+125

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_EdgeDragEvaluator.cpp−166

This diff is too big to show here.

tests/qmltests/Components/tst_FilterGrid.qml+186

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+277

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_RunningApplicationsGrid.qml+204

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+7−5

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+176

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+54

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+211

This diff is too big to show here.

tests/qmltests/Greeter/tst_Phone.qml+106

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+94−1500

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+67

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+162

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+108−46

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+131−613

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+64

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_OrientedShell.qml−1705

This diff is too big to show here.

tests/qmltests/tst_Shell.qml−3382

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+14−39

This diff is too big to show here.

tests/utils/modules/Unity/Test/CMakeLists.txt+10−26

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+3−8

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+121−494

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.desktop.in+2−1

This diff is too big to show here.

unity8.qmlproject+25

This diff is too big to show here.