From 31dd73ae81c6e6a95fd735cda13eaed076b31c52 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Mon, 29 Apr 2019 17:42:19 +0100
Subject: [PATCH] MediaDialog: Use new icons

Bug: T222086
Change-Id: I09c0a4e039de224d3cb0dd92855c559668ed35d3
---
 modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js      |  8 ++++----
 modules/ve-mw/ui/styles/apex/ve.ui.Icons.json        | 12 ------------
 modules/ve-mw/ui/styles/images/icons/image-frame.svg |  6 ------
 .../ve-mw/ui/styles/images/icons/image-frameless.svg |  5 -----
 modules/ve-mw/ui/styles/images/icons/image-none.svg  |  5 -----
 .../ve-mw/ui/styles/images/icons/image-thumbnail.svg |  8 --------
 modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json | 12 ------------
 7 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 modules/ve-mw/ui/styles/images/icons/image-frame.svg
 delete mode 100644 modules/ve-mw/ui/styles/images/icons/image-frameless.svg
 delete mode 100644 modules/ve-mw/ui/styles/images/icons/image-none.svg
 delete mode 100644 modules/ve-mw/ui/styles/images/icons/image-thumbnail.svg

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 5185e273c2..92aaab2ec1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -282,22 +282,22 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
 		// TODO: Inline images require a bit of further work, will be coming soon
 		new OO.ui.MenuOptionWidget( {
 			data: 'thumb',
-			icon: 'image-thumbnail',
+			icon: 'imageLayoutThumbnail',
 			label: ve.msg( 'visualeditor-dialog-media-type-thumb' )
 		} ),
 		new OO.ui.MenuOptionWidget( {
 			data: 'frameless',
-			icon: 'image-frameless',
+			icon: 'imageLayoutFrameless',
 			label: ve.msg( 'visualeditor-dialog-media-type-frameless' )
 		} ),
 		new OO.ui.MenuOptionWidget( {
 			data: 'frame',
-			icon: 'image-frame',
+			icon: 'imageLayoutFrame',
 			label: ve.msg( 'visualeditor-dialog-media-type-frame' )
 		} ),
 		new OO.ui.MenuOptionWidget( {
 			data: 'none',
-			icon: 'image-none',
+			icon: 'imageLayoutBasic',
 			label: ve.msg( 'visualeditor-dialog-media-type-none' )
 		} )
 	] );
diff --git a/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json b/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
index 4570620d39..7e7c899528 100644
--- a/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
+++ b/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
@@ -1,17 +1,5 @@
 {
 	"images": {
-		"image-none": {
-			"file": "../images/icons/image-none.svg"
-		},
-		"image-frame": {
-			"file": "../images/icons/image-frame.svg"
-		},
-		"image-frameless": {
-			"file": "../images/icons/image-frameless.svg"
-		},
-		"image-thumbnail": {
-			"file": "../images/icons/image-thumbnail.svg"
-		},
 		"parameter": {
 			"file": "../images/icons/parameter-ltr.svg"
 		},
diff --git a/modules/ve-mw/ui/styles/images/icons/image-frame.svg b/modules/ve-mw/ui/styles/images/icons/image-frame.svg
deleted file mode 100644
index a8abd8c4d7..0000000000
--- a/modules/ve-mw/ui/styles/images/icons/image-frame.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
-	<path id="frame" d="M4 5v13h16v-13zm15 12h-14v-11h14z"/>
-	<path id="mountains" d="M9.5 10l2.328 2.312-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3h-12v-2.5z"/>
-	<path id="sky" d="M9.516 7.844l3.046 3.172 2.938-2.016 2.5 2v-4h-12v5z"/>
-</svg>
diff --git a/modules/ve-mw/ui/styles/images/icons/image-frameless.svg b/modules/ve-mw/ui/styles/images/icons/image-frameless.svg
deleted file mode 100644
index a8e18500ec..0000000000
--- a/modules/ve-mw/ui/styles/images/icons/image-frameless.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
-	<path id="mountains" d="M11.828 12.312l-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3h-12v-2.5l3.5-3.5z"/>
-	<path id="sky" d="M12.562 11.016l2.938-2.016 2.5 2v-4h-12v5l3.516-4.156z"/>
-</svg>
diff --git a/modules/ve-mw/ui/styles/images/icons/image-none.svg b/modules/ve-mw/ui/styles/images/icons/image-none.svg
deleted file mode 100644
index cabcd17d39..0000000000
--- a/modules/ve-mw/ui/styles/images/icons/image-none.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
-	<path id="mountains" d="M9.531 8.844l-3.531 4.156v1.5l3.5-3.5 2.313 2.313-1.281 1.094.875 1.031 4.094-3.438 2.5 2v-2l-2.5-2-2.938 2.031-3.031-3.188z"/>
-	<path id="frame" d="M5 7v11h14v-11zm13 10h-12v-9h12z"/>
-</svg>
diff --git a/modules/ve-mw/ui/styles/images/icons/image-thumbnail.svg b/modules/ve-mw/ui/styles/images/icons/image-thumbnail.svg
deleted file mode 100644
index ec10a7c68e..0000000000
--- a/modules/ve-mw/ui/styles/images/icons/image-thumbnail.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
-	<path id="frame" d="M4 4v15h16v-15zm15 14h-14v-13h14z"/>
-	<path id="mountains" d="M6 15v-2.5l3.5-3.5 2.328 2.312-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3z"/>
-	<path id="sky" d="M9.516 6.844l3.046 3.172 2.938-2.016 2.5 2v-4h-12v5z"/>
-	<path id="text" d="M6 16h10v1h-10z"/>
-	<path id="zoom" d="M17 16h1v1h-1z"/>
-</svg>
diff --git a/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json b/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
index ebe7b39d8d..5f27c35a3a 100644
--- a/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
+++ b/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
@@ -10,18 +10,6 @@
 		}
 	},
 	"images": {
-		"image-none": {
-			"file": "../images/icons/image-none.svg"
-		},
-		"image-frame": {
-			"file": "../images/icons/image-frame.svg"
-		},
-		"image-frameless": {
-			"file": "../images/icons/image-frameless.svg"
-		},
-		"image-thumbnail": {
-			"file": "../images/icons/image-thumbnail.svg"
-		},
 		"parameter": {
 			"file": "../images/icons/parameter-ltr.svg"
 		},