From c67d30f897cc738b65186e3f9004ab63b59f1df8 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 29 Sep 2022 10:55:41 +0300
Subject: [PATCH 01/18] [PE] Add guides settings

---
 .../main/app/controller/ViewTab.js            | 106 ++++++--------
 .../main/app/view/ViewTab.js                  | 136 +++++++++++++++++-
 2 files changed, 169 insertions(+), 73 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 72f824a02..763526f2a 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -61,7 +61,6 @@ define([
                 zoom_type: undefined,
                 zoom_percent: undefined
             };
-            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             Common.NotificationCenter.on('uitheme:changed', this.onThemeChanged.bind(this));
             Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
         },
@@ -87,10 +86,18 @@ define([
             });
             this.addListeners({
                 'ViewTab': {
+                    'zoom:selected': _.bind(this.onSelectedZoomValue, this),
+                    'zoom:changedbefore': _.bind(this.onZoomChanged, this),
+                    'zoom:changedafter': _.bind(this.onZoomChanged, this),
                     'zoom:toslide': _.bind(this.onBtnZoomTo, this, 'toslide'),
                     'zoom:towidth': _.bind(this.onBtnZoomTo, this, 'towidth'),
                     'rulers:change': _.bind(this.onChangeRulers, this),
-                    'notes:change': _.bind(this.onChangeNotes, this)
+                    'notes:change': _.bind(this.onChangeNotes, this),
+                    'guides:show': _.bind(this.onGuidesShow, this),
+                    'guides:aftershow': _.bind(this.onGuidesAfterShow, this),
+                    'guides:add': _.bind(this.onGuidesAdd, this),
+                    'guides:clear': _.bind(this.onGuidesClear, this),
+                    'guides:smart': _.bind(this.onGuidesSmartShow, this)
                 },
                 'Toolbar': {
                     'view:compact': _.bind(function (toolbar, state) {
@@ -143,70 +150,6 @@ define([
             Common.localStorage.setBool('pe-hidden-notes', !bIsShow);
         },
 
-        onAppReady: function (config) {
-            var me = this;
-            if (me.view) {
-                (new Promise(function (accept, reject) {
-                    accept();
-                })).then(function () {
-                    me.view.setEvents();
-
-                    if (!Common.UI.Themes.available()) {
-                        me.view.btnInterfaceTheme.$el.closest('.group').remove();
-                        me.view.$el.find('.separator-theme').remove();
-                    }
-                    if (config.canBrandingExt && config.customization && config.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) {
-                        me.view.chStatusbar.$el.remove();
-
-                        if (!config.isEdit) {
-                            var slotChkNotes = me.view.chNotes.$el,
-                                groupRulers = slotChkNotes.closest('.group'),
-                                groupToolbar = me.view.chToolbar.$el.closest('.group');
-                            groupToolbar.find('.elset')[1].append(slotChkNotes[0]);
-                            groupRulers.remove();
-                            me.view.$el.find('.separator-rulers').remove();
-                        }
-                    } else if (!config.isEdit) {
-                        me.view.chRulers.hide();
-                    }
-
-                    me.view.cmbZoom.on('selected', _.bind(me.onSelectedZoomValue, me))
-                        .on('changed:before',_.bind(me.onZoomChanged, me, true))
-                        .on('changed:after', _.bind(me.onZoomChanged, me, false))
-                        .on('combo:blur',    _.bind(me.onComboBlur, me, false));
-                });
-
-                if (Common.UI.Themes.available()) {
-                    function _fill_themes() {
-                        var btn = this.view.btnInterfaceTheme;
-                        if ( typeof(btn.menu) == 'object' ) btn.menu.removeAll();
-                        else btn.setMenu(new Common.UI.Menu());
-
-                        var currentTheme = Common.UI.Themes.currentThemeId() || Common.UI.Themes.defaultThemeId();
-                        for (var t in Common.UI.Themes.map()) {
-                            btn.menu.addItem({
-                                value: t,
-                                caption: Common.UI.Themes.get(t).text,
-                                checked: t === currentTheme,
-                                checkable: true,
-                                toggleGroup: 'interface-theme'
-                            });
-                        }
-                    }
-
-                    Common.NotificationCenter.on('uitheme:countchanged', _fill_themes.bind(me));
-                    _fill_themes.call(me);
-
-                    if (me.view.btnInterfaceTheme.menu.items.length) {
-                        this.view.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
-                            var value = item.value;
-                            Common.UI.Themes.setTheme(value);
-                        }, this));
-                    }
-                }
-            }
-        },
-
         onBtnZoomTo: function (type, btn) {
             this._state.zoom_type = undefined;
             this._state.zoom_percent = undefined;
@@ -275,6 +218,37 @@ define([
 
         onComboBlur: function() {
             Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGuidesShow: function(state) {
+            this.api.asc_setShowGuides(state);
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGuidesAfterShow: function() {
+            if (this.view) {
+                this.view.btnGuides.menu.items[6].setDisabled(this.api.asc_canClearGuides());
+                this.view.btnGuides.menu.items[0].setChecked(this.api.asc_getShowGuides(), true);
+                this.view.btnGuides.menu.items[5].setChecked(this.api.asc_getShowSmartGuides(), true);
+            }
+        },
+
+        onGuidesAdd: function(type) {
+            if (type==='add-vert')
+                this.api.asc_addVerticalGuide();
+            else
+                this.api.asc_addHorizontalGuide();
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGuidesClear: function() {
+            this.api.asc_clearGuides();
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGuidesSmartShow: function(state) {
+            this.api.asc_setShowSmartGuides(state);
+            Common.NotificationCenter.trigger('edit:complete', this.view);
         }
 
     }, PE.Controllers.ViewTab || {}));
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 5fad142cf..fbd9582f4 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -77,6 +77,9 @@ define([
                         '<span class="btn-slot text" id="slot-chk-rulers"></span>' +
                     '</div>' +
                 '</div>' +
+                '<div class="group small">' +
+                    '<span class="btn-slot text x-huge" id="slot-btn-guides"></span>' +
+                '</div>' +
                 '<div class="separator long separator-rulers"></div>' +
                 '<div class="group small">' +
                     '<div class="elset">' +
@@ -110,8 +113,33 @@ define([
                 me.chNotes && me.chNotes.on('change', _.bind(function (checkbox, state) {
                     me.fireEvent('notes:change', [me.chNotes, state === 'checked']);
                 }, me));
-                me.cmbZoom.on('combo:focusin', _.bind(this.onComboOpen, this, false));
-                me.cmbZoom.on('show:after', _.bind(this.onComboOpen, this, true));
+                me.cmbZoom.on('selected', function (combo, record) {
+                    me.fireEvent('zoom:selected', [combo, record]);
+                }).on('changed:before', function (combo, record) {
+                    me.fireEvent('zoom:changedbefore', [true, combo, record]);
+                }).on('changed:after', function (combo, record) {
+                    me.fireEvent('zoom:changedafter', [false, combo, record]);
+                }).on('combo:blur', function () {
+                    me.fireEvent('editcomplete', me);
+                }).on('combo:focusin', _.bind(this.onComboOpen, this, false))
+                    .on('show:after', _.bind(this.onComboOpen, this, true));
+
+                me.btnGuides.on('toggle', _.bind(function(btn, state) {
+                    me.fireEvent('guides:show', [state]);
+                }, me));
+                me.btnGuides.menu.on('item:click', _.bind(function(menu, item) {
+                    if (item.value === 'add-vert' || item.value === 'add-hor')
+                        me.fireEvent('guides:add', [item.value]);
+                    else if (item.value === 'clear')
+                        me.fireEvent('guides:clear');
+                     else if (item.value === 'smart')
+                        me.fireEvent('guides:smart', [item.isChecked()]);
+                     else
+                        me.fireEvent('guides:show', [item.isChecked()]);
+                }, me));
+                me.btnGuides.menu.on('show:after', _.bind(function(btn, state) {
+                    me.fireEvent('guides:aftershow');
+                }, me));
             },
 
             initialize: function (options) {
@@ -226,6 +254,21 @@ define([
                 });
                 this.lockedControls.push(this.chNotes);
 
+                this.btnGuides = new Common.UI.Button({
+                    cls: 'btn-toolbar x-huge icon-top',
+                    iconCls: 'toolbar__icon day',
+                    caption: this.textGuides,
+                    lock: [_set.disableOnStart],
+                    enableToggle: true,
+                    allowDepress: true,
+                    split: true,
+                    menu: true,
+                    dataHint: '1',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'small'
+                });
+                this.lockedControls.push(this.btnGuides);
+
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
 
@@ -248,13 +291,85 @@ define([
                 this.chToolbar.render($host.find('#slot-chk-toolbar'));
                 this.chRulers.render($host.find('#slot-chk-rulers'));
                 this.chNotes.render($host.find('#slot-chk-notes'));
+                this.btnGuides.render($host.find('#slot-btn-guides'));
                 return this.$el;
             },
 
-            onAppReady: function () {
-                this.btnFitToSlide.updateHint(this.tipFitToSlide);
-                this.btnFitToWidth.updateHint(this.tipFitToWidth);
-                this.btnInterfaceTheme.updateHint(this.tipInterfaceTheme);
+            onAppReady: function (config) {
+                var me = this;
+                (new Promise(function (accept, reject) {
+                    accept();
+                })).then(function () {
+                    me.btnFitToSlide.updateHint(me.tipFitToSlide);
+                    me.btnFitToWidth.updateHint(me.tipFitToWidth);
+                    me.btnInterfaceTheme.updateHint(me.tipInterfaceTheme);
+                    me.btnGuides.updateHint(me.tipGuides);
+
+                    me.btnGuides.setMenu( new Common.UI.Menu({
+                        items: [
+                            { caption: me.textShowGuides, value: 'show', checkable: true },
+                            { caption: '--'},
+                            { caption: me.textAddVGuides, value: 'add-vert' },
+                            { caption: me.textAddHGuides, value: 'add-hor' },
+                            { caption: '--'},
+                            { caption: me.textSmartGuides, value: 'smart', checkable: true },
+                            { caption: me.textClearGuides, value: 'clear' }
+                        ]
+                    }));
+
+                    if (!Common.UI.Themes.available()) {
+                        me.btnInterfaceTheme.$el.closest('.group').remove();
+                        me.$el.find('.separator-theme').remove();
+                    }
+                    if (config.canBrandingExt && config.customization && config.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) {
+                        me.chStatusbar.$el.remove();
+
+                        if (!config.isEdit) {
+                            var slotChkNotes = me.chNotes.$el,
+                                groupRulers = slotChkNotes.closest('.group'),
+                                groupToolbar = me.chToolbar.$el.closest('.group');
+                            groupToolbar.find('.elset')[1].append(slotChkNotes[0]);
+                            groupRulers.remove();
+                            me.$el.find('.separator-rulers').remove();
+                        }
+                    } else if (!config.isEdit) {
+                        me.chRulers.hide();
+                    }
+                    if (!config.isEdit) {
+                        me.btnGuides.$el.closest('.group').remove();
+                    }
+
+                    if (Common.UI.Themes.available()) {
+                        function _fill_themes() {
+                            var btn = this.btnInterfaceTheme;
+                            if ( typeof(btn.menu) == 'object' ) btn.menu.removeAll();
+                            else btn.setMenu(new Common.UI.Menu());
+
+                            var currentTheme = Common.UI.Themes.currentThemeId() || Common.UI.Themes.defaultThemeId();
+                            for (var t in Common.UI.Themes.map()) {
+                                btn.menu.addItem({
+                                    value: t,
+                                    caption: Common.UI.Themes.get(t).text,
+                                    checked: t === currentTheme,
+                                    checkable: true,
+                                    toggleGroup: 'interface-theme'
+                                });
+                            }
+                        }
+
+                        Common.NotificationCenter.on('uitheme:countchanged', _fill_themes.bind(me));
+                        _fill_themes.call(me);
+
+                        if (me.btnInterfaceTheme.menu.items.length) {
+                            me.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
+                                var value = item.value;
+                                Common.UI.Themes.setTheme(value);
+                            }, me));
+                        }
+                    }
+
+                    me.setEvents();
+                });
             },
 
             show: function () {
@@ -294,7 +409,14 @@ define([
             textNotes: 'Notes',
             tipFitToSlide: 'Fit to slide',
             tipFitToWidth: 'Fit to width',
-            tipInterfaceTheme: 'Interface theme'
+            tipInterfaceTheme: 'Interface theme',
+            textGuides: 'Guides',
+            tipGuides: 'Show guides',
+            textShowGuides: 'Show Guides',
+            textAddVGuides: 'Add vertical guide',
+            textAddHGuides: 'Add horizontal guide',
+            textSmartGuides: 'Smart Guides',
+            textClearGuides: 'Clear Guides'
         }
     }()), PE.Views.ViewTab || {}));
 });
\ No newline at end of file

From dfeea528acb7e0da16b94436194e2448f1861e49 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 29 Sep 2022 14:58:43 +0300
Subject: [PATCH 02/18] [PE] Fix guides

---
 apps/presentationeditor/main/app/controller/LeftMenu.js | 6 ++++--
 apps/presentationeditor/main/app/controller/Main.js     | 8 +++++++-
 apps/presentationeditor/main/app/controller/ViewTab.js  | 3 +++
 apps/presentationeditor/main/app/view/FileMenuPanels.js | 3 ++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index c41b6fed9..e8fb6d79b 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -383,9 +383,11 @@ define([
                 value = parseInt(Common.localStorage.getItem("pe-settings-paste-button"));
                 Common.Utils.InternalSettings.set("pe-settings-paste-button", value);
                 this.api.asc_setVisiblePasteButton(!!value);
-            }
 
-            this.api.put_ShowSnapLines(Common.Utils.InternalSettings.get("pe-settings-showsnaplines"));
+                value = Common.localStorage.getBool("pe-settings-showsnaplines");
+                Common.Utils.InternalSettings.set("pe-settings-showsnaplines", value);
+                this.api.asc_setShowSmartGuides(value);
+            }
 
             menu.hide();
         },
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 2879f9150..8b93333c2 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -861,7 +861,13 @@ define([
                 me.api.asc_setAutoSaveGap(Common.Utils.InternalSettings.get("pe-settings-autosave"));
                 /** coauthoring end **/
 
-                Common.Utils.InternalSettings.set("pe-settings-showsnaplines", me.api.get_ShowSnapLines());
+                value = Common.localStorage.getBool("pe-settings-showsnaplines", true);
+                Common.Utils.InternalSettings.set("pe-settings-showsnaplines", value);
+                me.api.asc_setShowSmartGuides(value);
+
+                value = Common.localStorage.getBool("pe-settings-showguides");
+                Common.Utils.InternalSettings.set("pe-settings-showguides", value);
+                me.api.asc_setShowGuides(value);
 
                 var application = me.getApplication();
                 var toolbarController           = application.getController('Toolbar'),
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 763526f2a..af2dc56a9 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -222,6 +222,7 @@ define([
 
         onGuidesShow: function(state) {
             this.api.asc_setShowGuides(state);
+            Common.localStorage.setBool('pe-settings-showguides', state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
@@ -248,6 +249,8 @@ define([
 
         onGuidesSmartShow: function(state) {
             this.api.asc_setShowSmartGuides(state);
+            Common.localStorage.setBool('pe-settings-showsnaplines', state);
+            Common.Utils.InternalSettings.set("pe-settings-showsnaplines", state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         }
 
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 227cdb77d..5c18f20e6 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -711,7 +711,8 @@ define([
                 Common.localStorage.setItem("pe-settings-autosave", this.chAutosave.isChecked() ? 1 : 0);
             if (this.mode.canForcesave)
                 Common.localStorage.setItem("pe-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0);
-            Common.Utils.InternalSettings.set("pe-settings-showsnaplines", this.chAlignGuides.isChecked());
+
+            Common.localStorage.setBool("pe-settings-showsnaplines", this.chAlignGuides.isChecked());
 
             Common.localStorage.setItem("pe-macros-mode", this.cmbMacros.getValue());
             Common.Utils.InternalSettings.set("pe-macros-mode", this.cmbMacros.getValue());

From 7ed283a202ca5445b748f23feb7657976776a84a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 29 Sep 2022 18:26:54 +0300
Subject: [PATCH 03/18] [PE] Add guides settings to context menu

---
 .../main/app/controller/DocumentHolder.js     | 12 +++++
 .../main/app/controller/ViewTab.js            |  8 ++-
 .../main/app/view/DocumentHolder.js           | 50 +++++++++++++++----
 apps/presentationeditor/main/locale/en.json   | 16 +++++-
 4 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index 02ef179ee..a2d9ac585 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -422,6 +422,7 @@ define([
             view.menuTableSelectText.menu.on('item:click', _.bind(me.tableSelectText, me));
             view.menuTableInsertText.menu.on('item:click', _.bind(me.tableInsertText, me));
             view.menuTableDeleteText.menu.on('item:click', _.bind(me.tableDeleteText, me));
+            view.mnuGuides.menu.on('item:click', _.bind(me.onGuidesClick, me));
         },
 
         getView: function (name) {
@@ -2114,6 +2115,17 @@ define([
             return false;
         },
 
+        onGuidesClick: function(menu, item) {
+            if (item.value === 'add-vert' || item.value === 'add-hor')
+                this.documentHolder.fireEvent('guides:add', [item.value]);
+            else if (item.value === 'clear')
+                this.documentHolder.fireEvent('guides:clear');
+            else if (item.value === 'smart')
+                this.documentHolder.fireEvent('guides:smart', [item.isChecked()]);
+            else
+                this.documentHolder.fireEvent('guides:show', [item.isChecked()]);
+        },
+
         SetDisabled: function(state) {
             this._isDisabled = state;
             this.documentHolder.SetDisabled(state);
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index af2dc56a9..d159de05f 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -108,6 +108,12 @@ define([
                     'view:hide': _.bind(function (statusbar, state) {
                         this.view.chStatusbar.setValue(!state, true);
                     }, this)
+                },
+                'DocumentHolder': {
+                    'guides:show': _.bind(this.onGuidesShow, this),
+                    'guides:add': _.bind(this.onGuidesAdd, this),
+                    'guides:clear': _.bind(this.onGuidesClear, this),
+                    'guides:smart': _.bind(this.onGuidesSmartShow, this)
                 }
             });
         },
@@ -228,7 +234,7 @@ define([
 
         onGuidesAfterShow: function() {
             if (this.view) {
-                this.view.btnGuides.menu.items[6].setDisabled(this.api.asc_canClearGuides());
+                this.view.btnGuides.menu.items[6].setDisabled(!this.api.asc_canClearGuides());
                 this.view.btnGuides.menu.items[0].setChecked(this.api.asc_getShowGuides(), true);
                 this.view.btnGuides.menu.items[5].setChecked(this.api.asc_getShowSmartGuides(), true);
             }
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index 2245d0a5b..b8e4b7053 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -959,6 +959,22 @@ define([
                 checked: false
             });
 
+            me.mnuGuides = new Common.UI.MenuItem({
+                caption     : me.textGuides,
+                menu        : new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        { caption: me.textShowGuides, value: 'show', checkable: true },
+                        { caption: '--'},
+                        { caption: me.textAddVGuides, value: 'add-vert' },
+                        { caption: me.textAddHGuides, value: 'add-hor' },
+                        { caption: '--'},
+                        { caption: me.textSmartGuides, value: 'smart', checkable: true },
+                        { caption: me.textClearGuides, value: 'clear' }
+                    ]
+                })
+            });
+
             me.slideMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
                 restoreHeightAndTop: true,
@@ -977,17 +993,22 @@ define([
                     mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
                     me.menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
                     me.menuSlideSettings.options.value = null;
-                    me.slideMenu.items[13].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true);
-                    me.mnuMoveSlideToEnd.setVisible(!selectedLast && value.isSlideSelect===true);
-                    me.mnuMoveSlideToStart.setVisible(!selectedFirst && value.isSlideSelect===true);
-                    me.slideMenu.items[16].setVisible(value.fromThumbs===true);
-                    me.slideMenu.items[17].setVisible(value.fromThumbs===true);
-                    
-                    for (var i = 10; i < 13; i++) {
-                        me.slideMenu.items[i].setVisible(value.fromThumbs===true);
-                    }
+
+                    me.slideMenu.items[10].setVisible(!value.fromThumbs); // guides
+                    me.slideMenu.items[11].setVisible(!value.fromThumbs);
+                    me.slideMenu.items[12].setVisible(value.fromThumbs===true);
+                    me.slideMenu.items[13].setVisible(value.fromThumbs===true);
 
                     me.mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true);
+                    me.slideMenu.items[15].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true);
+                    me.mnuMoveSlideToEnd.setVisible(!selectedLast && value.isSlideSelect===true);
+                    me.mnuMoveSlideToStart.setVisible(!selectedFirst && value.isSlideSelect===true);
+                    me.slideMenu.items[18].setVisible(value.fromThumbs===true);
+                    me.slideMenu.items[19].setVisible(value.fromThumbs===true);
+
+                    me.mnuGuides.menu.items[6].setDisabled(!me.api.asc_canClearGuides());
+                    me.mnuGuides.menu.items[0].setChecked(me.api.asc_getShowGuides(), true);
+                    me.mnuGuides.menu.items[5].setChecked(me.api.asc_getShowSmartGuides(), true);
 
                     var selectedElements = me.api.getSelectedElements(),
                         locked           = false,
@@ -1030,6 +1051,8 @@ define([
                     mnuChangeTheme,
                     me.menuSlideSettings,
                     {caption: '--'},
+                    me.mnuGuides,
+                    {caption: '--'},
                     me.mnuSelectAll,
                     me.mnuPrintSelection,
                     {caption: '--'},
@@ -2451,7 +2474,14 @@ define([
         textEditPoints: 'Edit Points',
         txtMoveSlidesToEnd: 'Move Slide to End',
         txtMoveSlidesToStart: 'Move Slide to Beginning',
-        advancedChartText   : 'Chart Advanced Settings'
+        advancedChartText   : 'Chart Advanced Settings',
+        textGuides: 'Guides',
+        tipGuides: 'Show guides',
+        textShowGuides: 'Show Guides',
+        textAddVGuides: 'Add vertical guide',
+        textAddHGuides: 'Add horizontal guide',
+        textSmartGuides: 'Smart Guides',
+        textClearGuides: 'Clear Guides'
 
     }, PE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 99594782d..d16b5c1c3 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1613,6 +1613,13 @@
   "PE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "PE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?",
   "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "PE.Views.DocumentHolder.textGuides": "Guides",
+  "PE.Views.DocumentHolder.tipGuides": "Show guides",
+  "PE.Views.DocumentHolder.textShowGuides": "Show Guides",
+  "PE.Views.DocumentHolder.textAddVGuides": "Add vertical guide",
+  "PE.Views.DocumentHolder.textAddHGuides": "Add horizontal guide",
+  "PE.Views.DocumentHolder.textSmartGuides": "Smart Guides",
+  "PE.Views.DocumentHolder.textClearGuides": "Clear Guides",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
   "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
   "PE.Views.DocumentPreview.txtClose": "Close slideshow",
@@ -2409,5 +2416,12 @@
   "PE.Views.ViewTab.textZoom": "Zoom",
   "PE.Views.ViewTab.tipFitToSlide": "Fit to slide",
   "PE.Views.ViewTab.tipFitToWidth": "Fit to width",
-  "PE.Views.ViewTab.tipInterfaceTheme": "Interface theme"
+  "PE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
+  "PE.Views.ViewTab.textGuides": "Guides",
+  "PE.Views.ViewTab.tipGuides": "Show guides",
+  "PE.Views.ViewTab.textShowGuides": "Show Guides",
+  "PE.Views.ViewTab.textAddVGuides": "Add vertical guide",
+  "PE.Views.ViewTab.textAddHGuides": "Add horizontal guide",
+  "PE.Views.ViewTab.textSmartGuides": "Smart Guides",
+  "PE.Views.ViewTab.textClearGuides": "Clear Guides"
 }
\ No newline at end of file

From 493a6b53b5554fcb0749efe60144e1f51423fe38 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 30 Sep 2022 00:05:36 +0300
Subject: [PATCH 04/18] [PE] Add gridlines settings

---
 .../main/app/controller/Main.js               | 12 +++
 .../main/app/controller/ViewTab.js            | 61 ++++++++++++++-
 .../main/app/view/ViewTab.js                  | 76 ++++++++++++++++++-
 3 files changed, 144 insertions(+), 5 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 8b93333c2..32c742dc2 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -869,6 +869,18 @@ define([
                 Common.Utils.InternalSettings.set("pe-settings-showguides", value);
                 me.api.asc_setShowGuides(value);
 
+                value = Common.localStorage.getBool("pe-settings-showgrid");
+                Common.Utils.InternalSettings.set("pe-settings-showgrid", value);
+                me.api.asc_setShowGridlines(value);
+
+                value = Common.localStorage.getBool("pe-settings-snaptogrid");
+                Common.Utils.InternalSettings.set("pe-settings-snaptogrid", value);
+                me.api.asc_setSnapToGrid(value);
+
+                value = Common.localStorage.getItem("pe-settings-gridspacing");
+                Common.Utils.InternalSettings.set("pe-settings-gridspacing", value);
+                me.api.asc_setGridSpacing(value);
+
                 var application = me.getApplication();
                 var toolbarController           = application.getController('Toolbar'),
                     statusbarController         = application.getController('Statusbar'),
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index d159de05f..1c851b029 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -97,7 +97,12 @@ define([
                     'guides:aftershow': _.bind(this.onGuidesAfterShow, this),
                     'guides:add': _.bind(this.onGuidesAdd, this),
                     'guides:clear': _.bind(this.onGuidesClear, this),
-                    'guides:smart': _.bind(this.onGuidesSmartShow, this)
+                    'guides:smart': _.bind(this.onGuidesSmartShow, this),
+                    'gridlines:show': _.bind(this.onGridlinesShow, this),
+                    'gridlines:snap': _.bind(this.onGridlinesSnap, this),
+                    'gridlines:spacing': _.bind(this.onGridlinesSpacing, this),
+                    'gridlines:custom': _.bind(this.onGridlinesCustom, this),
+                    'gridlines:aftershow': _.bind(this.onGridlinesAfterShow, this)
                 },
                 'Toolbar': {
                     'view:compact': _.bind(function (toolbar, state) {
@@ -258,6 +263,60 @@ define([
             Common.localStorage.setBool('pe-settings-showsnaplines', state);
             Common.Utils.InternalSettings.set("pe-settings-showsnaplines", state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGridlinesShow: function(state) {
+            this.api.asc_setShowGridlines(state);
+            Common.localStorage.setBool('pe-settings-showgrid', state);
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGridlinesSnap: function(state) {
+            this.api.asc_setSnapToGrid(state);
+            Common.localStorage.setBool('pe-settings-snaptogrid', state);
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGridlinesSpacing: function(value) {
+            this.api.asc_setGridSpacing(value);
+            Common.localStorage.setItem('pe-settings-gridspacing', value);
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        onGridlinesCustom: function(state) {
+            var win, props,
+                me = this;
+            win = new PE.Views.GridSettingsDialog({
+                handler: function(dlg, result) {
+                    if (result == 'ok') {
+                        props = dlg.getSettings();
+                        me.api.asc_setGridSpacing(props);
+                        Common.localStorage.setItem('pe-settings-gridspacing', props);
+                        Common.NotificationCenter.trigger('edit:complete', me.view);
+                    }
+                }
+            });
+            win.show();
+            win.setSettings(me.api.asc_getGridSpacing());
+        },
+
+        onGridlinesAfterShow: function() {
+            if (this.view) {
+                this.view.btnGridlines.menu.items[0].setChecked(this.api.asc_getShowGridlines(), true);
+                this.view.btnGridlines.menu.items[1].setChecked(this.api.asc_getSnapToGrid(), true);
+
+                var value = this.api.asc_getGridSpacing(),
+                    items = this.view.btnGridlines.menu.items;
+                for (var i=3; i<14; i++) {
+                    var item = items[i];
+                    if (item.value<1 && Math.abs(item.value - value)<0.05)
+                        item.setChecked(true);
+                    else if (item.value>=1 && Math.abs(item.value - value)<0.001)
+                        item.setChecked(true);
+                    else
+                        item.setChecked(false);
+                }
+            }
         }
 
     }, PE.Controllers.ViewTab || {}));
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index fbd9582f4..ec56286c5 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -79,6 +79,7 @@ define([
                 '</div>' +
                 '<div class="group small">' +
                     '<span class="btn-slot text x-huge" id="slot-btn-guides"></span>' +
+                    '<span class="btn-slot text x-huge" id="slot-btn-gridlines"></span>' +
                 '</div>' +
                 '<div class="separator long separator-rulers"></div>' +
                 '<div class="group small">' +
@@ -132,14 +133,32 @@ define([
                         me.fireEvent('guides:add', [item.value]);
                     else if (item.value === 'clear')
                         me.fireEvent('guides:clear');
-                     else if (item.value === 'smart')
+                    else if (item.value === 'smart')
                         me.fireEvent('guides:smart', [item.isChecked()]);
-                     else
-                        me.fireEvent('guides:show', [item.isChecked()]);
+                    else
+                        me.btnGuides.toggle(item.isChecked());
                 }, me));
                 me.btnGuides.menu.on('show:after', _.bind(function(btn, state) {
                     me.fireEvent('guides:aftershow');
                 }, me));
+
+                me.btnGridlines.on('toggle', _.bind(function(btn, state) {
+                    me.fireEvent('gridlines:show', [state]);
+                }, me));
+                me.btnGridlines.menu.on('item:click', _.bind(function(menu, item) {
+                    if (item.value === 'custom')
+                        me.fireEvent('gridlines:custom');
+                    else if (item.value === 'snap')
+                        me.fireEvent('gridlines:snap', [item.isChecked()]);
+                    else if (item.value === 'show')
+                        me.btnGridlines.toggle(item.isChecked());
+                    else
+                        me.fireEvent('gridlines:spacing', [item.value]);
+
+                }, me));
+                me.btnGridlines.menu.on('show:after', _.bind(function(btn, state) {
+                    me.fireEvent('gridlines:aftershow');
+                }, me));
             },
 
             initialize: function (options) {
@@ -261,6 +280,7 @@ define([
                     lock: [_set.disableOnStart],
                     enableToggle: true,
                     allowDepress: true,
+                    pressed: Common.localStorage.getBool("pe-settings-showguides", true),
                     split: true,
                     menu: true,
                     dataHint: '1',
@@ -269,6 +289,22 @@ define([
                 });
                 this.lockedControls.push(this.btnGuides);
 
+                this.btnGridlines = new Common.UI.Button({
+                    cls: 'btn-toolbar x-huge icon-top',
+                    iconCls: 'toolbar__icon day',
+                    caption: this.textGridlines,
+                    lock: [_set.disableOnStart],
+                    enableToggle: true,
+                    allowDepress: true,
+                    pressed: Common.localStorage.getBool("pe-settings-showgrid", true),
+                    split: true,
+                    menu: true,
+                    dataHint: '1',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'small'
+                });
+                this.lockedControls.push(this.btnGridlines);
+
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
 
@@ -292,6 +328,7 @@ define([
                 this.chRulers.render($host.find('#slot-chk-rulers'));
                 this.chNotes.render($host.find('#slot-chk-notes'));
                 this.btnGuides.render($host.find('#slot-btn-guides'));
+                this.btnGridlines.render($host.find('#slot-btn-gridlines'));
                 return this.$el;
             },
 
@@ -304,6 +341,7 @@ define([
                     me.btnFitToWidth.updateHint(me.tipFitToWidth);
                     me.btnInterfaceTheme.updateHint(me.tipInterfaceTheme);
                     me.btnGuides.updateHint(me.tipGuides);
+                    me.btnGridlines.updateHint(me.tipGridlines);
 
                     me.btnGuides.setMenu( new Common.UI.Menu({
                         items: [
@@ -317,6 +355,27 @@ define([
                         ]
                     }));
 
+                    me.btnGridlines.setMenu( new Common.UI.Menu({
+                        items: [
+                            { caption: me.textShowGridlines, value: 'show', checkable: true },
+                            { caption: me.textSnapObjects, value: 'snap', checkable: true },
+                            { caption: '--'},
+                            { caption: Common.Utils.String.format(me.textManyGrids, 8), value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: Common.Utils.String.format(me.textManyGrids, 6), value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: Common.Utils.String.format(me.textManyGrids, 5), value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: Common.Utils.String.format(me.textFewGrids, 4), value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: Common.Utils.String.format(me.textFewGrids, 3), value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: Common.Utils.String.format(me.textFewGrids, 2), value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' },
+                            { caption: '--'},
+                            { caption: me.textCustom, value: 'custom' }
+                        ]
+                    }));
+
                     if (!Common.UI.Themes.available()) {
                         me.btnInterfaceTheme.$el.closest('.group').remove();
                         me.$el.find('.separator-theme').remove();
@@ -416,7 +475,16 @@ define([
             textAddVGuides: 'Add vertical guide',
             textAddHGuides: 'Add horizontal guide',
             textSmartGuides: 'Smart Guides',
-            textClearGuides: 'Clear Guides'
+            textClearGuides: 'Clear Guides',
+            textGridlines: 'Gridlines',
+            tipGridlines: 'Show gridlines',
+            textShowGridlines: 'Show Gridlines',
+            textSnapObjects: 'Snap object to grid',
+            textCm: 'cm',
+            textCustom: 'Custom',
+            textManyGrids: '{0} grids per cm',
+            textFewGrids: '{0} grids per cm'
+
         }
     }()), PE.Views.ViewTab || {}));
 });
\ No newline at end of file

From ee1c093ac94b695f504f4bd415b3f4afb89a61b9 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 30 Sep 2022 00:12:04 +0300
Subject: [PATCH 05/18] Refactoring

---
 apps/presentationeditor/main/app/view/ViewTab.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index ec56286c5..72310722e 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -356,6 +356,7 @@ define([
                     }));
 
                     me.btnGridlines.setMenu( new Common.UI.Menu({
+                        restoreHeight: true,
                         items: [
                             { caption: me.textShowGridlines, value: 'show', checkable: true },
                             { caption: me.textSnapObjects, value: 'snap', checkable: true },

From cfb73f7cb4291b276c7bdacd29d79cb67248f72d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 30 Sep 2022 22:02:06 +0300
Subject: [PATCH 06/18] [PE] Fix grid settings

---
 apps/presentationeditor/main/app/controller/Main.js    | 8 --------
 apps/presentationeditor/main/app/controller/ViewTab.js | 9 +++------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 32c742dc2..4c47d55db 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -873,14 +873,6 @@ define([
                 Common.Utils.InternalSettings.set("pe-settings-showgrid", value);
                 me.api.asc_setShowGridlines(value);
 
-                value = Common.localStorage.getBool("pe-settings-snaptogrid");
-                Common.Utils.InternalSettings.set("pe-settings-snaptogrid", value);
-                me.api.asc_setSnapToGrid(value);
-
-                value = Common.localStorage.getItem("pe-settings-gridspacing");
-                Common.Utils.InternalSettings.set("pe-settings-gridspacing", value);
-                me.api.asc_setGridSpacing(value);
-
                 var application = me.getApplication();
                 var toolbarController           = application.getController('Toolbar'),
                     statusbarController         = application.getController('Statusbar'),
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 1c851b029..d3445f52e 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -273,13 +273,11 @@ define([
 
         onGridlinesSnap: function(state) {
             this.api.asc_setSnapToGrid(state);
-            Common.localStorage.setBool('pe-settings-snaptogrid', state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
         onGridlinesSpacing: function(value) {
-            this.api.asc_setGridSpacing(value);
-            Common.localStorage.setItem('pe-settings-gridspacing', value);
+            this.api.asc_setGridSpacing(value * 360000);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
@@ -291,7 +289,6 @@ define([
                     if (result == 'ok') {
                         props = dlg.getSettings();
                         me.api.asc_setGridSpacing(props);
-                        Common.localStorage.setItem('pe-settings-gridspacing', props);
                         Common.NotificationCenter.trigger('edit:complete', me.view);
                     }
                 }
@@ -305,11 +302,11 @@ define([
                 this.view.btnGridlines.menu.items[0].setChecked(this.api.asc_getShowGridlines(), true);
                 this.view.btnGridlines.menu.items[1].setChecked(this.api.asc_getSnapToGrid(), true);
 
-                var value = this.api.asc_getGridSpacing(),
+                var value = this.api.asc_getGridSpacing()/360000,
                     items = this.view.btnGridlines.menu.items;
                 for (var i=3; i<14; i++) {
                     var item = items[i];
-                    if (item.value<1 && Math.abs(item.value - value)<0.05)
+                    if (item.value<1 && Math.abs(item.value - value)<0.005)
                         item.setChecked(true);
                     else if (item.value>=1 && Math.abs(item.value - value)<0.001)
                         item.setChecked(true);

From 83c888729e3d9331686715b062c2ed427fb7def9 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 30 Sep 2022 23:26:02 +0300
Subject: [PATCH 07/18] [PE] Add advanced grid settings

---
 .../main/app/controller/ViewTab.js            |   7 +-
 .../main/app/view/GridSettings.js             | 183 ++++++++++++++++++
 apps/presentationeditor/main/locale/en.json   |   6 +
 3 files changed, 193 insertions(+), 3 deletions(-)
 create mode 100644 apps/presentationeditor/main/app/view/GridSettings.js

diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index d3445f52e..2f3bea967 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -41,7 +41,8 @@
 
 define([
     'core',
-    'presentationeditor/main/app/view/ViewTab'
+    'presentationeditor/main/app/view/ViewTab',
+    'presentationeditor/main/app/view/GridSettings'
 ], function () {
     'use strict';
 
@@ -284,11 +285,11 @@ define([
         onGridlinesCustom: function(state) {
             var win, props,
                 me = this;
-            win = new PE.Views.GridSettingsDialog({
+            win = new PE.Views.GridSettings({
                 handler: function(dlg, result) {
                     if (result == 'ok') {
                         props = dlg.getSettings();
-                        me.api.asc_setGridSpacing(props);
+                        me.api.asc_setGridSpacing(props * 360000);
                         Common.NotificationCenter.trigger('edit:complete', me.view);
                     }
                 }
diff --git a/apps/presentationeditor/main/app/view/GridSettings.js b/apps/presentationeditor/main/app/view/GridSettings.js
new file mode 100644
index 000000000..378c2a997
--- /dev/null
+++ b/apps/presentationeditor/main/app/view/GridSettings.js
@@ -0,0 +1,183 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ *  GridSettings.js
+ *
+ *  Created by Julia Radzhabova on 09/30/22
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/ComboBox'
+], function () { 'use strict';
+
+    PE.Views.GridSettings = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 315,
+            header: true,
+            style: 'min-width: 315px;',
+            cls: 'modal-dlg',
+            id: 'window-grid-settings',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box" style="height: 30px;">',
+                    '<label class="input-label">' + this.textSpacing + '</label>',
+                    '<div id="grid-spacing-combo" class="input-group-nr" style="display: inline-block;width:125px;margin-left: 5px;"></div>',
+                    '<div id="grid-spacing-spin" style="display: inline-block;margin-left: 5px;"></div>',
+                '</div>',
+                '<div class="separator horizontal"></div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            var $window = this.getChild();
+            this.arrSpacing = [
+                { displayValue: Common.Utils.String.format(this.textManyGrids, 8), value: 0, spacing: 0.13 },
+                { displayValue: Common.Utils.String.format(this.textManyGrids, 6), value: 1, spacing: 0.17 },
+                { displayValue: Common.Utils.String.format(this.textManyGrids, 5), value: 2, spacing: 0.2 },
+                { displayValue: Common.Utils.String.format(this.textFewGrids, 4), value: 3, spacing: 0.25 },
+                { displayValue: Common.Utils.String.format(this.textFewGrids, 3), value: 4, spacing: 0.33 },
+                { displayValue: Common.Utils.String.format(this.textFewGrids, 2), value: 5, spacing: 0.5 },
+                { displayValue: '1 ' + this.textCm, value: 6, spacing: 1 },
+                { displayValue: '2 ' + this.textCm, value: 7, spacing: 2 },
+                { displayValue: '3 ' + this.textCm, value: 8, spacing: 3 },
+                { displayValue: '4 ' + this.textCm, value: 9, spacing: 4 },
+                { displayValue: '5 ' + this.textCm, value: 10, spacing: 5 },
+                { displayValue: this.textCustom, value: -1 }
+            ];
+            this.cmbGridSpacing = new Common.UI.ComboBox({
+                el: $window.find('#grid-spacing-combo'),
+                cls: 'input-group-nr',
+                style: 'width: 100%;',
+                menuStyle: 'min-width: 125px;max-height: 185px;',
+                editable: false,
+                takeFocusOnClose: true,
+                data: this.arrSpacing
+            });
+            this.cmbGridSpacing.on('selected', _.bind(function(combo, record) {
+                if (record.value<0) {
+                } else {
+                    this.spnSpacing.setValue(record.spacing, true);
+                }
+            }, this));
+
+            this.spnSpacing = new Common.UI.MetricSpinner({
+                el: $window.find('#grid-spacing-spin'),
+                step: .01,
+                width: 70,
+                defaultUnit : "cm",
+                value: '1 cm',
+                maxValue: 5.08,
+                minValue: 0.1
+            });
+            this.spnSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                var value = this.spnSpacing.getNumberValue(),
+                    idx = -1;
+                for (var i=0; i<this.arrSpacing.length; i++) {
+                    var item = this.arrSpacing[i];
+                    if (item.spacing<1 && Math.abs(item.spacing - value)<0.005 || item.spacing>=1 && Math.abs(item.spacing - value)<0.001) {
+                        idx = i;
+                        break;
+                    }
+                }
+                this.cmbGridSpacing.setValue(idx);
+            }, this));
+
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+        },
+
+        getFocusedComponents: function() {
+            return [ this.cmbGridSpacing, this.spnSpacing ];
+        },
+
+        getDefaultFocusableComponent: function () {
+            return this.cmbGridSpacing;
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, this, state);
+            }
+
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function() {
+            this._handleInput('ok');
+            return false;
+        },
+
+        setSettings: function (value) {
+            value = value/360000;
+            var idx = -1;
+            for (var i=0; i<this.arrSpacing.length; i++) {
+                var item = this.arrSpacing[i];
+                if (item.spacing<1 && Math.abs(item.spacing - value)<0.005 || item.spacing>=1 && Math.abs(item.spacing - value)<0.001)
+                    idx = i;
+            }
+            this.cmbGridSpacing.setValue(idx, true);
+            this.spnSpacing.setValue(value, true);
+        },
+
+        getSettings: function() {
+            return this.spnSpacing.getNumberValue();
+        },
+
+        textTitle: 'Grid Settings',
+        textSpacing: 'Spacing',
+        textCm: 'cm',
+        textCustom: 'Custom',
+        textManyGrids: '{0} grids per cm',
+        textFewGrids: '{0} grids per cm'
+    }, PE.Views.GridSettings || {}))
+});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index d16b5c1c3..34f57668e 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1735,6 +1735,12 @@
   "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification",
   "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
   "PE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace",
+  "PE.Views.GridSettings.textTitle": "Grid Settings",
+  "PE.Views.GridSettings.textSpacing": "Spacing",
+  "PE.Views.GridSettings.textCm": "cm",
+  "PE.Views.GridSettings.textCustom": "Custom",
+  "PE.Views.GridSettings.textManyGrids": "{0} grids per cm",
+  "PE.Views.GridSettings.textFewGrids": "{0} grids per cm",
   "PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
   "PE.Views.HeaderFooterDialog.applyText": "Apply",
   "PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",

From f598a930336ef881b15adde33a640da08793f143 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Sat, 1 Oct 2022 22:41:48 +0300
Subject: [PATCH 08/18] [PE] Add view settings to context menu

---
 .../main/app/controller/DocumentHolder.js     | 17 ++++
 .../main/app/controller/ViewTab.js            | 12 ++-
 .../main/app/view/DocumentHolder.js           | 85 ++++++++++++++++---
 .../main/app/view/ViewTab.js                  |  6 +-
 4 files changed, 102 insertions(+), 18 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index a2d9ac585..575555f5e 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -423,6 +423,8 @@ define([
             view.menuTableInsertText.menu.on('item:click', _.bind(me.tableInsertText, me));
             view.menuTableDeleteText.menu.on('item:click', _.bind(me.tableDeleteText, me));
             view.mnuGuides.menu.on('item:click', _.bind(me.onGuidesClick, me));
+            view.mnuGridlines.menu.on('item:click', _.bind(me.onGridlinesClick, me));
+            view.mnuRulers.on('click', _.bind(me.onRulersClick, me));
         },
 
         getView: function (name) {
@@ -2126,6 +2128,21 @@ define([
                 this.documentHolder.fireEvent('guides:show', [item.isChecked()]);
         },
 
+        onGridlinesClick: function(menu, item) {
+            if (item.value === 'custom')
+                this.documentHolder.fireEvent('gridlines:custom');
+            else if (item.value === 'snap')
+                this.documentHolder.fireEvent('gridlines:snap', [item.isChecked()]);
+            else if (item.value === 'show')
+                this.documentHolder.fireEvent('gridlines:show', [item.isChecked()]);
+            else
+                this.documentHolder.fireEvent('gridlines:spacing', [item.value]);
+        },
+
+        onRulersClick: function(item) {
+            this.documentHolder.fireEvent('rulers:change', [item.isChecked()]);
+        },
+
         SetDisabled: function(state) {
             this._isDisabled = state;
             this.documentHolder.SetDisabled(state);
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 2f3bea967..47d68b510 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -119,7 +119,12 @@ define([
                     'guides:show': _.bind(this.onGuidesShow, this),
                     'guides:add': _.bind(this.onGuidesAdd, this),
                     'guides:clear': _.bind(this.onGuidesClear, this),
-                    'guides:smart': _.bind(this.onGuidesSmartShow, this)
+                    'guides:smart': _.bind(this.onGuidesSmartShow, this),
+                    'gridlines:show': _.bind(this.onGridlinesShow, this),
+                    'gridlines:snap': _.bind(this.onGridlinesSnap, this),
+                    'gridlines:spacing': _.bind(this.onGridlinesSpacing, this),
+                    'gridlines:custom': _.bind(this.onGridlinesCustom, this),
+                    'rulers:change': _.bind(this.onChangeRulers, this)
                 }
             });
         },
@@ -172,8 +177,9 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
-        onChangeRulers: function (btn, checked) {
+        onChangeRulers: function (checked) {
             this.api.asc_SetViewRulers(checked);
+            this.view.chRulers.setValue(checked, true);
             Common.localStorage.setBool('pe-hidden-rulers', !checked);
             Common.Utils.InternalSettings.set("pe-hidden-rulers", !checked);
             Common.NotificationCenter.trigger('layout:changed', 'rulers');
@@ -234,6 +240,7 @@ define([
 
         onGuidesShow: function(state) {
             this.api.asc_setShowGuides(state);
+            this.view.btnGuides.toggle(state, true);
             Common.localStorage.setBool('pe-settings-showguides', state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
@@ -268,6 +275,7 @@ define([
 
         onGridlinesShow: function(state) {
             this.api.asc_setShowGridlines(state);
+            this.view.btnGridlines.toggle(state, true);
             Common.localStorage.setBool('pe-settings-showgrid', state);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index b8e4b7053..02c31959b 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -975,6 +975,35 @@ define([
                 })
             });
 
+            me.mnuGridlines = new Common.UI.MenuItem({
+                caption     : me.textGridlines,
+                menu        : new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        { caption: me.textShowGridlines, value: 'show', checkable: true },
+                        { caption: me.textSnapObjects, value: 'snap', checkable: true },
+                        { caption: '--'},
+                        { caption: Common.Utils.String.format(me.textManyGrids, 8), value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: Common.Utils.String.format(me.textManyGrids, 6), value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: Common.Utils.String.format(me.textManyGrids, 5), value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: Common.Utils.String.format(me.textFewGrids, 4), value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: Common.Utils.String.format(me.textFewGrids, 3), value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: Common.Utils.String.format(me.textFewGrids, 2), value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '--'},
+                        { caption: me.textCustom, value: 'custom' }
+                    ]
+                })
+            });
+            me.mnuRulers = new Common.UI.MenuItem({
+                caption : me.textRulers,
+                checkable: true
+            });
+
             me.slideMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
                 restoreHeightAndTop: true,
@@ -982,8 +1011,8 @@ define([
                     var selectedLast = me.api.asc_IsLastSlideSelected(),
                         selectedFirst = me.api.asc_IsFirstSlideSelected();
                     me.menuSlidePaste.setVisible(value.fromThumbs!==true);
-                    me.slideMenu.items[1].setVisible(value.fromThumbs===true); // New Slide
-                    me.slideMenu.items[2].setVisible(value.isSlideSelect===true); // Duplicate Slide
+                    me.mnuNewSlide.setVisible(value.fromThumbs===true); // New Slide
+                    me.mnuDuplicateSlide.setVisible(value.isSlideSelect===true); // Duplicate Slide
                     me.mnuDeleteSlide.setVisible(value.isSlideSelect===true);
                     me.mnuSlideHide.setVisible(value.isSlideSelect===true);
                     me.mnuSlideHide.setChecked(value.isSlideHidden===true);
@@ -994,21 +1023,41 @@ define([
                     me.menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
                     me.menuSlideSettings.options.value = null;
 
-                    me.slideMenu.items[10].setVisible(!value.fromThumbs); // guides
-                    me.slideMenu.items[11].setVisible(!value.fromThumbs);
-                    me.slideMenu.items[12].setVisible(value.fromThumbs===true);
-                    me.slideMenu.items[13].setVisible(value.fromThumbs===true);
+                    me.slideMenu.items[10].setVisible(!value.fromThumbs); // guides separator
+                    me.mnuGuides.setVisible(!value.fromThumbs);
+                    me.mnuGridlines.setVisible(!value.fromThumbs);
+                    me.mnuRulers.setVisible(!value.fromThumbs);
+                    me.slideMenu.items[14].setVisible(value.fromThumbs===true);
+                    me.mnuSelectAll.setVisible(value.fromThumbs===true);
 
                     me.mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true);
-                    me.slideMenu.items[15].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true);
+                    me.slideMenu.items[17].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true);
                     me.mnuMoveSlideToEnd.setVisible(!selectedLast && value.isSlideSelect===true);
                     me.mnuMoveSlideToStart.setVisible(!selectedFirst && value.isSlideSelect===true);
-                    me.slideMenu.items[18].setVisible(value.fromThumbs===true);
-                    me.slideMenu.items[19].setVisible(value.fromThumbs===true);
+                    me.slideMenu.items[20].setVisible(value.fromThumbs===true);
+                    me.mnuPreview.setVisible(value.fromThumbs===true);
 
-                    me.mnuGuides.menu.items[6].setDisabled(!me.api.asc_canClearGuides());
-                    me.mnuGuides.menu.items[0].setChecked(me.api.asc_getShowGuides(), true);
-                    me.mnuGuides.menu.items[5].setChecked(me.api.asc_getShowSmartGuides(), true);
+                    if (!value.fromThumbs) {
+                        me.mnuGuides.menu.items[6].setDisabled(!me.api.asc_canClearGuides());
+                        me.mnuGuides.menu.items[0].setChecked(me.api.asc_getShowGuides(), true);
+                        me.mnuGuides.menu.items[5].setChecked(me.api.asc_getShowSmartGuides(), true);
+
+                        me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true);
+                        me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true);
+
+                        var spacing = me.api.asc_getGridSpacing()/360000,
+                            items = me.mnuGridlines.menu.items;
+                        for (var i=3; i<14; i++) {
+                            var item = items[i];
+                            if (item.value<1 && Math.abs(item.value - spacing)<0.005)
+                                item.setChecked(true);
+                            else if (item.value>=1 && Math.abs(item.value - spacing)<0.001)
+                                item.setChecked(true);
+                            else
+                                item.setChecked(false);
+                        }
+                        me.mnuRulers.setChecked(!Common.Utils.InternalSettings.get("pe-hidden-rulers"));
+                    }
 
                     var selectedElements = me.api.getSelectedElements(),
                         locked           = false,
@@ -1052,6 +1101,8 @@ define([
                     me.menuSlideSettings,
                     {caption: '--'},
                     me.mnuGuides,
+                    me.mnuGridlines,
+                    me.mnuRulers,
                     {caption: '--'},
                     me.mnuSelectAll,
                     me.mnuPrintSelection,
@@ -2481,7 +2532,15 @@ define([
         textAddVGuides: 'Add vertical guide',
         textAddHGuides: 'Add horizontal guide',
         textSmartGuides: 'Smart Guides',
-        textClearGuides: 'Clear Guides'
+        textClearGuides: 'Clear Guides',
+        textGridlines: 'Gridlines',
+        textShowGridlines: 'Show Gridlines',
+        textSnapObjects: 'Snap object to grid',
+        textCm: 'cm',
+        textCustom: 'Custom',
+        textManyGrids: '{0} grids per cm',
+        textFewGrids: '{0} grids per cm',
+        textRulers: 'Rulers'
 
     }, PE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 72310722e..6d0fc1acf 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -109,7 +109,7 @@ define([
                     me.fireEvent('statusbar:hide', [me.chStatusbar, state !== 'checked']);
                 }, me));
                 me.chRulers && me.chRulers.on('change', _.bind(function (checkbox, state) {
-                    me.fireEvent('rulers:change', [me.chRulers, state === 'checked']);
+                    me.fireEvent('rulers:change', [state === 'checked']);
                 }, me));
                 me.chNotes && me.chNotes.on('change', _.bind(function (checkbox, state) {
                     me.fireEvent('notes:change', [me.chNotes, state === 'checked']);
@@ -136,7 +136,7 @@ define([
                     else if (item.value === 'smart')
                         me.fireEvent('guides:smart', [item.isChecked()]);
                     else
-                        me.btnGuides.toggle(item.isChecked());
+                        me.fireEvent('guides:show', [item.isChecked()]);
                 }, me));
                 me.btnGuides.menu.on('show:after', _.bind(function(btn, state) {
                     me.fireEvent('guides:aftershow');
@@ -151,7 +151,7 @@ define([
                     else if (item.value === 'snap')
                         me.fireEvent('gridlines:snap', [item.isChecked()]);
                     else if (item.value === 'show')
-                        me.btnGridlines.toggle(item.isChecked());
+                        me.fireEvent('gridlines:show', [item.isChecked()]);
                     else
                         me.fireEvent('gridlines:spacing', [item.value]);
 

From 5eeadb99a488f095fc63a4a22201d06f0867a9c9 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Sat, 1 Oct 2022 22:59:51 +0300
Subject: [PATCH 09/18] Add translation

---
 .../main/app/view/DocumentHolder.js           |  6 ++---
 .../main/app/view/ViewTab.js                  |  6 ++---
 apps/presentationeditor/main/locale/en.json   | 24 +++++++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index 02c31959b..e78622466 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -2529,13 +2529,13 @@ define([
         textGuides: 'Guides',
         tipGuides: 'Show guides',
         textShowGuides: 'Show Guides',
-        textAddVGuides: 'Add vertical guide',
-        textAddHGuides: 'Add horizontal guide',
+        textAddVGuides: 'Add Vertical Guide',
+        textAddHGuides: 'Add Horizontal Guide',
         textSmartGuides: 'Smart Guides',
         textClearGuides: 'Clear Guides',
         textGridlines: 'Gridlines',
         textShowGridlines: 'Show Gridlines',
-        textSnapObjects: 'Snap object to grid',
+        textSnapObjects: 'Snap Object to Grid',
         textCm: 'cm',
         textCustom: 'Custom',
         textManyGrids: '{0} grids per cm',
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 6d0fc1acf..9816dd43e 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -473,14 +473,14 @@ define([
             textGuides: 'Guides',
             tipGuides: 'Show guides',
             textShowGuides: 'Show Guides',
-            textAddVGuides: 'Add vertical guide',
-            textAddHGuides: 'Add horizontal guide',
+            textAddVGuides: 'Add Vertical Guide',
+            textAddHGuides: 'Add Horizontal Guide',
             textSmartGuides: 'Smart Guides',
             textClearGuides: 'Clear Guides',
             textGridlines: 'Gridlines',
             tipGridlines: 'Show gridlines',
             textShowGridlines: 'Show Gridlines',
-            textSnapObjects: 'Snap object to grid',
+            textSnapObjects: 'Snap Object to Grid',
             textCm: 'cm',
             textCustom: 'Custom',
             textManyGrids: '{0} grids per cm',
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 34f57668e..d3cd0b013 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1620,6 +1620,14 @@
   "PE.Views.DocumentHolder.textAddHGuides": "Add horizontal guide",
   "PE.Views.DocumentHolder.textSmartGuides": "Smart Guides",
   "PE.Views.DocumentHolder.textClearGuides": "Clear Guides",
+  "PE.Views.DocumentHolder.textGridlines": "Gridlines",
+  "PE.Views.DocumentHolder.textShowGridlines": "Show Gridlines",
+  "PE.Views.DocumentHolder.textSnapObjects": "Snap Object to Grid",
+  "PE.Views.DocumentHolder.textCm": "cm",
+  "PE.Views.DocumentHolder.textCustom": "Custom",
+  "PE.Views.DocumentHolder.textManyGrids": "{0} grids per cm",
+  "PE.Views.DocumentHolder.textFewGrids": "{0} grids per cm",
+  "PE.Views.DocumentHolder.textRulers": "Rulers",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
   "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
   "PE.Views.DocumentPreview.txtClose": "Close slideshow",
@@ -2424,10 +2432,18 @@
   "PE.Views.ViewTab.tipFitToWidth": "Fit to width",
   "PE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
   "PE.Views.ViewTab.textGuides": "Guides",
-  "PE.Views.ViewTab.tipGuides": "Show guides",
+  "PE.Views.ViewTab.tipGuides": "Show Guides",
   "PE.Views.ViewTab.textShowGuides": "Show Guides",
-  "PE.Views.ViewTab.textAddVGuides": "Add vertical guide",
-  "PE.Views.ViewTab.textAddHGuides": "Add horizontal guide",
+  "PE.Views.ViewTab.textAddVGuides": "Add Vertical Guide",
+  "PE.Views.ViewTab.textAddHGuides": "Add Horizontal Guide",
   "PE.Views.ViewTab.textSmartGuides": "Smart Guides",
-  "PE.Views.ViewTab.textClearGuides": "Clear Guides"
+  "PE.Views.ViewTab.textClearGuides": "Clear Guides",
+  "PE.Views.ViewTab.textGridlines": "Gridlines",
+  "PE.Views.ViewTab.tipGridlines": "Show gridlines",
+  "PE.Views.ViewTab.textShowGridlines": "Show Gridlines",
+  "PE.Views.ViewTab.textSnapObjects": "Snap Object to Grid",
+  "PE.Views.ViewTab.textCm": "cm",
+  "PE.Views.ViewTab.textCustom": "Custom",
+  "PE.Views.ViewTab.textManyGrids": "{0} grids per cm",
+  "PE.Views.ViewTab.textFewGrids": "{0} grids per cm"
 }
\ No newline at end of file

From d92096f2a6d5453311eb42d039fc81cd4c7a2924 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Sat, 1 Oct 2022 23:23:46 +0300
Subject: [PATCH 10/18] [PE] Delete guides

---
 .../main/app/controller/DocumentHolder.js              |  6 +++++-
 .../presentationeditor/main/app/view/DocumentHolder.js | 10 +++++++---
 apps/presentationeditor/main/locale/en.json            |  5 +++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index 575555f5e..4e25af86b 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -443,6 +443,8 @@ define([
                 if (event.get_Type() == Asc.c_oAscContextMenuTypes.Thumbnails) {
                     showPoint[0] -= 3;
                     showPoint[1] -= 3;
+                } else {
+                    value && (value.guideId = event.get_Guide());
                 }
 
                 if (!menu.rendered) {
@@ -2118,7 +2120,9 @@ define([
         },
 
         onGuidesClick: function(menu, item) {
-            if (item.value === 'add-vert' || item.value === 'add-hor')
+            if (item.value == 'del-guide' && item.options.guideId)
+                this.api.asc_deleteGuide(item.options.guideId);
+            else if (item.value === 'add-vert' || item.value === 'add-hor')
                 this.documentHolder.fireEvent('guides:add', [item.value]);
             else if (item.value === 'clear')
                 this.documentHolder.fireEvent('guides:clear');
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index e78622466..f7ee85aed 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -968,6 +968,7 @@ define([
                         { caption: '--'},
                         { caption: me.textAddVGuides, value: 'add-vert' },
                         { caption: me.textAddHGuides, value: 'add-hor' },
+                        { caption: me.textDeleteGuide, value: 'del-guide' },
                         { caption: '--'},
                         { caption: me.textSmartGuides, value: 'smart', checkable: true },
                         { caption: me.textClearGuides, value: 'clear' }
@@ -1038,9 +1039,11 @@ define([
                     me.mnuPreview.setVisible(value.fromThumbs===true);
 
                     if (!value.fromThumbs) {
-                        me.mnuGuides.menu.items[6].setDisabled(!me.api.asc_canClearGuides());
                         me.mnuGuides.menu.items[0].setChecked(me.api.asc_getShowGuides(), true);
-                        me.mnuGuides.menu.items[5].setChecked(me.api.asc_getShowSmartGuides(), true);
+                        me.mnuGuides.menu.items[4].setVisible(!!value.guideId);
+                        me.mnuGuides.menu.items[4].options.guideId = value.guideId;
+                        me.mnuGuides.menu.items[6].setChecked(me.api.asc_getShowSmartGuides(), true);
+                        me.mnuGuides.menu.items[7].setDisabled(!me.api.asc_canClearGuides());
 
                         me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true);
                         me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true);
@@ -2540,7 +2543,8 @@ define([
         textCustom: 'Custom',
         textManyGrids: '{0} grids per cm',
         textFewGrids: '{0} grids per cm',
-        textRulers: 'Rulers'
+        textRulers: 'Rulers',
+        textDeleteGuide: 'Delete Guide'
 
     }, PE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index d3cd0b013..46b88757e 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1616,8 +1616,8 @@
   "PE.Views.DocumentHolder.textGuides": "Guides",
   "PE.Views.DocumentHolder.tipGuides": "Show guides",
   "PE.Views.DocumentHolder.textShowGuides": "Show Guides",
-  "PE.Views.DocumentHolder.textAddVGuides": "Add vertical guide",
-  "PE.Views.DocumentHolder.textAddHGuides": "Add horizontal guide",
+  "PE.Views.DocumentHolder.textAddVGuides": "Add Vertical Guide",
+  "PE.Views.DocumentHolder.textAddHGuides": "Add Horizontal Guide",
   "PE.Views.DocumentHolder.textSmartGuides": "Smart Guides",
   "PE.Views.DocumentHolder.textClearGuides": "Clear Guides",
   "PE.Views.DocumentHolder.textGridlines": "Gridlines",
@@ -1628,6 +1628,7 @@
   "PE.Views.DocumentHolder.textManyGrids": "{0} grids per cm",
   "PE.Views.DocumentHolder.textFewGrids": "{0} grids per cm",
   "PE.Views.DocumentHolder.textRulers": "Rulers",
+  "PE.Views.DocumentHolder.textDeleteGuide": "Delete Guide",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
   "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
   "PE.Views.DocumentPreview.txtClose": "Close slideshow",

From 291c29706e6729bd8bb874b2b1c7a78a045420e5 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 3 Oct 2022 11:28:30 +0300
Subject: [PATCH 11/18] [PE] Show guide position

---
 .../main/app/controller/DocumentHolder.js     | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index 4e25af86b..f4f7eac4f 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -126,6 +126,7 @@ define([
                 onKeyUp: _.bind(me.onKeyUp, me)
             };
 
+            me.guideTip = { ttHeight: 20 };
             // Hotkeys
             // ---------------------
             var keymap = {};
@@ -219,6 +220,7 @@ define([
                     me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholderTable, me));
                     me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video));
                     me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio));
+                    me.api.asc_registerCallback('asc_onTrackGuide',   _.bind(me.onTrackGuide, me));
                 }
                 me.api.asc_registerCallback('asc_onCoAuthoringDisconnect',  _.bind(me.onCoAuthoringDisconnect, me));
                 Common.NotificationCenter.on('api:disconnect',              _.bind(me.onCoAuthoringDisconnect, me));
@@ -2147,6 +2149,57 @@ define([
             this.documentHolder.fireEvent('rulers:change', [item.isChecked()]);
         },
 
+        onTrackGuide: function(dPos, x, y) {
+            var tip = this.guideTip;
+            if (dPos === undefined) {
+                if (!tip.isHidden && tip.ref) {
+                    tip.ref.hide();
+                    tip.ref = undefined;
+                    tip.text = '';
+                    tip.isHidden = true;
+                }
+            } else {
+                if (!tip.parentEl) {
+                    tip.parentEl = $('<div id="tip-container-guide" style="position: absolute; z-index: 10000;"></div>');
+                    this.documentHolder.cmpEl.append(tip.parentEl);
+                }
+
+                var str = dPos.toFixed(2);
+                if (tip.ref && tip.ref.isVisible()) {
+                    if (tip.text != str) {
+                        tip.text = str;
+                        tip.ref.setTitle(str);
+                        tip.ref.updateTitle();
+                    }
+                }
+
+                if (!tip.ref || !tip.ref.isVisible()) {
+                    tip.text = str;
+                    tip.ref = new Common.UI.Tooltip({
+                        owner   : tip.parentEl,
+                        html    : true,
+                        title   : str
+                    });
+
+                    tip.ref.show([-10000, -10000]);
+                    tip.isHidden = false;
+
+                    var showPoint = [x, y];
+                    showPoint[0] += (this._XY[0] + 6);
+                    showPoint[1] += (this._XY[1] - 20 - tip.ttHeight);
+
+                    var tipwidth = tip.ref.getBSTip().$tip.width();
+                    if (showPoint[0] + tipwidth > this._BodyWidth )
+                        showPoint[0] = this._BodyWidth - tipwidth - 20;
+
+                    tip.ref.getBSTip().$tip.css({
+                        top : showPoint[1] + 'px',
+                        left: showPoint[0] + 'px'
+                    });
+                }
+            }
+        },
+
         SetDisabled: function(state) {
             this._isDisabled = state;
             this.documentHolder.SetDisabled(state);

From b9d8d1ee8af2e265dcdec0e07333a392ac361183 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 3 Oct 2022 16:29:30 +0300
Subject: [PATCH 12/18] [PE] Fix tip for guide position

---
 .../main/app/controller/DocumentHolder.js     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index f4f7eac4f..d03bd6ca4 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -2151,7 +2151,7 @@ define([
 
         onTrackGuide: function(dPos, x, y) {
             var tip = this.guideTip;
-            if (dPos === undefined) {
+            if (dPos === undefined || x<0 || y<0) {
                 if (!tip.isHidden && tip.ref) {
                     tip.ref.hide();
                     tip.ref = undefined;
@@ -2183,20 +2183,19 @@ define([
 
                     tip.ref.show([-10000, -10000]);
                     tip.isHidden = false;
-
-                    var showPoint = [x, y];
-                    showPoint[0] += (this._XY[0] + 6);
-                    showPoint[1] += (this._XY[1] - 20 - tip.ttHeight);
-
-                    var tipwidth = tip.ref.getBSTip().$tip.width();
-                    if (showPoint[0] + tipwidth > this._BodyWidth )
-                        showPoint[0] = this._BodyWidth - tipwidth - 20;
-
-                    tip.ref.getBSTip().$tip.css({
-                        top : showPoint[1] + 'px',
-                        left: showPoint[0] + 'px'
-                    });
                 }
+                var showPoint = [x, y];
+                showPoint[0] += (this._XY[0] + 6);
+                showPoint[1] += (this._XY[1] - 20 - tip.ttHeight);
+
+                var tipwidth = tip.ref.getBSTip().$tip.width();
+                if (showPoint[0] + tipwidth > this._BodyWidth )
+                    showPoint[0] = this._BodyWidth - tipwidth - 20;
+
+                tip.ref.getBSTip().$tip.css({
+                    top : showPoint[1] + 'px',
+                    left: showPoint[0] + 'px'
+                });
             }
         },
 

From 621fe7293001b64c37dfe5f9cc01b4af4cb212e5 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 3 Oct 2022 21:22:51 +0300
Subject: [PATCH 13/18] [PE] Add gridlines presets for inch metric

---
 apps/common/main/lib/util/utils.js            | 10 +--
 .../main/app/controller/ViewTab.js            | 41 +++++++++---
 .../main/app/view/DocumentHolder.js           | 66 ++++++++++++++-----
 .../main/app/view/GridSettings.js             | 61 ++++++++++-------
 .../main/app/view/ViewTab.js                  | 42 ++++++++----
 apps/presentationeditor/main/locale/en.json   |  8 +--
 6 files changed, 156 insertions(+), 72 deletions(-)

diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index b1d58e132..a03125116 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -411,10 +411,11 @@ var metrics = new(function() {
             return me.defaultMetric;
         },
 
-        fnRecalcToMM: function(value) {
+        fnRecalcToMM: function(value, fromMetric) {
             // value in pt/cm/inch. need to convert to mm
+            var metric = (fromMetric!==undefined) ? fromMetric : me.currentMetric;
             if (value!==null && value!==undefined) {
-                switch (me.currentMetric) {
+                switch (metric) {
                     case me.c_MetricUnits.cm:
                         return value * 10;
                     case me.c_MetricUnits.pt:
@@ -426,9 +427,10 @@ var metrics = new(function() {
             return value;
         },
 
-        fnRecalcFromMM: function(value) {
+        fnRecalcFromMM: function(value, toMetric) {
             // value in mm. need to convert to pt/cm/inch
-            switch (me.currentMetric) {
+            var metric = (toMetric!==undefined) ? toMetric : me.currentMetric;
+            switch (metric) {
                 case me.c_MetricUnits.cm:
                     return parseFloat((value/10.).toFixed(4));
                 case me.c_MetricUnits.pt:
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 47d68b510..57d19e575 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -60,10 +60,12 @@ define([
         onLaunch: function () {
             this._state = {
                 zoom_type: undefined,
-                zoom_percent: undefined
+                zoom_percent: undefined,
+                unitsChanged: true
             };
             Common.NotificationCenter.on('uitheme:changed', this.onThemeChanged.bind(this));
             Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
+            Common.NotificationCenter.on('settings:unitschanged', _.bind(this.unitsChanged, this));
         },
 
         setApi: function (api) {
@@ -286,7 +288,9 @@ define([
         },
 
         onGridlinesSpacing: function(value) {
-            this.api.asc_setGridSpacing(value * 360000);
+            value = Common.Utils.Metric.fnRecalcToMM(value,
+         Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
+            this.api.asc_setGridSpacing(value * 36000);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
@@ -297,7 +301,9 @@ define([
                 handler: function(dlg, result) {
                     if (result == 'ok') {
                         props = dlg.getSettings();
-                        me.api.asc_setGridSpacing(props * 360000);
+                        props = Common.Utils.Metric.fnRecalcToMM(props,
+                      Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
+                        me.api.asc_setGridSpacing(props * 36000);
                         Common.NotificationCenter.trigger('edit:complete', me.view);
                     }
                 }
@@ -308,12 +314,27 @@ define([
 
         onGridlinesAfterShow: function() {
             if (this.view) {
-                this.view.btnGridlines.menu.items[0].setChecked(this.api.asc_getShowGridlines(), true);
-                this.view.btnGridlines.menu.items[1].setChecked(this.api.asc_getSnapToGrid(), true);
+                var menu = this.view.btnGridlines.menu;
+                if (this._state.unitsChanged) {
+                    for (var i = 3; i < menu.items.length-2; i++) {
+                        menu.removeItem(menu.items[i]);
+                        i--;
+                    }
+                    var arr = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? this.view._arrGlidlinesInch : this.view._arrGlidlinesCm;
+                    for (var i = 0; i < arr.length; i++) {
+                        var menuItem = new Common.UI.MenuItem(arr[i]);
+                        menu.insertItem(3+i, menuItem);
+                    }
+                    this._state.unitsChanged = false;
+                }
 
-                var value = this.api.asc_getGridSpacing()/360000,
-                    items = this.view.btnGridlines.menu.items;
-                for (var i=3; i<14; i++) {
+                menu.items[0].setChecked(this.api.asc_getShowGridlines(), true);
+                menu.items[1].setChecked(this.api.asc_getSnapToGrid(), true);
+
+                var value = Common.Utils.Metric.fnRecalcFromMM(this.api.asc_getGridSpacing()/36000,
+                    Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm),
+                    items = menu.items;
+                for (var i=3; i<items.length-2; i++) {
                     var item = items[i];
                     if (item.value<1 && Math.abs(item.value - value)<0.005)
                         item.setChecked(true);
@@ -323,6 +344,10 @@ define([
                         item.setChecked(false);
                 }
             }
+        },
+
+        unitsChanged: function(m) {
+            this._state.unitsChanged = true;
         }
 
     }, PE.Controllers.ViewTab || {}));
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index f7ee85aed..a9cc56675 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -63,8 +63,10 @@ define([
             me._currentParaObjDisabled = false;
             me._currentSpellObj = undefined;
             me._currLang        = {};
-            me._state = {};
+            me._state = {unitsChanged: true};
             me._isDisabled = false;
+
+            Common.NotificationCenter.on('settings:unitschanged', _.bind(this.unitsChanged, this));
         },
 
         render: function () {
@@ -976,6 +978,33 @@ define([
                 })
             });
 
+            me._arrGlidlinesCm = [
+                { caption: '1/8 ' + me.textCm, value: 0.13, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/6 ' + me.textCm, value: 0.17, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/5 ' + me.textCm, value: 0.2, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/4 ' + me.textCm, value: 0.25, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/3 ' + me.textCm, value: 0.33, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/2 ' + me.textCm, value: 0.5, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'mnu-gridlines' }
+            ];
+            me._arrGlidlinesInch = [
+                { caption: '1/24 \"', value: 0.04, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/16 \"', value: 0.06, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/12 \"', value: 0.08, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/10 \"', value: 0.1, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/8 \"', value: 0.13, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/6 \"', value: 0.17, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/5 \"', value: 0.2, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/4 \"', value: 0.25, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/3 \"', value: 0.33, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1/2 \"', value: 0.5, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '1 \"', value: 1, checkable: true, toggleGroup: 'mnu-gridlines' },
+                { caption: '2 \"', value: 2, checkable: true, toggleGroup: 'mnu-gridlines' }
+            ];
             me.mnuGridlines = new Common.UI.MenuItem({
                 caption     : me.textGridlines,
                 menu        : new Common.UI.Menu({
@@ -984,17 +1013,6 @@ define([
                         { caption: me.textShowGridlines, value: 'show', checkable: true },
                         { caption: me.textSnapObjects, value: 'snap', checkable: true },
                         { caption: '--'},
-                        { caption: Common.Utils.String.format(me.textManyGrids, 8), value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: Common.Utils.String.format(me.textManyGrids, 6), value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: Common.Utils.String.format(me.textManyGrids, 5), value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: Common.Utils.String.format(me.textFewGrids, 4), value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: Common.Utils.String.format(me.textFewGrids, 3), value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: Common.Utils.String.format(me.textFewGrids, 2), value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' },
                         { caption: '--'},
                         { caption: me.textCustom, value: 'custom' }
                     ]
@@ -1048,9 +1066,23 @@ define([
                         me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true);
                         me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true);
 
-                        var spacing = me.api.asc_getGridSpacing()/360000,
+                        var spacing = Common.Utils.Metric.fnRecalcFromMM(me.api.asc_getGridSpacing()/36000,
+                             Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm),
                             items = me.mnuGridlines.menu.items;
-                        for (var i=3; i<14; i++) {
+                        if (me._state.unitsChanged) {
+                            for (var i = 3; i < items.length-2; i++) {
+                                me.mnuGridlines.menu.removeItem(items[i]);
+                                i--;
+                            }
+                            var arr = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? me._arrGlidlinesInch : me._arrGlidlinesCm;
+                            for (var i = 0; i < arr.length; i++) {
+                                var menuItem = new Common.UI.MenuItem(arr[i]);
+                                me.mnuGridlines.menu.insertItem(3+i, menuItem);
+                            }
+                            me._state.unitsChanged = false;
+                        }
+
+                        for (var i=3; i<items.length-2; i++) {
                             var item = items[i];
                             if (item.value<1 && Math.abs(item.value - spacing)<0.005)
                                 item.setChecked(true);
@@ -2342,6 +2374,10 @@ define([
             }
         },
 
+        unitsChanged: function(m) {
+            this._state.unitsChanged = true;
+        },
+
         SetDisabled: function(state) {
             this._isDisabled = state;
         },
@@ -2541,8 +2577,6 @@ define([
         textSnapObjects: 'Snap Object to Grid',
         textCm: 'cm',
         textCustom: 'Custom',
-        textManyGrids: '{0} grids per cm',
-        textFewGrids: '{0} grids per cm',
         textRulers: 'Rulers',
         textDeleteGuide: 'Delete Guide'
 
diff --git a/apps/presentationeditor/main/app/view/GridSettings.js b/apps/presentationeditor/main/app/view/GridSettings.js
index 378c2a997..b3b89344d 100644
--- a/apps/presentationeditor/main/app/view/GridSettings.js
+++ b/apps/presentationeditor/main/app/view/GridSettings.js
@@ -46,7 +46,7 @@ define([
 
     PE.Views.GridSettings = Common.UI.Window.extend(_.extend({
         options: {
-            width: 315,
+            width: 214,
             header: true,
             style: 'min-width: 315px;',
             cls: 'modal-dlg',
@@ -60,10 +60,12 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 30px;">',
-                    '<label class="input-label">' + this.textSpacing + '</label>',
-                    '<div id="grid-spacing-combo" class="input-group-nr" style="display: inline-block;width:125px;margin-left: 5px;"></div>',
-                    '<div id="grid-spacing-spin" style="display: inline-block;margin-left: 5px;"></div>',
+                '<div class="box" style="height: 55px;">',
+                    '<div class="input-row">',
+                        '<label class="text">' + this.textSpacing + '</label>',
+                    '</div>',
+                    '<div id="grid-spacing-combo" class="input-group-nr" style="display: inline-block;width:86px;"></div>',
+                    '<div id="grid-spacing-spin" style="display: inline-block;margin-left: 10px;"></div>',
                 '</div>',
                 '<div class="separator horizontal"></div>'
             ].join('');
@@ -77,13 +79,27 @@ define([
             Common.UI.Window.prototype.render.call(this);
 
             var $window = this.getChild();
-            this.arrSpacing = [
-                { displayValue: Common.Utils.String.format(this.textManyGrids, 8), value: 0, spacing: 0.13 },
-                { displayValue: Common.Utils.String.format(this.textManyGrids, 6), value: 1, spacing: 0.17 },
-                { displayValue: Common.Utils.String.format(this.textManyGrids, 5), value: 2, spacing: 0.2 },
-                { displayValue: Common.Utils.String.format(this.textFewGrids, 4), value: 3, spacing: 0.25 },
-                { displayValue: Common.Utils.String.format(this.textFewGrids, 3), value: 4, spacing: 0.33 },
-                { displayValue: Common.Utils.String.format(this.textFewGrids, 2), value: 5, spacing: 0.5 },
+            this.arrSpacing = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? [
+                { displayValue: '1/24 \"', value: 0, spacing: 0.04 },
+                { displayValue: '1/16 \"', value: 1, spacing:  0.06 },
+                { displayValue: '1/12 \"', value: 2, spacing:  0.08 },
+                { displayValue: '1/10 \"', value: 3, spacing:  0.1 },
+                { displayValue: '1/8 \"', value: 4, spacing:  0.13 },
+                { displayValue: '1/6 \"', value: 5, spacing:  0.17 },
+                { displayValue: '1/5 \"', value: 6, spacing:  0.2 },
+                { displayValue: '1/4 \"', value: 7, spacing:  0.25 },
+                { displayValue: '1/3 \"', value: 8, spacing:  0.33 },
+                { displayValue: '1/2 \"', value: 9, spacing:  0.5 },
+                { displayValue: '1 \"', value: 10, spacing:  1 },
+                { displayValue: '2 \"', value: 11, spacing:  2 },
+                { displayValue: this.textCustom, value: -1 }
+            ] : [
+                { displayValue: '1/8 ' + this.textCm, value: 0, spacing: 0.13 },
+                { displayValue: '1/6 ' + this.textCm, value: 1, spacing: 0.17 },
+                { displayValue: '1/5 ' + this.textCm, value: 2, spacing: 0.2 },
+                { displayValue: '1/4 ' + this.textCm, value: 3, spacing: 0.25 },
+                { displayValue: '1/3 ' + this.textCm, value: 4, spacing: 0.33 },
+                { displayValue: '1/2 ' + this.textCm, value: 5, spacing: 0.5 },
                 { displayValue: '1 ' + this.textCm, value: 6, spacing: 1 },
                 { displayValue: '2 ' + this.textCm, value: 7, spacing: 2 },
                 { displayValue: '3 ' + this.textCm, value: 8, spacing: 3 },
@@ -95,7 +111,7 @@ define([
                 el: $window.find('#grid-spacing-combo'),
                 cls: 'input-group-nr',
                 style: 'width: 100%;',
-                menuStyle: 'min-width: 125px;max-height: 185px;',
+                menuStyle: 'min-width: 86px;max-height: 185px;',
                 editable: false,
                 takeFocusOnClose: true,
                 data: this.arrSpacing
@@ -110,11 +126,11 @@ define([
             this.spnSpacing = new Common.UI.MetricSpinner({
                 el: $window.find('#grid-spacing-spin'),
                 step: .01,
-                width: 70,
-                defaultUnit : "cm",
-                value: '1 cm',
-                maxValue: 5.08,
-                minValue: 0.1
+                width: 86,
+                defaultUnit : Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? "\"": "cm",
+                value: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? "1 \"" : '1 cm',
+                maxValue: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? 2 : 5.08,
+                minValue: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? 0.04 : 0.1
             });
             this.spnSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){
                 var value = this.spnSpacing.getNumberValue(),
@@ -158,14 +174,15 @@ define([
         },
 
         setSettings: function (value) {
-            value = value/360000;
+            value = Common.Utils.Metric.fnRecalcFromMM(value/36000,
+            Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
             var idx = -1;
             for (var i=0; i<this.arrSpacing.length; i++) {
                 var item = this.arrSpacing[i];
                 if (item.spacing<1 && Math.abs(item.spacing - value)<0.005 || item.spacing>=1 && Math.abs(item.spacing - value)<0.001)
                     idx = i;
             }
-            this.cmbGridSpacing.setValue(idx, true);
+            this.cmbGridSpacing.setValue(idx, -1);
             this.spnSpacing.setValue(value, true);
         },
 
@@ -176,8 +193,6 @@ define([
         textTitle: 'Grid Settings',
         textSpacing: 'Spacing',
         textCm: 'cm',
-        textCustom: 'Custom',
-        textManyGrids: '{0} grids per cm',
-        textFewGrids: '{0} grids per cm'
+        textCustom: 'Custom'
     }, PE.Views.GridSettings || {}))
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 9816dd43e..0e5bcf72a 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -355,23 +355,39 @@ define([
                         ]
                     }));
 
+                    me._arrGlidlinesCm = [
+                        { caption: '1/8 ' + me.textCm, value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/6 ' + me.textCm, value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/5 ' + me.textCm, value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/4 ' + me.textCm, value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/3 ' + me.textCm, value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/2 ' + me.textCm, value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' }
+                    ];
+                    me._arrGlidlinesInch = [
+                        { caption: '1/24 \"', value: 0.04, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/16 \"', value: 0.06, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/12 \"', value: 0.08, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/10 \"', value: 0.1, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/8 \"', value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/6 \"', value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/5 \"', value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/4 \"', value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/3 \"', value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1/2 \"', value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '1 \"', value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
+                        { caption: '2 \"', value: 2, checkable: true, toggleGroup: 'tb-gridlines' }
+                    ];
                     me.btnGridlines.setMenu( new Common.UI.Menu({
                         restoreHeight: true,
                         items: [
                             { caption: me.textShowGridlines, value: 'show', checkable: true },
                             { caption: me.textSnapObjects, value: 'snap', checkable: true },
                             { caption: '--'},
-                            { caption: Common.Utils.String.format(me.textManyGrids, 8), value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: Common.Utils.String.format(me.textManyGrids, 6), value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: Common.Utils.String.format(me.textManyGrids, 5), value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: Common.Utils.String.format(me.textFewGrids, 4), value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: Common.Utils.String.format(me.textFewGrids, 3), value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: Common.Utils.String.format(me.textFewGrids, 2), value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
-                            { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' },
                             { caption: '--'},
                             { caption: me.textCustom, value: 'custom' }
                         ]
@@ -482,9 +498,7 @@ define([
             textShowGridlines: 'Show Gridlines',
             textSnapObjects: 'Snap Object to Grid',
             textCm: 'cm',
-            textCustom: 'Custom',
-            textManyGrids: '{0} grids per cm',
-            textFewGrids: '{0} grids per cm'
+            textCustom: 'Custom'
 
         }
     }()), PE.Views.ViewTab || {}));
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 46b88757e..39effab5a 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1625,8 +1625,6 @@
   "PE.Views.DocumentHolder.textSnapObjects": "Snap Object to Grid",
   "PE.Views.DocumentHolder.textCm": "cm",
   "PE.Views.DocumentHolder.textCustom": "Custom",
-  "PE.Views.DocumentHolder.textManyGrids": "{0} grids per cm",
-  "PE.Views.DocumentHolder.textFewGrids": "{0} grids per cm",
   "PE.Views.DocumentHolder.textRulers": "Rulers",
   "PE.Views.DocumentHolder.textDeleteGuide": "Delete Guide",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
@@ -1748,8 +1746,6 @@
   "PE.Views.GridSettings.textSpacing": "Spacing",
   "PE.Views.GridSettings.textCm": "cm",
   "PE.Views.GridSettings.textCustom": "Custom",
-  "PE.Views.GridSettings.textManyGrids": "{0} grids per cm",
-  "PE.Views.GridSettings.textFewGrids": "{0} grids per cm",
   "PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
   "PE.Views.HeaderFooterDialog.applyText": "Apply",
   "PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",
@@ -2444,7 +2440,5 @@
   "PE.Views.ViewTab.textShowGridlines": "Show Gridlines",
   "PE.Views.ViewTab.textSnapObjects": "Snap Object to Grid",
   "PE.Views.ViewTab.textCm": "cm",
-  "PE.Views.ViewTab.textCustom": "Custom",
-  "PE.Views.ViewTab.textManyGrids": "{0} grids per cm",
-  "PE.Views.ViewTab.textFewGrids": "{0} grids per cm"
+  "PE.Views.ViewTab.textCustom": "Custom"
 }
\ No newline at end of file

From 70540b1eb51b23e3693fece044edf52466d9c74e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 4 Oct 2022 18:45:40 +0300
Subject: [PATCH 14/18] [PE] Add gridline presets for pt metric

---
 apps/common/main/lib/util/define.js           | 772 ----------------
 .../main/app/controller/Toolbar.js            |   3 +-
 .../main/app/controller/ViewTab.js            |  20 +-
 .../main/app/view/DocumentHolder.js           |  40 +-
 .../main/app/view/GridSettings.js             |  53 +-
 .../main/app/view/ViewTab.js                  |  27 -
 .../main/app/view/define.js                   | 868 ++++++++++++++++++
 7 files changed, 906 insertions(+), 877 deletions(-)
 create mode 100644 apps/presentationeditor/main/app/view/define.js

diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js
index 57fc090ce..33a96d13a 100644
--- a/apps/common/main/lib/util/define.js
+++ b/apps/common/main/lib/util/define.js
@@ -597,776 +597,4 @@ define(function(){ 'use strict';
             textValue: 'Value is'
         }
     })(), Common.define.conditionalData || {});
-
-    Common.define.effectData = _.extend(new (function () {
-        return {
-            textEntrance: 'Entrance Effect',
-            textEmphasis: 'Emphasis Effect',
-            textExit: 'Exit Effect',
-            textPath: 'Motion Path',
-            textAppear: 'Appear',
-            textFade: 'Fade',
-            textFlyIn: 'Fly in',
-            textFloatIn: 'Float In',
-            textSplit: 'Split',
-            textWipe: 'Wipe',
-            textShape: 'Shape',
-            textWheel: 'Wheel',
-            textRandomBars: 'Random Bars ',
-            textGrowTurn: 'Grow & Turn',
-            textZoom: 'Zoom',
-            textSwivel: 'Swivel',
-            textBounce: 'Bounce',
-            textPulse: 'Pulse',
-            textColorPulse: 'Color Pulse',
-            textTeeter: 'Teeter',
-            textSpin: 'Spin',
-            textGrowShrink: 'Grow/Shrink',
-            textShrinkTurn: 'Shrink & Turn',
-            textDesaturate: 'Desaturate',
-            textDarken: 'Darken',
-            textLighten: 'Lighten',
-            textTransparency: 'Transparency',
-            textObjectColor: 'Object Color',
-            textComplementaryColor: 'Complementary Color',
-            textComplementaryColor2: 'Complementary Color 2',
-            textLineColor: 'Line Color',
-            textFillColor: 'Fill Color',
-            textBrushColor: 'Brush Color',
-            textFontColor: 'Font Color',
-            textUnderline: 'Underline',
-            textBoldFlash: 'Bold Flash',
-            textBoldReveal: 'Bold Reveal',
-            textWave: 'Wave',
-            textDisappear: 'Disappear',
-            textFlyOut: 'Fly Out',
-            textFloatOut: 'Float Out',
-            textBasic: 'Basic',
-            textSubtle: 'Subtle',
-            textModerate: 'Moderate',
-            textExciting: 'Exciting',
-            textLinesCurves: 'Lines Curves',
-            textSpecial: 'Special',
-            textBox: 'Box',
-            textCircle: 'Circle',
-            textPlus: 'Plus',
-            textDiamond: 'Diamond',
-            textDissolveIn: 'Dissolve In',
-            textBlinds: 'Blinds',
-            textCheckerboard: 'Checkerboard',
-            textPeekIn: 'Peek In',
-            textStrips: 'Strips',
-            textExpand: 'Expand',
-            textBasicZoom: 'Basic Zoom',
-            textCompress: 'Compress',
-            textFloatUp: 'Float Up',
-            textRiseUp: 'Rise Up',
-            textStretch: 'Stretch',
-            textCenterRevolve: 'Center Revolve',
-            textFloatDown: 'Float Down',
-            textSpinner: 'Spinner',
-            textBasicSwivel: 'Basic Swivel',
-            textBoomerang: 'Boomerang',
-            textCredits: 'Credits',
-            textCuverUp: 'Cuver Up',
-            textDrop: 'Drop',
-            textFloat: 'Float',
-            textPinwheel: 'Pinwheel',
-            textSpiralIn: 'Spiral In',
-            textWhip: 'Whip',
-            textGrowWithColor: 'Grow With Color',
-            textShimmer: 'Shimmer',
-            textBlink: 'Blink',
-            textDissolveOut: 'Dissolve Out',
-            textPeekOut: 'Peek Out',
-            textContrast: 'Contrast',
-            textCollapse: 'Collapse',
-            textSinkDown: 'Sink Down',
-            textCurveDown: 'CurveDown',
-            textSpiralOut: 'Spiral Out',
-            textContrastingColor: 'Contrasting Color',
-            textPointStar4: '4 Point Star',
-            textPointStar5: '5 Point Star',
-            textPointStar6: '6 Point Star',
-            textPointStar8: '8 Point Star',
-            textCrescentMoon: 'Crescent Moon',
-            textEqualTriangle: 'Equal Triangle',
-            textFootball: 'Football',
-            textHeart: 'Heart',
-            textHexagon: 'Hexagon',
-            textOctagon: 'Octagon',
-            textParallelogram: 'Parallelogram',
-            textPentagon: 'Pentagon',
-            textSquare: 'Square',
-            textTeardrop: 'Teardrop',
-            textTrapezoid: 'Trapezoid',
-            textArcDown: 'Arc Down',
-            textArcLeft: 'Arc Left',
-            textArcRight: 'Arc Right',
-            textArcUp: 'Arc Up',
-            textBounceLeft: 'Bounce Left',
-            textBounceRight: 'Bounce Right',
-            textCurvyLeft: 'Curvy Left',
-            textCurvyRight: 'Curvy Right',
-            textDecayingWave: 'Decaying Wave',
-            textDiagonalDownRight: 'Diagonal Down Right',
-            textDiagonalUpRight: 'Diagonal Up Right',
-            textDown: 'Down',
-            textFunnel: 'Funnel',
-            textHeartbeat: 'Heartbeat',
-            textLeft: 'Left',
-            textRight: 'Right',
-            textSCurve1: 'S Curve 1',
-            textSCurve2: 'S Curve 2',
-            textSineWave: 'Sine Wave',
-            textSpiralLeft: 'Spiral Left',
-            textSpiralRight: 'Spiral Right',
-            textSpring: 'Spring:',
-            textStairsDown: 'Stairs Down',
-            textTurnDown: 'Turn Down',
-            textTurnDownRight: 'Turn Down Right',
-            textTurnUp: 'Turn Up',
-            textTurnUpRight: 'Turn Up Right',
-            textUp: 'Up',
-            textZigzag: 'Zigzag',
-            textBean: 'Bean',
-            textCurvedSquare: 'CurvedSquare',
-            textCurvedX: 'Curved X',
-            textCurvyStar: 'Curvy Star',
-            textFigureFour: 'Figure 8 Four',
-            textHorizontalFigure: 'Horizontal Figure 8',
-            textInvertedSquare: 'Inverted Square',
-            textInvertedTriangle: 'Inverted Triangle',
-            textLoopDeLoop: 'Loop de Loop',
-            textNeutron: 'Neutron',
-            textPeanut: 'Peanut',
-            textPointStar: 'Point Star',
-            textSwoosh: 'Swoosh',
-            textVerticalFigure: 'Vertical Figure 8',
-            textRightTriangle: 'Right Triangle',
-            textAcross: 'Across',
-            textFromBottom: 'From Bottom',
-            textFromBottomLeft: 'From Bottom-Left',
-            textFromLeft: 'From Left',
-            textFromTopLeft: 'From Top-Left',
-            textFromTop: 'From Top',
-            textFromTopRight: 'From Top-Right',
-            textFromRight: 'From Right',
-            textFromBottomRight: 'From Bottom-Right',
-            textLeftDown: ' Left Down',
-            textLeftUp: ' Left Up',
-            textRightDown: ' Right Down',
-            textRightUp: ' Right Up',
-            textObjectCenter: 'Object Center',
-            textSlideCenter: 'Slide Center',
-            textInFromScreenCenter: 'In From Screen Center',
-            textOutFromScreenBottom: 'Out From Screen Bottom',
-            textInSlightly: 'In Slightly',
-            textInToScreenBottom: 'In To Screen Bottom',
-            textOutToScreenCenter: 'Out To Screen Center',
-            textOutSlightly: 'Out Slightly',
-            textToBottom: 'To Bottom',
-            textToBottomLeft: 'To Bottom-Left',
-            textToLeft: 'To Left',
-            textToTopLeft: 'To Top-Left',
-            textToTop: 'To Top',
-            textToTopRight: 'To Top-Right',
-            textToRight: 'To Right',
-            textToBottomRight: 'To Bottom-Right',
-            textSpoke1: '1 Spoke',
-            textSpoke2: '2 Spokes',
-            textSpoke3: '3 Spokes',
-            textSpoke4: '4 Spokes',
-            textSpoke8: '8 Spokes',
-            textCustomPath: 'Custom Path',
-            textHorizontalIn: 'Horizontal In',
-            textHorizontalOut: 'Horizontal Out',
-            textVerticalIn: 'Vertical In',
-            textVerticalOut: 'Vertical Out',
-            textVertical: 'Vertical',
-            textHorizontal: 'Horizontal',
-            textIn: 'In',
-            textOut: 'Out',
-            textWedge: 'Wedge',
-            textFlip: 'Flip',
-            textLines: 'Lines',
-            textArcs: 'Arcs',
-            textTurns: 'Turns',
-            textShapes: 'Shapes',
-            textLoops: 'Loops',
-            textPathCurve: 'Curve',
-            textPathLine: 'Line',
-            textPathScribble: 'Scribble',
-
-            getEffectGroupData: function () {
-                return [
-                    {id: 'menu-effect-group-entrance',  value: AscFormat.PRESET_CLASS_ENTR,     caption: this.textEntrance,     iconClsCustom: 'animation-entrance-custom'},
-                    {id: 'menu-effect-group-emphasis',  value: AscFormat.PRESET_CLASS_EMPH,     caption: this.textEmphasis,     iconClsCustom: 'animation-emphasis-custom'},
-                    {id: 'menu-effect-group-exit',      value: AscFormat.PRESET_CLASS_EXIT,     caption: this.textExit,         iconClsCustom: 'animation-exit-custom'},
-                    {id: 'menu-effect-group-path',      value: AscFormat.PRESET_CLASS_PATH,     caption: this.textPath,         iconClsCustom: 'animation-motion-paths-custom'}
-                ];
-            },
-
-            getEffectData: function () {
-                return [
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FADE,                     iconCls: 'animation-entrance-fade',                 displayValue: this.textFade},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLY_IN_FROM,              iconCls: 'animation-entrance-fly-in',               displayValue: this.textFlyIn},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLOAT_UP,                 iconCls: 'animation-entrance-float-in',             displayValue: this.textFloatIn,     familyEffect: 'entrfloat'},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_SPLIT,                    iconCls: 'animation-entrance-split',                displayValue: this.textSplit},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WIPE_FROM,                iconCls: 'animation-entrance-wipe',                 displayValue: this.textWipe},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_CIRCLE,                   iconCls: 'animation-entrance-shape',                displayValue: this.textShape,       familyEffect: 'entrshape'},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WHEEL,                    iconCls: 'animation-entrance-wheel',                displayValue: this.textWheel},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_RANDOM_BARS,              iconCls: 'animation-entrance-random-bars',          displayValue: this.textRandomBars},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_GROW_AND_TURN,            iconCls: 'animation-entrance-grow-turn',            displayValue: this.textGrowTurn},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_ZOOM,                     iconCls: 'animation-entrance-zoom',                 displayValue: this.textZoom},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_SWIVEL,                   iconCls: 'animation-entrance-swivel',               displayValue: this.textSwivel},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_BOUNCE,                   iconCls: 'animation-entrance-bounce',               displayValue: this.textBounce},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_PULSE,                    iconCls: 'animation-emphasis-pulse',                displayValue: this.textPulse},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_COLOR_PULSE,              iconCls: 'animation-emphasis-color-pulse',          displayValue: this.textColorPulse},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_TEETER,                   iconCls: 'animation-emphasis-teeter',               displayValue: this.textTeeter},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_SPIN,                     iconCls: 'animation-emphasis-spin',                 displayValue: this.textSpin},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_GROW_SHRINK,              iconCls: 'animation-emphasis-grow-or-shrink',       displayValue: this.textGrowShrink},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_DESATURATE,               iconCls: 'animation-emphasis-desaturate',           displayValue: this.textDesaturate},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_CONTRASTING_DARKEN,       iconCls: 'animation-emphasis-darken',               displayValue: this.textDarken},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_LIGHTEN,                  iconCls: 'animation-emphasis-lighten',              displayValue: this.textLighten},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_TRANSPARENCY,             iconCls: 'animation-emphasis-transparency',         displayValue: this.textTransparency},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_OBJECT_COLOR,             iconCls: 'animation-emphasis-object-color',         displayValue: this.textObjectColor},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR,      iconCls: 'animation-emphasis-complementary-color',  displayValue: this.textComplementaryColor},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_LINE_COLOR,               iconCls: 'animation-emphasis-line-color',           displayValue: this.textLineColor},
-                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_FILL_COLOR,               iconCls: 'animation-emphasis-fill-color',           displayValue: this.textFillColor},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_DISAPPEAR,                    iconCls: 'animation-exit-disappear',                displayValue: this.textDisappear},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FADE,                         iconCls: 'animation-exit-fade',                     displayValue: this.textFade},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLY_OUT_TO,                   iconCls: 'animation-exit-fly-out',                  displayValue: this.textFlyOut},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLOAT_DOWN,                   iconCls: 'animation-exit-float-out',                displayValue: this.textFloatOut,    familyEffect: 'exitfloat'},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SPLIT,                        iconCls: 'animation-exit-split',                    displayValue: this.textSplit},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WIPE_FROM,                    iconCls: 'animation-exit-wipe',                     displayValue: this.textWipe},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_CIRCLE,                       iconCls: 'animation-exit-shape',                    displayValue: this.textShape,       familyEffect: 'shape'},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WHEEL,                        iconCls: 'animation-exit-wheel',                    displayValue: this.textWheel},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_RANDOM_BARS,                  iconCls: 'animation-exit-random-bars',              displayValue: this.textRandomBars},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SHRINK_AND_TURN,              iconCls: 'animation-exit-shrink-turn',              displayValue: this.textShrinkTurn},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_ZOOM,                         iconCls: 'animation-exit-zoom',                     displayValue: this.textZoom},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SWIVEL,                       iconCls: 'animation-exit-swivel',                   displayValue: this.textSwivel},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_BOUNCE,                       iconCls: 'animation-exit-bounce',                   displayValue: this.textBounce},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_DOWN,                       iconCls: 'animation-motion-paths-lines',            displayValue: this.textLines,       familyEffect: 'pathlines'},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_ARC_DOWN,                   iconCls: 'animation-motion-paths-arcs',             displayValue: this.textArcs,        familyEffect: 'patharcs'},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_TURN_DOWN,                  iconCls: 'animation-motion-paths-turns',            displayValue: this.textTurns,       familyEffect: 'pathturns'},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_CIRCLE,                     iconCls: 'animation-motion-paths-shapes',           displayValue: this.textShapes,      familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR,   iconCls: 'animation-motion-paths-loops',            displayValue: this.textLoops,       familyEffect: 'pathloops'},
-                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_CUSTOM_PATH,                iconCls: 'animation-motion-paths-custom-path',      displayValue: this.textCustomPath}
-                ];
-            },
-
-            getLevelEffect: function (isPath) {
-
-                if (!isPath)
-                    return [
-                        {id: 'menu-effect-level-basic',         displayValue: this.textBasic},
-                        {id: 'menu-effect-level-subtle',        displayValue: this.textSubtle},
-                        {id: 'menu-effect-level-moderate',      displayValue: this.textModerate},
-                        {id: 'menu-effect-level-exciting',      displayValue: this.textExciting}
-                    ];
-                else
-                    return [
-                        {id: 'menu-effect-level-basic',         displayValue: this.textBasic},
-                        {id: 'menu-effect-level-lines_curves',  displayValue: this.textSubtle},
-                        {id: 'menu-effect-level-special',       displayValue: this.textModerate}
-                    ];
-            },
-
-            getEffectFullData: function () {
-                return [
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_APPEAR,                   displayValue: this.textAppear},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_BLINDS,                   displayValue: this.textBlinds},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_BOX,                      displayValue: this.textBox,                 familyEffect: 'entrshape'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_CHECKERBOARD,             displayValue: this.textCheckerboard},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_CIRCLE,                   displayValue: this.textCircle,              familyEffect: 'entrshape'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_DIAMOND,                  displayValue: this.textDiamond,             familyEffect: 'entrshape'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_DISSOLVE_IN,              displayValue: this.textDissolveIn},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_FLY_IN_FROM,              displayValue: this.textFlyIn},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_PEEK_IN_FROM,             displayValue: this.textPeekIn},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_PLUS,                     displayValue: this.textPlus,                familyEffect: 'entrshape'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_RANDOM_BARS,              displayValue: this.textRandomBars},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_SPLIT,                    displayValue: this.textSplit},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_STRIPS,                   displayValue: this.textStrips},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WEDGE,                    displayValue: this.textWedge},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WHEEL,                    displayValue: this.textWheel},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WIPE_FROM,                displayValue: this.textWipe},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_EXPAND,                   displayValue: this.textExpand},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_FADE,                     displayValue: this.textFade},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_SWIVEL,                   displayValue: this.textSwivel},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_ZOOM,                     displayValue: this.textZoom},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_BASIC_ZOOM,               displayValue: this.textBasicZoom},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_REVOLVE,           displayValue: this.textCenterRevolve},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_COMPRESS,          displayValue: this.textCompress},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_DOWN,               displayValue: this.textFloatDown,           familyEffect: 'entrfloat'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_UP,                 displayValue: this.textFloatUp,             familyEffect: 'entrfloat'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_GROW_AND_TURN,            displayValue: this.textGrowTurn},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_RISE_UP,                  displayValue: this.textRiseUp},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_SPINNER,                  displayValue: this.textSpinner},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_STRETCH,                  displayValue: this.textStretch},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BASIC_SWIVEL,             displayValue: this.textBasicSwivel},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BOOMERANG,                displayValue: this.textBoomerang},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BOUNCE,                   displayValue: this.textBounce},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_CREDITS,                  displayValue: this.textCredits},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_CURVE_UP,                 displayValue: this.textCuverUp},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_DROP,                     displayValue: this.textDrop},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_FLIP,                     displayValue: this.textFlip},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_FLOAT,                    displayValue: this.textFloat},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_PINWHEEL,                 displayValue: this.textPinwheel},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_SPIRAL_IN,                displayValue: this.textSpiralIn},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_WHIP,                     displayValue: this.textWhip},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FILL_COLOR,               displayValue: this.textFillColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_GROW_SHRINK,              displayValue: this.textGrowShrink},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FONT_COLOR,               displayValue: this.textFontColor, notsupported: true},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_LINE_COLOR,               displayValue: this.textLineColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_SPIN,                     displayValue: this.textSpin},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_TRANSPARENCY,             displayValue: this.textTransparency},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BOLD_FLASH,               displayValue: this.textBoldFlash, notsupported: true},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR,      displayValue: this.textComplementaryColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2,    displayValue: this.textComplementaryColor2},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_CONTRASTING_COLOR,        displayValue: this.textContrastingColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_CONTRASTING_DARKEN,       displayValue: this.textDarken},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_DESATURATE,                displayValue: this.textDesaturate},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_LIGHTEN,                  displayValue: this.textLighten},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_OBJECT_COLOR,             displayValue: this.textObjectColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_PULSE,                    displayValue: this.textPulse},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_UNDERLINE,                displayValue: this.textUnderline, notsupported: true},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BRUSH_COLOR,              displayValue: this.textBrushColor, notsupported: true},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_COLOR_PULSE,              displayValue: this.textColorPulse},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_GROW_WITH_COLOR,          displayValue: this.textGrowWithColor},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_SHIMMER,                  displayValue: this.textShimmer},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_TEETER,                   displayValue: this.textTeeter},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BLINK,                    displayValue: this.textBlink},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BOLD_REVEAL,              displayValue: this.textBoldReveal, notsupported: true},
-                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_WAVE,                     displayValue: this.textWave, notsupported: true},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BLINDS,                       displayValue: this.textBlinds},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BOX,                          displayValue: this.textBox,                 familyEffect: 'shape'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_CHECKERBOARD,                 displayValue: this.textCheckerboard},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_CIRCLE,                       displayValue: this.textCircle,              familyEffect: 'shape'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DIAMOND,                      displayValue: this.textDiamond,             familyEffect: 'shape'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DISAPPEAR,                    displayValue: this.textDisappear},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DISSOLVE_OUT,                 displayValue: this.textDissolveOut},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_FLY_OUT_TO,                   displayValue: this.textFlyOut},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_PEEK_OUT_TO,                  displayValue: this.textPeekOut},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_PLUS,                         displayValue: this.textPlus,                familyEffect: 'shape'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_RANDOM_BARS,                  displayValue: this.textRandomBars},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_SPLIT,                        displayValue: this.textSplit},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_STRIPS,                       displayValue: this.textStrips},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WEDGE,                        displayValue: this.textWedge},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WHEEL,                        displayValue: this.textWheel},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WIPE_FROM,                    displayValue: this.textWipe},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_CONTRACT,                     displayValue: this.textContrast},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_FADE,                         displayValue: this.textFade},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_SWIVEL,                       displayValue: this.textSwivel},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_ZOOM,                         displayValue: this.textZoom},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_BASIC_ZOOM,                   displayValue: this.textBasicZoom},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_CENTER_REVOLVE,               displayValue: this.textCenterRevolve},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_COLLAPSE,                     displayValue: this.textCollapse},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_DOWN,                   displayValue: this.textFloatDown,    familyEffect: 'exitfloat'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_UP,                     displayValue: this.textFloatUp,      familyEffect: 'exitfloat'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SHRINK_AND_TURN,              displayValue: this.textShrinkTurn},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SINK_DOWN,                    displayValue: this.textSinkDown},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SPINNER,                      displayValue: this.textSpinner},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_STRETCHY,                     displayValue: this.textStretch},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BASIC_SWIVEL,                 displayValue: this.textBasicSwivel},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BOOMERANG,                    displayValue: this.textBoomerang},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BOUNCE,                       displayValue: this.textBounce},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_CREDITS,                      displayValue: this.textCredits},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_CURVE_DOWN,                   displayValue: this.textCurveDown},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_DROP,                         displayValue: this.textDrop},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_FLIP,                         displayValue: this.textFlip},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_FLOAT,                        displayValue: this.textFloat},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_PINWHEEL,                     displayValue: this.textPinwheel},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_SPIRAL_OUT,                   displayValue: this.textSpiralOut},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_WHIP,                         displayValue: this.textWhip},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_4_POINT_STAR,          displayValue: this.textPointStar4},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_5_POINT_STAR,          displayValue: this.textPointStar5},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_6_POINT_STAR,          displayValue: this.textPointStar6},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_8_POINT_STAR,          displayValue: this.textPointStar8},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_CIRCLE,                     displayValue: this.textCircle,              familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_CRESCENT_MOON,              displayValue: this.textCrescentMoon},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_DIAMOND,                    displayValue: this.textDiamond,             familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_EQUAL_TRIANGLE,             displayValue: this.textEqualTriangle,       familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_FOOTBALL,                   displayValue: this.textFootball},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_HEART,                      displayValue: this.textHeart},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_HEXAGON,                    displayValue: this.textHexagon,             familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_OCTAGON,                    displayValue: this.textOctagon,             familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PARALLELOGRAM,              displayValue: this.textParallelogram,       familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PENTAGON,                   displayValue: this.textPentagon,            familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_RIGHT_TRIANGLE,             displayValue: this.textRightTriangle,       familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_SQUARE,                     displayValue: this.textSquare,              familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_TEARDROP,                   displayValue: this.textTeardrop},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_TRAPEZOID,                  displayValue: this.textTrapezoid,           familyEffect: 'pathshapes'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_DOWN,                   displayValue: this.textArcDown,             familyEffect: 'patharcs'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_LEFT,                   displayValue: this.textArcLeft,             familyEffect: 'patharcs'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_RIGHT,                  displayValue: this.textArcRight,            familyEffect: 'patharcs'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_UP,                     displayValue: this.textArcUp,               familyEffect: 'patharcs'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_BOUNCE_LEFT,                displayValue: this.textBounceLeft},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_BOUNCE_RIGHT,               displayValue: this.textBounceRight},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_CURVY_LEFT,                 displayValue: this.textCurvyLeft},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_CURVY_RIGHT,                displayValue: this.textCurvyRight},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DECAYING_WAVE,              displayValue: this.textDecayingWave},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DIAGONAL_DOWN_RIGHT,        displayValue: this.textDiagonalDownRight},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DIAGONAL_UP_RIGHT,          displayValue: this.textDiagonalUpRight},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DOWN,                       displayValue: this.textDown,                familyEffect: 'pathlines'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_FUNNEL,                     displayValue: this.textFunnel},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_HEARTBEAT,                  displayValue: this.textHeartbeat},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_LEFT,                       displayValue: this.textLeft,                familyEffect: 'pathlines'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_RIGHT,                      displayValue: this.textRight,               familyEffect: 'pathlines'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_S_CURVE_1,                  displayValue: this.textSCurve1},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_S_CURVE_2,                  displayValue: this.textSCurve2},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_WAVE,                  displayValue: this.textSineWave},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_SPIRAL_LEFT,           displayValue: this.textSpiralLeft},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_SPIRAL_RIGHT,          displayValue: this.textSpiralRight},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SPRING,                     displayValue: this.textSpring},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_STAIRS_DOWN,                displayValue: this.textStairsDown},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_DOWN,                  displayValue: this.textTurnDown,            familyEffect: 'pathturns'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_DOWN_RIGHT,            displayValue: this.textTurnDownRight,       familyEffect: 'pathturns'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_UP,                    displayValue: this.textTurnUp,              familyEffect: 'pathturns'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_UP_RIGHT,              displayValue: this.textTurnUpRight,         familyEffect: 'pathturns'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_UP,                         displayValue: this.textUp,                  familyEffect: 'pathlines'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_WAVE,                       displayValue: this.textWave},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ZIGZAG,                     displayValue: this.textZigzag},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_BEAN,                       displayValue: this.textBean},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVED_SQUARE,              displayValue: this.textCurvedSquare},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVED_X,                   displayValue: this.textCurvedX},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVY_STAR,                 displayValue: this.textCurvyStar},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_FIGURE_8_FOUR,              displayValue: this.textFigureFour},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR,   displayValue: this.textHorizontalFigure,    familyEffect: 'pathloops'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_INVERTED_SQUARE,            displayValue: this.textInvertedSquare},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_INVERTED_TRIANGLE,          displayValue: this.textInvertedTriangle},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_LOOP_DE_LOOP,               displayValue: this.textLoopDeLoop,          familyEffect: 'pathloops'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_NEUTRON,                    displayValue: this.textNeutron},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_PEANUT,                     displayValue: this.textPeanut},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_POINTY_STAR,                displayValue: this.textPointStar},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_SWOOSH,                     displayValue: this.textSwoosh},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_VERTICAL_FIGURE_8,          displayValue: this.textVerticalFigure,      familyEffect: 'pathloops'},
-                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CUSTOM_PATH,                displayValue: this.textCustomPath,  notsupported: true}
-
-                ];
-            },
-
-            getEffectOptionsData: function (group, type) {
-                switch (group) {
-                    case 'menu-effect-group-entrance':
-                        switch (type) {
-                            case AscFormat.ENTRANCE_BLINDS:
-                                return [
-                                    {value: AscFormat.ENTRANCE_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_BLINDS_VERTICAL,         caption: this.textVertical}
-                                ];
-                            case AscFormat.ENTRANCE_BOX:
-                                return [
-                                    {value: AscFormat.ENTRANCE_BOX_IN,                  caption: this.textIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_BOX_OUT,                 caption: this.textOut}
-                                ];
-                            case AscFormat.ENTRANCE_CHECKERBOARD:
-                                return [
-                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_DOWN,       caption: this.textDown}
-                                ];
-                            case AscFormat.ENTRANCE_CIRCLE:
-                                return [
-                                    {value: AscFormat.ENTRANCE_CIRCLE_IN,               caption: this.textIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_CIRCLE_OUT,              caption: this.textOut}
-                                ];
-                            case AscFormat.ENTRANCE_DIAMOND:
-                                return [
-                                    {value: AscFormat.ENTRANCE_DIAMOND_IN,              caption: this.textIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_DIAMOND_OUT,             caption: this.textOut}
-                                ];
-
-                            case AscFormat.ENTRANCE_FLY_IN_FROM:
-                                return [
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM,      caption: this.textFromBottom, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM_LEFT, caption: this.textFromBottomLeft},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_LEFT,        caption: this.textFromLeft},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP_LEFT,    caption: this.textFromTopLeft},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP,         caption: this.textFromTop},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP_RIGHT,   caption: this.textFromTopRight},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_RIGHT,       caption: this.textFromRight},
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM_RIGHT, caption: this.textFromBottomRight}
-                                ];
-                            case AscFormat.ENTRANCE_PEEK_IN_FROM:
-                                return [
-                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_BOTTOM,     caption: this.textFromBottom, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_LEFT,       caption: this.textFromLeft},
-                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_RIGHT,      caption: this.textFromRight},
-                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_TOP,        caption: this.textFromTop}
-                                ];
-                            case AscFormat.ENTRANCE_PLUS:
-                                return [
-                                    {value: AscFormat.ENTRANCE_PLUS_IN,                 caption: this.textIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_PLUS_OUT,                caption: this.textOut}
-                                ];
-                            case AscFormat.ENTRANCE_RANDOM_BARS:
-                                return [
-                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
-                                ];
-                            case AscFormat.ENTRANCE_SPLIT:
-                                return [
-                                    {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
-                                    {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
-                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
-                                ];
-                            case AscFormat.ENTRANCE_STRIPS:
-                                return [
-                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_UP,          caption: this.textLeftUp},
-                                    {value: AscFormat.ENTRANCE_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
-                                    {value: AscFormat.ENTRANCE_STRIPS_RIGHT_UP,         caption: this.textRightUp}
-                                ];
-                            case AscFormat.ENTRANCE_WHEEL:
-                                return [
-                                    {value: AscFormat.ENTRANCE_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_WHEEL_2_SPOKES,           caption: this.textSpoke2},
-                                    {value: AscFormat.ENTRANCE_WHEEL_3_SPOKES,           caption: this.textSpoke3},
-                                    {value: AscFormat.ENTRANCE_WHEEL_4_SPOKES,           caption: this.textSpoke4},
-                                    {value: AscFormat.ENTRANCE_WHEEL_8_SPOKES,           caption: this.textSpoke8}
-                                ];
-                            case AscFormat.ENTRANCE_WIPE_FROM:
-                                return [
-                                    {value: AscFormat.ENTRANCE_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_WIPE_FROM_LEFT,          caption: this.textFromLeft},
-                                    {value: AscFormat.ENTRANCE_WIPE_FROM_RIGHT,         caption: this.textFromRight},
-                                    {value: AscFormat.ENTRANCE_WIPE_FROM_TOP,           caption: this.textFromTop}
-                                ];
-                            case AscFormat.ENTRANCE_ZOOM:
-                                return [
-                                    {value: AscFormat.ENTRANCE_ZOOM_OBJECT_CENTER,      caption: this.textObjectCenter, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_ZOOM_SLIDE_CENTER,       caption: this.textSlideCenter}
-                                ];
-                            case AscFormat.ENTRANCE_BASIC_ZOOM:
-                                return [
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN,           caption: this.textIn, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_FROM_SCREEN_CENTER, caption: this.textInFromScreenCenter},
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly},
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT,          caption: this.textOut},
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT_FROM_SCREEN_BOTTOM, caption: this.textOutFromScreenBottom},
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly}
-                                ];
-                            case AscFormat.ENTRANCE_STRETCH:
-                                return [
-                                    {value: AscFormat.ENTRANCE_STRETCH_ACROSS,          caption: this.textAcross, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_BOTTOM,     caption: this.textFromBottom},
-                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_LEFT,       caption: this.textFromLeft},
-                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_RIGHT,      caption: this.textFromRight},
-                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_TOP,        caption: this.textFromTop}
-                                ];
-                            case AscFormat.ENTRANCE_BASIC_SWIVEL:
-                                return [
-                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
-                                ];
-                            default:
-                                return undefined;
-                        }
-                        break;
-
-                    case 'menu-effect-group-exit':
-                        switch (type){
-                            case AscFormat.EXIT_BLINDS:
-                                return [
-                                    {value: AscFormat.EXIT_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.EXIT_BLINDS_VERTICAL,         caption: this.textVertical}
-                                ];
-                            case AscFormat.EXIT_BOX:
-                                return [
-                                    {value: AscFormat.EXIT_BOX_IN,                  caption: this.textIn},
-                                    {value: AscFormat.EXIT_BOX_OUT,                 caption: this.textOut, defvalue: true}
-                                ];
-                            case AscFormat.EXIT_CHECKERBOARD:
-                                return [
-                                    {value: AscFormat.EXIT_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
-                                    {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textUp}
-                                ];
-                            case AscFormat.EXIT_CIRCLE:
-                                return [
-                                    {value: AscFormat.EXIT_CIRCLE_IN,               caption: this.textIn},
-                                    {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textOut, defvalue: true}
-                                ];
-                            case AscFormat.EXIT_DIAMOND:
-                                return [
-                                    {value: AscFormat.EXIT_DIAMOND_IN,              caption: this.textIn},
-                                    {value: AscFormat.EXIT_DIAMOND_OUT,             caption: this.textOut, defvalue: true}
-                                ];
-                            case AscFormat.EXIT_FLY_OUT_TO:
-                                return [
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM,       caption: this.textToBottom, defvalue: true},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM_LEFT,  caption: this.textToBottomLeft},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_LEFT,         caption: this.textToLeft},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP_LEFT,     caption: this.textToTopLeft},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP,          caption: this.textToTop},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP_RIGHT,    caption: this.textToTopRight},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_RIGHT,        caption: this.textToRight},
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM_RIGHT, caption: this.textToBottomRight}
-                                ];
-                            case AscFormat.EXIT_PEEK_OUT_TO:
-                                return [
-                                    {value: AscFormat.EXIT_PEEK_OUT_TO_BOTTOM,      caption: this.textToBottom, defvalue: true},
-                                    {value: AscFormat.EXIT_PEEK_OUT_TO_LEFT,        caption: this.textToLeft},
-                                    {value: AscFormat.EXIT_PEEK_OUT_TO_RIGHT,       caption: this.textToRight},
-                                    {value: AscFormat.EXIT_PEEK_OUT_TO_TOP,         caption: this.textToTop}
-                                ];
-                            case AscFormat.EXIT_PLUS:
-                                return [
-                                    {value: AscFormat.EXIT_PLUS_IN,                 caption: this.textIn},
-                                    {value: AscFormat.EXIT_PLUS_OUT,                caption: this.textOut, defvalue: true}
-                                ];
-                            case AscFormat.EXIT_RANDOM_BARS:
-                                return [
-                                    {value: AscFormat.EXIT_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.EXIT_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
-                                ];
-                            case AscFormat.EXIT_SPLIT:
-                                return [
-                                    {value: AscFormat.EXIT_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
-                                    {value: AscFormat.EXIT_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
-                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
-                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
-                                ];
-                            case AscFormat.EXIT_STRIPS:
-                                return [
-                                    {value: AscFormat.EXIT_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
-                                    {value: AscFormat.EXIT_STRIPS_LEFT_UP,          caption: this.textLeftUp},
-                                    {value: AscFormat.EXIT_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
-                                    {value: AscFormat.EXIT_STRIPS_RIGHT_UP,         caption: this.textRightUp}
-                                ];
-                            case AscFormat.EXIT_WHEEL:
-                                return [
-                                    {value: AscFormat.EXIT_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
-                                    {value: AscFormat.EXIT_WHEEL_2_SPOKES,           caption: this.textSpoke2},
-                                    {value: AscFormat.EXIT_WHEEL_3_SPOKES,           caption: this.textSpoke3},
-                                    {value: AscFormat.EXIT_WHEEL_4_SPOKES,           caption: this.textSpoke4},
-                                    {value: AscFormat.EXIT_WHEEL_8_SPOKES,           caption: this.textSpoke8}
-                                ];
-                            case AscFormat.EXIT_WIPE_FROM:
-                                return [
-                                    {value: AscFormat.EXIT_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
-                                    {value: AscFormat.EXIT_WIPE_FROM_LEFT,          caption: this.textFromLeft},
-                                    {value: AscFormat.EXIT_WIPE_FROM_RIGHT,         caption: this.textFromRight},
-                                    {value: AscFormat.EXIT_WIPE_FROM_TOP,           caption: this.textFromTop}
-                                ];
-                            case AscFormat.EXIT_ZOOM:
-                                return [
-                                    {value: AscFormat.EXIT_ZOOM_OBJECT_CENTER,  caption: this.textObjectCenter, defvalue: true},
-                                    {value: AscFormat.EXIT_ZOOM_SLIDE_CENTER,   caption: this.textSlideCenter}
-                                ];
-                            case AscFormat.EXIT_BASIC_ZOOM:
-                                return [
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT,          caption: this.textOut, defvalue: true},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_TO_SCREEN_CENTER, caption: this.textOutToScreenCenter},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN,           caption: this.textIn},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_TO_SCREEN_BOTTOM, caption: this.textInToScreenBottom},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly}
-                                ];
-                            case AscFormat.EXIT_COLLAPSE:
-                                return [
-                                    {value: AscFormat.EXIT_COLLAPSE_ACROSS,         caption: this.textAcross, defvalue: true},
-                                    {value: AscFormat.EXIT_COLLAPSE_TO_BOTTOM,      caption: this.textToBottom},
-                                    {value: AscFormat.EXIT_COLLAPSE_TO_LEFT,        caption: this.textToLeft},
-                                    {value: AscFormat.EXIT_COLLAPSE_TO_RIGHT,       caption: this.textToRight},
-                                    {value: AscFormat.EXIT_COLLAPSE_TO_TOP,         caption: this.textToTop}
-                                ];
-                            case AscFormat.EXIT_BASIC_SWIVEL:
-                                return [
-                                    {value: AscFormat.EXIT_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
-                                    {value: AscFormat.EXIT_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
-                                ];
-                           default:
-                               return undefined;
-                        }
-                        break;
-                    case  'menu-effect-group-path':
-                        switch (type) {
-                            case AscFormat.MOTION_CUSTOM_PATH:
-                                return [
-                                    {value: AscFormat.MOTION_CUSTOM_PATH_CURVE,        caption: this.textPathCurve, isCustom: true},
-                                    {value: AscFormat.MOTION_CUSTOM_PATH_LINE,         caption: this.textPathLine, isCustom: true},
-                                    {value: AscFormat.MOTION_CUSTOM_PATH_SCRIBBLE,     caption: this.textPathScribble, isCustom: true}
-                                ];
-                        }
-                        break;
-                    default:
-                        return undefined;
-                }
-            },
-            getSimilarEffectsArray: function (familyEffect) {
-                switch (familyEffect){
-                    case 'shape':
-                        return [
-                            {value: AscFormat.EXIT_CIRCLE,  caption: this.textCircle},
-                            {value: AscFormat.EXIT_BOX,     caption: this.textBox},
-                            {value: AscFormat.EXIT_DIAMOND, caption: this.textDiamond},
-                            {value: AscFormat.EXIT_PLUS,    caption: this.textPlus}
-                        ];
-                    case 'entrshape':
-                        return [
-                            {value: AscFormat.ENTRANCE_CIRCLE,  caption: this.textCircle},
-                            {value: AscFormat.ENTRANCE_BOX,     caption: this.textBox},
-                            {value: AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond},
-                            {value: AscFormat.ENTRANCE_PLUS,    caption: this.textPlus}
-                        ];
-                    case 'pathlines':
-                        return[
-                            {value: AscFormat.MOTION_DOWN,  caption: this.textDown},
-                            {value: AscFormat.MOTION_LEFT,  caption: this.textLeft},
-                            {value: AscFormat.MOTION_RIGHT, caption: this.textRight},
-                            {value: AscFormat.MOTION_UP,    caption: this.textUp}
-                        ];
-                    case 'patharcs':
-                        return [
-                            {value: AscFormat.MOTION_ARC_DOWN,  caption: this.textArcDown},
-                            {value: AscFormat.MOTION_ARC_LEFT,  caption: this.textArcLeft},
-                            {value: AscFormat.MOTION_ARC_RIGHT, caption: this.textArcRight},
-                            {value: AscFormat.MOTION_ARC_UP,    caption: this.textArcUp}
-                        ];
-                    case 'pathturns':
-                        return [
-                            {value: AscFormat.MOTION_TURN_DOWN,       caption: this.textTurnDown},
-                            {value: AscFormat.MOTION_TURN_DOWN_RIGHT, caption: this.textTurnDownRight},
-                            {value: AscFormat.MOTION_TURN_UP,         caption: this.textTurnUp},
-                            {value: AscFormat.MOTION_TURN_UP_RIGHT,   caption: this.textTurnUpRight}
-                        ];
-                    case 'pathshapes':
-                        return [
-                            {value: AscFormat.MOTION_CIRCLE,         caption: this.textCircle},
-                            {value: AscFormat.MOTION_DIAMOND,        caption: this.textDiamond},
-                            {value: AscFormat.MOTION_EQUAL_TRIANGLE, caption: this.textEqualTriangle},
-                            {value: AscFormat.MOTION_HEXAGON,        caption: this.textHexagon},
-                            {value: AscFormat.MOTION_OCTAGON,        caption: this.textOctagon},
-                            {value: AscFormat.MOTION_PARALLELOGRAM,  caption: this.textParallelogram},
-                            {value: AscFormat.MOTION_PENTAGON,       caption: this.textPentagon},
-                            {value: AscFormat.MOTION_RIGHT_TRIANGLE, caption: this.textRightTriangle},
-                            {value: AscFormat.MOTION_SQUARE,         caption: this.textSquare},
-                            {value: AscFormat.MOTION_TRAPEZOID,      caption: this.textTrapezoid}
-
-                        ];
-                    case 'pathloops':
-                        return [
-                            {value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, caption: this.textHorizontalFigure},
-                            {value: AscFormat.MOTION_VERTICAL_FIGURE_8,        caption: this.textVerticalFigure},
-                            {value: AscFormat.MOTION_LOOP_DE_LOOP,             caption: this.textLoopDeLoop}
-                        ];
-                    case 'entrfloat':
-                        return [
-                            {value: AscFormat.ENTRANCE_FLOAT_UP,            caption: this.textFloatUp},
-                            {value: AscFormat.ENTRANCE_FLOAT_DOWN,          caption: this.textFloatDown}
-                        ];
-                    case 'exitfloat':
-                        return [
-                            {value: AscFormat.EXIT_FLOAT_UP,            caption: this.textFloatUp},
-                            {value: AscFormat.EXIT_FLOAT_DOWN,          caption: this.textFloatDown}
-                        ];
-                    default:
-                        return [];
-                }
-            }
-        }
-    })(), Common.define.effectData || {});
-
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 917fb1299..d2806b6c6 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -59,7 +59,8 @@ define([
     'presentationeditor/main/app/view/HeaderFooterDialog',
     'presentationeditor/main/app/view/HyperlinkSettingsDialog',
     'presentationeditor/main/app/view/SlideSizeSettings',
-    'presentationeditor/main/app/view/SlideshowSettings'
+    'presentationeditor/main/app/view/SlideshowSettings',
+    'presentationeditor/main/app/view/define'
 ], function () { 'use strict';
 
     PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index 57d19e575..d6f1d432b 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -288,9 +288,7 @@ define([
         },
 
         onGridlinesSpacing: function(value) {
-            value = Common.Utils.Metric.fnRecalcToMM(value,
-         Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
-            this.api.asc_setGridSpacing(value * 36000);
+            this.api.asc_setGridSpacing(Common.Utils.Metric.fnRecalcToMM(value) * 36000);
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
@@ -301,9 +299,7 @@ define([
                 handler: function(dlg, result) {
                     if (result == 'ok') {
                         props = dlg.getSettings();
-                        props = Common.Utils.Metric.fnRecalcToMM(props,
-                      Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
-                        me.api.asc_setGridSpacing(props * 36000);
+                        me.api.asc_setGridSpacing(Common.Utils.Metric.fnRecalcToMM(props) * 36000);
                         Common.NotificationCenter.trigger('edit:complete', me.view);
                     }
                 }
@@ -320,9 +316,14 @@ define([
                         menu.removeItem(menu.items[i]);
                         i--;
                     }
-                    var arr = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? this.view._arrGlidlinesInch : this.view._arrGlidlinesCm;
+                    var arr = Common.define.gridlineData.getGridlineData(Common.Utils.Metric.getCurrentMetric());
                     for (var i = 0; i < arr.length; i++) {
-                        var menuItem = new Common.UI.MenuItem(arr[i]);
+                        var menuItem = new Common.UI.MenuItem({
+                            caption: arr[i].caption,
+                            value: arr[i].value,
+                            checkable: true,
+                            toggleGroup: 'tb-gridlines'
+                        });
                         menu.insertItem(3+i, menuItem);
                     }
                     this._state.unitsChanged = false;
@@ -331,8 +332,7 @@ define([
                 menu.items[0].setChecked(this.api.asc_getShowGridlines(), true);
                 menu.items[1].setChecked(this.api.asc_getSnapToGrid(), true);
 
-                var value = Common.Utils.Metric.fnRecalcFromMM(this.api.asc_getGridSpacing()/36000,
-                    Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm),
+                var value = Common.Utils.Metric.fnRecalcFromMM(this.api.asc_getGridSpacing()/36000),
                     items = menu.items;
                 for (var i=3; i<items.length-2; i++) {
                     var item = items[i];
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index a9cc56675..131f3a128 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -977,34 +977,6 @@ define([
                     ]
                 })
             });
-
-            me._arrGlidlinesCm = [
-                { caption: '1/8 ' + me.textCm, value: 0.13, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/6 ' + me.textCm, value: 0.17, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/5 ' + me.textCm, value: 0.2, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/4 ' + me.textCm, value: 0.25, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/3 ' + me.textCm, value: 0.33, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/2 ' + me.textCm, value: 0.5, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'mnu-gridlines' }
-            ];
-            me._arrGlidlinesInch = [
-                { caption: '1/24 \"', value: 0.04, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/16 \"', value: 0.06, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/12 \"', value: 0.08, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/10 \"', value: 0.1, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/8 \"', value: 0.13, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/6 \"', value: 0.17, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/5 \"', value: 0.2, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/4 \"', value: 0.25, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/3 \"', value: 0.33, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1/2 \"', value: 0.5, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '1 \"', value: 1, checkable: true, toggleGroup: 'mnu-gridlines' },
-                { caption: '2 \"', value: 2, checkable: true, toggleGroup: 'mnu-gridlines' }
-            ];
             me.mnuGridlines = new Common.UI.MenuItem({
                 caption     : me.textGridlines,
                 menu        : new Common.UI.Menu({
@@ -1066,17 +1038,21 @@ define([
                         me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true);
                         me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true);
 
-                        var spacing = Common.Utils.Metric.fnRecalcFromMM(me.api.asc_getGridSpacing()/36000,
-                             Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm),
+                        var spacing = Common.Utils.Metric.fnRecalcFromMM(me.api.asc_getGridSpacing()/36000),
                             items = me.mnuGridlines.menu.items;
                         if (me._state.unitsChanged) {
                             for (var i = 3; i < items.length-2; i++) {
                                 me.mnuGridlines.menu.removeItem(items[i]);
                                 i--;
                             }
-                            var arr = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? me._arrGlidlinesInch : me._arrGlidlinesCm;
+                            var arr = Common.define.gridlineData.getGridlineData(Common.Utils.Metric.getCurrentMetric());
                             for (var i = 0; i < arr.length; i++) {
-                                var menuItem = new Common.UI.MenuItem(arr[i]);
+                                var menuItem = new Common.UI.MenuItem({
+                                    caption: arr[i].caption,
+                                    value: arr[i].value,
+                                    checkable: true,
+                                    toggleGroup: 'mnu-gridlines'
+                                });
                                 me.mnuGridlines.menu.insertItem(3+i, menuItem);
                             }
                             me._state.unitsChanged = false;
diff --git a/apps/presentationeditor/main/app/view/GridSettings.js b/apps/presentationeditor/main/app/view/GridSettings.js
index b3b89344d..c39cab567 100644
--- a/apps/presentationeditor/main/app/view/GridSettings.js
+++ b/apps/presentationeditor/main/app/view/GridSettings.js
@@ -79,34 +79,17 @@ define([
             Common.UI.Window.prototype.render.call(this);
 
             var $window = this.getChild();
-            this.arrSpacing = (Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch) ? [
-                { displayValue: '1/24 \"', value: 0, spacing: 0.04 },
-                { displayValue: '1/16 \"', value: 1, spacing:  0.06 },
-                { displayValue: '1/12 \"', value: 2, spacing:  0.08 },
-                { displayValue: '1/10 \"', value: 3, spacing:  0.1 },
-                { displayValue: '1/8 \"', value: 4, spacing:  0.13 },
-                { displayValue: '1/6 \"', value: 5, spacing:  0.17 },
-                { displayValue: '1/5 \"', value: 6, spacing:  0.2 },
-                { displayValue: '1/4 \"', value: 7, spacing:  0.25 },
-                { displayValue: '1/3 \"', value: 8, spacing:  0.33 },
-                { displayValue: '1/2 \"', value: 9, spacing:  0.5 },
-                { displayValue: '1 \"', value: 10, spacing:  1 },
-                { displayValue: '2 \"', value: 11, spacing:  2 },
-                { displayValue: this.textCustom, value: -1 }
-            ] : [
-                { displayValue: '1/8 ' + this.textCm, value: 0, spacing: 0.13 },
-                { displayValue: '1/6 ' + this.textCm, value: 1, spacing: 0.17 },
-                { displayValue: '1/5 ' + this.textCm, value: 2, spacing: 0.2 },
-                { displayValue: '1/4 ' + this.textCm, value: 3, spacing: 0.25 },
-                { displayValue: '1/3 ' + this.textCm, value: 4, spacing: 0.33 },
-                { displayValue: '1/2 ' + this.textCm, value: 5, spacing: 0.5 },
-                { displayValue: '1 ' + this.textCm, value: 6, spacing: 1 },
-                { displayValue: '2 ' + this.textCm, value: 7, spacing: 2 },
-                { displayValue: '3 ' + this.textCm, value: 8, spacing: 3 },
-                { displayValue: '4 ' + this.textCm, value: 9, spacing: 4 },
-                { displayValue: '5 ' + this.textCm, value: 10, spacing: 5 },
-                { displayValue: this.textCustom, value: -1 }
-            ];
+            var arr = Common.define.gridlineData.getGridlineData(Common.Utils.Metric.getCurrentMetric());
+            this.arrSpacing = [];
+            for (var i = 0; i < arr.length; i++) {
+                this.arrSpacing.push({
+                    displayValue: arr[i].caption,
+                    value: i,
+                    spacing: arr[i].value
+                });
+            }
+            this.arrSpacing.push({ displayValue: this.textCustom, value: -1 });
+
             this.cmbGridSpacing = new Common.UI.ComboBox({
                 el: $window.find('#grid-spacing-combo'),
                 cls: 'input-group-nr',
@@ -123,14 +106,15 @@ define([
                 }
             }, this));
 
+            var metric = Common.Utils.Metric.getCurrentMetric();
             this.spnSpacing = new Common.UI.MetricSpinner({
                 el: $window.find('#grid-spacing-spin'),
-                step: .01,
+                step: metric === Common.Utils.Metric.c_MetricUnits.pt ? 1 : .01,
                 width: 86,
-                defaultUnit : Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? "\"": "cm",
-                value: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? "1 \"" : '1 cm',
-                maxValue: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? 2 : 5.08,
-                minValue: Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? 0.04 : 0.1
+                defaultUnit: Common.Utils.Metric.getCurrentMetricName(),
+                value: metric === Common.Utils.Metric.c_MetricUnits.inch ? "1 \"" : (metric === Common.Utils.Metric.c_MetricUnits.pt ? '36 pt' : '1 cm'),
+                maxValue: metric === Common.Utils.Metric.c_MetricUnits.inch ? 2 : (metric === Common.Utils.Metric.c_MetricUnits.pt ? 145 : 5.08),
+                minValue: metric === Common.Utils.Metric.c_MetricUnits.inch ? 0.04 : (metric === Common.Utils.Metric.c_MetricUnits.pt ? 3 : 0.1)
             });
             this.spnSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){
                 var value = this.spnSpacing.getNumberValue(),
@@ -174,8 +158,7 @@ define([
         },
 
         setSettings: function (value) {
-            value = Common.Utils.Metric.fnRecalcFromMM(value/36000,
-            Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.inch ? Common.Utils.Metric.c_MetricUnits.inch : Common.Utils.Metric.c_MetricUnits.cm);
+            value = Common.Utils.Metric.fnRecalcFromMM(value/36000);
             var idx = -1;
             for (var i=0; i<this.arrSpacing.length; i++) {
                 var item = this.arrSpacing[i];
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 0e5bcf72a..1ee69f0b4 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -355,33 +355,6 @@ define([
                         ]
                     }));
 
-                    me._arrGlidlinesCm = [
-                        { caption: '1/8 ' + me.textCm, value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/6 ' + me.textCm, value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/5 ' + me.textCm, value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/4 ' + me.textCm, value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/3 ' + me.textCm, value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/2 ' + me.textCm, value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1 ' + me.textCm, value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '2 ' + me.textCm, value: 2, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '3 ' + me.textCm, value: 3, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '4 ' + me.textCm, value: 4, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '5 ' + me.textCm, value: 5, checkable: true, toggleGroup: 'tb-gridlines' }
-                    ];
-                    me._arrGlidlinesInch = [
-                        { caption: '1/24 \"', value: 0.04, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/16 \"', value: 0.06, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/12 \"', value: 0.08, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/10 \"', value: 0.1, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/8 \"', value: 0.13, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/6 \"', value: 0.17, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/5 \"', value: 0.2, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/4 \"', value: 0.25, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/3 \"', value: 0.33, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1/2 \"', value: 0.5, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '1 \"', value: 1, checkable: true, toggleGroup: 'tb-gridlines' },
-                        { caption: '2 \"', value: 2, checkable: true, toggleGroup: 'tb-gridlines' }
-                    ];
                     me.btnGridlines.setMenu( new Common.UI.Menu({
                         restoreHeight: true,
                         items: [
diff --git a/apps/presentationeditor/main/app/view/define.js b/apps/presentationeditor/main/app/view/define.js
new file mode 100644
index 000000000..6e4390214
--- /dev/null
+++ b/apps/presentationeditor/main/app/view/define.js
@@ -0,0 +1,868 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+if (Common === undefined) {
+    var Common = {};
+}
+
+if (Common.define === undefined) {
+    Common.define = {};
+}
+
+define(function(){ 'use strict';
+
+    Common.define.effectData = _.extend(new (function () {
+        return {
+            textEntrance: 'Entrance Effect',
+            textEmphasis: 'Emphasis Effect',
+            textExit: 'Exit Effect',
+            textPath: 'Motion Path',
+            textAppear: 'Appear',
+            textFade: 'Fade',
+            textFlyIn: 'Fly in',
+            textFloatIn: 'Float In',
+            textSplit: 'Split',
+            textWipe: 'Wipe',
+            textShape: 'Shape',
+            textWheel: 'Wheel',
+            textRandomBars: 'Random Bars ',
+            textGrowTurn: 'Grow & Turn',
+            textZoom: 'Zoom',
+            textSwivel: 'Swivel',
+            textBounce: 'Bounce',
+            textPulse: 'Pulse',
+            textColorPulse: 'Color Pulse',
+            textTeeter: 'Teeter',
+            textSpin: 'Spin',
+            textGrowShrink: 'Grow/Shrink',
+            textShrinkTurn: 'Shrink & Turn',
+            textDesaturate: 'Desaturate',
+            textDarken: 'Darken',
+            textLighten: 'Lighten',
+            textTransparency: 'Transparency',
+            textObjectColor: 'Object Color',
+            textComplementaryColor: 'Complementary Color',
+            textComplementaryColor2: 'Complementary Color 2',
+            textLineColor: 'Line Color',
+            textFillColor: 'Fill Color',
+            textBrushColor: 'Brush Color',
+            textFontColor: 'Font Color',
+            textUnderline: 'Underline',
+            textBoldFlash: 'Bold Flash',
+            textBoldReveal: 'Bold Reveal',
+            textWave: 'Wave',
+            textDisappear: 'Disappear',
+            textFlyOut: 'Fly Out',
+            textFloatOut: 'Float Out',
+            textBasic: 'Basic',
+            textSubtle: 'Subtle',
+            textModerate: 'Moderate',
+            textExciting: 'Exciting',
+            textLinesCurves: 'Lines Curves',
+            textSpecial: 'Special',
+            textBox: 'Box',
+            textCircle: 'Circle',
+            textPlus: 'Plus',
+            textDiamond: 'Diamond',
+            textDissolveIn: 'Dissolve In',
+            textBlinds: 'Blinds',
+            textCheckerboard: 'Checkerboard',
+            textPeekIn: 'Peek In',
+            textStrips: 'Strips',
+            textExpand: 'Expand',
+            textBasicZoom: 'Basic Zoom',
+            textCompress: 'Compress',
+            textFloatUp: 'Float Up',
+            textRiseUp: 'Rise Up',
+            textStretch: 'Stretch',
+            textCenterRevolve: 'Center Revolve',
+            textFloatDown: 'Float Down',
+            textSpinner: 'Spinner',
+            textBasicSwivel: 'Basic Swivel',
+            textBoomerang: 'Boomerang',
+            textCredits: 'Credits',
+            textCuverUp: 'Cuver Up',
+            textDrop: 'Drop',
+            textFloat: 'Float',
+            textPinwheel: 'Pinwheel',
+            textSpiralIn: 'Spiral In',
+            textWhip: 'Whip',
+            textGrowWithColor: 'Grow With Color',
+            textShimmer: 'Shimmer',
+            textBlink: 'Blink',
+            textDissolveOut: 'Dissolve Out',
+            textPeekOut: 'Peek Out',
+            textContrast: 'Contrast',
+            textCollapse: 'Collapse',
+            textSinkDown: 'Sink Down',
+            textCurveDown: 'CurveDown',
+            textSpiralOut: 'Spiral Out',
+            textContrastingColor: 'Contrasting Color',
+            textPointStar4: '4 Point Star',
+            textPointStar5: '5 Point Star',
+            textPointStar6: '6 Point Star',
+            textPointStar8: '8 Point Star',
+            textCrescentMoon: 'Crescent Moon',
+            textEqualTriangle: 'Equal Triangle',
+            textFootball: 'Football',
+            textHeart: 'Heart',
+            textHexagon: 'Hexagon',
+            textOctagon: 'Octagon',
+            textParallelogram: 'Parallelogram',
+            textPentagon: 'Pentagon',
+            textSquare: 'Square',
+            textTeardrop: 'Teardrop',
+            textTrapezoid: 'Trapezoid',
+            textArcDown: 'Arc Down',
+            textArcLeft: 'Arc Left',
+            textArcRight: 'Arc Right',
+            textArcUp: 'Arc Up',
+            textBounceLeft: 'Bounce Left',
+            textBounceRight: 'Bounce Right',
+            textCurvyLeft: 'Curvy Left',
+            textCurvyRight: 'Curvy Right',
+            textDecayingWave: 'Decaying Wave',
+            textDiagonalDownRight: 'Diagonal Down Right',
+            textDiagonalUpRight: 'Diagonal Up Right',
+            textDown: 'Down',
+            textFunnel: 'Funnel',
+            textHeartbeat: 'Heartbeat',
+            textLeft: 'Left',
+            textRight: 'Right',
+            textSCurve1: 'S Curve 1',
+            textSCurve2: 'S Curve 2',
+            textSineWave: 'Sine Wave',
+            textSpiralLeft: 'Spiral Left',
+            textSpiralRight: 'Spiral Right',
+            textSpring: 'Spring:',
+            textStairsDown: 'Stairs Down',
+            textTurnDown: 'Turn Down',
+            textTurnDownRight: 'Turn Down Right',
+            textTurnUp: 'Turn Up',
+            textTurnUpRight: 'Turn Up Right',
+            textUp: 'Up',
+            textZigzag: 'Zigzag',
+            textBean: 'Bean',
+            textCurvedSquare: 'CurvedSquare',
+            textCurvedX: 'Curved X',
+            textCurvyStar: 'Curvy Star',
+            textFigureFour: 'Figure 8 Four',
+            textHorizontalFigure: 'Horizontal Figure 8',
+            textInvertedSquare: 'Inverted Square',
+            textInvertedTriangle: 'Inverted Triangle',
+            textLoopDeLoop: 'Loop de Loop',
+            textNeutron: 'Neutron',
+            textPeanut: 'Peanut',
+            textPointStar: 'Point Star',
+            textSwoosh: 'Swoosh',
+            textVerticalFigure: 'Vertical Figure 8',
+            textRightTriangle: 'Right Triangle',
+            textAcross: 'Across',
+            textFromBottom: 'From Bottom',
+            textFromBottomLeft: 'From Bottom-Left',
+            textFromLeft: 'From Left',
+            textFromTopLeft: 'From Top-Left',
+            textFromTop: 'From Top',
+            textFromTopRight: 'From Top-Right',
+            textFromRight: 'From Right',
+            textFromBottomRight: 'From Bottom-Right',
+            textLeftDown: ' Left Down',
+            textLeftUp: ' Left Up',
+            textRightDown: ' Right Down',
+            textRightUp: ' Right Up',
+            textObjectCenter: 'Object Center',
+            textSlideCenter: 'Slide Center',
+            textInFromScreenCenter: 'In From Screen Center',
+            textOutFromScreenBottom: 'Out From Screen Bottom',
+            textInSlightly: 'In Slightly',
+            textInToScreenBottom: 'In To Screen Bottom',
+            textOutToScreenCenter: 'Out To Screen Center',
+            textOutSlightly: 'Out Slightly',
+            textToBottom: 'To Bottom',
+            textToBottomLeft: 'To Bottom-Left',
+            textToLeft: 'To Left',
+            textToTopLeft: 'To Top-Left',
+            textToTop: 'To Top',
+            textToTopRight: 'To Top-Right',
+            textToRight: 'To Right',
+            textToBottomRight: 'To Bottom-Right',
+            textSpoke1: '1 Spoke',
+            textSpoke2: '2 Spokes',
+            textSpoke3: '3 Spokes',
+            textSpoke4: '4 Spokes',
+            textSpoke8: '8 Spokes',
+            textCustomPath: 'Custom Path',
+            textHorizontalIn: 'Horizontal In',
+            textHorizontalOut: 'Horizontal Out',
+            textVerticalIn: 'Vertical In',
+            textVerticalOut: 'Vertical Out',
+            textVertical: 'Vertical',
+            textHorizontal: 'Horizontal',
+            textIn: 'In',
+            textOut: 'Out',
+            textWedge: 'Wedge',
+            textFlip: 'Flip',
+            textLines: 'Lines',
+            textArcs: 'Arcs',
+            textTurns: 'Turns',
+            textShapes: 'Shapes',
+            textLoops: 'Loops',
+            textPathCurve: 'Curve',
+            textPathLine: 'Line',
+            textPathScribble: 'Scribble',
+
+            getEffectGroupData: function () {
+                return [
+                    {id: 'menu-effect-group-entrance',  value: AscFormat.PRESET_CLASS_ENTR,     caption: this.textEntrance,     iconClsCustom: 'animation-entrance-custom'},
+                    {id: 'menu-effect-group-emphasis',  value: AscFormat.PRESET_CLASS_EMPH,     caption: this.textEmphasis,     iconClsCustom: 'animation-emphasis-custom'},
+                    {id: 'menu-effect-group-exit',      value: AscFormat.PRESET_CLASS_EXIT,     caption: this.textExit,         iconClsCustom: 'animation-exit-custom'},
+                    {id: 'menu-effect-group-path',      value: AscFormat.PRESET_CLASS_PATH,     caption: this.textPath,         iconClsCustom: 'animation-motion-paths-custom'}
+                ];
+            },
+
+            getEffectData: function () {
+                return [
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FADE,                     iconCls: 'animation-entrance-fade',                 displayValue: this.textFade},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLY_IN_FROM,              iconCls: 'animation-entrance-fly-in',               displayValue: this.textFlyIn},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLOAT_UP,                 iconCls: 'animation-entrance-float-in',             displayValue: this.textFloatIn,     familyEffect: 'entrfloat'},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_SPLIT,                    iconCls: 'animation-entrance-split',                displayValue: this.textSplit},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WIPE_FROM,                iconCls: 'animation-entrance-wipe',                 displayValue: this.textWipe},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_CIRCLE,                   iconCls: 'animation-entrance-shape',                displayValue: this.textShape,       familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WHEEL,                    iconCls: 'animation-entrance-wheel',                displayValue: this.textWheel},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_RANDOM_BARS,              iconCls: 'animation-entrance-random-bars',          displayValue: this.textRandomBars},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_GROW_AND_TURN,            iconCls: 'animation-entrance-grow-turn',            displayValue: this.textGrowTurn},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_ZOOM,                     iconCls: 'animation-entrance-zoom',                 displayValue: this.textZoom},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_SWIVEL,                   iconCls: 'animation-entrance-swivel',               displayValue: this.textSwivel},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_BOUNCE,                   iconCls: 'animation-entrance-bounce',               displayValue: this.textBounce},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_PULSE,                    iconCls: 'animation-emphasis-pulse',                displayValue: this.textPulse},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_COLOR_PULSE,              iconCls: 'animation-emphasis-color-pulse',          displayValue: this.textColorPulse},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_TEETER,                   iconCls: 'animation-emphasis-teeter',               displayValue: this.textTeeter},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_SPIN,                     iconCls: 'animation-emphasis-spin',                 displayValue: this.textSpin},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_GROW_SHRINK,              iconCls: 'animation-emphasis-grow-or-shrink',       displayValue: this.textGrowShrink},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_DESATURATE,               iconCls: 'animation-emphasis-desaturate',           displayValue: this.textDesaturate},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_CONTRASTING_DARKEN,       iconCls: 'animation-emphasis-darken',               displayValue: this.textDarken},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_LIGHTEN,                  iconCls: 'animation-emphasis-lighten',              displayValue: this.textLighten},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_TRANSPARENCY,             iconCls: 'animation-emphasis-transparency',         displayValue: this.textTransparency},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_OBJECT_COLOR,             iconCls: 'animation-emphasis-object-color',         displayValue: this.textObjectColor},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR,      iconCls: 'animation-emphasis-complementary-color',  displayValue: this.textComplementaryColor},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_LINE_COLOR,               iconCls: 'animation-emphasis-line-color',           displayValue: this.textLineColor},
+                    {group: 'menu-effect-group-emphasis',   value: AscFormat.EMPHASIS_FILL_COLOR,               iconCls: 'animation-emphasis-fill-color',           displayValue: this.textFillColor},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_DISAPPEAR,                    iconCls: 'animation-exit-disappear',                displayValue: this.textDisappear},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FADE,                         iconCls: 'animation-exit-fade',                     displayValue: this.textFade},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLY_OUT_TO,                   iconCls: 'animation-exit-fly-out',                  displayValue: this.textFlyOut},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLOAT_DOWN,                   iconCls: 'animation-exit-float-out',                displayValue: this.textFloatOut,    familyEffect: 'exitfloat'},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SPLIT,                        iconCls: 'animation-exit-split',                    displayValue: this.textSplit},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WIPE_FROM,                    iconCls: 'animation-exit-wipe',                     displayValue: this.textWipe},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_CIRCLE,                       iconCls: 'animation-exit-shape',                    displayValue: this.textShape,       familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WHEEL,                        iconCls: 'animation-exit-wheel',                    displayValue: this.textWheel},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_RANDOM_BARS,                  iconCls: 'animation-exit-random-bars',              displayValue: this.textRandomBars},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SHRINK_AND_TURN,              iconCls: 'animation-exit-shrink-turn',              displayValue: this.textShrinkTurn},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_ZOOM,                         iconCls: 'animation-exit-zoom',                     displayValue: this.textZoom},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SWIVEL,                       iconCls: 'animation-exit-swivel',                   displayValue: this.textSwivel},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_BOUNCE,                       iconCls: 'animation-exit-bounce',                   displayValue: this.textBounce},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_DOWN,                       iconCls: 'animation-motion-paths-lines',            displayValue: this.textLines,       familyEffect: 'pathlines'},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_ARC_DOWN,                   iconCls: 'animation-motion-paths-arcs',             displayValue: this.textArcs,        familyEffect: 'patharcs'},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_TURN_DOWN,                  iconCls: 'animation-motion-paths-turns',            displayValue: this.textTurns,       familyEffect: 'pathturns'},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_CIRCLE,                     iconCls: 'animation-motion-paths-shapes',           displayValue: this.textShapes,      familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR,   iconCls: 'animation-motion-paths-loops',            displayValue: this.textLoops,       familyEffect: 'pathloops'},
+                    {group: 'menu-effect-group-path',       value: AscFormat.MOTION_CUSTOM_PATH,                iconCls: 'animation-motion-paths-custom-path',      displayValue: this.textCustomPath}
+                ];
+            },
+
+            getLevelEffect: function (isPath) {
+
+                if (!isPath)
+                    return [
+                        {id: 'menu-effect-level-basic',         displayValue: this.textBasic},
+                        {id: 'menu-effect-level-subtle',        displayValue: this.textSubtle},
+                        {id: 'menu-effect-level-moderate',      displayValue: this.textModerate},
+                        {id: 'menu-effect-level-exciting',      displayValue: this.textExciting}
+                    ];
+                else
+                    return [
+                        {id: 'menu-effect-level-basic',         displayValue: this.textBasic},
+                        {id: 'menu-effect-level-lines_curves',  displayValue: this.textSubtle},
+                        {id: 'menu-effect-level-special',       displayValue: this.textModerate}
+                    ];
+            },
+
+            getEffectFullData: function () {
+                return [
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_APPEAR,                   displayValue: this.textAppear},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_BLINDS,                   displayValue: this.textBlinds},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_BOX,                      displayValue: this.textBox,                 familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_CHECKERBOARD,             displayValue: this.textCheckerboard},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_CIRCLE,                   displayValue: this.textCircle,              familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_DIAMOND,                  displayValue: this.textDiamond,             familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_DISSOLVE_IN,              displayValue: this.textDissolveIn},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_FLY_IN_FROM,              displayValue: this.textFlyIn},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_PEEK_IN_FROM,             displayValue: this.textPeekIn},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_PLUS,                     displayValue: this.textPlus,                familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_RANDOM_BARS,              displayValue: this.textRandomBars},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_SPLIT,                    displayValue: this.textSplit},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_STRIPS,                   displayValue: this.textStrips},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WEDGE,                    displayValue: this.textWedge},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WHEEL,                    displayValue: this.textWheel},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-basic',           value: AscFormat.ENTRANCE_WIPE_FROM,                displayValue: this.textWipe},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_EXPAND,                   displayValue: this.textExpand},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_FADE,                     displayValue: this.textFade},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_SWIVEL,                   displayValue: this.textSwivel},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-subtle',          value: AscFormat.ENTRANCE_ZOOM,                     displayValue: this.textZoom},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_BASIC_ZOOM,               displayValue: this.textBasicZoom},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_REVOLVE,           displayValue: this.textCenterRevolve},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_COMPRESS,          displayValue: this.textCompress},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_DOWN,               displayValue: this.textFloatDown,           familyEffect: 'entrfloat'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_UP,                 displayValue: this.textFloatUp,             familyEffect: 'entrfloat'},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_GROW_AND_TURN,            displayValue: this.textGrowTurn},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_RISE_UP,                  displayValue: this.textRiseUp},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_SPINNER,                  displayValue: this.textSpinner},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_STRETCH,                  displayValue: this.textStretch},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BASIC_SWIVEL,             displayValue: this.textBasicSwivel},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BOOMERANG,                displayValue: this.textBoomerang},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_BOUNCE,                   displayValue: this.textBounce},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_CREDITS,                  displayValue: this.textCredits},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_CURVE_UP,                 displayValue: this.textCuverUp},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_DROP,                     displayValue: this.textDrop},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_FLIP,                     displayValue: this.textFlip},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_FLOAT,                    displayValue: this.textFloat},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_PINWHEEL,                 displayValue: this.textPinwheel},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_SPIRAL_IN,                displayValue: this.textSpiralIn},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_WHIP,                     displayValue: this.textWhip},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FILL_COLOR,               displayValue: this.textFillColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_GROW_SHRINK,              displayValue: this.textGrowShrink},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FONT_COLOR,               displayValue: this.textFontColor, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_LINE_COLOR,               displayValue: this.textLineColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_SPIN,                     displayValue: this.textSpin},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_TRANSPARENCY,             displayValue: this.textTransparency},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BOLD_FLASH,               displayValue: this.textBoldFlash, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR,      displayValue: this.textComplementaryColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2,    displayValue: this.textComplementaryColor2},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_CONTRASTING_COLOR,        displayValue: this.textContrastingColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_CONTRASTING_DARKEN,       displayValue: this.textDarken},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_DESATURATE,                displayValue: this.textDesaturate},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_LIGHTEN,                  displayValue: this.textLighten},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_OBJECT_COLOR,             displayValue: this.textObjectColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_PULSE,                    displayValue: this.textPulse},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_UNDERLINE,                displayValue: this.textUnderline, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BRUSH_COLOR,              displayValue: this.textBrushColor, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_COLOR_PULSE,              displayValue: this.textColorPulse},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_GROW_WITH_COLOR,          displayValue: this.textGrowWithColor},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_SHIMMER,                  displayValue: this.textShimmer},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_TEETER,                   displayValue: this.textTeeter},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BLINK,                    displayValue: this.textBlink},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BOLD_REVEAL,              displayValue: this.textBoldReveal, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_WAVE,                     displayValue: this.textWave, notsupported: true},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BLINDS,                       displayValue: this.textBlinds},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BOX,                          displayValue: this.textBox,                 familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_CHECKERBOARD,                 displayValue: this.textCheckerboard},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_CIRCLE,                       displayValue: this.textCircle,              familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DIAMOND,                      displayValue: this.textDiamond,             familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DISAPPEAR,                    displayValue: this.textDisappear},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_DISSOLVE_OUT,                 displayValue: this.textDissolveOut},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_FLY_OUT_TO,                   displayValue: this.textFlyOut},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_PEEK_OUT_TO,                  displayValue: this.textPeekOut},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_PLUS,                         displayValue: this.textPlus,                familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_RANDOM_BARS,                  displayValue: this.textRandomBars},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_SPLIT,                        displayValue: this.textSplit},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_STRIPS,                       displayValue: this.textStrips},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WEDGE,                        displayValue: this.textWedge},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WHEEL,                        displayValue: this.textWheel},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_WIPE_FROM,                    displayValue: this.textWipe},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_CONTRACT,                     displayValue: this.textContrast},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_FADE,                         displayValue: this.textFade},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_SWIVEL,                       displayValue: this.textSwivel},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-subtle',          value: AscFormat.EXIT_ZOOM,                         displayValue: this.textZoom},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_BASIC_ZOOM,                   displayValue: this.textBasicZoom},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_CENTER_REVOLVE,               displayValue: this.textCenterRevolve},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_COLLAPSE,                     displayValue: this.textCollapse},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_DOWN,                   displayValue: this.textFloatDown,    familyEffect: 'exitfloat'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_UP,                     displayValue: this.textFloatUp,      familyEffect: 'exitfloat'},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SHRINK_AND_TURN,              displayValue: this.textShrinkTurn},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SINK_DOWN,                    displayValue: this.textSinkDown},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SPINNER,                      displayValue: this.textSpinner},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_STRETCHY,                     displayValue: this.textStretch},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BASIC_SWIVEL,                 displayValue: this.textBasicSwivel},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BOOMERANG,                    displayValue: this.textBoomerang},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_BOUNCE,                       displayValue: this.textBounce},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_CREDITS,                      displayValue: this.textCredits},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_CURVE_DOWN,                   displayValue: this.textCurveDown},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_DROP,                         displayValue: this.textDrop},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_FLIP,                         displayValue: this.textFlip},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_FLOAT,                        displayValue: this.textFloat},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_PINWHEEL,                     displayValue: this.textPinwheel},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_SPIRAL_OUT,                   displayValue: this.textSpiralOut},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-exciting',        value: AscFormat.EXIT_WHIP,                         displayValue: this.textWhip},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_4_POINT_STAR,          displayValue: this.textPointStar4},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_5_POINT_STAR,          displayValue: this.textPointStar5},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_6_POINT_STAR,          displayValue: this.textPointStar6},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PATH_8_POINT_STAR,          displayValue: this.textPointStar8},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_CIRCLE,                     displayValue: this.textCircle,              familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_CRESCENT_MOON,              displayValue: this.textCrescentMoon},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_DIAMOND,                    displayValue: this.textDiamond,             familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_EQUAL_TRIANGLE,             displayValue: this.textEqualTriangle,       familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_FOOTBALL,                   displayValue: this.textFootball},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_HEART,                      displayValue: this.textHeart},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_HEXAGON,                    displayValue: this.textHexagon,             familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_OCTAGON,                    displayValue: this.textOctagon,             familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PARALLELOGRAM,              displayValue: this.textParallelogram,       familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_PENTAGON,                   displayValue: this.textPentagon,            familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_RIGHT_TRIANGLE,             displayValue: this.textRightTriangle,       familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_SQUARE,                     displayValue: this.textSquare,              familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_TEARDROP,                   displayValue: this.textTeardrop},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-basic',           value: AscFormat.MOTION_TRAPEZOID,                  displayValue: this.textTrapezoid,           familyEffect: 'pathshapes'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_DOWN,                   displayValue: this.textArcDown,             familyEffect: 'patharcs'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_LEFT,                   displayValue: this.textArcLeft,             familyEffect: 'patharcs'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_RIGHT,                  displayValue: this.textArcRight,            familyEffect: 'patharcs'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ARC_UP,                     displayValue: this.textArcUp,               familyEffect: 'patharcs'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_BOUNCE_LEFT,                displayValue: this.textBounceLeft},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_BOUNCE_RIGHT,               displayValue: this.textBounceRight},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_CURVY_LEFT,                 displayValue: this.textCurvyLeft},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_CURVY_RIGHT,                displayValue: this.textCurvyRight},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DECAYING_WAVE,              displayValue: this.textDecayingWave},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DIAGONAL_DOWN_RIGHT,        displayValue: this.textDiagonalDownRight},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DIAGONAL_UP_RIGHT,          displayValue: this.textDiagonalUpRight},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_DOWN,                       displayValue: this.textDown,                familyEffect: 'pathlines'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_FUNNEL,                     displayValue: this.textFunnel},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_HEARTBEAT,                  displayValue: this.textHeartbeat},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_LEFT,                       displayValue: this.textLeft,                familyEffect: 'pathlines'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_RIGHT,                      displayValue: this.textRight,               familyEffect: 'pathlines'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_S_CURVE_1,                  displayValue: this.textSCurve1},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_S_CURVE_2,                  displayValue: this.textSCurve2},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_WAVE,                  displayValue: this.textSineWave},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_SPIRAL_LEFT,           displayValue: this.textSpiralLeft},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SINE_SPIRAL_RIGHT,          displayValue: this.textSpiralRight},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_SPRING,                     displayValue: this.textSpring},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_STAIRS_DOWN,                displayValue: this.textStairsDown},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_DOWN,                  displayValue: this.textTurnDown,            familyEffect: 'pathturns'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_DOWN_RIGHT,            displayValue: this.textTurnDownRight,       familyEffect: 'pathturns'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_UP,                    displayValue: this.textTurnUp,              familyEffect: 'pathturns'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_TURN_UP_RIGHT,              displayValue: this.textTurnUpRight,         familyEffect: 'pathturns'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_UP,                         displayValue: this.textUp,                  familyEffect: 'pathlines'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_WAVE,                       displayValue: this.textWave},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-lines_curves',    value: AscFormat.MOTION_ZIGZAG,                     displayValue: this.textZigzag},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_BEAN,                       displayValue: this.textBean},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVED_SQUARE,              displayValue: this.textCurvedSquare},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVED_X,                   displayValue: this.textCurvedX},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CURVY_STAR,                 displayValue: this.textCurvyStar},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_FIGURE_8_FOUR,              displayValue: this.textFigureFour},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR,   displayValue: this.textHorizontalFigure,    familyEffect: 'pathloops'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_INVERTED_SQUARE,            displayValue: this.textInvertedSquare},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_INVERTED_TRIANGLE,          displayValue: this.textInvertedTriangle},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_LOOP_DE_LOOP,               displayValue: this.textLoopDeLoop,          familyEffect: 'pathloops'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_NEUTRON,                    displayValue: this.textNeutron},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_PEANUT,                     displayValue: this.textPeanut},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_POINTY_STAR,                displayValue: this.textPointStar},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_SWOOSH,                     displayValue: this.textSwoosh},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_VERTICAL_FIGURE_8,          displayValue: this.textVerticalFigure,      familyEffect: 'pathloops'},
+                    {group: 'menu-effect-group-path',       level: 'menu-effect-level-special',         value: AscFormat.MOTION_CUSTOM_PATH,                displayValue: this.textCustomPath,  notsupported: true}
+
+                ];
+            },
+
+            getEffectOptionsData: function (group, type) {
+                switch (group) {
+                    case 'menu-effect-group-entrance':
+                        switch (type) {
+                            case AscFormat.ENTRANCE_BLINDS:
+                                return [
+                                    {value: AscFormat.ENTRANCE_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_BLINDS_VERTICAL,         caption: this.textVertical}
+                                ];
+                            case AscFormat.ENTRANCE_BOX:
+                                return [
+                                    {value: AscFormat.ENTRANCE_BOX_IN,                  caption: this.textIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_BOX_OUT,                 caption: this.textOut}
+                                ];
+                            case AscFormat.ENTRANCE_CHECKERBOARD:
+                                return [
+                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_DOWN,       caption: this.textDown}
+                                ];
+                            case AscFormat.ENTRANCE_CIRCLE:
+                                return [
+                                    {value: AscFormat.ENTRANCE_CIRCLE_IN,               caption: this.textIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_CIRCLE_OUT,              caption: this.textOut}
+                                ];
+                            case AscFormat.ENTRANCE_DIAMOND:
+                                return [
+                                    {value: AscFormat.ENTRANCE_DIAMOND_IN,              caption: this.textIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_DIAMOND_OUT,             caption: this.textOut}
+                                ];
+
+                            case AscFormat.ENTRANCE_FLY_IN_FROM:
+                                return [
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM,      caption: this.textFromBottom, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM_LEFT, caption: this.textFromBottomLeft},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_LEFT,        caption: this.textFromLeft},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP_LEFT,    caption: this.textFromTopLeft},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP,         caption: this.textFromTop},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP_RIGHT,   caption: this.textFromTopRight},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_RIGHT,       caption: this.textFromRight},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM_RIGHT, caption: this.textFromBottomRight}
+                                ];
+                            case AscFormat.ENTRANCE_PEEK_IN_FROM:
+                                return [
+                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_BOTTOM,     caption: this.textFromBottom, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_LEFT,       caption: this.textFromLeft},
+                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_RIGHT,      caption: this.textFromRight},
+                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_TOP,        caption: this.textFromTop}
+                                ];
+                            case AscFormat.ENTRANCE_PLUS:
+                                return [
+                                    {value: AscFormat.ENTRANCE_PLUS_IN,                 caption: this.textIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_PLUS_OUT,                caption: this.textOut}
+                                ];
+                            case AscFormat.ENTRANCE_RANDOM_BARS:
+                                return [
+                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
+                                ];
+                            case AscFormat.ENTRANCE_SPLIT:
+                                return [
+                                    {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
+                                    {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
+                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
+                                ];
+                            case AscFormat.ENTRANCE_STRIPS:
+                                return [
+                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_UP,          caption: this.textLeftUp},
+                                    {value: AscFormat.ENTRANCE_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
+                                    {value: AscFormat.ENTRANCE_STRIPS_RIGHT_UP,         caption: this.textRightUp}
+                                ];
+                            case AscFormat.ENTRANCE_WHEEL:
+                                return [
+                                    {value: AscFormat.ENTRANCE_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_WHEEL_2_SPOKES,           caption: this.textSpoke2},
+                                    {value: AscFormat.ENTRANCE_WHEEL_3_SPOKES,           caption: this.textSpoke3},
+                                    {value: AscFormat.ENTRANCE_WHEEL_4_SPOKES,           caption: this.textSpoke4},
+                                    {value: AscFormat.ENTRANCE_WHEEL_8_SPOKES,           caption: this.textSpoke8}
+                                ];
+                            case AscFormat.ENTRANCE_WIPE_FROM:
+                                return [
+                                    {value: AscFormat.ENTRANCE_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_WIPE_FROM_LEFT,          caption: this.textFromLeft},
+                                    {value: AscFormat.ENTRANCE_WIPE_FROM_RIGHT,         caption: this.textFromRight},
+                                    {value: AscFormat.ENTRANCE_WIPE_FROM_TOP,           caption: this.textFromTop}
+                                ];
+                            case AscFormat.ENTRANCE_ZOOM:
+                                return [
+                                    {value: AscFormat.ENTRANCE_ZOOM_OBJECT_CENTER,      caption: this.textObjectCenter, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_ZOOM_SLIDE_CENTER,       caption: this.textSlideCenter}
+                                ];
+                            case AscFormat.ENTRANCE_BASIC_ZOOM:
+                                return [
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN,           caption: this.textIn, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_FROM_SCREEN_CENTER, caption: this.textInFromScreenCenter},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT,          caption: this.textOut},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT_FROM_SCREEN_BOTTOM, caption: this.textOutFromScreenBottom},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly}
+                                ];
+                            case AscFormat.ENTRANCE_STRETCH:
+                                return [
+                                    {value: AscFormat.ENTRANCE_STRETCH_ACROSS,          caption: this.textAcross, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_BOTTOM,     caption: this.textFromBottom},
+                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_LEFT,       caption: this.textFromLeft},
+                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_RIGHT,      caption: this.textFromRight},
+                                    {value: AscFormat.ENTRANCE_STRETCH_FROM_TOP,        caption: this.textFromTop}
+                                ];
+                            case AscFormat.ENTRANCE_BASIC_SWIVEL:
+                                return [
+                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
+                                ];
+                            default:
+                                return undefined;
+                        }
+                        break;
+
+                    case 'menu-effect-group-exit':
+                        switch (type){
+                            case AscFormat.EXIT_BLINDS:
+                                return [
+                                    {value: AscFormat.EXIT_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.EXIT_BLINDS_VERTICAL,         caption: this.textVertical}
+                                ];
+                            case AscFormat.EXIT_BOX:
+                                return [
+                                    {value: AscFormat.EXIT_BOX_IN,                  caption: this.textIn},
+                                    {value: AscFormat.EXIT_BOX_OUT,                 caption: this.textOut, defvalue: true}
+                                ];
+                            case AscFormat.EXIT_CHECKERBOARD:
+                                return [
+                                    {value: AscFormat.EXIT_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
+                                    {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textUp}
+                                ];
+                            case AscFormat.EXIT_CIRCLE:
+                                return [
+                                    {value: AscFormat.EXIT_CIRCLE_IN,               caption: this.textIn},
+                                    {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textOut, defvalue: true}
+                                ];
+                            case AscFormat.EXIT_DIAMOND:
+                                return [
+                                    {value: AscFormat.EXIT_DIAMOND_IN,              caption: this.textIn},
+                                    {value: AscFormat.EXIT_DIAMOND_OUT,             caption: this.textOut, defvalue: true}
+                                ];
+                            case AscFormat.EXIT_FLY_OUT_TO:
+                                return [
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM,       caption: this.textToBottom, defvalue: true},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM_LEFT,  caption: this.textToBottomLeft},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_LEFT,         caption: this.textToLeft},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP_LEFT,     caption: this.textToTopLeft},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP,          caption: this.textToTop},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_TOP_RIGHT,    caption: this.textToTopRight},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_RIGHT,        caption: this.textToRight},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM_RIGHT, caption: this.textToBottomRight}
+                                ];
+                            case AscFormat.EXIT_PEEK_OUT_TO:
+                                return [
+                                    {value: AscFormat.EXIT_PEEK_OUT_TO_BOTTOM,      caption: this.textToBottom, defvalue: true},
+                                    {value: AscFormat.EXIT_PEEK_OUT_TO_LEFT,        caption: this.textToLeft},
+                                    {value: AscFormat.EXIT_PEEK_OUT_TO_RIGHT,       caption: this.textToRight},
+                                    {value: AscFormat.EXIT_PEEK_OUT_TO_TOP,         caption: this.textToTop}
+                                ];
+                            case AscFormat.EXIT_PLUS:
+                                return [
+                                    {value: AscFormat.EXIT_PLUS_IN,                 caption: this.textIn},
+                                    {value: AscFormat.EXIT_PLUS_OUT,                caption: this.textOut, defvalue: true}
+                                ];
+                            case AscFormat.EXIT_RANDOM_BARS:
+                                return [
+                                    {value: AscFormat.EXIT_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.EXIT_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
+                                ];
+                            case AscFormat.EXIT_SPLIT:
+                                return [
+                                    {value: AscFormat.EXIT_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
+                                    {value: AscFormat.EXIT_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
+                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
+                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
+                                ];
+                            case AscFormat.EXIT_STRIPS:
+                                return [
+                                    {value: AscFormat.EXIT_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
+                                    {value: AscFormat.EXIT_STRIPS_LEFT_UP,          caption: this.textLeftUp},
+                                    {value: AscFormat.EXIT_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
+                                    {value: AscFormat.EXIT_STRIPS_RIGHT_UP,         caption: this.textRightUp}
+                                ];
+                            case AscFormat.EXIT_WHEEL:
+                                return [
+                                    {value: AscFormat.EXIT_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
+                                    {value: AscFormat.EXIT_WHEEL_2_SPOKES,           caption: this.textSpoke2},
+                                    {value: AscFormat.EXIT_WHEEL_3_SPOKES,           caption: this.textSpoke3},
+                                    {value: AscFormat.EXIT_WHEEL_4_SPOKES,           caption: this.textSpoke4},
+                                    {value: AscFormat.EXIT_WHEEL_8_SPOKES,           caption: this.textSpoke8}
+                                ];
+                            case AscFormat.EXIT_WIPE_FROM:
+                                return [
+                                    {value: AscFormat.EXIT_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
+                                    {value: AscFormat.EXIT_WIPE_FROM_LEFT,          caption: this.textFromLeft},
+                                    {value: AscFormat.EXIT_WIPE_FROM_RIGHT,         caption: this.textFromRight},
+                                    {value: AscFormat.EXIT_WIPE_FROM_TOP,           caption: this.textFromTop}
+                                ];
+                            case AscFormat.EXIT_ZOOM:
+                                return [
+                                    {value: AscFormat.EXIT_ZOOM_OBJECT_CENTER,  caption: this.textObjectCenter, defvalue: true},
+                                    {value: AscFormat.EXIT_ZOOM_SLIDE_CENTER,   caption: this.textSlideCenter}
+                                ];
+                            case AscFormat.EXIT_BASIC_ZOOM:
+                                return [
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT,          caption: this.textOut, defvalue: true},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_TO_SCREEN_CENTER, caption: this.textOutToScreenCenter},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN,           caption: this.textIn},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_TO_SCREEN_BOTTOM, caption: this.textInToScreenBottom},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly}
+                                ];
+                            case AscFormat.EXIT_COLLAPSE:
+                                return [
+                                    {value: AscFormat.EXIT_COLLAPSE_ACROSS,         caption: this.textAcross, defvalue: true},
+                                    {value: AscFormat.EXIT_COLLAPSE_TO_BOTTOM,      caption: this.textToBottom},
+                                    {value: AscFormat.EXIT_COLLAPSE_TO_LEFT,        caption: this.textToLeft},
+                                    {value: AscFormat.EXIT_COLLAPSE_TO_RIGHT,       caption: this.textToRight},
+                                    {value: AscFormat.EXIT_COLLAPSE_TO_TOP,         caption: this.textToTop}
+                                ];
+                            case AscFormat.EXIT_BASIC_SWIVEL:
+                                return [
+                                    {value: AscFormat.EXIT_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
+                                    {value: AscFormat.EXIT_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
+                                ];
+                            default:
+                                return undefined;
+                        }
+                        break;
+                    case  'menu-effect-group-path':
+                        switch (type) {
+                            case AscFormat.MOTION_CUSTOM_PATH:
+                                return [
+                                    {value: AscFormat.MOTION_CUSTOM_PATH_CURVE,        caption: this.textPathCurve, isCustom: true},
+                                    {value: AscFormat.MOTION_CUSTOM_PATH_LINE,         caption: this.textPathLine, isCustom: true},
+                                    {value: AscFormat.MOTION_CUSTOM_PATH_SCRIBBLE,     caption: this.textPathScribble, isCustom: true}
+                                ];
+                        }
+                        break;
+                    default:
+                        return undefined;
+                }
+            },
+            getSimilarEffectsArray: function (familyEffect) {
+                switch (familyEffect){
+                    case 'shape':
+                        return [
+                            {value: AscFormat.EXIT_CIRCLE,  caption: this.textCircle},
+                            {value: AscFormat.EXIT_BOX,     caption: this.textBox},
+                            {value: AscFormat.EXIT_DIAMOND, caption: this.textDiamond},
+                            {value: AscFormat.EXIT_PLUS,    caption: this.textPlus}
+                        ];
+                    case 'entrshape':
+                        return [
+                            {value: AscFormat.ENTRANCE_CIRCLE,  caption: this.textCircle},
+                            {value: AscFormat.ENTRANCE_BOX,     caption: this.textBox},
+                            {value: AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond},
+                            {value: AscFormat.ENTRANCE_PLUS,    caption: this.textPlus}
+                        ];
+                    case 'pathlines':
+                        return[
+                            {value: AscFormat.MOTION_DOWN,  caption: this.textDown},
+                            {value: AscFormat.MOTION_LEFT,  caption: this.textLeft},
+                            {value: AscFormat.MOTION_RIGHT, caption: this.textRight},
+                            {value: AscFormat.MOTION_UP,    caption: this.textUp}
+                        ];
+                    case 'patharcs':
+                        return [
+                            {value: AscFormat.MOTION_ARC_DOWN,  caption: this.textArcDown},
+                            {value: AscFormat.MOTION_ARC_LEFT,  caption: this.textArcLeft},
+                            {value: AscFormat.MOTION_ARC_RIGHT, caption: this.textArcRight},
+                            {value: AscFormat.MOTION_ARC_UP,    caption: this.textArcUp}
+                        ];
+                    case 'pathturns':
+                        return [
+                            {value: AscFormat.MOTION_TURN_DOWN,       caption: this.textTurnDown},
+                            {value: AscFormat.MOTION_TURN_DOWN_RIGHT, caption: this.textTurnDownRight},
+                            {value: AscFormat.MOTION_TURN_UP,         caption: this.textTurnUp},
+                            {value: AscFormat.MOTION_TURN_UP_RIGHT,   caption: this.textTurnUpRight}
+                        ];
+                    case 'pathshapes':
+                        return [
+                            {value: AscFormat.MOTION_CIRCLE,         caption: this.textCircle},
+                            {value: AscFormat.MOTION_DIAMOND,        caption: this.textDiamond},
+                            {value: AscFormat.MOTION_EQUAL_TRIANGLE, caption: this.textEqualTriangle},
+                            {value: AscFormat.MOTION_HEXAGON,        caption: this.textHexagon},
+                            {value: AscFormat.MOTION_OCTAGON,        caption: this.textOctagon},
+                            {value: AscFormat.MOTION_PARALLELOGRAM,  caption: this.textParallelogram},
+                            {value: AscFormat.MOTION_PENTAGON,       caption: this.textPentagon},
+                            {value: AscFormat.MOTION_RIGHT_TRIANGLE, caption: this.textRightTriangle},
+                            {value: AscFormat.MOTION_SQUARE,         caption: this.textSquare},
+                            {value: AscFormat.MOTION_TRAPEZOID,      caption: this.textTrapezoid}
+
+                        ];
+                    case 'pathloops':
+                        return [
+                            {value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, caption: this.textHorizontalFigure},
+                            {value: AscFormat.MOTION_VERTICAL_FIGURE_8,        caption: this.textVerticalFigure},
+                            {value: AscFormat.MOTION_LOOP_DE_LOOP,             caption: this.textLoopDeLoop}
+                        ];
+                    case 'entrfloat':
+                        return [
+                            {value: AscFormat.ENTRANCE_FLOAT_UP,            caption: this.textFloatUp},
+                            {value: AscFormat.ENTRANCE_FLOAT_DOWN,          caption: this.textFloatDown}
+                        ];
+                    case 'exitfloat':
+                        return [
+                            {value: AscFormat.EXIT_FLOAT_UP,            caption: this.textFloatUp},
+                            {value: AscFormat.EXIT_FLOAT_DOWN,          caption: this.textFloatDown}
+                        ];
+                    default:
+                        return [];
+                }
+            }
+        }
+    })(), Common.define.effectData || {});
+
+    Common.define.gridlineData = _.extend(new (function () {
+        return {
+            txtCm: 'cm',
+            txtPt: 'pt',
+
+            getGridlineData: function (metric) {
+                switch (metric) {
+                    case Common.Utils.Metric.c_MetricUnits.inch:
+                        return [
+                            { caption: '1/16 \"', value: 0.06 },
+                            { caption: '1/12 \"', value: 0.08 },
+                            { caption: '1/10 \"', value: 0.1 },
+                            { caption: '1/8 \"', value: 0.13 },
+                            { caption: '1/6 \"', value: 0.17 },
+                            { caption: '1/5 \"', value: 0.2 },
+                            { caption: '1/4 \"', value: 0.25 },
+                            { caption: '1/3 \"', value: 0.33 },
+                            { caption: '1/2 \"', value: 0.5 },
+                            { caption: '1 \"', value: 1 },
+                            { caption: '2 \"', value: 2 }
+                        ];
+                    case Common.Utils.Metric.c_MetricUnits.cm:
+                        return [
+                            { caption: '1/8 ' + this.txtCm, value: 0.13 },
+                            { caption: '1/6 ' + this.txtCm, value: 0.17 },
+                            { caption: '1/5 ' + this.txtCm, value: 0.2 },
+                            { caption: '1/4 ' + this.txtCm, value: 0.25 },
+                            { caption: '1/3 ' + this.txtCm, value: 0.33 },
+                            { caption: '1/2 ' + this.txtCm, value: 0.5 },
+                            { caption: '1 ' + this.txtCm, value: 1 },
+                            { caption: '2 ' + this.txtCm, value: 2 },
+                            { caption: '3 ' + this.txtCm, value: 3 },
+                            { caption: '4 ' + this.txtCm, value: 4 },
+                            { caption: '5 ' + this.txtCm, value: 5 }
+                        ];
+                    case Common.Utils.Metric.c_MetricUnits.pt:
+                        return [
+                            { caption: '4 ' + this.txtPt, value: 4 },
+                            { caption: '8 ' + this.txtPt, value: 8 },
+                            { caption: '12 ' + this.txtPt, value: 12 },
+                            { caption: '16 ' + this.txtPt, value: 16 },
+                            { caption: '20 ' + this.txtPt, value: 20 },
+                            { caption: '24 ' + this.txtPt, value: 24 },
+                            { caption: '36 ' + this.txtPt, value: 36 },
+                            { caption: '40 ' + this.txtPt, value: 40 },
+                            { caption: '56 ' + this.txtPt, value: 56 },
+                            { caption: '64 ' + this.txtPt, value: 64 },
+                            { caption: '72 ' + this.txtPt, value: 72 },
+                            { caption: '144 ' + this.txtPt, value: 144 }
+                        ];
+                }
+            }
+        }
+    })(), Common.define.gridlineData || {});
+});
\ No newline at end of file

From 68fa3649fb64ea8bfb1e7c474042fe8513af1bba Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 4 Oct 2022 18:54:24 +0300
Subject: [PATCH 15/18] Revert changes

---
 apps/common/main/lib/util/utils.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index a03125116..b1d58e132 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -411,11 +411,10 @@ var metrics = new(function() {
             return me.defaultMetric;
         },
 
-        fnRecalcToMM: function(value, fromMetric) {
+        fnRecalcToMM: function(value) {
             // value in pt/cm/inch. need to convert to mm
-            var metric = (fromMetric!==undefined) ? fromMetric : me.currentMetric;
             if (value!==null && value!==undefined) {
-                switch (metric) {
+                switch (me.currentMetric) {
                     case me.c_MetricUnits.cm:
                         return value * 10;
                     case me.c_MetricUnits.pt:
@@ -427,10 +426,9 @@ var metrics = new(function() {
             return value;
         },
 
-        fnRecalcFromMM: function(value, toMetric) {
+        fnRecalcFromMM: function(value) {
             // value in mm. need to convert to pt/cm/inch
-            var metric = (toMetric!==undefined) ? toMetric : me.currentMetric;
-            switch (metric) {
+            switch (me.currentMetric) {
                 case me.c_MetricUnits.cm:
                     return parseFloat((value/10.).toFixed(4));
                 case me.c_MetricUnits.pt:

From 8ca56d8aa22870442130a96213f4b0529f89b52f Mon Sep 17 00:00:00 2001
From: Kirill Volkov <kirill.volkov@onlyoffice.com>
Date: Mon, 10 Oct 2022 16:29:59 +0300
Subject: [PATCH 16/18] Add new icons

Added new icons. Changed btn-text icon.
---
 .../img/toolbar/1.25x/big/btn-text-vertical.png | Bin 0 -> 168 bytes
 .../img/toolbar/1.25x/big/btn-text.png          | Bin 305 -> 169 bytes
 .../img/toolbar/1.25x/btn-text-vertical.png     | Bin 0 -> 166 bytes
 .../resources/img/toolbar/1.25x/btn-text.png    | Bin 0 -> 168 bytes
 .../img/toolbar/1.5x/big/btn-text-vertical.png  | Bin 0 -> 189 bytes
 .../resources/img/toolbar/1.5x/big/btn-text.png | Bin 315 -> 191 bytes
 .../img/toolbar/1.5x/btn-text-vertical.png      | Bin 0 -> 164 bytes
 .../resources/img/toolbar/1.5x/btn-text.png     | Bin 0 -> 163 bytes
 .../img/toolbar/1.75x/big/btn-text-vertical.png | Bin 0 -> 187 bytes
 .../img/toolbar/1.75x/big/btn-text.png          | Bin 339 -> 193 bytes
 .../img/toolbar/1.75x/btn-text-vertical.png     | Bin 0 -> 168 bytes
 .../resources/img/toolbar/1.75x/btn-text.png    | Bin 0 -> 170 bytes
 .../img/toolbar/1x/big/btn-text-vertical.png    | Bin 0 -> 165 bytes
 .../resources/img/toolbar/1x/big/btn-text.png   | Bin 276 -> 168 bytes
 .../img/toolbar/1x/btn-text-vertical.png        | Bin 0 -> 149 bytes
 .../main/resources/img/toolbar/1x/btn-text.png  | Bin 0 -> 147 bytes
 .../img/toolbar/1x/text-box-horizontal.png      | Bin 0 -> 147 bytes
 .../img/toolbar/1x/text-box-vertical.png        | Bin 0 -> 149 bytes
 .../img/toolbar/2x/big/btn-text-vertical.png    | Bin 0 -> 178 bytes
 .../resources/img/toolbar/2x/big/btn-text.png   | Bin 387 -> 178 bytes
 .../img/toolbar/2x/btn-text-vertical.png        | Bin 0 -> 164 bytes
 .../main/resources/img/toolbar/2x/btn-text.png  | Bin 0 -> 164 bytes
 .../resources/img/toolbar/1.25x/big/combine.png | Bin 0 -> 269 bytes
 .../img/toolbar/1.25x/big/restrict-editing.png  | Bin 0 -> 347 bytes
 .../resources/img/toolbar/1.5x/big/combine.png  | Bin 0 -> 289 bytes
 .../img/toolbar/1.5x/big/restrict-editing.png   | Bin 0 -> 381 bytes
 .../resources/img/toolbar/1.75x/big/combine.png | Bin 0 -> 308 bytes
 .../img/toolbar/1.75x/big/restrict-editing.png  | Bin 0 -> 426 bytes
 .../resources/img/toolbar/1x/big/combine.png    | Bin 0 -> 236 bytes
 .../img/toolbar/1x/big/restrict-editing.png     | Bin 0 -> 304 bytes
 .../resources/img/toolbar/2x/big/combine.png    | Bin 0 -> 508 bytes
 .../img/toolbar/2x/big/restrict-editing.png     | Bin 0 -> 571 bytes
 .../img/toolbar/1.25x/big/gridlines.png         | Bin 0 -> 169 bytes
 .../resources/img/toolbar/1.25x/big/guides.png  | Bin 0 -> 192 bytes
 .../img/toolbar/1.25x/horizontal-guide.png      | Bin 0 -> 143 bytes
 .../img/toolbar/1.25x/vertical-guide.png        | Bin 0 -> 142 bytes
 .../img/toolbar/1.5x/big/gridlines.png          | Bin 0 -> 180 bytes
 .../resources/img/toolbar/1.5x/big/guides.png   | Bin 0 -> 201 bytes
 .../img/toolbar/1.5x/horizontal-guide.png       | Bin 0 -> 153 bytes
 .../img/toolbar/1.5x/vertical-guide.png         | Bin 0 -> 152 bytes
 .../img/toolbar/1.75x/big/gridlines.png         | Bin 0 -> 197 bytes
 .../resources/img/toolbar/1.75x/big/guides.png  | Bin 0 -> 221 bytes
 .../img/toolbar/1.75x/horizontal-guide.png      | Bin 0 -> 161 bytes
 .../img/toolbar/1.75x/vertical-guide.png        | Bin 0 -> 162 bytes
 .../resources/img/toolbar/1x/big/gridlines.png  | Bin 0 -> 149 bytes
 .../resources/img/toolbar/1x/big/guides.png     | Bin 0 -> 179 bytes
 .../img/toolbar/1x/horizontal-guide.png         | Bin 0 -> 139 bytes
 .../resources/img/toolbar/1x/vertical-guide.png | Bin 0 -> 138 bytes
 .../resources/img/toolbar/2x/big/gridlines.png  | Bin 0 -> 278 bytes
 .../resources/img/toolbar/2x/big/guides.png     | Bin 0 -> 303 bytes
 .../img/toolbar/2x/horizontal-guide.png         | Bin 0 -> 230 bytes
 .../resources/img/toolbar/2x/vertical-guide.png | Bin 0 -> 232 bytes
 .../img/toolbar/1.25x/big/edit-links.png        | Bin 0 -> 479 bytes
 .../img/toolbar/1.5x/big/edit-links.png         | Bin 0 -> 538 bytes
 .../img/toolbar/1.75x/big/edit-links.png        | Bin 0 -> 641 bytes
 .../resources/img/toolbar/1x/big/edit-links.png | Bin 0 -> 392 bytes
 .../resources/img/toolbar/2x/big/edit-links.png | Bin 0 -> 845 bytes
 57 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.25x/btn-text.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.5x/btn-text.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.75x/btn-text.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-text.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/2x/btn-text.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.75x/big/restrict-editing.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/combine.png
 create mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/restrict-editing.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/vertical-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/big/gridlines.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/big/guides.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/gridlines.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/guides.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/big/gridlines.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png
 create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/vertical-guide.png
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/edit-links.png
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/edit-links.png
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/edit-links.png
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/edit-links.png

diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..1850634ab80f5ea62d42f235bb0df876eb518756
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ@%40Z45_%4oUp(?frmk84Id9r46j3*ScHcO5U^+**~rBq_Aub+
z0|p`XBsGEdW-%uvgN3XroSkiL4lQA84=KBB`)Kmj?B_*CZw7{w3380@9CHmo7J9n+
KxvX<aXaWEtS1^A7

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-text.png
index 26147828bd84830f93597c460cefad2ee1663f55..b06d5aa0ee2fc5b52f958c78e9e03d92a95f8ff3 100644
GIT binary patch
delta 153
zcmdnUw32axL_HHT0|P@y<&=LwiZj3`#FY`qU|{(F|NoR_w<iKwj3q&S!3+-1ZlnP@
zex5FlAr-fh6C^|$t}=QUuo)O+G*-m$Iy9+@u&_u-ObKH=*v0l{mBhhYjgMp$W_32Q
zC|<k3&@tiKDz-aLJW2+=+!Ab41uE~USuc3W%TQh{BzIX%YDOo>N>5immvv4FO#pr$
BG5-Jn

delta 290
zcmZ3<xRGgsL_G%^0|SGmcug*l;w<opEM{Qf76xHPhFNnYfP#$0LGDfr>(0r%1aer?
z9eo`c7&i8E|4C#8@{f7CIEGX(zP)jftJ#64<zdLLf9v;5ZIWv`oR_p|`TyM_InpUI
zrIE%A2g>HRCntaUE4}dM<C6bBQd-kC^MBm`%Ax+!=GDxRb8WMImIowTxgLIRvGU59
zzJ@eo{=>>mf*fu?qVBx<d+%r3@95fZDfe<r+)kJrTW){kW7$5=@Mf)Rb|!8L5{(Hg
zAf<4|i8VEQ-)hG#E!y6HjDtm4pyxo^j<xo)+kUSRnN`brd8g#MwAIloKYO*Nm2Z<y
f3s+`5@SD+mznen$kN>NIeq!)+^>bP0l+XkK0hM<W

diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5c53bf6488ef5e5c9f103659725355c6aab5dd
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRIaCsV@SoVx6?ei7!-L}KL7Xs
zC9=28pxrNqZ3~x;*)oHyGYkse<=NiLte@~|&Fp_PB~@}_#GIz{cBM+wrf8&YVx4NN
z-+3e~N>3=7bK-56De2{2E|q115Bn58&F8THtvONq_>Z!Lp8TGV48J8yELpE-)@`-}
PTFl_->gTe~DWM4fX4*NZ

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-text.png b/apps/common/main/resources/img/toolbar/1.25x/btn-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ab41f1ff32359b15210b9b5552420f79045243b
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRKBN+V@SoVx6>T?4k&Q2{QR$8
z%Vj&wBsX>Cmq$L21XD$r(-=0W%7uBaVSmEh60zUYD{`9PPPL^1-)}r}U8A9RG)zTn
z<G-TI{!hPnss#IW`22H>&OG~%L8(Kb>BOZri@J;sW$l9(PF%QQV#0LbBxCC~*6XJ&
So6iHSX7F_Nb6Mw<&;$UulRiTL

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce930c0052c4b1ffba0894e25c8b83ef0f87bc62
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf#0(?@bf-K9Qk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQN%C}Y45_%4oFE~hAmU=s#=yCbRbg2eb4LkF_a+8TK30KXMkOgO
zri8$?p$;1sFmC76Nw_TQz%t|fK?8$DiwXjlv4#kzvam6Sh)4)L>9}+%wOQdx;S!BC
hne5e8hx3?Z85v$aGxttQUwH`R3Qt!*mvv4FO#tSCHu(Sm

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png
index 54077238a150746234e34e658882ca3f79848edb..3da7ffbc2ba4757f721beb489a09beb838022ea1 100644
GIT binary patch
delta 175
zcmdnZw4ZT;L_HHT0|P^V?v%$siZj3`#FY`qU|{(F|NoR_w<iKwj3q&S!3+-1ZlnP@
zDV{ElAr-fh6C|=4Oc{JStqcs-Fm0X@#=t4YXb{byaf?OpDMM#hTayEWM~SFJ!2^@V
zgN$d=7?b!qe0i62x3#r7xb6&Fo2B4BMUf>>FPvH9uz~PWotnZUHrFhU&66uQ@<)M{
ZVG*bK+h;!?uLD}h;OXk;vd$@?2>|k*JC^_e

delta 300
zcmdnbxSMH$L_G%^0|SGub4>w|;w<opEM{Qf76xHPhFNnYfP#$0LGDfr>(0r%1aer?
z9eo`c7&i8E|4C#8@-KM0IEGX(zP;th*Q_Ao8hESZfAliHSrN@je_mfdXuDX=OenrW
z<6@AC=cJNDuOCFn{&>IUgGA}a@+Q~Dz~n1)@7FK+Ao05UZk$DGN>909){;+>ho+u)
z(9xEh+CN`s;V0WLxwHiv{AZd6uh*8_%Xe0Xd7|khNiO4nh$WxaMqN4gv1IM9b<-KE
z(x39QN@|>ONMr-b&1gKtBa*hjfEgk*ac|9O<!|q8!}m!3Eo=iyJ&QiiS@%NVNjsnU
sE7iMCjbDk#DKGw3uA@6i<)!Donx9b|ldsz)0)5Be>FVdQ&MBb@0KqPJW&i*H

diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..e220bbeb976dc5f5d3567e88c988f81743f4dece
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L#0(PoHuVmW;tcQ!ab*ND7#RNl|378f?TJ7Z
zV@Z%-FoVOh8)-m}r>Bc!NX4z>gaslUOopqOnJ+Ub>}Bd;bq0clnzf;;!%7n-rZXnF
zDdaIEv3~loCg2~_q91D(E=>5hD)h$BC9~WY{`Tb6KgGacY^Jnv>0O1XAj>>m{an^L
HB{Ts5!zDH+

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-text.png b/apps/common/main/resources/img/toolbar/1.5x/btn-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cb7a918b903223656127e4b71ddb449964bbf0
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L#0(PoHuVmW;tcQ!ab*ND7#RNl|378f?TJ7Z
zV@Z%-FoVOh8)-m}ho_5UNX4z>gau|Cj7i5B*w(QrtYtm2ZlQz1fdd=4IK&bsiZf&u
zB_uEf%G~(TvrsW%-?de2YiiiSR{Ub+VLp8PeO=Ju=3NX7O7~>5FYw5H2ifK6>gTe~
HDWM4fRbey$

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..b22e55c5754b23b59c9f3b46b254239248d01e39
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK#0(^3E>1ZDq&Ne7LR=Yv3<ie(|Nl=}c6%a_
z#aI&L7tG-B>_!@pli=y%7*cU7IYHuz!xcuyLS2T<3#T+NH$4gfF&s1`SQ=8dgf$-E
zVr5!p=(Hx8aWZehq|U^Q6C11)Qf7$pC`kq;s2oVy(J;|r=9z?VF9Uq6D~iO<{b{y7
e|IjS=0uzIfjqQO;$4h^L+~Dcz=d#Wzp$Pys&_9v@

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png
index 2ef05951645b7e91b5818cdda7b0710a35742418..244eff7bc0b4e11cfef17afcaaaf1c95cbdd0d38 100644
GIT binary patch
delta 177
zcmcc2bdYg^L_HHT0|P_M#VJRC6lZ`>h$|zI!NBnU|Nkk=ZchZV7)yfuf*Bm1-ADs+
z(mY)pLn>}1CrDT}m@+sSw;321tZm?0$0Vr36d)<KfQLO~8K;i26c?j{<hoFS3oZ9e
z*w{7rU9=r;a+yqI+{vfLTolXfYQ)pS=<#ihL)k&C6+D$jUp&|=E}5RY(rtb8vFG)}
aTnr5NJ)KzA%FD)poZ{)~=d#Wzp$Pzi?l)rq

literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%62Db50q$YKTtZeb8+WSBKa0w~B>
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oApeD@i(^Oy<J()exta|`TrO_;^1t5l>&3V|
z4`*y{-8-+Pi?Q8!o9SB5Nh+S(Ki>GUN8ZL>b5q&;nwXSJY@X}xiubv9tg+oMdEfk5
zmix6jGew!T%e*FLt(vmx=&7tzF&j3_+7{s}z{Z#;Ah5nHZc(}WKf9k3E6V273RnvQ
zg(t39wsqng>+{-M!?Zu&+V$zZpgPkb1qB`ggwjX5B;IebN8%Q5%di5O12q0!t?Y^1
zpY?t21=0U_-~Rj+WqE7jR_)iFA-zDS2c3`>(u)%LB(U)l(9aB>u6{1-oD!M<1R;Ep

diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..64e713b3f36f3219f7c7af24229454664f574c12
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ@%40Z45_%4oUp(?frmk84Id9r46j3*ScHcO5U^+**~rBq_Aub+
z0|p`XBsGEd<|IYI85fwmT3wu-6`WRwJrrEDtoI5x=cmQZ(-;^!ljJim*8cwvve47j
K&t;ucLK6T$88RCH

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-text.png b/apps/common/main/resources/img/toolbar/1.75x/btn-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..05f63a78db0ee25744d43fff4b383172a99048ce
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ@%MCb45_%4oFF06aFx-+fX%=lqp>1}*P%&OgoQ;yVoDg}!7jEp
zt0WHIYJ4Q4FsrkXMe*VVfsPBSLb(gL4Lc5)=p{&mI6bMH{ib1=IRnFzsS4Jr^G;-g
Otn_sCb6Mw<&;$THyEI(@

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..267ec2ec38a33638c675ae4534d64e86105ce1ca
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^7C<b+#0(@ouTEJDq&Ne7LR=Yv3<ie(|Nl=}c6%a_
z#aI&L7tG-B>_!@p<K^k%7*cU7IYEK5g<+!x^I<N9rL0HREnK*;k%uRCb=cad7ENu2
zBRV`hTn=5$JnJ}GRy(qUo0za1xf->VNqV}<VvPc0&qik^28Km*B-ktVKHvq}=IQF^
Jvd$@?2>=SdFV+A6

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1x/big/btn-text.png
index 630b2c47c6eb6f01683daef4721c01e7055d1ef5..448117d319da71db052886ad82fae72412fc6626 100644
GIT binary patch
delta 140
zcmV;70CWG80;mCyB!6#7L_t(|+U=J?3cw%?1oQt-r`I5bu52tVnE`LIIvB-70Kk{X
zGLC0u!Cp+v%A3tOBc24;%{kP}u_qW!a&lIO+-}xbLFK-+2`cvuL8C--W1d}B^5cOZ
uf(RmrAcB0=W((5r((wME;RS&AxByMPX|s2p8MOca002ovP6b4+LSTY+(?4qf

delta 248
zcmV<U00;l50h9ueB!3BTNLh0L01FcU01FcV0GgZ_00001b5ch_0Itp)=>Px#1ZP1_
zK>z@;j|==^1poj5sYygZRCodHm*EP4APj^}djD5m{V_z;X*;3WeSe~oo9BjOArSIu
zj^bT9|7KCO<mOp$6D+|RTCuX$YHUi&YE0AWWe|y)L1?gnLvcd{9@an@ZE3`?IolgN
zC)R3ZguI;8vK_sgn8A$v#H8{KN}i#V%{MKDmyCC4&^t8f9rnQn%lcn6m|>)1iF)UE
y1FsZM3#wK!h#YuJt=QQZ0#yr{#Z?tS$U-hsa7GvulXV;b0000<MNUMnLSTaAdSpNV

diff --git a/apps/common/main/resources/img/toolbar/1x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1x/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aa4448aa6c187c85802bccb42f510b727d39097
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQZb$`jv*Dd-cCKp#h}39{QbXu
z?sY*I;cf%j3h6f!XF05%(WCXo_!6hQ#)Xz9CJW{@NB&*W=U_bdbh5MSeZ7dh^+IoQ
z^Q{hCXsQr<8hv2iLFtC``)Asfs`|yg*5=*qxG3k--2AIRdl)=j{an^LB{Ts5^jbGF

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/btn-text.png b/apps/common/main/resources/img/toolbar/1x/btn-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dbaf0d6e392f80a99ce2a2020004a6923bf01cd
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQc<2Rjv*Dd-cB{-V^H8={`r4-
zp{k3wu=s_zM`2IjG|d#)`=ManW;qRc<<0vf`}#tgDlL@mN#0J#V=+xX<NnCuip=GE
w9tU+!rSvyNPC4ln&~%q&tLMHODvvb9BzPC)@YLDO0@}jh>FVdQ&MBb@0DUDiqyPW_

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png b/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dbaf0d6e392f80a99ce2a2020004a6923bf01cd
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQc<2Rjv*Dd-cB{-V^H8={`r4-
zp{k3wu=s_zM`2IjG|d#)`=ManW;qRc<<0vf`}#tgDlL@mN#0J#V=+xX<NnCuip=GE
w9tU+!rSvyNPC4ln&~%q&tLMHODvvb9BzPC)@YLDO0@}jh>FVdQ&MBb@0DUDiqyPW_

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png b/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aa4448aa6c187c85802bccb42f510b727d39097
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQZb$`jv*Dd-cCKp#h}39{QbXu
z?sY*I;cf%j3h6f!XF05%(WCXo_!6hQ#)Xz9CJW{@NB&*W=U_bdbh5MSeZ7dh^+IoQ
z^Q{hCXsQr<8hv2iLFtC``)Asfs`|yg*5=*qxG3k--2AIRdl)=j{an^LB{Ts5^jbGF

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..79541939738181decbb0cd52d2cf2bc253e1fb00
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U#0(@OTBqCuQk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ3HNky45_%4oFI{;V8Y<Exvl9$D7S*my3iI?W~YS>qDP`PaB=P6
z@Sc>fu6^caf@_Syy{3nnC#4#6PHs*3;I*k~k(Ay^)~>8s-h68Xq$FRKWlU9b=3roO
XpHkf#&}{1fw1UCY)z4*}Q$iB}o69&{

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-text.png b/apps/common/main/resources/img/toolbar/2x/big/btn-text.png
index 65e28009cf1f919fe73d7220f0abbfb2ca27fa3a..d625655815f2a9b3eede55dd12ca6a162f51ef62 100644
GIT binary patch
delta 162
zcmZo>-o!XTqMnJFfq@~Sb;?a3#Tnoe;>rkQFfjc8|9{G|+Y^B-#*!evU<QY0H`0Kd
za8DP<kcwN$2@;wOrXt6<coPyHM6o_z8|4r%$y9`k$zf8=>IDgmiJqI@rf@XumUhu;
z__#wNL!0vxhm+6~!CT%&8`u=AJF*!MuXr+H+LGd3(y~dG)h-MS+e52cr*D@`2HEZD
L>gTe~DWM4f&Luab

literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_
z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(P)@?r#WAFU@$H@4d`$)dt``sf_`g4<mr<U>
zl$C34?zbxAIHQw=5(_j1C#iT|y1PvN{Z!`rJDsQRI(7S5|DK}`)vv2sE<`cSNvgS?
z`!eXdNq0)r>rKoL`_3F#vkQplH2x|{X{&#$S~?|?XWMo@Yk_kN4|yQOJITLuZ6}|u
zxc>b0o0(bfciWXI%waqvsc=Wsctcr_e(!wmwPuH}ZT`4U6h#}t05sOSuCE8Ap8Sem
z9cVr0je`Yqi!qcaf8n&l`Mdwt7<Rpr)33e`yjEIrbM=Ojlxfe8ta-g^BlE*3D}&c-
pUIc|-i@XsvT~@<$l1k=s@g@7c;}+ccT?Gs?22WQ%mvv4FO#r%;pRE7@

diff --git a/apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dd250109d610790cb89ec70fc901681d9d2642c
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5#0(@w_@+(*Qk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ@$__Y45_%4oFEZ#K#EIwN7z9QnWi-h9S(3kDqhRPq<5#uW%fw{
z26eFmoO7DiFd8_nW4$8CvP)Krqr`eDOXfqrB<IYA<YER!hU!(}hFt+O-+(OhboFyt
I=akR{0Jq^Vi2wiq

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/2x/btn-text.png b/apps/common/main/resources/img/toolbar/2x/btn-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a4da53ff1b6e98586a6aad3e31855ce0799538
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5#0(@w_@+(*Qk(%kA+C%-1_Q(Y|No~fyFC%e
zVk`;r3ubV5b|VeQ@$__Y45_$vb)q2`g8>Kg<{dw*#Q#5kqb<FgTbApQpbOt4r46hf
zXXQ1d<w~v<Q4b56?4mzE|IiKdmAW_hkMeUSu4^%R{q#dWo2AJ4;I$774?O@H%HZkh
K=d#Wzp$PzZc{T9>

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20ba06bbc1a94a067eeb758f9177d7efac45709
GIT binary patch
literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhb)D=$`$B>F!Z)cw7Z8hLw(L5=8
zkxBJJrkA1PqXSP}^&j~5m}vhL;dDKGY<^0lfYXa=Ez>=MsaM?Y?5&7SRgtLQDaU#2
z{u*Yr7aDhx!<&9S*0{5E^}#Ry0#|SBJW#RRdCjqDj6Jb@#z((bo7Fj5%BC58aMBPm
z@L!;Da7)p}3<LXO!9LF?5=A_rn#&kxv#CYPE6<+FbfD#&m-F*>pUpgdGr^Lbc5UaT
zM{*vYkUV2*TIkYw*7rm29RG6X=ek#RZg(v|*Dy(3TqDAucGX+OiDRx6!z6{*-xh3r
R_z37f22WQ%mvv4FO#sNFZDs%f

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png
new file mode 100644
index 0000000000000000000000000000000000000000..a831cdfe637f93a87f8a063f3b87b11ca683ad55
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq002e+001Kh1^@s6DHnWg0003ZNkl<Zc-rmQ
z{RzV$5C!mz;0TVG4U&yAf}=P>Mz|`xe;U%(ue%6+4~~M^5Pv<Q&9X2I!!Xk&rjp9q
zG;TyhqSR;8f{}*#Q3EHhvUWZ&w^?Ak22LZ4*TRv;`NMHqVDPDeBOUXH;<UnO;YjEF
zVK_Z78aTBu-*z!;n2)>I6EJGm8MYw85QZ>>`6HNV7PQRrOB3e(P#032`2K-0a~K@z
zLaGx-m?Mup0pkI(r*fzjW8M-5C>dl=<xnfeyfw@Lh--FqktIy-j`e0dLj`LXL6=<P
z&^6Yt9o)@$?ws=p7?lTk@1Mxg5AvD|l)MIw7BGdcL8BFnD0E;ejEwF;!Vrcqgt3Gv
t*=ej`e(p4uFryKp#f?~O*9^lH<plu>b|Kk2-berd002ovPDHLkV1nPyliUCR

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea709cf6697aed2909a0849e29e268460e272b13
GIT binary patch
literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq002|~001fo1^@s6Ekk^80002!Nkl<Zc-rln
z(G7(#2ml?4ja<PI+_a-$U*eY^uZFfj&0WHuCVCPmwc7>&007WSsiBQ1(GRJrMcb4N
zLUqtJvxVx2YY>XiHHE&Zd(Sw%g}$tNPtFLT)*Ge9;V9I4pVT<A3za*w#p?rFUhtOr
z%WU!bfR-2Rk?AJ1N2a&XR?W>K^l!~2LqD9M)KI#7{x0vnupc?OtR!^W=Ez{7Q#VIa
z%&e=-)(Ax?LaCv2d3KxFZDLYlmJbukZW9@rJ430Vba~${Z~5!F2dqOae?9kzb*T5$
n#X$#zBJ?vtIeiBJ0N}|5>km7%L-i)g00000NkvXXu0mjf>!g4-

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png
new file mode 100644
index 0000000000000000000000000000000000000000..714b66191729e109a657d0f59e459f286bb00533
GIT binary patch
literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq002|~001fo1^@s6Ekk^80003*Nkl<Zc-rmS
z;R%B<5CvdI$OswH4Rj+%aFmST2-gH&|A^4q++EJ{9vp?hiGIe`Sf`0$7=~dUlu}DN
zYVp`f5h>D_#S2tAdy5BZ6Y1&230a;1nmtezK(iOBDD;}6_JZQm1yz)KO;I&Ky--E5
z*9=t))B{zNdreR^L9J26pjRDL8`KiD2lShJ*a)B>?_r~Wx@}wgpe?seP=XSapadl-
zK?yoAmY`v05kYl9+j4WSbzqwt#zKK&xw+Rmut?h4STxWK$hB5N%^1s3K!MpH*IEfR
zV=PAk-2iybidh>4w9Ur(V!Q$Gkw68r@|=WO8U?f^U5vMxdPD;?{f^cG_4v`Veth??
zG79wOU(jVFsCZoo77v)st^|S-l%ND9C_xGOr=Y*Q&Nu?}_UnwJK)p^z8MTw%H}(v}
bFwAvco1PSpe|Ie400000NkvXXu0mjfG(({V

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1d7a93c63dd2a43909f2d08594236995eb9b3c
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq003eD001!v1^@s6A-{ZA0002{Nkl<Zc-rlo
z!3~2j3`H}NH(~`wVAG7^rV>Y_rb>dp;XTPWdI(RpV~dso000000FZ~;!aJg>9>CqJ
z_feHa_~hpzMEK0-5P=9ptf=KzaVUuRqn2NBsEF|F8L_G~WD{X6_RJ#M&#lFtS%jUX
z%_1{$<VBnkzNO8gGtvVkgo>CUK|w@MlUEn<v&oYYWCT4TqX=$I%n{5HvnTc{EaKMf
ztMtMuQpD}&Km;NXL63M(kKoqC9Pz$6g2}qDYZ`tLY+rRmuze*X=n;?W5!{-@L@-AP
zeAl#zh#2{<X;TqVvS-Ay10Vtsh<Km~{vQDV00000Fu(^R*^6b)Y0cvR0000<MNUMn
GLSTZToPhQK

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/big/restrict-editing.png
new file mode 100644
index 0000000000000000000000000000000000000000..e10007382af457c75a5c8ffb18ec53de18bc88ac
GIT binary patch
literal 426
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%6oFfbN+x;TbZ+<JSvcjX}ik+z3@
z69lcC%-1OIXv}-UA^CJhjB-c9#G-$%YVA3kl-0NSYk!GY-YMY3p=dwxR+~nzX%f53
zlCHRG8XSRZf|U(^UA(-?IN<tX=QDy5rv!>c+BB{g9>35cv0hOkDd4!Mv$PVIbI+?C
zi4hJi2_1>D;yl_M`8<Z}lKT=lA9gD8mHHU2QQTv&MPc7w!!tY|ul6REb!^zG!{7Hj
z%7KBAMF5!)6!z~pJa?(X5$7o{FQ(S!GTB+Lf65`SHs)pQwe4yNvbRqOD*S5Sv$b%Z
z+}ii))6CW-uS;o@;Mi_<ZtvH>n`$#3TRrnC>!`aHZ}!akf~KX5{cC;c&$2J3$S&&J
z{6F~F$9ZQ2{%U93obms6qlR^h#rkwc#d)t8KQ0!io;QE(OocK#`{>P%9#5vOU{RbH
zu7u(=#+K``AAd6+y(qBzf9NbuC9chBw;FkL`GBGJU%x!*>w3fHpZd#yalqi|>gTe~
HDWM4fKijD<

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png
new file mode 100644
index 0000000000000000000000000000000000000000..b49b49a44e0eac402ecc19071cfe959107002d72
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^7C<b+!3HEvcGuVesm-1)jv*Dd-p;tldq9E1MYgkd
zSCjINm5T#rKZwr_yrA|~@1eKwXO@p9EF8C-cCwf&RqG!+GxPQ-V}{Ct9FYm`$F?!l
zXl<49d=}K1!C0fYb(Ko-N|!B6S>>}+j89C8&9&sbvsE(X<T|kp?B{rHFh6I#q4hYj
zVS8#1&m*2!3TtCS_TGD?_v%rKn|^Bd<e86{!glke2&4=6v4LUQqv{V4f8=azc5Cd@
iDP#TfcfHh?seT(|>Qc-D-`4=0&*16m=d#Wzp$PzQc3e*Y

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3e69e64ff56f66fa55a8d8804765c73815722f5
GIT binary patch
literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq001}u000~a1^@s6G`oC00002@Nkl<Zc-rmQ
z(G7zz3<OX{$Ovo-8?XYKWrU1yjU`v&r(h>%RN7dw3dm7-K%JIp8ZqLrk!!+`3u7_>
z8MathKp1N>11V>2snH9u+zFf+NC$9cA>pX$Mp}XTNkPI{(}nZ^Sx7Y0G$Xx02GRmN
z>$DNTkDWFONE_RFl09Pw@SlOxoxt1f!mk6RRTs@I8YoLc&7!$Q17(7}X417#w$~`2
zfNJhFldgrby+#6y!rqbeSQJq1+I-j-Xo&=(_Yrpj!T1ha2b}$y$!y@o|Hd2v1mh`i
z06}Y112}-+4ZM2k#0H+ebcz5nE<|Qe#_Xaao)9lT`3DcV9Z69D0000<MNUMnLSTZ{
Ckb30+

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/combine.png
new file mode 100644
index 0000000000000000000000000000000000000000..159293d26e0920087fd989553c9bc9dc1a2d6e3d
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq003|R001}$1^@s6CF^`j0005QNkl<Zc-rmT
zTaJSu7=~e&;u5-}vV*!~mcSCIHZ?JfCR5};pzoKENiV>QCt*1J3<DvA5JCtccg}Ne
zX>R$)7QcO6C+GZ}TgtyDE`56dj1_omOC12lT%Xhf;EJKuPaE(Pt$qLk2q1s}o&v00
z74EfAj6KfnWeIp<Rk)W>j6KfnWepew@z${?L%=AAw~jqo0!mCxTfF%FZ8G&r{BJ4n
zmcOIb)GGlff#(KL0?!km6rKw}DLgNLl6dBTl6W2f$BM;JH-H7+zXBkDOrcDnEMji8
zh+!LX5kNNb7Xb8hlqPb@fAyoZE#lPZd#(UCh*OL2c?I0dnVXO33Gm>1XKp@X4}f8)
zy8%hV-y08)fT8jRB$YQFUIA6p(@nSP>JGsB0;<-98cd<;b)njTs&%0Tfa-Oj(%T5@
zni%PAgn3O28+kVJ9Hm|9C`|&-4Ini!9RpGm(=i}5F_csQ2q04^Qz(lVYGT+%u#smY
zzfFs`fy)>Vr$=cm-UcpXJiH#Ig`v$G!6QWLnwXH=yb(M?G_Q%#4o|EB1Q0*~0lX`q
yYF(%Spn6@Xc4}9>Rdt~Tfa-Ojgb+f=mGcIf=f-%o=BmyB0000<MNUMnLSTXir`I|F

literal 0
HcmV?d00001

diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/restrict-editing.png
new file mode 100644
index 0000000000000000000000000000000000000000..8164cba4b20ce114b1b0d250c9d686789e9f032a
GIT binary patch
literal 571
zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)OjsFfcKBx;TbZ+<JSbaqS@m0k#CU
z1Qz#~9CsJ=JYXx`+;>4xqES#lNo~)u5cz_F>woH<lHxu}{gqo57d_QUfW;AnI3o`g
zB>rGiz7}b@*W&$Op|;PtLa*1{VaQe9Q?sUrVQs#A-2Ww+TUH(B`uMkR`>Ml&8%-BH
zZ1G^o*rB+MEo6>BH1o3KYXmeIZYl&Z6ge+pN@?_9J;6CqsK7!=RYBY(>%hW}D-ALN
z)eL;jZx}74Hi|zGI1<;OELhDXC-^>`=}$w&be4!q{-sR}-oIA*2_?its@8^THY{7R
zUW;?W)4J+?6BmEuc3@x<XkcJbU|{5M$dhEP*g2H}BBaw9w%(XOdfWQgy;1p(7@ad^
z&)c+YOqJbYyY1dOhKk_le*<Sf>tNwY&5!@JxbU{G(SoxJmTi$res<VQSL8xkKyXa&
z%lDrXXHVnE*vIga=c6L8f%W_Ef*Q43_6f=hF@6szx0`9a)N;1N0o$qb{Ga(`o>LS2
zFn!moUkY6UAEtZjl=LrtFtOp)sfNA#jxh){)CX1VU+8;2l{cbrf1=HTNEL=_ck*Ab
zfJqgGY1fp0YN#^ktaATVD+2Ql%xC|n--^$C#24{Z+gFIeH}!jq^@5cz=Xo$Z*|JFY
zyLkA{MQd3OToQd7vYdM^+uDrlpPke}@i%drde@XAH&!kFHU*d{7(8A5T-G@yGywqI
Cf#%!*

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab1ab7427c7598d62795542d6dbfb3fb37ea43d0
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRDq|9V@SoVw>J)Q9#9Z)b@bjY
z{Pv5wrb9r$1Ow*ko57ztI5b%q9>m|WwzSCo<~V7~oU37nQZ}rg{VkGX^1*$1x7;NX
zTLhmiGx+*Ir}byts|P=lWK@A7$JRaxE1J?G=q8bv_O<)pgRisyJz!+G^Num*IahTX
SPwHHt-3*?telF{r5}E)C5kiUp

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aacef90b7416c600614e58a3e33ebc5e22d5b11
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRJ*5(V@SoVw=*2M4k+-je7;qq
z{jVgOzxAHU1&3Sb8Xh=yOKuV~VFs%FA!gXl<^D#_C1}O86CHsYD^!n6nWy^u@0-Lu
z-7|LH5&X<#=+fEe$P>6ISx)5f_C?{v{%<_HExGq~#hop`e$ns_5dK-$DHN#W)$ucU
mO54}UgVJ;3J^)Q-*j3EnJ>?(&?8WzFL0nH)KbLh*2~7a%u1V?u

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bf7b14c5728e6147d1ef15dad4e9126a1629d0
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRG6oWV@SoVx6=&y7!){;)ac%S
zrm5b%TV}Fhu2WHWqY(QwCWar4Yc4I=blV{)%gstjO3$I~#ESOce1a|lJNZS_+b8Ny
rRPyV~dzP)(#GzDwKZ=1Ne-k4ouZnE*gS+2>HZXX)`njxgN@xNALW3<M

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/vertical-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cde0894517dcc5b2ee8978838e7b4d84526b846
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRH&zmV@SoVx6>TC7!){IYS-TX
zrWyU5FEC8NlzCpt#75f;Hii#Of$p817nvtHSthx;%$=)Vytc#2`uvl9q8l$OSr><N
qX9eoItPr~zC0P0FIupZ=$xKs(6++JL3sVGIz~JfX=d#Wzp$P!(LoEgX

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/gridlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..851d47700ee0420035da3cdd4acffb0589d3f3ac
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!3HFCoofn!RJEszV@SoVw>Ja18WaRv1E;_9
z%UQnumcxaHrc%B$*Z&+*b=+VIRCiDEddkC|Q|@Y#k=Y^5&l0bzzX{@*)gC*4L-&Fv
zF0B;{n(CA?;w_#oC~s(e%wPJ1RWu~PkyZ4{){|RLP80{TLoReJe*4j*{LLp1b_RwI
a_UfniO<|gA)KLO7p25@A&t;ucLK6VTxI`xa

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee13509a5202fd7150b2aa417d4653215f5e0b9a
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!3HFCoofn!)C5l#$B>F!Z*MwsH7E$M2Kc|;
z`ej+LUemU7Ngh@FEoO^qpKV`h3RL*5r`q+Q)J$);BOOu7(itk>zn=PhO<D~^vHV)-
zaGSGnnSQ2IXxsv=d?5KW^j=FC%dL3Ew>IhDmN3UYv;nfzzt0G`4}`*60aL>(!Q@YS
p{}(ywf0oQ%{$~j@1H+H`+;1Y{!u_UBlK@)D;OXk;vd$@?2>?)QPZ0nB

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f65ee5987801de9349b006e7df395c452b48de2
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4LuvsRU0K$B>F!Z?B)`WKiUBy%>^x
zTl4A41m=qk`>Pcm<V<<J#)O%HVfjZhFNuB`t&>v^FFxqC%YwBz_}tu^?FmhsYCm>8
zFghl7?csxEUnK7bXa6%e$Rh0XA^YI{z0(*NZY*GWE1zu>ddI{RXcvR0tDnm{r-UW|
DQ#m>_

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..31ec9a394df4da98ca2b0f85e747a0745efc0f9b
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4Luvsd!Hp$B>F!Z?9YPH7E$M1o)rc
z`dwr3Qq?10C;y0Zau-wcIlPULAwKxH*Wp!DohOG>UCDaj^G4FQ_*|p$#`KaiJ4-IA
vGv7Bo&dt5%lGa)nx-0Ude7`C~#X-Kq&*C3?$+krStzz(W^>bP0l+XkK@0dAZ

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..de422a897954e937854da53af9b963ea333f095d
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%62sUA-k$B>F!Z*QIEY%maUJve2a
zU()jMTnE<Ajx!s#S83Zya72I%U^sKR@8qG(e0c@W(@|^PJMO%B{h-#W<;2;2eD~Zr
z6k7zGz(mJP#aD-33O%Zc<UTI`Fhd9;3Y0472SXE1xKfV7T<!b+*Ju7dT<;6A;KLEV
XhJM)@uP4sF0pfbP`njxgN@xNA^@BzS

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/guides.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf1c6f38914786674bde22445f0e392bde41a408
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%62sU@B+jv*Dd-rjQLYB3OCIk3m<
zewV$hvQotq9|Mh0h1aUPXWV-kqr(bR%5d-UFH!FG(`p+!GB$?I7Ie}1r+lPEVVd3H
zHTTcgdH$^usI3%jQ3#owWhB@X;JfOi%L+Be6>3*gl!BxK^JiNX&5yKK?Z`InKR@yJ
zlPckdJq2zS%04g+0xdvoYEA;HJWc0r`}FtwtZnvtuCsuw^?x(*=lYxj{IfvrW$<+M
Kb6Mw<&;$TrMp2vq

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..211560a004c4ad2318db411e0b5e8e34e1b870b2
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbREDREV@SoVw>J)Q9#G(M2wZ;l
zR^Ozmf=0ID4Ym9&b6o7I3V9eB-p|ZVJv=L)f6`3j>N8$5a=7NT8tA64e5c)GaEL=0
zNW=)LeUo8-9yCK0NTr(}3l?&dNNf>wn-Smov6-ErU?IDP)uFl$yF11}I~hD({an^L
HB{Ts5(qJ~D

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..268067c2222cb657aa4cac44644df940728faca1
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRHmnkV@SoVw>J)QHW&!790-}c
zZT*z1{j4fQi;S3mwmMJ0?SG7c;m3R{e<{DUbsm$v`fqWnahIoGzN0-u=gwT&V%Eza
zne#cGb?!8CGgy_9%(B>P)e;bba*NF+^eY$`<VzUBx^}&(a(K%Qw3NZq)z4*}Q$iB}
DA1OCq

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/gridlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d8a18a4762c013175782814d95c2cdcaecd3d0e
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^7C<b+!3HEvcGuVesTfZe$B>F!Z>Jk_F(~jb*H+cv
zTJCc9s8ZS`>l2e)`MnQbV_-Po-gjcg9a%Nar>feHy1RC~2;s=Oc+^#$MX<)fphuJS
yxohu3Rza5us)r{fx(NP>{P6R=5Cg-U3ykTKO^<u-8VCdJVeoYIb6Mw<&;$VYaWY8&

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/guides.png
new file mode 100644
index 0000000000000000000000000000000000000000..9235a910b9614d373906a5cc6ede2c6f20ac6df4
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^7C<b+!3HEvcGuVesVYww$B>F!Z>KwQ9Z=w5sa<>j
zT=2GU0UwfPZP8?%$!OS~5VKin8&E^(4GAr|ZCYw4L;5S3L~T0eS(sQdIe&GF+Hvph
ztX~I2*Rw9`66L(JuQ@`b``?X&cAXy{Wz5t5aO;m{b)ix}UlDty+6E1=ql^5n-}$$j
dg@Hkm&wTx!?S)B4Qh}~u@O1TaS?83{1OT(yLXZFe

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a88f1b7d337d49576054b11dd87f59a89c58fdc
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQbC?Bjv*Dd-cEJoVo=~<sa<>j
zo967s=Q;X;TbQ}ol$2#ngq;Fh*j$oKc^n#)tsEzCFBDwz?Clrt58RIHZ@As%QnL$w
npSo6m+5_&U>+wR0e#Q)J_kQG-@TZ&wn$F<q>gTe~DWM4fX>cpW

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..255ec3f26379c7e45419ad6331eb1c66ad04c71d
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQh}Z>jv*Dd-cCKp#h}39{5Pup
zwtr--RaCE%(6<BKJhJZ=%oJ!+s%l&@gO^$0LB~`_m0I<$hZQF6Gye6qbvw_z7pLO_
n1htb~W1cqMuNP8`yUeiS@Q2%y>V<oNhBJ7&`njxgN@xNAj8-vQ

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/gridlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa46a7819b0eaee3a85ed6970c1be5dd2acf3688
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6sk@#ojv*Dd-rjcPI%FW=aPiI-
zTd%xX%1<~9CyL$aSh~{c(Qkv@I!^PqNO*WnQt<?#FZXq8v*wGHoZ5Cgc<Z%kc3Y3G
z?Xf+_FzrCa?<<@KE<FlQXZYU!W!0Xu%dgAcy>EP=n*G{S!}y5ujCuw}CKe6>1&0O@
z;|JRTnG!w5JMtL^7&$IzUonSCfK~V<{h3%U#C*ZCCtL%f9;z{pU*c!lrN_KWH#dA`
z*V{ft@_^~leG5aj+s<Q+X}%vIWxv4`>`I_RFY)Hoa%xZ5dVU_zqYR#|elF{r5}E*F
C?P$#a

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png
new file mode 100644
index 0000000000000000000000000000000000000000..3367ca64d8e9ff026a6a2c82393e10fd1024e36f
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6sc)Vxjv*Dd-rjcPYf<2F2+X%y
zx5v!=0f(%w%FG?ig-Q?qF5!-xa4VlnZ<h{GIS3e-&$s;~_wkcQ`nph;BkBDz@6}~@
zZsYJ_KA}BPnq`?p`yHhXBFn{ZOYY4)wK-&2w2<I!!MpMA+~%<e{Sc2+{IGGl@&pIn
z5N_284osXX7gUewP62ZZ^ct@p%AdX>_Wj=bx<Kai=hwcne^V|fYm8c9Ji%eVV4X6D
zN&t5$n~;Y>Ba6@rp~qrg3&d8nLbyMC<|+HA{q@thDyGJ7a%WN$%evDN!d^emYz=#0
lb)x0c$AxRTA?|1JIU~Lx_CvMHXZe1Rh^MQc%Q~loCICpgZzli%

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..952f04eeb7724f6e2333e927dd4add807503ce6a
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!3HEV6KWZO)LKs$$B>F!Z*MwswHolaUVL|@
z?@rmY393i9#JVi9Y8F-Srz}dSUvKeKmldd*;a*DS<6I|`vNeXPO4H2bthTM6$eD4d
zqSi+6g420p#@}k8LFeCFPx-q;dY-=nlhA|)78M0X&L1BeUT5xl^EH~u?6t+=zgJ3`
z_Gu{0H(=!SfU0@0pGoVy^ReQIH+g?C*T0NbOVGVlENFji25-dC=Ssi1SAi_wv4PR+
W&Hbd5rA)~nr+B*hxvX<aXaWFm7gWOl

literal 0
HcmV?d00001

diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/2x/vertical-guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..631115b05b1a96302230471cfa870456be03784c
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!3HEV6KWZO)Ot@B$B>F!Z)ZAkwHWZYRtN9?
zbj#AIPvG{#rVj4qGxd%3u-B_=)(SB%69KAbU}!MkxTV6oBk6IErczSo#|w#ndwLv%
zPu+gZ*(g?Jqg=56N$fSj(7&4x@W<Qi|F+_l@&{HX`L+MMxs^VgXSsBU!$pB<<{=(I
zAhU*9u)~4H$YsVMpTsDMM#;ugwI>SojkGVw|5%zY*|;_1yOQ0x8KMzKt0(?z$^yBS
bVMhY<hSdk9@;A#Y1#vxH{an^LB{Ts5+3Z!S

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/edit-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d385dfe0ad9beeb62370d64d86ea4604769d4d
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq002e+001Kh1^@s6DHnWg0004|Nkl<Zc-rlm
zjg7+~422mXBd}q!0ojOdkWn%MBe)>>Bo1L0h~2Anev;K6nW%hy4^ZNq$z(E_zD`#z
zn5>}jLjd4{c?B&nu+V>Lz$vqw?MIm5Tfle?IE!Gs793dY7l*R~247X+z>R)UIICc^
z;K0p(F*tX?Xuz2T!|h_921D**e*s4AI${$tFb2lJ7#IU%U<}NE2UAY8XRgE?=py#1
zg25B*nJY23A7bg#2ICRPk!vHymG5`#^IHEjLMcFwTpKZN%e7;lcZv~+IO!1`=qxQT
z#R>c1_yX_L1Otpy+K6rV-VqVI3kDdcv=J-LN!7St5t9Iu2r#{fZOt{7BSwHpJutn9
zAsCQ~SP#sJlOKuLBiB<RVg#7th+`yT`ST;!Qz~NI;=4D_fyOC;aYh|6iN$xXol{2)
zoe?N!)De@~u48krB~{T$=m^j3T5uOk1t-?`T7DviUnO*wXLc=+0^=qk))N&mk%Ji(
zF`~B{F-b5~#9F5Wsl}J+?MAHQl(4$^jy`asBG%Tsh;fr0df-MytRpsJCX>mesTUNG
VH1$_YjhO%d002ovPDHLkV1fyC%kTgI

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..def9fc7035dc19b664acd8df7110e6da6d0ee071
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq002|~001fo1^@s6Ekk^80005uNkl<Zc-rln
ziH*WA5JgjhJ0K;b!?=Ucf$4}6T*|Dynw3x#pK}1(`I3bM83Pad#SU2(i^XEGSiUGR
zH6XNI<3j>K1X^}2pg^pR8c;J4N-h2%`!@hxHJ~y8UA3SBL#;SeDo}h>feK8uqEI=2
zYC#3YS}~|xKsBHObFBzePN33IL7<i$DmPF`s1%?*YuHZ!+FZka3Q)Daxxchz-v-ox
z8c+jjKn<t?HJ}F6fEv($0My~0ytU2z+q=7W08KBuyeIG2W=1^Dy#r`|(`RaTyx>vG
zmf8c4cbY&E<}<Z>zTna5XG`sY$2)DHdBlam{xW>8IW2L-g~9$Ze6Q`fh$C+#E7oZO
z&C_@r?C<x|oi@-Jzb>c8l3zK24*T`BuI5*X5qcZ+>vl0hul&kALT@8}MVH2wU%7#1
z#~g!x4Hbt@`?Ueor*@3^H9uE!DAlh$XZdj9(z9PzgkKwl(|+wd%ZIZ|&wfRB9<@<O
z^=pqOeWxdV$CL(cpf6B;rzd@DN|XL_nXIe%wYFA`5<qAC+E}YbZJ;&3mJ%c!+Ndk~
zwNewL9NJPr$*))LZ246RXwk0)cOKNU{LJl)HNTej`F^3TLx*o?togOF&-c`IsKsKj
cSS%{}0W&S&K;Q~m&Hw-a07*qoM6N<$f}&dXRR910

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/edit-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..6da669b7b71bf204103ef6e964b3fa2e8445cfcc
GIT binary patch
literal 641
zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%6oFfe&|x;TbZ+<H6v;lw5bf!3Et
zrZ~9Y;4D#)%}Af(z-ei;`J5%!N$0Z7cg|KD_t@`QvqS!w@x*MYwnT}x#DA{Ko_2V-
zzyHXV)DwKg`#r0Y*0q^72}|B(UKL#NH=bS4CPAZ_BhFw^(cD)CCXOc-bN6HfEZ5@6
z6#$9_&doB=ai}=Z(N?<Zzy_v3X*ZK~$$W=}Tzn-qI>`o0TvNz8c!8-=kLNrOQ<TI!
z*_PYck!H)EWec)63gAFja{MCtZWo>5-FA3ZS<-u>cOnWY(!aOK7*|C5-s;@DyfB^d
zqGxjZ)ML*M@EWcA%(l_yE|B~Em>7gBxMb$r>06^E<@Y%3`Lp11UF7bm9}fy2iCy<b
z+4Hgc`pW2K(;p`M{c_TvmS0uia^Fjh?<;4?I{LgQ3HcFncAmncb8YK6_f}TxaK=iz
z+`0LIf8qXXjxBkNN~T|#uAJcf`%*IG#Vv)PV10*P--Y(J&0Kexj&N8kQuz|Mt_CD?
zY?88<lYe>M5^Z_WUDvlSn{(l!n!M1ji}}8m3m5xd6R67M+iSM}y9#T-3&($TlRhqU
zV!tMM{kg4YHg9b97KS%ZcWM{#wYT=ITO)t=`Cjj6rFl=e_)k4AEJ^)avA<kX`BCJu
ztqUsUrv0{GaY69>jyL}oIJw(A=42AA(o|g--7Fz0RvWqSI>W-fypI^2N~Mo*vnYMh
zZK!U^V*@H-Q_%Sm)b}S`Q|Zgv$I=U*Z!_G-rS!$8jC(F9A<Phd#;z)TKIMm(xGpeh
OF?hQAxvX<aXaWGcR}azv

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/edit-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..627639f5139272c4ecaa4c3e5d4078dd6e0d43a6
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq001}u000~a1^@s6G`oC00003`Nkl<Zc-rll
ziw%Sz3_u;l5g36{*g!XML`HCw9whamwLpP-pM)lj$ys9G@luJ?G-AYG#vT#`xoJEM
z0CteYrUeMXnq31jb}p&GKVthN;H&{z0XS<xLPbqCq!bXZDv(fF(*;=rs09fPHO-K<
zfEthzz}%#L0x&sgp8`}{+uCH$+5tEK2jK4kE}6;cLpn{s@Y9l+oIa$}1at^z6ZHn~
zuNu1$n@2dCs5f|j)zZu(L@q2sY5>L^GKDoZLTUk~G&pNJk?UF8T0ltDy|pFh(~Gt(
zfSjIGTZ2&5+A@GQJ*l>+sc+Sm0<PGsNoafM=~}d909S0*aM~Vv(jBYOmQ%zb6sKcu
zr=W3)I)vhMOzxC)s!9*rwopU0?LBPULd`|nUO-M;PEV%<c+-~CQ#xo$ADuXDX^P*A
mrH@XWwoG)r7e|cvQoI0)l8}zd95J5&0000<MNUMnLSTXyj-q1#

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/edit-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f0f17c94ae6193825fb953a7f03077115abd5f1
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq003|R001}$1^@s6CF^`j0009NNkl<Zc-rlp
zfsKS95JfG45-i0|)(*}Nv=g@zORxk=umlfsm`pah3^0u2Wqv|(ySkvh1>YgrrqO6L
z8jVJy(P$*+<;v#DPEdS3qokAD_x<I{w$sGdGfD$!iQvI93Ib?%`pEi{hC)@3D2T@u
zr>aLHL~4M&B#0FN_R=6y18gKgqy`xN76q{eKrs+&0F(x?7C;dYYXOu5u_nOVA=U&a
z1!8T0w?eE9Py$2_fVV;90C+b<E`YZ{<N|mnL{5O85QqN+@C4%UB!D^dsoR49=FF#V
zPXg$BR?fWYQvmik^Qun*D6(D73wc+&3Qz$mKn17(6`%rCfC^9nDnJFO02QDD{HFj-
z^Y;`XWy)-IWp<^N4$$pp{8NO)DYMm;*_Bp0z|sZ4{<DKrfCLMGH~92H8o(d0-{MLa
zdLt%&-#7UDOWIK8Hva$+iz}V)jmY}_zHjh(*7L&vY(dYP3fh@KPc%{h`k@c>ys4m_
z3G_rG3E&*I&jf8P1YZPdfOFVoCTMFZ{UX!=xQ6W=L0es@%L)RxhFv;>wz^Q4l>{(H
zHqLDIc>lA$n61_Zm@FG-whG?=TmbylRyhG;$Mq{)y=pIJt1JK$q~+9BuiA^*DhEKD
zFoeczwFAA4#a0mjEp`Zv*(w-9S58}v0h|DkrqEU~LPTn-2!Mw@E|Geowu%v=8nzk(
zXaJb8z*a{9CUzenvsDB@1Hg>Awi@n<2bh-AR#O+`&KJY!nXQ`edTG+uf|A*4#)91W
zY&bo$)d0T(Ku~KzscjW&nFE2G^a&PAGS!wal{OH_Nsl}xLpjx!a-rHF8tWHe=Hs;u
zL!qg7T*UyveeMl<+kR!M;I$3+HB;-jST0netzw7Jl@nm39$Vob{#6n{tgT`~Hho73
z5M`^#y2z&QC;?(^HI@`x<phYbRYW~#Tjd6bwbd*5Ikw7suR+-A7x>AxicRUSG+}Ku
z<-u=Hb#kS@(uB3u#0S4*=XdlPO9=4FR%0dCRx!QCQUScORYbCERin{pG#ZUYqv6Xh
Xze<j7B!z|Z00000NkvXXu0mjf@4j~e

literal 0
HcmV?d00001


From 3b325b4cf5c4f48c0103f1398d481ae36bfaacf1 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 10 Oct 2022 22:12:58 +0300
Subject: [PATCH 17/18] [PE] Add icons

---
 apps/presentationeditor/main/app/view/DocumentHolder.js | 4 ++--
 apps/presentationeditor/main/app/view/ViewTab.js        | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index 131f3a128..49d6c7132 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -968,8 +968,8 @@ define([
                     items: [
                         { caption: me.textShowGuides, value: 'show', checkable: true },
                         { caption: '--'},
-                        { caption: me.textAddVGuides, value: 'add-vert' },
-                        { caption: me.textAddHGuides, value: 'add-hor' },
+                        { caption: me.textAddVGuides, iconCls: 'menu__icon vertical-guide', value: 'add-vert' },
+                        { caption: me.textAddHGuides, iconCls: 'menu__icon horizontal-guide', value: 'add-hor' },
                         { caption: me.textDeleteGuide, value: 'del-guide' },
                         { caption: '--'},
                         { caption: me.textSmartGuides, value: 'smart', checkable: true },
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 1ee69f0b4..7df50557c 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -275,7 +275,7 @@ define([
 
                 this.btnGuides = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
-                    iconCls: 'toolbar__icon day',
+                    iconCls: 'toolbar__icon guides',
                     caption: this.textGuides,
                     lock: [_set.disableOnStart],
                     enableToggle: true,
@@ -291,7 +291,7 @@ define([
 
                 this.btnGridlines = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
-                    iconCls: 'toolbar__icon day',
+                    iconCls: 'toolbar__icon gridlines',
                     caption: this.textGridlines,
                     lock: [_set.disableOnStart],
                     enableToggle: true,
@@ -344,11 +344,12 @@ define([
                     me.btnGridlines.updateHint(me.tipGridlines);
 
                     me.btnGuides.setMenu( new Common.UI.Menu({
+                        cls: 'shifted-right',
                         items: [
                             { caption: me.textShowGuides, value: 'show', checkable: true },
                             { caption: '--'},
-                            { caption: me.textAddVGuides, value: 'add-vert' },
-                            { caption: me.textAddHGuides, value: 'add-hor' },
+                            { caption: me.textAddVGuides, iconCls: 'menu__icon vertical-guide', value: 'add-vert' },
+                            { caption: me.textAddHGuides, iconCls: 'menu__icon horizontal-guide', value: 'add-hor' },
                             { caption: '--'},
                             { caption: me.textSmartGuides, value: 'smart', checkable: true },
                             { caption: me.textClearGuides, value: 'clear' }

From c984d62e9aa90a4c50b1ed24d335d473e34a756e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 11 Oct 2022 18:55:06 +0300
Subject: [PATCH 18/18] [PE] Show guides when new guide is added

---
 apps/presentationeditor/main/app/controller/ViewTab.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index d6f1d432b..40122de89 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -260,6 +260,9 @@ define([
                 this.api.asc_addVerticalGuide();
             else
                 this.api.asc_addHorizontalGuide();
+
+            !this.api.asc_getShowGuides() && this.onGuidesShow(true);
+
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },