ef9a87a · unity8 · git.iko.soy

git.iko.soy/unity8

Move images only used in tests to tests folder

Approved by: Michael Zanetti

commitef9a87ae110955706a578d801e1b77d8b4719df8 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 8 Dec 2015, 15:36 (11 years ago) parentfc437d9 a28df86

40 files changed+38−39

compare with xenial

unifiedsplit

qml/graphics/12_10_background_wide@12.pngdeleted

Binary file not shown.

tests/autopilot/unity8/shell/tests/test_notifications.py+1−1

@@ -61,7 +61,7 @@ class NotificationsBase(UnityTestCase):

6161 return '/usr/share/unity8/graphics/' + icon_name

6262 else:

6363 return os.path.dirname(__file__) + (

64− "/../../../../../qml/graphics/" + icon_name)

64+ "/../../../../../tests/graphics/" + icon_name)

6565

6666 def _get_notifications_list(self):

6767 return self.main_window.select_single(

qml/graphics/applicationIcons/browser@18.png → tests/graphics/applicationIcons/browser@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/calendar@18.png → tests/graphics/applicationIcons/calendar@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/camera@18.png → tests/graphics/applicationIcons/camera@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/contacts-app@18.png → tests/graphics/applicationIcons/contacts-app@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/dash.png → tests/graphics/applicationIcons/dash.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/dialer-app@18.png → tests/graphics/applicationIcons/dialer-app@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/evernote@18.png → tests/graphics/applicationIcons/evernote@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/facebook@18.png → tests/graphics/applicationIcons/facebook@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/gallery@18.png → tests/graphics/applicationIcons/gallery@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/gmail@18.png → tests/graphics/applicationIcons/gmail@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/libreoffice@18.png → tests/graphics/applicationIcons/libreoffice@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/map@18.png → tests/graphics/applicationIcons/map@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/messages-app@18.png → tests/graphics/applicationIcons/messages-app@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/notepad@18.png → tests/graphics/applicationIcons/notepad@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/pinterest@18.png → tests/graphics/applicationIcons/pinterest@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/soundcloud@18.png → tests/graphics/applicationIcons/soundcloud@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/system-settings@18.png → tests/graphics/applicationIcons/system-settings@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/twitter@18.png → tests/graphics/applicationIcons/twitter@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/weather@18.png → tests/graphics/applicationIcons/weather@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/wikipedia@18.png → tests/graphics/applicationIcons/wikipedia@18.pngrenamed

Binary file not shown.

qml/graphics/applicationIcons/youtube@18.png → tests/graphics/applicationIcons/youtube@18.pngrenamed

Binary file not shown.

qml/graphics/avatars/amanda@12.png → tests/graphics/avatars/amanda@12.pngrenamed

Binary file not shown.

qml/graphics/avatars/anna_olsson@12.png → tests/graphics/avatars/anna_olsson@12.pngrenamed

Binary file not shown.

qml/graphics/avatars/funky@12.png → tests/graphics/avatars/funky@12.pngrenamed

Binary file not shown.

qml/graphics/clock@18.png → tests/graphics/clock@18.pngrenamed

Binary file not shown.

tests/mocks/Unity/Application/ApplicationInfo.cpp+1−2

@@ -116,8 +116,7 @@ void ApplicationInfo::setSession(Session* session)

116116

117117void ApplicationInfo::setIconId(const QString &iconId)

118118{

119− setIcon(QString("file://%1/graphics/applicationIcons/%2@18.png")

120− .arg(qmlDirectory())

119+ setIcon(QString("../../tests/graphics/applicationIcons/%2@18.png")

121120 .arg(iconId));

122121}

123122

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1−1

@@ -29,7 +29,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

2929 m_appId(appId),

3030 m_desktopFile(desktopFile),

3131 m_name(name),

32− m_icon(qmlDirectory() + "/graphics/applicationIcons/" + icon + ".png"),

32+ m_icon("../../tests/graphics/applicationIcons/" + icon + ".png"),

3333 m_pinned(false),

3434 m_running(false),

3535 m_recent(false),

tests/mocks/Unity/fake_resultsmodel.cpp+1−1

@@ -78,7 +78,7 @@ ResultsModel::data(const QModelIndex& index, int role) const

7878 case RoleTitle:

7979 return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());

8080 case RoleArt:

81− return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png");

81+ return QString("../../../tests/graphics/applicationIcons/dash.png");

8282 case RoleSubtitle:

8383 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());

8484 case RoleMascot:

tests/mocks/Unity/fake_scopesoverview.cpp+1−1

@@ -298,7 +298,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co

298298 case RoleSubtitle:

299299 return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();

300300 case RoleArt:

301− return QString(qmlDirectory() + "/graphics/applicationIcons/dash.png");

301+ return QString("../../tests/graphics/applicationIcons/dash.png");

302302 case RoleMascot:

303303 case RoleEmblem:

304304 case RoleSummary:

tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml+2−2

@@ -29,8 +29,8 @@ Rectangle {

2929

3030 ListModel {

3131 id: fakeModel

32− ListElement { icon: "../graphics/applicationIcons/facebook.png"; name: "Facebook" }

33− ListElement { icon: "../graphics/applicationIcons/gmail.png"; name: "Mail" }

32+ ListElement { icon: "../../tests/graphics/applicationIcons/facebook.png"; name: "Facebook" }

33+ ListElement { icon: "../../tests/graphics/applicationIcons/gmail.png"; name: "Mail" }

3434 }

3535

3636 function openWarning() {

tests/qmltests/Dash/Previews/tst_PreviewComment.qml+2−2

@@ -30,7 +30,7 @@ Rectangle {

3030 "author": "Claire Thompson",

3131 "subtitle": "28/04/2015 3:48pm",

3232 "comment": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",

33− "source": "../../graphics/avatars/amanda@12.png"

33+ "source": "../../../tests/graphics/avatars/amanda.png"

3434 }

3535

3636 property var commentNoImage: {

@@ -43,7 +43,7 @@ Rectangle {

4343 property var commentNoSubtitle: {

4444 "author": "Claire Thompson",

4545 "comment": "Been quite a while since I really liked one.",

46− "source": "../../graphics/avatars/amanda@12.png"

46+ "source": "../../../tests/graphics/avatars/amanda.png"

4747 }

4848

4949 PreviewComment {

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+2−2

@@ -45,7 +45,7 @@ Rectangle {

4545 property var commentData: {

4646 "author": "Claire Thompson",

4747 "comment": "C.",

48− "source": "../../graphics/avatars/amanda@12.png"

48+ "source": "../../../tests/graphics/avatars/amanda.png"

4949 }

5050

5151 property var commentInputData: {

@@ -56,7 +56,7 @@ Rectangle {

5656 "sources": [

5757 "../../graphics/phone_background.jpg",

5858 "../../graphics/tablet_background.jpg",

59− "../../graphics/clock@18.png",

59+ "../../../tests/graphics/clock@18.png",

6060 "../../graphics/borked"

6161 ]

6262 }

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+3−3

@@ -33,7 +33,7 @@ Rectangle {

3333 "sources": [

3434 "../../graphics/phone_background.jpg",

3535 "../../graphics/tablet_background.jpg",

36− "../../graphics/clock@18.png",

36+ "../../../tests/graphics/clock@18.png",

3737 "../../graphics/borked"

3838 ]

3939 }

@@ -42,10 +42,10 @@ Rectangle {

4242 "sources": [

4343 "../../graphics/phone_background.jpg",

4444 "../../graphics/tablet_background.jpg",

45− "../../graphics/clock@18.png",

45+ "../../../tests/graphics/clock@18.png",

4646 "../../graphics/borked"

4747 ]

48− , "fallback": "../../graphics/clock@18.png"

48+ , "fallback": "../../../tests/graphics/clock@18.png"

4949 }

5050

5151 PreviewImageGallery {

tests/qmltests/Notifications/tst_Notifications.qml+11−11

@@ -76,8 +76,8 @@ Item {

7676 "hints": {},

7777 "summary": "Cole Raby",

7878 "body": "I did not expect it to be <b>that</b> late.",

79− "icon": "../graphics/avatars/amanda.png",

80− "secondaryIcon": "../graphics/applicationIcons/facebook.png",

79+ "icon": "../../tests/graphics/avatars/amanda.png",

80+ "secondaryIcon": "../../tests/graphics/applicationIcons/facebook.png",

8181 "rawActions": ["reply_id", "Dummy"]})

8282 n.completed.connect(mockModel.onCompleted)

8383 mockModel.append(n)

@@ -90,7 +90,7 @@ Item {

9090 "hints": {"x-canonical-non-shaped-icon": "true"},

9191 "summary": "Contacts",

9292 "body": "Synchronised contacts-database & cloud-storage.",

93− "icon": "../graphics/applicationIcons/contacts-app.png",

93+ "icon": "../../tests/graphics/applicationIcons/contacts-app.png",

9494 "secondaryIcon": "",

9595 "rawActions": ["reply_id", "Dummy"]})

9696 n.completed.connect(mockModel.onCompleted)

@@ -104,7 +104,7 @@ Item {

104104 "hints": {"x-canonical-non-shaped-icon": "false"},

105105 "summary": "Photo upload completed",

106106 "body": "",

107− "icon": "../graphics/applicationIcons/facebook.png",

107+ "icon": "../../tests/graphics/applicationIcons/facebook.png",

108108 "secondaryIcon": "",

109109 "rawActions": ["reply_id", "Dummy"]})

110110 n.completed.connect(mockModel.onCompleted)

@@ -118,7 +118,7 @@ Item {

118118 "hints": {},

119119 "summary": "Interactive notification",

120120 "body": "This is a notification that can be clicked",

121− "icon": "../graphics/avatars/anna_olsson.png",

121+ "icon": "../../tests/graphics/avatars/anna_olsson.png",

122122 "secondaryIcon": "",

123123 "rawActions": ["reply_id", "Dummy"]})

124124 n.completed.connect(mockModel.onCompleted)

@@ -288,7 +288,7 @@ Item {

288288 type: Notification.Ephemeral

289289 summary: "Photo upload completed"

290290 body: ""

291− icon: "../graphics/applicationIcons/facebook.png"

291+ icon: "../../tests/graphics/applicationIcons/facebook.png"

292292 secondaryIcon: ""

293293 value: 0

294294 rawActions: []

@@ -302,7 +302,7 @@ Item {

302302 summary: "New comment successfully published"

303303 body: ""

304304 icon: ""

305− secondaryIcon: "../graphics/applicationIcons/facebook.png"

305+ secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png"

306306 value: 0

307307 rawActions: []

308308 },

@@ -313,7 +313,7 @@ Item {

313313 "sound-file": "dummy.ogg"}

314314 summary: "Interactive notification"

315315 body: "This is a notification that can be clicked"

316− icon: "../graphics/avatars/amanda.png"

316+ icon: "../../tests/graphics/avatars/amanda.png"

317317 secondaryIcon: ""

318318 value: 0

319319 rawActions: ["reply_id", "Dummy"]

@@ -325,7 +325,7 @@ Item {

325325 "sound-file": "dummy.ogg"}

326326 summary: "Bro Coly"

327327 body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."

328− icon: "../graphics/avatars/anna_olsson.png"

328+ icon: "../../tests/graphics/avatars/anna_olsson.png"

329329 secondaryIcon: ""

330330 value: 0

331331 rawActions: ["accept_id", "Accept",

@@ -338,8 +338,8 @@ Item {

338338 "sound-file": "dummy.ogg"}

339339 summary: "Cole Raby"

340340 body: "I did not expect it to be that late."

341− icon: "../graphics/avatars/funky.png"

342− secondaryIcon: "../graphics/applicationIcons/facebook.png"

341+ icon: "../../tests/graphics/avatars/funky.png"

342+ secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png"

343343 value: 0

344344 rawActions: []

345345 },

tests/qmltests/Notifications/tst_OptionToggle.qml+2−2

@@ -70,7 +70,7 @@ Row {

7070 hints: {"x-canonical-private-affirmative-tint": "true"},

7171 summary: "Incoming call",

7272 body: "Frank Zappa\n+44 (0)7736 027340",

73− icon: "../graphics/avatars/funky.png",

73+ icon: "../../tests/graphics/avatars/funky.png",

7474 secondaryIcon: "image://theme/incoming-call",

7575 actions: [{ id: "ok_id", label: "Ok"},

7676 { id: "cancel_id", label: "Cancel"},

@@ -159,7 +159,7 @@ Row {

159159 hints: {"x-canonical-private-affirmative-tint": "true"},

160160 summary: "Incoming call",

161161 body: "Frank Zappa\n+44 (0)7736 027340",

162− icon: "../graphics/avatars/funky.png",

162+ icon: "../../tests/graphics/avatars/funky.png",

163163 secondaryIcon: "image://theme/incoming-call",

164164 actions: [{ id: "ok_id", label: "Ok"},

165165 { id: "cancel_id", label: "Cancel"},

tests/qmltests/Notifications/tst_SwipeToAct.qml+5−5

@@ -72,7 +72,7 @@ Item {

7272 hints: {"x-canonical-snap-decisions-swipe": "true"},

7373 summary: "Incoming call",

7474 body: "Frank Zappa\n+44 (0)7736 027340",

75− icon: "../graphics/avatars/amanda.png",

75+ icon: "../../tests/graphics/avatars/amanda.png",

7676 secondaryIcon: "incoming-call",

7777 actions: [{ id: "ok_id", label: "Ok"},

7878 { id: "cancel_id", label: "Cancel"},

@@ -182,8 +182,8 @@ Item {

182182 hints: {"x-canonical-snap-decisions-swipe": "true"},

183183 summary: "Incoming call",

184184 body: "Frank Zappa\n+44 (0)7736 027340",

185− icon: "../graphics/avatars/amanda.png",

186− secondaryIcon: "../graphics/applicationIcons/facebook.png",

185+ icon: "../../tests/graphics/avatars/amanda.png",

186+ secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png",

187187 actions: myActionModel,

188188 summaryVisible: true,

189189 bodyVisible: true,

@@ -201,8 +201,8 @@ Item {

201201 hints: {"x-canonical-snap-decisions-swipe": "true"},

202202 summary: "Incoming call",

203203 body: "Bro Coly\n+49 (0)221 426973",

204− icon: "../graphics/avatars/funky.png",

205− secondaryIcon: "../graphics/applicationIcons/facebook.png",

204+ icon: "../../tests/graphics/avatars/funky.png",

205+ secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png",

206206 actions: myActionModel,

207207 summaryVisible: true,

208208 bodyVisible: true,

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+4−4

@@ -66,8 +66,8 @@ Row {

6666 hints: {"x-canonical-private-button-tint": "true"},

6767 summary: "Incoming call",

6868 body: "Frank Zappa\n+44 (0)7736 027340",

69− icon: "../graphics/avatars/funky.png",

70− secondaryIcon: "../graphics/applicationIcons/dialer-app.png",

69+ icon: "../../tests/graphics/avatars/funky.png",

70+ secondaryIcon: "../../tests/graphics/applicationIcons/dialer-app.png",

7171 actions: [{ id: "pickup_id", label: "Pick up"},

7272 { id: "decline_1_id", label: "Decline"},

7373 { id: "decline_2_id", label: "Can't talk now, what's up?"},

@@ -109,8 +109,8 @@ Row {

109109 hints: {"x-canonical-private-button-tint": "true"},

110110 summary: "Jenny Sample",

111111 body: "Hey there! Have you been watching the latest episode of that TV-show I told you about last week?",

112− icon: "../graphics/avatars/amanda.png",

113− secondaryIcon: "../graphics/applicationIcons/messages-app.png",

112+ icon: "../../tests/graphics/avatars/amanda.png",

113+ secondaryIcon: "../../tests/graphics/applicationIcons/messages-app.png",

114114 actions: [{ id: "reply_id", label: "Reply"},

115115 { id: "ignore_id", label: "Ignore"}]

116116 }]

tests/qmltests/tst_Shell.qml+2−2

@@ -454,8 +454,8 @@ Rectangle {

454454 hints: {"x-canonical-private-affirmative-tint": "true"},

455455 summary: "Tom Ato",

456456 body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",

457− icon: "../graphics/avatars/funky.png",

458− secondaryIcon: "../graphics/applicationIcons/facebook.png",

457+ icon: "../../tests/graphics/avatars/funky.png",

458+ secondaryIcon: "../../tests/graphics/applicationIcons/facebook.png",

459459 actions: [{ id: "ok_id", label: "Ok"},

460460 { id: "cancel_id", label: "Cancel"},

461461 { id: "notreally_id", label: "Not really"},