removed/removed extra data
commit60d489600e4a89c298dcd250e8dbb8dbf1535d38
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateFri 7 Jun 2013, 14:51 (13 years ago)
parente2b019b
Panel/IndicatorRow.qml+2−1
@@ -21,7 +21,7 @@ Item {
2121 id: indicatorRow
2222
2323 property QtObject currentItem : null
24− property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
24+ readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
2525 property alias row: row
2626 property QtObject indicatorsModel: null
2727 property bool overviewActive: false // "state of the menu"
@@ -54,6 +54,7 @@ Item {
5454 id: rowRepeater
5555 objectName: "rowRepeater"
5656 model: indicatorsModel ? indicatorsModel : undefined
57+
5758 IndicatorItem {
5859 id: indicatorItem
5960
plugins/IndicatorsClient/indicators/messaging/indicatorclient_messaging.cpp−8
@@ -37,14 +37,6 @@ IndicatorClientMessaging::~IndicatorClientMessaging()
3737void IndicatorClientMessaging::init(const QSettings& settings)
3838{
3939 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");
4840}
4941
5042QUrl IndicatorClientMessaging::pageComponentSource() const
plugins/IndicatorsClient/indicators/messaging/indicatorclient_messaging.h−1
@@ -32,7 +32,6 @@ public:
3232
3333 void init(const QSettings& settings);
3434
35− QUrl iconComponentSource() const;
3635 QUrl pageComponentSource() const;
3736};
3837
plugins/IndicatorsClient/indicators/network/indicatorclient_network.cpp−1
@@ -44,7 +44,6 @@ void IndicatorClientNetwork::init(const QSettings& settings)
4444 IndicatorClientCommon::init(settings);
4545
4646 qmlRegisterType<NetworkAgent>("NetworkSettings", 0, 1, "NetworkAgent");
47− // setIcon(QUrl("image://gicon/wifi-none"));
4847}
4948
5049QUrl IndicatorClientNetwork::iconComponentSource() const
plugins/IndicatorsClient/indicators/power/indicatorclient_power.cpp−5
@@ -31,8 +31,3 @@ void IndicatorClientPower::init(const QSettings& settings)
3131{
3232 IndicatorClientCommon::init(settings);
3333}
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:
3030 IndicatorClientPower(QObject *parent=0);
3131
3232 void init(const QSettings& settings);
33−
34− QUrl iconComponentSource() const;
3533};
3634
3735#endif
plugins/IndicatorsClient/indicators/sound/indicatorclient_sound.cpp−6
@@ -24,7 +24,6 @@ IndicatorClientSound::IndicatorClientSound(QObject *parent)
2424{
2525 setTitle("Sound");
2626 setPriority(IndicatorPriority::SOUND);
27− // setIcon(QUrl("audio-volume-high"));
2827}
2928
3029
@@ -32,8 +31,3 @@ void IndicatorClientSound::init(const QSettings& settings)
3231{
3332 IndicatorClientCommon::init(settings);
3433}
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:
2929 IndicatorClientSound(QObject *parent=0);
3030
3131 void init(const QSettings& settings);
32−
33− QUrl iconComponentSource() const;
3432};
3533
3634#endif
plugins/IndicatorsClient/qml/IndicatorPage.qml+1−1
@@ -124,7 +124,7 @@ IndicatorBase {
124124 }
125125 }
126126
127− FactoryMenu {
127+ MenuFactory {
128128 id: factory
129129
130130 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
88ButtonMenu 0.1 ButtonMenu.qml
99DBusActionState 0.1 DBusActionState.qml
1010DivMenu 0.1 DivMenu.qml
11−FactoryMenu 0.1 FactoryMenu.qml
11+MenuFactory 0.1 MenuFactory.qml
1212HLine 0.1 HLine.qml
1313Menu 0.1 Menu.qml
1414RemovableMenu 0.1 RemovableMenu.qml
plugins/IndicatorsClient/resources/qml/DefaultIndicatorIcon.qml−1
@@ -42,7 +42,6 @@ IndicatorsClient.IndicatorIcon {
4242 Image {
4343 id: itemImage
4444 objectName: "itemImage"
45− source: "image://gicon/audio-volume-high"
4645 visible: source != ""
4746 height: units.gu(2.5)
4847 width: units.gu(2.5)
plugins/IndicatorsClient/resources/qml/MessagingIndicatorPage.qml+3
@@ -24,6 +24,9 @@ import IndicatorsClient 0.1 as IndicatorsClient
2424IndicatorsClient.IndicatorPage {
2525 anchors.fill: parent
2626
27+ highlightFollowsCurrentItem: false
28+ emptyText: "You have no more outstanding messages."
29+
2730 function stop() {
2831 // never stops the service
2932 // this will keep all objects in memory, consume more memory