5d9ff5f · unity8 · git.iko.soy

Components/Showable.qml+5−14

compare with xenial

unifiedsplit

@@ -52,7 +52,7 @@ Item {

52 function show() {

53 required = true;

54 if (created) {

55− __reallyShow(true);

55+ __reallyShow();

56 } else {

57 __shouldShow = true;

58 }

@@ -60,16 +60,12 @@ Item {

60

61 onCreatedChanged: {

62 if (created && __shouldShow) {

63− __reallyShow(true);

63+ __reallyShow();

64 __shouldShow = false;

65 }

66 }

67

68− function showWithoutAnimation() {

69− __reallyShow(false);

68+ function __reallyShow() {

70− }

71−

72− function __reallyShow(animated) {

73 if (!available) {

69 if (!available) {

74 return false;

70 return false;

75 }

71 }

@@ -81,13 +77,8 @@ Item {

81 }

77 }

82

78

83 if (showAnimation != undefined) {

79 if (showAnimation != undefined) {

84− if (animated) {

85− if (!showAnimation.running) {

80+ if (!showAnimation.running) {

86− showAnimation.restart()

81+ showAnimation.restart()

87− }

88− } else {

89− showAnimation.start();

90− showAnimation.complete();

91 }

82 }

92 } else {

83 } else {

93 visible = true;

84 visible = true;

Panel/Indicators/NetworkIndicatorPage.qml+1−2

@@ -49,7 +49,6 @@ PageStack {

49

50 ICNetwork.PasswordPage {

51 agent: networkAgent

52− token: token

53 }

52 }

54 }

53 }

55

54

@@ -57,7 +56,7 @@ PageStack {

57 id: networkAgent

56 id: networkAgent

58

57

59 onSecretRequested: {

58 onSecretRequested: {

60− _network.push(passwordPageComponent);

59+ _network.push(passwordPageComponent, {"token": token});

61 }

60 }

62 }

61 }

63

62

Shell.qml−3

@@ -263,9 +263,6 @@ FocusScope {

263 function show() {

264 stages.show();

265 }

266− function showWithoutAnimation() {

267− stages.showWithoutAnimation();

268− }

269 function hide() {

266 function hide() {

270 }

267 }

271

268

cmake/modules/Plugins.cmake+25−15

@@ -1,17 +1,12 @@

1−# Creates targets for copying and installing qmlfiles and generating the qmltypes file for a plugin

1+# Creates target for copying and installing qmlfiles

2#

3−# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])

3+# export_qmlfiles(plugin sub_path)

4#

5−# TARGETS additional install targets (eg the plugin shared object)

6#

5#

7−# Two targets will be created:

6+# Target to be created:

8# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.

7# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.

9−# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.

10−

11

8

12−macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)

9+macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)

13− set(multi_value_keywords TARGETS)

14− cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})

15

10

16 file(GLOB QMLFILES

11 file(GLOB QMLFILES

17 *.qml

12 *.qml

@@ -25,17 +20,32 @@ macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)

25 DEPENDS ${QMLFILES}

20 DEPENDS ${QMLFILES}

26 )

21 )

27

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+

28 # create the plugin.qmltypes file

43 # create the plugin.qmltypes file

29 add_custom_target(${PLUGIN}-qmltypes ALL

44 add_custom_target(${PLUGIN}-qmltypes ALL

30 COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

45 COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

31 )

46 )

32 add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})

47 add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})

33

48

34− # install the qmldir file.

35− install(FILES ${QMLFILES}

36− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

37− )

38−

39 # install the qmltypes file.

49 # install the qmltypes file.

40 install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

50 install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes

41 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

51 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

@@ -45,4 +55,4 @@ macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)

45 install(TARGETS ${qmlplugin_TARGETS}

55 install(TARGETS ${qmlplugin_TARGETS}

46 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

56 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}

47 )

57 )

48−endmacro(export_qmlplugin)

58+endmacro(export_qmlplugin)

debian/changelog+34

@@ -1,3 +1,37 @@

1+unity8 (7.81.3+13.10.20130717ubuntu.unity.next-0ubuntu1) saucy; urgency=low

2+

3+ [ Daniel d'Andrada ]

4+ * Remove dead code: Showable::showWithoutAnimation.

5+

6+ [ Nick Dedekind ]

7+ * Split Plugins export macro into export_qmlfiles and

8+ export_qmlplugins. Added qmltypes to indicators plugin.

9+

10+ [ Ubuntu daily release ]

11+ * Automatic snapshot from revision 112 (ubuntu-unity/next)

12+

13+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Jul 2013 03:14:49 +0000

14+

15+unity8 (7.81.3+13.10.20130716ubuntu.unity.next-0ubuntu1) saucy; urgency=low

16+

17+ [ Pete Woods ]

18+ * Rename the demo user "single" to "phablet" Fix the infographics on

19+ the device At the moment the mock lightdm backend we are using says

20+ the current user is called "single", while in reality the processes

21+ all run as the "phablet" user.

22+

23+ [ Michał Sawicz ]

24+ * Only use ppa:ubuntu-unity/next and clean build scripts and CODING,

25+ accordingly.

26+ * Do not recommend indicator-power and indicator-sound. On device

27+ they're provided by lp:indicator-server for the time being.

28+ * Fix the Network page to provide the correct token. (LP: #1201529)

29+

30+ [ Ubuntu daily release ]

31+ * Automatic snapshot from revision 109 (ubuntu-unity/next)

32+

33+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Jul 2013 02:32:03 +0000

34+

1unity8 (7.81.3+13.10.20130714ubuntu.unity.next-0ubuntu1) saucy; urgency=low

35unity8 (7.81.3+13.10.20130714ubuntu.unity.next-0ubuntu1) saucy; urgency=low

2

36

3 [ Michael Terry ]

37 [ Michael Terry ]

debian/control−2

@@ -70,8 +70,6 @@ Depends: qmenumodel-qml,

70 ${shlibs:Depends},

71Recommends: indicator-battery,

72 indicator-messages,

73− indicator-network,

74− indicator-sound,

75 indicator-time,

73 indicator-time,

76 ${unity-default-masterscopes},

74 ${unity-default-masterscopes},

77Description: Unity 8 shell

75Description: Unity 8 shell

plugins/HudClient/CMakeLists.txt+2−1

@@ -38,5 +38,6 @@ target_link_libraries(HudClientQml

38

39qt5_use_modules(HudClientQml Qml)

40

41−# export the qmldir and qmltypes files

41+# export the qmldir qmltypes and plugin files

42+export_qmlfiles(HudClient HudClient)

42export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)

43export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)

plugins/LightDM/CMakeLists.txt+2−1

@@ -35,5 +35,6 @@ target_link_libraries(LightDM-qml

35

36qt5_use_modules(LightDM-qml Gui Qml)

37

38−# export the qmldir and qmltypes files

38+# export the qmldir qmltypes and plugin files

39+export_qmlfiles(LightDM LightDM)

39export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

40export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

plugins/ListViewWithPageHeader/CMakeLists.txt+2−1

@@ -33,5 +33,6 @@ target_link_libraries(ListViewWithPageHeader-qml

33

34qt5_use_modules(ListViewWithPageHeader-qml Qml Quick)

35

36−# export the qmldir and qmltypes files

36+# export the qmldir qmltypes and plugin files

37+export_qmlfiles(ListViewWithPageHeader ListViewWithPageHeader)

37export_qmlplugin(ListViewWithPageHeader 0.1 ListViewWithPageHeader TARGETS ListViewWithPageHeader-qml)

38export_qmlplugin(ListViewWithPageHeader 0.1 ListViewWithPageHeader TARGETS ListViewWithPageHeader-qml)

plugins/Ubuntu/Gestures/CMakeLists.txt+2−1

@@ -23,5 +23,6 @@ qt5_use_modules(UbuntuGestureQml Core Quick)

23# So that Foo.cpp can #include "Foo.moc"

24include_directories(${CMAKE_CURRENT_BINARY_DIR})

25

26−# export the qmldir and qmltypes files

26+# export the qmldir qmltypes and plugin files

27+export_qmlfiles(Ubuntu.Gestures Ubuntu/Gestures)

27export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)

28export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)

plugins/Unity/CMakeLists.txt+2−1

@@ -48,7 +48,8 @@ target_link_libraries(Unity-qml

48

49qt5_use_modules(Unity-qml Qml)

50

51−# export the qmldir and qmltypes files

51+# export the qmldir qmltypes and plugin files

52+export_qmlfiles(Unity Unity)

52export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)

53export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)

53

54

54add_subdirectory(Launcher)

55add_subdirectory(Launcher)

plugins/Unity/Indicators/CMakeLists.txt+5−3

@@ -1,3 +1,6 @@

1+# export_qmlplugin macro

2+include(Plugins)

3+

1project(IndicatorsQml)

4project(IndicatorsQml)

2

5

3pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

6pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

@@ -47,6 +50,5 @@ target_link_libraries(IndicatorsQml

47

50

48qt5_use_modules(IndicatorsQml Core Qml Quick)

51qt5_use_modules(IndicatorsQml Core Qml Quick)

49

52

53+# export the qmltypes and plugin files

50−install(TARGETS IndicatorsQml

54+export_qmlplugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)

51− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators

52− )

plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt+4−14

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

1−file(GLOB IndicatorsMessaging_QMLFILES

1+# export_qmlfiles macro

2− *.qml

2+include(Plugins)

3− *.js

4− qmldir

5−)

6

3

7−# copy qml & qmldir files into build directory for shadow builds

4+# export the qmldir, *.qml files.

8−add_custom_target(UnityIndicatorsMessagingQmlFiles ALL

5+export_qmlfiles(Unity.Indicators.Messaging Unity/Indicators/Messaging)

9− COMMAND cp ${IndicatorsMessaging_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Messaging

10− DEPENDS ${IndicatorsMessaging_QMLFILES}

11−)

12−

13−install(FILES ${IndicatorsMessaging_QMLFILES}

14− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Messaging

15−)

plugins/Unity/Indicators/Network/CMakeLists.txt+6−3

@@ -1,3 +1,6 @@

1+# export_qmlplugin macro

2+include(Plugins)

3+

1project(IndicatorsNetworkQml)

4project(IndicatorsNetworkQml)

2

5

3pkg_check_modules(GLIB glib-2.0>=2.32)

6pkg_check_modules(GLIB glib-2.0>=2.32)

@@ -32,9 +35,9 @@ if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)

32 ${LIBNM_UTIL_LIBRARIES}

35 ${LIBNM_UTIL_LIBRARIES}

33 )

36 )

34

37

38+ # export the qmltypes and plugin files

35− install(TARGETS IndicatorsNetworkQml

39+ export_qmlplugin(Unity.Indicators.Network 0.1 Unity/Indicators/Network TARGETS IndicatorsNetworkQml)

36− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network

40+

37− )

38else()

41else()

39 message(WARNING "Missing glib or libnm dependency for the network plugin, not building")

42 message(WARNING "Missing glib or libnm dependency for the network plugin, not building")

40endif()

43endif()

plugins/Unity/Indicators/Network/qml/CMakeLists.txt+4−14

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

1−file(GLOB IndicatorsNetwork_QMLFILES

1+# export_qmlplugin macro

2− *.qml

2+include(Plugins)

3− *.js

4− qmldir

5−)

6

3

7−# copy qml & qmldir files into build directory for shadow builds

4+# export the qmldir, *.qml files.

8−add_custom_target(UnityIndicatorsNetworkQmlFiles ALL

5+export_qmlfiles(Unity.Indicators.Network Unity/Indicators/Network)

9− COMMAND cp ${IndicatorsNetwork_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Network

10− DEPENDS ${IndicatorsNetwork_QMLFILES}

11−)

12−

13−install(FILES ${IndicatorsNetwork_QMLFILES}

14− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network

15−)

plugins/Unity/Indicators/Network/qml/qmldir+1

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

1module Unity.Indicators.Network

2plugin IndicatorsNetworkQml

3+typeinfo plugin.qmltypes

3

4

4NetworkPage 0.1 NetworkPage.qml

5NetworkPage 0.1 NetworkPage.qml

5AccessPoint 0.1 AccessPoint.qml

6AccessPoint 0.1 AccessPoint.qml

plugins/Unity/Indicators/qml/CMakeLists.txt+4−13

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

1−file(GLOB Indicators_QMLFILES

1+# export_qmlplugin macro

2− *.qml

2+include(Plugins)

3− qmldir

4−)

5

3

6−# copy qml & qmldir files into build directory for shadow builds

4+# export the qmldir, *.qml files.

7−add_custom_target(UnityIndicatorsQmlFiles ALL

5+export_qmlfiles(Unity.Indicators Unity/Indicators)

8− COMMAND cp ${Indicators_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators

9− DEPENDS ${Indicators_QMLFILES}

10−)

11−

12−install(FILES ${Indicators_QMLFILES}

13− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators

14−)

plugins/Unity/Indicators/qml/qmldir+1

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

1module Unity.Indicators

2plugin IndicatorsQml

3+typeinfo plugin.qmltypes

3

4

4BasicMenuItem 0.1 BasicMenuItem.qml

5BasicMenuItem 0.1 BasicMenuItem.qml

5ButtonMenuItem 0.1 ButtonMenuItem.qml

6ButtonMenuItem 0.1 ButtonMenuItem.qml

plugins/Unity/Launcher/CMakeLists.txt+1

@@ -24,4 +24,5 @@ add_library(UnityLauncher-qml MODULE

24qt5_use_modules(UnityLauncher-qml Qml)

25

26# export the qmldir and qmltypes files

27+export_qmlfiles(Unity.Launcher Unity/Launcher)

27export_qmlplugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)

28export_qmlplugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)

plugins/Unity/Launcher/qmldir+1

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

1module Unity.Launcher

2plugin UnityLauncher-qml

3+typeinfo plugin.qmltypes

plugins/Utils/CMakeLists.txt+2−1

@@ -23,5 +23,6 @@ set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)

23

24qt5_use_modules(Utils-qml Qml Quick)

25

26−# export the qmldir and qmltypes files

26+# export the qmldir qmltypes and plugin files

27+export_qmlfiles(Utils Utils)

27export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)

28export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)

tests/mocks/LightDM/demo/InfographicModelPrivate.cpp+3−3

@@ -54,7 +54,7 @@ void InfographicModelPrivate::generateFakeData()

54 QSharedPointer<InfographicData> data(

55 new InfographicData("52km travelled", yellowTheme, firstMonth,

56 orangeTheme, secondMonth, this));

57− m_fakeData.insert("guest", data);

57+ m_fakeData.insert("phablet", data);

58 }

59

60 {

@@ -69,7 +69,7 @@ void InfographicModelPrivate::generateFakeData()

69 QSharedPointer<InfographicData> data(

70 new InfographicData("33 messages today", pinkTheme,

71 firstMonth, orangeTheme, secondMonth, this));

72− m_fakeData.insert("guest", data);

72+ m_fakeData.insert("phablet", data);

73 }

74

75 {

@@ -84,7 +84,7 @@ void InfographicModelPrivate::generateFakeData()

84 QSharedPointer<InfographicData> data(

85 new InfographicData("69 minutes talk time", darkPurpleTheme,

86 firstMonth, redTheme, secondMonth, this));

87− m_fakeData.insert("guest", data);

87+ m_fakeData.insert("phablet", data);

88 }

89}

90

tests/mocks/LightDM/demo/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

26{

27 entries =

28 {

29− { "single", "Guest", 0, 0, false, false, 0, 0 },

29+ { "phablet", "Guest", 0, 0, false, false, 0, 0 },

30 };

31}

32