23b0a43 · unity8 · git.iko.soy

Panel/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -1 +1 @@

1−add_subdirectory(indicatorsclient)

1+add_subdirectory(Indicators)

Panel/Indicators/CMakeLists.txtnew file+1

@@ -0,0 +1 @@

1+add_subdirectory(client)

Panel/indicatorsclient/CMakeLists.txt → Panel/Indicators/client/CMakeLists.txtrenamed

The content is the same.

Panel/indicatorsclient/IndicatorsClient.qml → Panel/Indicators/client/IndicatorsClient.qmlrenamed

The content is the same.

Panel/indicatorsclient/IndicatorsList.qml → Panel/Indicators/client/IndicatorsList.qmlrenamed+1−1

@@ -21,7 +21,7 @@ import QtQuick 2.0

21import Ubuntu.Components 0.1

22import Ubuntu.Components.ListItems 0.1 as ListItem

23import IndicatorsClient 0.1 as IndicatorsClient

24−import ".."

24+import "../.."

25

26Page {

27 id: page

Panel/indicatorsclient/IndicatorsPage.qml → Panel/Indicators/client/IndicatorsPage.qmlrenamed

The content is the same.

Panel/indicatorsclient/indicatorsclient.cpp → Panel/Indicators/client/indicatorsclient.cpprenamed+1−1

@@ -45,7 +45,7 @@ IndicatorsClient::~IndicatorsClient()

45void IndicatorsClient::setupUI()

46{

47 m_view = new QQuickView;

48− m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/indicatorsclient/"));

48+ m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/Indicators/client/"));

49 m_view->engine()->addImportPath(::shellImportPath());

50

51 m_view->setSource(QUrl("IndicatorsClient.qml"));

Panel/indicatorsclient/indicatorsclient.h → Panel/Indicators/client/indicatorsclient.hrenamed

The content is the same.

Panel/indicatorsclient/main.cpp → Panel/Indicators/client/main.cpprenamed

The content is the same.

Panel/indicatorsclient/indicatorsclient.qrcdeleted−7

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

1−<RCC>

2− <qresource prefix="/">

3− <file>qml/IndicatorsClient.qml</file>

4− <file>qml/IndicatorsList.qml</file>

5− <file>qml/IndicatorsPage.qml</file>

6− </qresource>

7−</RCC>

Panel/indicatorsclient/qml/IndicatorsClient.qmldeleted−40

@@ -1,40 +0,0 @@

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−import Ubuntu.Components.ListItems 0.1 as ListItem

23−

24−Rectangle {

25− color: "black"

26− id: root

27−

28− PageStack {

29− id: pages

30−

31− anchors.fill: parent

32− Component.onCompleted: root.reset()

33− }

34−

35− function reset() {

36− pages.clear();

37− var component = Qt.createComponent("IndicatorsList.qml")

38− pages.push(component.createObject(pages));

39− }

40−}

Panel/indicatorsclient/qml/IndicatorsList.qmldeleted−78

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

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−import Ubuntu.Components.ListItems 0.1 as ListItem

23−import IndicatorsClient 0.1 as IndicatorsClient

24−

25−Page {

26− id: page

27− anchors.fill: parent

28− title: "Plugin list"

29−

30− IndicatorsClient.IndicatorsModel {

31− id: indicators

32−

33− Component.onCompleted: indicators.load()

34− }

35−

36− ListView {

37− id: mainMenu

38− objectName: "mainMenu"

39− anchors.fill: parent

40− model: indicators

41−

42− delegate: IndicatorsClient.Menu {

43− anchors.left: parent.left

44− anchors.right: parent.right

45− height: implicitHeight

46− progression: isValid

47− objectName: identifier

48−

49− // Used basic components instead of 'ListItem.Standard' properties because it does not support image resize

50− Image {

51− id: itemIcon

52− anchors.left: parent.left

53− anchors.verticalCenter: parent.verticalCenter

54− source: iconSource

55− smooth: true

56− width: units.gu(5)

57− height: units.gu(5)

58− }

59−

60− Label {

61− anchors.left: itemIcon.right

62− anchors.leftMargin: units.gu(0.5)

63− anchors.verticalCenter: parent.verticalCenter

64− text: (label != "") ? (title + " (" + label + ")") : title

65− }

66−

67− onClicked: {

68− if (progression) {

69− var props = model.initialProperties

70−

71− var page = Qt.createComponent("IndicatorsPage.qml")

72− pages.push(page.createObject(pages), {"initialProperties" : props, "component" : model.component})

73− }

74− }

75− }

76− }

77−}

78−

Panel/indicatorsclient/qml/IndicatorsPage.qmldeleted−49

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

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: initialProperties && initialProperties.title ? initialProperties.title : ""

27− property variant initialProperties

28− property alias component : page_loader.sourceComponent

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 initialProperties) {

41− if (item.hasOwnProperty(pName)) {

42− item[pName] = initialProperties[pName]

43− }

44− }

45− item.start()

46− }

47− }

48− }

49−}

tests/autopilot/indicators_client/tests/__init__.py+1−1

@@ -46,7 +46,7 @@ class IndicatorsTestCase(AutopilotTestCase):

46 def launch_test_local(self):

47 os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib"

48 os.environ['QML2_IMPORT_PATH'] = "../../builddir/plugins:../../builddir/tests/mocks"

49− self.app = self.launch_test_application("../../builddir/Panel/indicatorsclient/indicators-client")

49+ self.app = self.launch_test_application("../../builddir/Panel/Indicators/client/indicators-client")

50

51 def skipWrapper(*args, **kwargs):

52 pass