f943e0c · unity8 · git.iko.soy

git.iko.soy/unity8

s/iconQml/widgetSource & s/pageQml/pageSource. Renamed indicator icons to widgets.

commitf943e0c38244e21ab407cc098b0fb79cbc51e3c6 authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 17 Jun 2013, 10:02 (13 years ago) parentbfe6afc

23 files changed+47−47

compare with xenial

unifiedsplit

Panel/IndicatorItem.qml+1−1

@@ -21,7 +21,7 @@ import Unity.Indicators 0.1 as Indicators

2121Item {

2222 id: indicatorItem

2323

24− property alias iconQml: loader.source

24+ property alias widgetSource: loader.source

2525 property bool highlighted: false

2626 property bool dimmed: false

2727 property var indicatorProperties: undefined

Panel/IndicatorRow.qml+1−1

@@ -60,7 +60,7 @@ Item {

6060

6161 property int ownIndex: index

6262

63− iconQml: model.iconQml

63+ widgetSource: model.widgetSource

6464

6565 indicatorProperties : model.indicatorProperties

6666 highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false

Panel/Indicators/DatetimeIndicatorIcon.qml → Panel/Indicators/DatetimeIndicatorWidget.qmlrenamed

The content is the same.

Panel/Indicators/DefaultIndicatorIcon.qml → Panel/Indicators/DefaultIndicatorWidget.qmlrenamed

The content is the same.

Panel/Indicators/MessagingIndicatorIcon.qml → Panel/Indicators/MessagingIndicatorWidget.qmlrenamed+1−1

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

1919

2020import QtQuick 2.0

2121

22−DefaultIndicatorIcon {

22+DefaultIndicatorWidget {

2323 // default the icon so we have something to show when we don't have the bus.

2424 iconSource: "image://gicon/indicator-messages"

2525}

Panel/Indicators/NetworkIndicatorIcon.qml → Panel/Indicators/NetworkIndicatorWidget.qmlrenamed

The content is the same.

Panel/Indicators/SoundIndicatorIcon.qml → Panel/Indicators/SoundIndicatorWidget.qmlrenamed+1−1

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

1919

2020import QtQuick 2.0

2121

22−DefaultIndicatorIcon {

22+DefaultIndicatorWidget {

2323 // default the icon so we have something to show when we don't have the bus.

2424 iconSource: "image://gicon/audio-volume-high"

2525}

Panel/Indicators/client/IndicatorsList.qml+1−1

@@ -55,7 +55,7 @@ Page {

5555 onClicked: {

5656 if (progression) {

5757 var page = Qt.createComponent("IndicatorsPage.qml")

58− pages.push(page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageQml" : model.pageQml})

58+ pages.push(page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource})

5959 }

6060 }

6161 }

Panel/Indicators/client/IndicatorsPage.qml+1−1

@@ -25,7 +25,7 @@ Page {

2525

2626 title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title : ""

2727 property variant indicatorProperties

28− property alias pageQml : page_loader.source

28+ property alias pageSource : page_loader.source

2929

3030 anchors.fill: parent

3131

Panel/IndicatorsDataModel.qml+10−10

@@ -33,36 +33,36 @@ Indicators.IndicatorsModel {

3333 'title': 'Messaging',

3434 'description' : '',

3535 'priority': 10,

36− 'iconQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorIcon.qml',

37− 'pageQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'

36+ 'widgetSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',

37+ 'pageSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'

3838 },

3939 'indicator-sound' : {

4040 'title': 'Sound',

4141 'description' : '',

4242 'priority': 20,

43− 'iconQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/SoundIndicatorIcon.qml',

44− 'pageQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

43+ 'widgetSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/SoundIndicatorWidget.qml',

44+ 'pageSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

4545 },

4646 'indicator-network' : {

4747 'title': 'Networks',

4848 'description' : '',

4949 'priority': 30,

50− 'iconQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorIcon.qml',

51− 'pageQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

50+ 'widgetSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorWidget.qml',

51+ 'pageSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

5252 },

5353 'indicator-power' : {

5454 'title': 'Battery',

5555 'description' : '',

5656 'priority': 40,

57− 'iconQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorIcon.qml',

58− 'pageQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

57+ 'widgetSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',

58+ 'pageSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'

5959 },

6060 'indicator-datetime' : {

6161 'title': 'Date and Time',

6262 'description' : '',

6363 'priority': 100,

64− 'iconQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorIcon.qml',

65− 'pageQml' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorPage.qml'

64+ 'widgetSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorWidget.qml',

65+ 'pageSource' : applicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorPage.qml'

6666 }

6767 }

6868}

Panel/MenuContent.qml+1−1

@@ -94,7 +94,7 @@ Rectangle {

9494

9595 width: menus.width

9696 height: menus.height

97− source: pageQml

97+ source: pageSource

9898 visible: content.__shown

9999 onVisibleChanged: {

100100 // Reset the indicator states

Panel/Menus/Overview/OverviewGrid.qml+1−1

@@ -63,7 +63,7 @@ Item {

6363

6464 Loader {

6565 id: loader

66− source: iconQml

66+ source: widgetSource

6767

6868 onStatusChanged: {

6969 item.width = units.gu(5)

modules/Unity/Indicators/indicatorsmodel.cpp+7−7

@@ -213,8 +213,8 @@ QHash<int, QByteArray> IndicatorsModel::roleNames() const

213213 roles[Priority] = "priority";

214214 roles[Title] = "title";

215215 roles[Description] = "description";

216− roles[IconQml] = "iconQml";

217− roles[PageQml] = "pageQml";

216+ roles[WidgetSource] = "widgetSource";

217+ roles[PageSource] = "pageSource";

218218 roles[IndicatorProperties] = "indicatorProperties";

219219 roles[IsValid] = "isValid";

220220 }

@@ -238,9 +238,9 @@ QVariant IndicatorsModel::defaultData(Indicator::Ptr plugin, int role)

238238 return plugin ? plugin->identifier() : "Unknown";

239239 case Description:

240240 return "";

241− case IconQml:

242− return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorIcon.qml";

243− case PageQml:

241+ case WidgetSource:

242+ return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";

243+ case PageSource:

244244 return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";

245245 }

246246 return QVariant();

@@ -273,8 +273,8 @@ QVariant IndicatorsModel::data(const QModelIndex &index, int role) const

273273 case Priority:

274274 case Title:

275275 case Description:

276− case IconQml:

277− case PageQml:

276+ case WidgetSource:

277+ case PageSource:

278278 return indicatorData(plugin, role);

279279 default:

280280 break;

modules/Unity/Indicators/indicatorsmodel.h+2−2

@@ -41,8 +41,8 @@ public:

4141 Priority,

4242 Title,

4343 Description,

44− IconQml,

45− PageQml,

44+ WidgetSource,

45+ PageSource,

4646 IndicatorProperties,

4747 IsValid

4848 };

tests/qmltests/Panel/tst_IndicatorItem.qml+1−1

@@ -60,7 +60,7 @@ Rectangle {

6060 init_test()

6161

6262 compare(indicatorItem.visible, false, "IndicatorItem should not be visible.")

63− indicatorItem.iconQml = "qrc:/tests/indciatorsclient/qml/fake_menu_icon1.qml";

63+ indicatorItem.widgetSource = "qrc:/tests/indciatorsclient/qml/fake_menu_widget1.qml";

6464 tryCompare(indicatorItem, "visible", true)

6565 }

6666 }

tests/qmltests/Panel/tst_Overview.qml+4−4

@@ -48,9 +48,9 @@ Rectangle {

4848

4949 ListModel {

5050 id: mockModel

51− ListElement {title: "fake1"; iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon1.qml"; indicatorProperties: ""}

52− ListElement {title: "fake2"; iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon2.qml"; indicatorProperties: ""}

53− ListElement {title: "fake3"; iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon3.qml"; indicatorProperties: ""}

51+ ListElement {title: "fake1"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget1.qml"; indicatorProperties: ""}

52+ ListElement {title: "fake2"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget2.qml"; indicatorProperties: ""}

53+ ListElement {title: "fake3"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget3.qml"; indicatorProperties: ""}

5454 }

5555

5656 ListModel {

@@ -99,7 +99,7 @@ Rectangle {

9999 button = findChild(overview, "overviewGridButton3");

100100 compare(button, undefined, "There should only be 3 buttons... found at least 4...");

101101

102− mockModel2.append({title: "humppa", iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon4.qml", indicatorProperties: ""})

102+ mockModel2.append({title: "humppa", widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget4.qml", indicatorProperties: ""})

103103 overviewGrid.forceLayout();

104104 waitForRendering(overviewGrid);

105105

tests/qmltests/modules/Unity/Indicators/IndicatorsModel.qml+10−10

@@ -27,8 +27,8 @@ ListModel {

2727 priority: 0

2828 title: "Menu1";

2929 description: "";

30− iconQml: "qrc:/tests/indciators/qml/fake_menu_icon1.qml";

31− pageQml: "qrc:/tests/indciators/qml/fake_menu_page1.qml";

30+ widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget1.qml";

31+ pageSource: "qrc:/tests/indciators/qml/fake_menu_page1.qml";

3232 indicatorProperties: "";

3333 isValid: "";

3434 }

@@ -37,8 +37,8 @@ ListModel {

3737 priority: 1

3838 title: "Menu2";

3939 description: "";

40− iconQml: "qrc:/tests/indciators/qml/fake_menu_icon2.qml";

41− pageQml: "qrc:/tests/indciators/qml/fake_menu_page2.qml";

40+ widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget2.qml";

41+ pageSource: "qrc:/tests/indciators/qml/fake_menu_page2.qml";

4242 indicatorProperties: "";

4343 isValid: "";

4444 }

@@ -47,8 +47,8 @@ ListModel {

4747 priority: 2

4848 title: "Menu3";

4949 description: "";

50− iconQml: "qrc:/tests/indciators/qml/fake_menu_icon3.qml";

51− pageQml: "qrc:/tests/indciators/qml/fake_menu_page3.qml";

50+ widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget3.qml";

51+ pageSource: "qrc:/tests/indciators/qml/fake_menu_page3.qml";

5252 indicatorProperties: "";

5353 isValid: "";

5454 }

@@ -57,8 +57,8 @@ ListModel {

5757 priority: 3

5858 title: "Menu4";

5959 description: "";

60− iconQml: "qrc:/tests/indciators/qml/fake_menu_icon4.qml";

61− pageQml: "qrc:/tests/indciators/qml/fake_menu_page4.qml";

60+ widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget4.qml";

61+ pageSource: "qrc:/tests/indciators/qml/fake_menu_page4.qml";

6262 indicatorProperties: "";

6363 isValid: "";

6464 }

@@ -67,8 +67,8 @@ ListModel {

6767 priority: 4

6868 title: "Menu5";

6969 description: "";

70− iconQml: "qrc:/tests/indciators/qml/fake_menu_icon5.qml";

71− pageQml: "qrc:/tests/indciators/qml/fake_menu_page5.qml";

70+ widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget5.qml";

71+ pageSource: "qrc:/tests/indciators/qml/fake_menu_page5.qml";

7272 indicatorProperties: "";

7373 isValid: "";

7474 }

tests/qmltests/modules/Unity/Indicators/indicators_fake.qrc+5−5

@@ -1,10 +1,10 @@

11<RCC>

22 <qresource prefix="/tests/indciators">

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

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

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

6− <file>qml/fake_menu_icon4.qml</file>

7− <file>qml/fake_menu_icon5.qml</file>

3+ <file>qml/fake_menu_widget1.qml</file>

4+ <file>qml/fake_menu_widget2.qml</file>

5+ <file>qml/fake_menu_widget3.qml</file>

6+ <file>qml/fake_menu_widget4.qml</file>

7+ <file>qml/fake_menu_widget5.qml</file>

88 <file>qml/fake_menu_page1.qml</file>

99 <file>qml/fake_menu_page2.qml</file>

1010 <file>qml/fake_menu_page3.qml</file>

tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon1.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_widget1.qmlrenamed

The content is the same.

tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon2.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_widget2.qmlrenamed

The content is the same.

tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon3.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_widget3.qmlrenamed

The content is the same.

tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon4.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_widget4.qmlrenamed

The content is the same.

tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon5.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_widget5.qmlrenamed

The content is the same.