Impress add context: MasterPage

Fix #4808 by add SlideMasterPage to impress view tab
and add a context related MasterPage tab.

Update the icons to use the master*.svg colibre icons from core

Signed-off-by: andreas kainz <kainz.a@gmail.com>
Change-Id: Ibbd24d1c20a48e26591d217311c5989794aa841e

7 files changed, 46 insertions, 3 deletions

diff --git a/browser/images/lc_closemasterview.svg b/browser/images/lc_closemasterview.svg
new file mode 100644
index 0000000000..2c05916d71
--- /dev/null
+++ b/browser/images/lc_closemasterview.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v15h9.085938a6 6 0 0 1 -.085938-1h-8v-8h16v2.351562a6 6 0 0 1 1 .458985v-8.810547zm1 1h16v4h-16zm1 1v2h14v-2zm0 5v6h7.089844a6 6 0 0 1 5.910156-5 6 6 0 0 1 1 .089844v-1.089844z" fill="#1e8bcd"/><path d="m2 3v17h10.349609a6 6 0 0 1 -.263671-1h-9.085938v-15h18v8.810547a6 6 0 0 1 1 .724609v-10.535156z" fill="#3a3a38"/><path d="m4 5v4h16v-4zm1 1h14v2h-14zm-1 4v8h8a6 6 0 0 1 .089844-1h-7.089844v-6h14v1.089844a6 6 0 0 1 1 .261718v-2.351562z" fill="#fafafa"/><path d="m18 13a5 5 0 0 0 -5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0 -5-5zm-2.505859 1.994141a.50005.50005 0 0 1 .359375.152343l2.146484 2.146485 2.146484-2.146485a.50005.50005 0 0 1 .34375-.15039.50005.50005 0 0 1 .363282.857422l-2.146485 2.146484 2.146485 2.146484a.50005.50005 0 1 1 -.707032.707032l-2.146484-2.146485-2.146484 2.146485a.50005.50005 0 1 1 -.707032-.707032l2.146485-2.146484-2.146485-2.146484a.50005.50005 0 0 1 .347657-.859375z" fill="#ed3d3b"/><path d="m15.494141 14.994141a.50005.50005 0 0 0 -.347657.859375l2.146485 2.146484-2.146485 2.146484a.50005.50005 0 1 0 .707032.707032l2.146484-2.146485 2.146484 2.146485a.50005.50005 0 1 0 .707032-.707032l-2.146485-2.146484 2.146485-2.146484a.50005.50005 0 0 0 -.363282-.857422.50005.50005 0 0 0 -.34375.15039l-2.146484 2.146485-2.146484-2.146485a.50005.50005 0 0 0 -.359375-.152343z" fill="#fafafa"/></svg>
\ No newline at end of file
diff --git a/browser/images/lc_masterslide.svg b/browser/images/lc_masterslide.svg
index 412b63197a..9e76a24add 100644
--- a/browser/images/lc_masterslide.svg
+++ b/browser/images/lc_masterslide.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-linejoin="round"><path d="m2.5 4.5h19v15h-19z" fill="#83beec" stroke="#0063b1"/><g fill="#fafafa" stroke="#fafafa"><path d="m9.5 10.5h5v1h-5z"/><path d="m7.5 14.5h9"/></g></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v15h18v-15zm1 1h16v4h-16zm1 1v2h14v-2zm-1 4h16v8h-16zm1 1v6h14v-6z" fill="#1e8bcd"/><path d="m2 3v17h20v-17zm1 1h18v15h-18z" fill="#3a3a38"/><path d="m4 5v4h16v-4zm1 1h14v2h-14zm-1 4v8h16v-8zm1 1h14v6h-14z" fill="#fafafa"/></svg>
\ No newline at end of file
diff --git a/browser/images/lc_masterslidespanel.svg b/browser/images/lc_masterslidespanel.svg
index 412b63197a..9e76a24add 100644
--- a/browser/images/lc_masterslidespanel.svg
+++ b/browser/images/lc_masterslidespanel.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-linejoin="round"><path d="m2.5 4.5h19v15h-19z" fill="#83beec" stroke="#0063b1"/><g fill="#fafafa" stroke="#fafafa"><path d="m9.5 10.5h5v1h-5z"/><path d="m7.5 14.5h9"/></g></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v15h18v-15zm1 1h16v4h-16zm1 1v2h14v-2zm-1 4h16v8h-16zm1 1v6h14v-6z" fill="#1e8bcd"/><path d="m2 3v17h20v-17zm1 1h18v15h-18z" fill="#3a3a38"/><path d="m4 5v4h16v-4zm1 1h14v2h-14zm-1 4v8h16v-8zm1 1h14v6h-14z" fill="#fafafa"/></svg>
\ No newline at end of file
diff --git a/browser/images/lc_renamemasterpage.svg b/browser/images/lc_renamemasterpage.svg
new file mode 100644
index 0000000000..25851ef9ec
--- /dev/null
+++ b/browser/images/lc_renamemasterpage.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v15h12v-1h-11v-8h11v-1h-11v-4h9.304688c.362311-.582535 1.004767-.999931 1.695312-1zm14.001953 0c.173959.0002428.330046.089654.498047.1347656.168001-.0451116.324088-.1345228.498047-.1347656zm2.998047 0c.356572.0000357.6992.1176026 1 .3046875v-.3046875zm-15 2v2h8.304688c-.187085-.3008002-.304652-.6434277-.304688-1v-1zm16 2.6953125c-.3008.1870849-.643428.3046518-1 .3046875v1 8 1h1zm-16 2.3046875v6h10v-6z" fill="#1e8bcd"/><path d="m2 3v17h11.304688c.362311-.582535 1.004767-.999931 1.695312-1h-12v-15h12 2.001953.996094 2.001953 1v.3046875c.582535.3623119.999931 1.0047682 1 1.6953125v-3zm20 4c-.000069.6905443-.417465 1.3330006-1 1.6953125v10.3046875h-1c.690545.000069 1.333001.417465 1.695312 1h.304688z" fill="#3a3a38"/><path d="m4 5v4h11c-.690545-.000069-1.333001-.417465-1.695312-1h-8.304688v-2h8c.000036-.3565723.117603-.6991998.304688-1zm0 5v8h11v-1h-10v-6h10v-1z" fill="#fafafa"/><circle cx="18" cy="18" fill="#1e8bcd" r="0"/><path d="m15 5.0000005a1.0001 1.0001 0 0 0 -1 1v1a1.0001 1.0001 0 0 0 1 1h1v1 9.9999995 1h-1a1.0001 1.0001 0 0 0 -1 1v1a1.0001 1.0001 0 0 0 1 1h2a1.0001 1.0001 0 0 0 .5-.134766 1.0001 1.0001 0 0 0 .5.134766h2a1.0001 1.0001 0 0 0 1-1v-1a1.0001 1.0001 0 0 0 -1-1h-1v-1-9.9999995-1h1a1.0001 1.0001 0 0 0 1-1v-1a1.0001 1.0001 0 0 0 -1-1h-2a1.0001 1.0001 0 0 0 -.5.1347656 1.0001 1.0001 0 0 0 -.5-.1347656z" fill="#3a3a38"/><path d="m15 6.0000005v1h2v-1zm2 1v13.9999995h1v-13.9999995zm1 0h2v-1h-2zm0 13.9999995v1h2v-1zm-1 0h-2v1h2z" fill="#fafafa"/></svg>
\ No newline at end of file
diff --git a/browser/images/lc_slidemasterpage.svg b/browser/images/lc_slidemasterpage.svg
index 412b63197a..9e76a24add 100644
--- a/browser/images/lc_slidemasterpage.svg
+++ b/browser/images/lc_slidemasterpage.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-linejoin="round"><path d="m2.5 4.5h19v15h-19z" fill="#83beec" stroke="#0063b1"/><g fill="#fafafa" stroke="#fafafa"><path d="m9.5 10.5h5v1h-5z"/><path d="m7.5 14.5h9"/></g></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v15h18v-15zm1 1h16v4h-16zm1 1v2h14v-2zm-1 4h16v8h-16zm1 1v6h14v-6z" fill="#1e8bcd"/><path d="m2 3v17h20v-17zm1 1h18v15h-18z" fill="#3a3a38"/><path d="m4 5v4h16v-4zm1 1h14v2h-14zm-1 4v8h16v-8zm1 1h14v6h-14z" fill="#fafafa"/></svg>
\ No newline at end of file
diff --git a/browser/src/control/Control.NotebookbarImpress.js b/browser/src/control/Control.NotebookbarImpress.js
index 7d2424d829..a632449165 100644
--- a/browser/src/control/Control.NotebookbarImpress.js
+++ b/browser/src/control/Control.NotebookbarImpress.js
@@ -109,6 +109,12 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 				'context': 'Draw|DrawLine|3DObject|MultiObject|Graphic|DrawFontwork'
 			},
 			{
+				'text': _('~Master'),
+				'id': '-15',
+				'name': 'MasterPage',
+				'context': 'MasterPage'
+			},
+			{
 				'text': _('~View'),
 				'id': 'View',
 				'name': 'View',
@@ -132,6 +138,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 				this.getFormatTab(),
 				this.getTableTab(),
 				this.getDrawTab(),
+				this.getMasterTab(),
 				this.getViewTab(),
 				this.getHelpTab()
 			], selectedId);
@@ -362,6 +369,11 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 			},
 			{
 				'type': 'bigtoolitem',
+				'text': _UNO('.uno:SlideMasterPage', 'presentation'),
+				'command': '.uno:SlideMasterPage'
+			},
+			{
+				'type': 'bigtoolitem',
 				'text': _UNO('.uno:Sidebar'),
 				'command': '.uno:Sidebar'
 			}
@@ -1210,6 +1222,33 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 		return this.getTabPage('Layout', content);
 	},
 
+	getMasterTab: function() {
+		var content = [
+			{
+				'type': 'bigtoolitem',
+				'text': _UNO('.uno:SlideSetup', 'presentation'),
+				'command': '.uno:PageSetup'
+			},
+			{
+				'type': 'bigtoolitem',
+				'text': _UNO('.uno:HeaderAndFooter', 'presentation'),
+				'command': '.uno:HeaderAndFooter'
+			},
+			{
+				'type': 'bigtoolitem',
+				'text': _UNO('.uno:RenameMasterPage', 'presentation'),
+				'command': '.uno:RenameMasterPage'
+			},
+			{
+				'type': 'bigtoolitem',
+				'text': _UNO('.uno:CloseMasterView', 'presentation'),
+				'command': '.uno:CloseMasterView'
+			}
+		];
+
+		return this.getTabPage('MasterPage', content);
+	},
+
 	getReviewTab: function() {
 		var content = [
 			{
diff --git a/browser/src/unocommands.js b/browser/src/unocommands.js
index 5e30be7b20..86dc4f30dc 100644
--- a/browser/src/unocommands.js
+++ b/browser/src/unocommands.js
@@ -418,6 +418,8 @@ var unoCommandsArray = {
 	'Sidebar':{global:{menu:_('Sidebar'),},},
 	'SlideChangeWindow':{presentation:{menu:_('Slide Transition'),},},
 	'SlideMasterPage':{presentation:{menu:_('~Master Slide'),},},
+	'CloseMasterView':{presentation:{menu:_('Close Master View'),},},
+	'RenameMasterPage':{presentation:{menu:_('Rename Master Slide'),},},
 	'SlideMenu':{presentation:{menu:_('S~lide'),},},
 	'SlideSetup':{presentation:{menu:_('Slide Properties...'),},},
 	'SmallCaps':{global:{menu:_('Small capitals'),},},