b512b17 · unity8 · git.iko.soy

git.iko.soy/unity8

Renamed DefaultActionState to ActionState.

commitb512b1736c775df0c93f9d1bcd7227aedf71f8dc authorNick Dedekind <nicholas.dedekind@gmail.com> dateThu 27 Jun 2013, 15:12 (13 years ago) parenta6ea4dc

3 files changed+8−8

compare with xenial

unifiedsplit

Panel/Indicators/DefaultIndicatorWidget.qml+3−3 modules/Unity/Indicators/indicators.h+4−4 modules/Unity/Indicators/plugin.cpp+1−1

Panel/Indicators/DefaultIndicatorWidget.qml+3−3

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

7373 return;

7474 }

7575

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

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

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

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

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

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

7979 }

8080}

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

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

1919#ifndef INDICATORS_H

2020#define INDICATORS_H

2121

22−class DefaultActionState : public QObject

22+class ActionState : public QObject

2323{

2424 Q_OBJECT

2525public:

26− Q_ENUMS(DefaultActionStates)

27− enum DefaultActionStates {

26+ Q_ENUMS(ActionStates)

27+ enum ActionStates {

2828 Label = 0x00,

2929 IconSource = 0x01,

3030 AccessableName = 0x02,

3131 Visible = 0x03,

3232 };

3333

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

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

3535};

3636

3737class NetworkActionState : public QObject

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

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

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

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

3737 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");

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

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

4141}