b512b17 · unity8 · git.iko.soy

Panel/Indicators/DefaultIndicatorWidget.qml+3−3

compare with xenial

unifiedsplit

@@ -73,8 +73,8 @@ Indicators.IndicatorWidget {

73 return;

74 }

75

76− label = action.state[Indicators.DefaultActionState.Label];

76+ label = action.state[Indicators.ActionState.Label];

77− iconSource = "image://gicon/" + action.state[Indicators.DefaultActionState.IconSource];

77+ iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];

78− enabled = action.state[Indicators.DefaultActionState.Visible];

78+ enabled = action.state[Indicators.ActionState.Visible];

79 }

80}

modules/Unity/Indicators/indicators.h+4−4

@@ -19,19 +19,19 @@

19#ifndef INDICATORS_H

20#define INDICATORS_H

21

22−class DefaultActionState : public QObject

22+class ActionState : public QObject

23{

24 Q_OBJECT

25public:

26− Q_ENUMS(DefaultActionStates)

26+ Q_ENUMS(ActionStates)

27− enum DefaultActionStates {

27+ enum ActionStates {

28 Label = 0x00,

29 IconSource = 0x01,

30 AccessableName = 0x02,

31 Visible = 0x03,

32 };

33

34− DefaultActionState(QObject*parent=0):QObject(parent) {}

34+ ActionState(QObject*parent=0):QObject(parent) {}

35};

36

37class NetworkActionState : public QObject

modules/Unity/Indicators/plugin.cpp+1−1

@@ -35,7 +35,7 @@ void IndicatorsPlugin::registerTypes(const char *uri)

35 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");

36 qmlRegisterType<FlatMenuProxyModel>(uri, 0, 1, "FlatMenuProxyModel");

37 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

38− qmlRegisterUncreatableType<DefaultActionState>(uri, 0, 1, "DefaultActionState", "Can't create DefaultActionState class");

38+ qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

39 qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

40 qmlRegisterUncreatableType<NetworkConnection>(uri, 0, 1, "NetworkConnection", "Can't create NetworkConnection class");

41}