60d4896 · unity8 · git.iko.soy

Panel/IndicatorRow.qml+2−1

compare with xenial

unifiedsplit

@@ -21,7 +21,7 @@ Item {

21 id: indicatorRow

22

23 property QtObject currentItem : null

24− property int currentItemIndex: currentItem ? currentItem.ownIndex : -1

24+ readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1

25 property alias row: row

26 property QtObject indicatorsModel: null

27 property bool overviewActive: false // "state of the menu"

@@ -54,6 +54,7 @@ Item {

54 id: rowRepeater

55 objectName: "rowRepeater"

56 model: indicatorsModel ? indicatorsModel : undefined

57+

57 IndicatorItem {

58 IndicatorItem {

58 id: indicatorItem

59 id: indicatorItem

59

60

plugins/IndicatorsClient/indicators/messaging/indicatorclient_messaging.cpp−8

@@ -37,14 +37,6 @@ IndicatorClientMessaging::~IndicatorClientMessaging()

37void IndicatorClientMessaging::init(const QSettings& settings)

38{

39 IndicatorClientCommon::init(settings);

40−

41− m_initialProperties.insert("emptyText", "You have no more outstanding messages.");

42− m_initialProperties.insert("highlightFollowsCurrentItem", false);

43−}

44−

45−QUrl IndicatorClientMessaging::iconComponentSource() const

46−{

47− return QUrl("qrc:/indicatorsclient/qml/DefaultIndicatorIcon.qml");

48}

40}

49

41

50QUrl IndicatorClientMessaging::pageComponentSource() const

42QUrl IndicatorClientMessaging::pageComponentSource() const

plugins/IndicatorsClient/indicators/messaging/indicatorclient_messaging.h−1

@@ -32,7 +32,6 @@ public:

32

33 void init(const QSettings& settings);

34

35− QUrl iconComponentSource() const;

36 QUrl pageComponentSource() const;

35 QUrl pageComponentSource() const;

37};

36};

38

37

plugins/IndicatorsClient/indicators/network/indicatorclient_network.cpp−1

@@ -44,7 +44,6 @@ void IndicatorClientNetwork::init(const QSettings& settings)

44 IndicatorClientCommon::init(settings);

45

46 qmlRegisterType<NetworkAgent>("NetworkSettings", 0, 1, "NetworkAgent");

47− // setIcon(QUrl("image://gicon/wifi-none"));

48}

47}

49

48

50QUrl IndicatorClientNetwork::iconComponentSource() const

49QUrl IndicatorClientNetwork::iconComponentSource() const

plugins/IndicatorsClient/indicators/power/indicatorclient_power.cpp−5

@@ -31,8 +31,3 @@ void IndicatorClientPower::init(const QSettings& settings)

31{

32 IndicatorClientCommon::init(settings);

33}

34−

35−QUrl IndicatorClientPower::iconComponentSource() const

36−{

37− return QUrl("qrc:/indicatorsclient/qml/DefaultIndicatorIcon.qml");

38−}

plugins/IndicatorsClient/indicators/power/indicatorclient_power.h−2

@@ -30,8 +30,6 @@ public:

30 IndicatorClientPower(QObject *parent=0);

31

32 void init(const QSettings& settings);

33−

34− QUrl iconComponentSource() const;

35};

33};

36

34

37#endif

35#endif

plugins/IndicatorsClient/indicators/sound/indicatorclient_sound.cpp−6

@@ -24,7 +24,6 @@ IndicatorClientSound::IndicatorClientSound(QObject *parent)

24{

25 setTitle("Sound");

26 setPriority(IndicatorPriority::SOUND);

27− // setIcon(QUrl("audio-volume-high"));

28}

27}

29

28

30

29

@@ -32,8 +31,3 @@ void IndicatorClientSound::init(const QSettings& settings)

32{

31{

33 IndicatorClientCommon::init(settings);

32 IndicatorClientCommon::init(settings);

34}

33}

35−

36−QUrl IndicatorClientSound::iconComponentSource() const

37−{

38− return QUrl("qrc:/indicatorsclient/qml/DefaultIndicatorIcon.qml");

39−}

plugins/IndicatorsClient/indicators/sound/indicatorclient_sound.h−2

@@ -29,8 +29,6 @@ public:

29 IndicatorClientSound(QObject *parent=0);

30

31 void init(const QSettings& settings);

32−

33− QUrl iconComponentSource() const;

34};

32};

35

33

36#endif

34#endif

plugins/IndicatorsClient/qml/IndicatorPage.qml+1−1

@@ -124,7 +124,7 @@ IndicatorBase {

124 }

125 }

126

127− FactoryMenu {

127+ MenuFactory {

128 id: factory

129

130 actionGroup: main.actionGroup

plugins/IndicatorsClient/qml/FactoryMenu.qml → plugins/IndicatorsClient/qml/MenuFactory.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/qmldir+1−1

@@ -8,7 +8,7 @@ BasicMenu 0.1 BasicMenu.qml

8ButtonMenu 0.1 ButtonMenu.qml

9DBusActionState 0.1 DBusActionState.qml

10DivMenu 0.1 DivMenu.qml

11−FactoryMenu 0.1 FactoryMenu.qml

11+MenuFactory 0.1 MenuFactory.qml

12HLine 0.1 HLine.qml

13Menu 0.1 Menu.qml

14RemovableMenu 0.1 RemovableMenu.qml

plugins/IndicatorsClient/resources/qml/DefaultIndicatorIcon.qml−1

@@ -42,7 +42,6 @@ IndicatorsClient.IndicatorIcon {

42 Image {

43 id: itemImage

44 objectName: "itemImage"

45− source: "image://gicon/audio-volume-high"

46 visible: source != ""

45 visible: source != ""

47 height: units.gu(2.5)

46 height: units.gu(2.5)

48 width: units.gu(2.5)

47 width: units.gu(2.5)

plugins/IndicatorsClient/resources/qml/MessagingIndicatorPage.qml+3

@@ -24,6 +24,9 @@ import IndicatorsClient 0.1 as IndicatorsClient

24IndicatorsClient.IndicatorPage {

25 anchors.fill: parent

26

27+ highlightFollowsCurrentItem: false

28+ emptyText: "You have no more outstanding messages."

29+

27 function stop() {

30 function stop() {

28 // never stops the service

31 // never stops the service

29 // this will keep all objects in memory, consume more memory

32 // this will keep all objects in memory, consume more memory