6fcf493 · unity8 · git.iko.soy

CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -77,7 +77,7 @@ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

77pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)

78pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

79pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)

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

80+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3)

81pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

82

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

debian/changelog+6

@@ -1,3 +1,9 @@

1+unity8 (8.15+17.04.20170221-0ubuntu1) zesty; urgency=medium

2+

3+ * Handle ubuntu-app-launch API/ABI break

4+

5+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2017 13:23:23 +0000

6+

1unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium

7unity8 (8.15+17.04.20170216.1-0ubuntu1) zesty; urgency=medium

2

8

3 [ Albert Astals Cid ]

9 [ Albert Astals Cid ]

debian/control+1−1

@@ -32,7 +32,7 @@ Build-Depends: cmake,

32 libqt5svg5-dev,

33 libqt5xmlpatterns5-dev,

34 libsystemsettings-dev,

35− libubuntu-app-launch2-dev,

35+ libubuntu-app-launch3-dev,

36 libubuntu-download-manager-common-dev,

37 libubuntugestures5-dev (>= 1.3.2030),

38 libubuntugestures5-private-dev (>= 1.3.2030),

po/unity8.pot+1−1

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2017-02-16 13:49+0000\n"

11+"POT-Creation-Date: 2017-02-21 13:23+0000\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

tools/CMakeLists.txt+2−12

@@ -1,14 +1,4 @@

1−add_executable(${SCOPE_TOOL}

1+add_subdirectory(menutool)

2− scopetool.cpp

2+add_subdirectory(scopetool)

3− registry-tracker.cpp

4− ../src/UnixSignalHandler.cpp

5− )

6−

7−qt5_use_modules(${SCOPE_TOOL} Qml Quick)

8−

9−# install binaries

10−install(TARGETS ${SCOPE_TOOL}

11− RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

12− )

13

3

14install(FILES unlock-device DESTINATION ${SHELL_APP_DIR})

4install(FILES unlock-device DESTINATION ${SHELL_APP_DIR})

tools/menutool/CMakeLists.txtnew file+5

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

1+add_executable(menutool

2+ menutool.cpp

3+ )

4+

5+qt5_use_modules(menutool Qml Quick)

tools/menutool/READMEnew file+11

@@ -0,0 +1,11 @@

1+This tool can be used to browse the menus of another application

2+

3+How to use:

4+ * Start application that exports menus

5+ e.g. QT_QPA_PLATFORMTHEME=ubuntuappmenu kate

6+ * Figure out which is the dbus address

7+ * This is a bit tricky, but using qdbusviewer to see the addresses

8+ that appear when starting the app and looking for one that

9+ contains com/Ubuntu/Menu/0 should be enough

10+ * Start tool passing the dbus address

11+ builddir/menutool/menutool :1.293

tools/menutool/menutool.cppnew 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+// Qt

18+#include <QDebug>

19+#include <QCommandLineParser>

20+#include <QGuiApplication>

21+#include <QQmlContext>

22+#include <QQmlEngine>

23+#include <QQuickView>

24+

25+// local

26+#include <paths.h>

27+

28+int main(int argc, char *argv[])

29+{

30+ QGuiApplication::setApplicationName("Menu Test Tool");

31+ QGuiApplication *application = new QGuiApplication(argc, argv);

32+

33+ QCommandLineParser parser;

34+ parser.parse(application->arguments());

35+ const QStringList args = parser.positionalArguments();

36+

37+ if (args.count() != 1) {

38+ qWarning() << "You need to pass the dbus address";

39+ return 1;

40+ }

41+

42+ QQuickView* view = new QQuickView();

43+ view->setResizeMode(QQuickView::SizeRootObjectToView);

44+ view->setTitle(QGuiApplication::applicationName());

45+ view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

46+ view->rootContext()->setContextProperty("contextBusName", args[0]);

47+

48+ QUrl source(::sourceDirectory() + "/tools/menutool/menutool.qml");

49+ prependImportPaths(view->engine(), ::overrideImportPaths());

50+ prependImportPaths(view->engine(), ::nonMirImportPaths());

51+

52+ view->setSource(source);

53+

54+ view->show();

55+

56+ int result = application->exec();

57+

58+ delete view;

59+ delete application;

60+

61+ return result;

62+}

tools/menutool/menutool.qmlnew file+103

@@ -0,0 +1,103 @@

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

18+import Ubuntu.Components 1.3

19+

20+import "../../qml/ApplicationMenus"

21+import "../../qml/Panel"

22+import "../../qml/Components/PanelState"

23+

24+import QMenuModel 0.1

25+import Unity.Indicators 0.1 as Indicators

26+

27+Item {

28+ width: units.gu(180)

29+ height: units.gu(120)

30+

31+ UnityMenuModel {

32+ id: menuModel

33+ busName: contextBusName

34+ menuObjectPath: "/com/ubuntu/Menu/0"

35+ actions: { "unity": "/com/ubuntu/Menu/0" }

36+ }

37+

38+ Panel {

39+ id: panel

40+

41+ height: parent.height

42+ width: parent.width / 2

43+ minimizedPanelHeight: units.gu(6)

44+

45+ mode: "windowed"

46+

47+ applicationMenus {

48+ model: menuModel

49+ }

50+

51+ Rectangle {

52+ width: 50

53+ height: 50

54+ anchors.centerIn: parent

55+ color: "gray"

56+ rotation: 45

57+ Timer {

58+ interval: 20

59+ running: true

60+ repeat: true

61+ onTriggered: parent.rotation = parent.rotation+1

62+ }

63+ }

64+

65+ Rectangle {

66+ color: "green"

67+ anchors.bottom: parent.bottom

68+ anchors.right: parent.right

69+ Label {

70+ id: label

71+ anchors.centerIn: parent

72+ text: "Click here to open touch menu manually"

73+ }

74+ width: label.width + units.gu(2)

75+ height: label.height + units.gu(2)

76+ MouseArea {

77+ anchors.fill: parent

78+ onClicked: panel.applicationMenus.show();

79+ }

80+ visible: !panel.applicationMenus.shown

81+ }

82+ }

83+

84+ Rectangle {

85+ color: "blue"

86+ height: parent.height

87+ width: parent.width / 2

88+ x: width

89+

90+ MenuBar {

91+ id: menuBar

92+ height: units.gu(3)

93+ width: parent.width

94+ enableKeyFilter: true

95+ unityMenuModel: menuModel

96+ }

97+ }

98+

99+ Component.onCompleted: {

100+ theme.name = "Ubuntu.Components.Themes.SuruDark";

101+ PanelState.title = "Drag here to open touch menu";

102+ }

103+}

tools/scopetool/CMakeLists.txtnew file+12

@@ -0,0 +1,12 @@

1+add_executable(${SCOPE_TOOL}

2+ scopetool.cpp

3+ registry-tracker.cpp

4+ ../../src/UnixSignalHandler.cpp

5+ )

6+

7+qt5_use_modules(${SCOPE_TOOL} Qml Quick)

8+

9+# install binaries

10+install(TARGETS ${SCOPE_TOOL}

11+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

12+ )

tools/registry-tracker.cpp → tools/scopetool/registry-tracker.cpprenamed

The content is the same.

tools/registry-tracker.h → tools/scopetool/registry-tracker.hrenamed

The content is the same.

tools/scopetool.cpp → tools/scopetool/scopetool.cpprenamed

The content is the same.