diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index d1cef5bfe..9fe50e74d 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -545,7 +545,7 @@ define([ Common.localStorage.setItem(this.view.appPrefix + "settings-spellcheck", state ? 1 : 0); this.api.asc_setSpellCheck(state); - Common.Utils.InternalSettings.set("de-settings-spellcheck", state); + Common.Utils.InternalSettings.set(this.view.appPrefix + "settings-spellcheck", state); }, onReviewViewClick: function(menu, item, e) { diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 96d232761..9c4c0e6c3 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -99,7 +99,7 @@ define([ $('.statusbar #label-zoom').css('min-width', 80); if ( cfg.isEdit ) { - var review = DE.getController('Common.Controllers.ReviewChanges').getView(); + var review = me.getApplication().getController('Common.Controllers.ReviewChanges').getView(); if (cfg.canReview) { me.btnTurnReview = review.getButton('turn', 'statusbar'); me.btnTurnReview.render(me.statusbar.$layout.find('#btn-doc-review')); diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 401ff7ecd..0d79ec3b9 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -58,9 +58,6 @@ define([ initialize: function() { var me = this; this.addListeners({ - 'FileMenu': { - 'settings:apply': _.bind(this.applySettings, this) - }, 'Statusbar': { 'langchanged': this.onLangMenu }, @@ -101,7 +98,17 @@ define([ this.statusbar.zoomMenu.on('item:click', _.bind(this.menuZoomClick, this)); this.statusbar.btnPreview.on('click', _.bind(this.onPreviewBtnClick, this)); this.statusbar.btnPreview.menu.on('item:click', _.bind(this.onPreviewItemClick, this)); - this.statusbar.btnSetSpelling.on('click', _.bind(this.onBtnSpelling, this)); + + var me = this; + Common.NotificationCenter.on('app:face', function (cfg) { + if ( cfg.isEdit ) { + var review = me.getApplication().getController('Common.Controllers.ReviewChanges').getView(); + me.btnSpelling = review.getButton('spelling', 'statusbar'); + me.btnSpelling.render( me.statusbar.$el.find('#btn-doc-spell') ); + } else { + me.statusbar.$el.find('.el-edit, .el-review').hide(); + } + }); }, setApi: function(api) { @@ -204,7 +211,6 @@ define([ }, createDelayedElements: function() { - this.statusbar.btnSetSpelling.toggle(Common.localStorage.getBool("pe-settings-spellcheck", true), true); this.statusbar.$el.css('z-index', ''); }, @@ -226,17 +232,6 @@ define([ this.api.put_TextPrLang(langid); }, - onBtnSpelling: function(d, b, e) { - Common.localStorage.setItem("pe-settings-spellcheck", d.pressed ? 1 : 0); - Common.Utils.InternalSettings.set("pe-settings-spellcheck", d.pressed); - this.api.asc_setSpellCheck(d.pressed); - Common.NotificationCenter.trigger('edit:complete', this.statusbar); - }, - - applySettings: function(menu) { - this.statusbar.btnSetSpelling.toggle(Common.localStorage.getBool("pe-settings-spellcheck", true), true); - }, - zoomText : 'Zoom {0}%' }, PE.Controllers.Statusbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 73e44e237..fabe7b7cd 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -34,7 +34,7 @@ - +
diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 84f328d43..2a3194745 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -254,13 +254,6 @@ define([ disabled: true }); - this.btnSetSpelling = new Common.UI.Button({ - el: $('#btn-doc-spell',this.el), - enableToggle: true, - hint: this.tipSetSpelling, - hintAnchor: 'top' - }); - var panelLang = $('.cnt-lang',this.el); this.langMenu = new Common.UI.Menu({ cls: 'lang-menu', @@ -417,7 +410,6 @@ define([ tipAccessRights : 'Manage document access rights', tipSetLang : 'Set Text Language', tipSetDocLang : 'Set Document Language', - tipSetSpelling : 'Spell checking', textShowBegin: 'Show from Beginning', textShowCurrent: 'Show from Current slide', textShowPresenterView: 'Show presenter view' diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 3038aaa2f..23fcd6c49 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1540,7 +1540,7 @@ "PE.Views.Statusbar.tipPreview": "Start slideshow", "PE.Views.Statusbar.tipSetDocLang": "Set document language", "PE.Views.Statusbar.tipSetLang": "Set text language", - "PE.Views.Statusbar.tipSetSpelling": "Spell checking", + "del_PE.Views.Statusbar.tipSetSpelling": "Spell checking", "PE.Views.Statusbar.tipZoomFactor": "Zoom", "PE.Views.Statusbar.tipZoomIn": "Zoom in", "PE.Views.Statusbar.tipZoomOut": "Zoom out", diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index 533e62d1e..65965cf15 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -63,7 +63,6 @@ } #btn-doc-spell { - .btn-tpl(-1520px); margin-right: 5px; } diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 3995f1dc7..6db45b1f2 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -227,75 +227,54 @@ } @toolbar-icon-size: 20px; -.toolbar-btn-icon(btn-changeslide, 7, @toolbar-icon-size); -.toolbar-btn-icon(btn-preview, 8, @toolbar-icon-size); -.toolbar-btn-icon(btn-print, 9, @toolbar-icon-size); -.toolbar-btn-icon(btn-save, 10, @toolbar-icon-size); -.toolbar-btn-icon(btn-synch, 11, @toolbar-icon-size); -.toolbar-btn-icon(btn-copy, 12, @toolbar-icon-size); -.toolbar-btn-icon(btn-decfont, 12, @toolbar-icon-size); -.toolbar-btn-icon(btn-paste, 13, @toolbar-icon-size); -.toolbar-btn-icon(btn-bold, 14, @toolbar-icon-size); -.toolbar-btn-icon(btn-italic, 15, @toolbar-icon-size); -.toolbar-btn-icon(btn-underline, 16, @toolbar-icon-size); -.toolbar-btn-icon(btn-strikeout, 17, @toolbar-icon-size); -.toolbar-btn-icon(btn-fontcolor, 18, @toolbar-icon-size); -.toolbar-btn-icon(btn-superscript, 19, @toolbar-icon-size); -.toolbar-btn-icon(btn-subscript, 20, @toolbar-icon-size); -.toolbar-btn-icon(btn-undo, 21, @toolbar-icon-size); -.toolbar-btn-icon(btn-redo, 22, @toolbar-icon-size); -.toolbar-btn-icon(btn-clearstyle, 23, @toolbar-icon-size); -.toolbar-btn-icon(btn-copystyle, 24, @toolbar-icon-size); -.toolbar-btn-icon(btn-setmarkers, 25, @toolbar-icon-size); -.toolbar-btn-icon(btn-numbering, 26, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-center, 27, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-just, 28, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-left, 29, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-right, 30, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-top, 31, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-middle, 32, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-bottom, 33, @toolbar-icon-size); -.toolbar-btn-icon(btn-decoffset, 34, @toolbar-icon-size); -.toolbar-btn-icon(btn-incoffset, 35, @toolbar-icon-size); -.toolbar-btn-icon(btn-linespace, 36, @toolbar-icon-size); -.toolbar-btn-icon(btn-arrange-shape, 37, @toolbar-icon-size); -.toolbar-btn-icon(btn-align-shape, 38, @toolbar-icon-size); +.button-normal-icon(btn-changeslide, 7, @toolbar-icon-size); +.button-normal-icon(btn-preview, 8, @toolbar-icon-size); +.button-normal-icon(btn-print, 9, @toolbar-icon-size); +.button-normal-icon(btn-save, 10, @toolbar-icon-size); +.button-normal-icon(btn-synch, 11, @toolbar-icon-size); +.button-normal-icon(btn-copy, 12, @toolbar-icon-size); +.button-normal-icon(btn-decfont, 12, @toolbar-icon-size); +.button-normal-icon(btn-paste, 13, @toolbar-icon-size); +.button-normal-icon(btn-bold, 14, @toolbar-icon-size); +.button-normal-icon(btn-italic, 15, @toolbar-icon-size); +.button-normal-icon(btn-underline, 16, @toolbar-icon-size); +.button-normal-icon(btn-strikeout, 17, @toolbar-icon-size); +.button-normal-icon(btn-fontcolor, 18, @toolbar-icon-size); +.button-normal-icon(btn-superscript, 19, @toolbar-icon-size); +.button-normal-icon(btn-subscript, 20, @toolbar-icon-size); +.button-normal-icon(btn-undo, 21, @toolbar-icon-size); +.button-normal-icon(btn-redo, 22, @toolbar-icon-size); +.button-normal-icon(btn-clearstyle, 23, @toolbar-icon-size); +.button-normal-icon(btn-copystyle, 24, @toolbar-icon-size); +.button-normal-icon(btn-setmarkers, 25, @toolbar-icon-size); +.button-normal-icon(btn-numbering, 26, @toolbar-icon-size); +.button-normal-icon(btn-align-center, 27, @toolbar-icon-size); +.button-normal-icon(btn-align-just, 28, @toolbar-icon-size); +.button-normal-icon(btn-align-left, 29, @toolbar-icon-size); +.button-normal-icon(btn-align-right, 30, @toolbar-icon-size); +.button-normal-icon(btn-align-top, 31, @toolbar-icon-size); +.button-normal-icon(btn-align-middle, 32, @toolbar-icon-size); +.button-normal-icon(btn-align-bottom, 33, @toolbar-icon-size); +.button-normal-icon(btn-decoffset, 34, @toolbar-icon-size); +.button-normal-icon(btn-incoffset, 35, @toolbar-icon-size); +.button-normal-icon(btn-linespace, 36, @toolbar-icon-size); +.button-normal-icon(btn-arrange-shape, 37, @toolbar-icon-size); +.button-normal-icon(btn-align-shape, 38, @toolbar-icon-size); -//.toolbar-btn-icon(btn-insertshape, 39, @toolbar-icon-size); -//.button-normal-icon(btn-insertshape, 39, @toolbar-icon-size); +.button-normal-icon(btn-colorschemas, 45, @toolbar-icon-size); +.button-normal-icon(btn-slidesize, 46, @toolbar-icon-size); +.button-normal-icon(btn-hidebars, 47, @toolbar-icon-size); +.button-normal-icon(btn-settings, 48, @toolbar-icon-size); +.button-normal-icon(btn-zoomin, 61, @toolbar-icon-size); +.button-normal-icon(btn-zoomout, 60, @toolbar-icon-size); +.button-normal-icon(btn-save-coauth, 69, @toolbar-icon-size); -//.toolbar-btn-icon(btn-inserttext, 40, @toolbar-icon-size); -//.toolbar-btn-icon(btn-inserthyperlink, 41, @toolbar-icon-size); -//.toolbar-btn-icon(btn-inserttable, 42, @toolbar-icon-size); -//.toolbar-btn-icon(btn-insertimage, 43, @toolbar-icon-size); -//.toolbar-btn-icon(btn-insertchart, 44, @toolbar-icon-size); -.toolbar-btn-icon(btn-colorschemas, 45, @toolbar-icon-size); -.toolbar-btn-icon(btn-slidesize, 46, @toolbar-icon-size); -.toolbar-btn-icon(btn-hidebars, 47, @toolbar-icon-size); -.toolbar-btn-icon(btn-settings, 48, @toolbar-icon-size); -.toolbar-btn-icon(btn-zoomin, 61, @toolbar-icon-size); -.toolbar-btn-icon(btn-zoomout, 60, @toolbar-icon-size); -.toolbar-btn-icon(btn-save-coauth, 69, @toolbar-icon-size); -//.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size); +.button-normal-icon(rotate-90, 79, @toolbar-icon-size); +.button-normal-icon(rotate-270, 80, @toolbar-icon-size); +.button-normal-icon(flip-hor, 81, @toolbar-icon-size); +.button-normal-icon(flip-vert, 82, @toolbar-icon-size); -.toolbar-btn-icon(rotate-90, 79, @toolbar-icon-size); -.toolbar-btn-icon(rotate-270, 80, @toolbar-icon-size); -.toolbar-btn-icon(flip-hor, 81, @toolbar-icon-size); -.toolbar-btn-icon(flip-vert, 82, @toolbar-icon-size); - -// add slide -//.btn-toolbar .btn-addslide {background-position: 0 -120px;} -//.btn-toolbar.active > .btn-addslide, -//.btn-toolbar:active > .btn-addslide {background-position: -20px -120px;} -//.btn-toolbar.disabled:not(.active) > .btn-addslide {background-position: -40px -120px;} -//.btn-toolbar.disabled > .btn-addslide {background-position: -20px -120px; opacity: 0.6;} - -//.btn-toolbar.large .btn-addslide {background-position: 0px -5px;} -////.btn-group.open .btn-toolbar.large > .btn-addslide, -//.btn-toolbar.large.active > .btn-addslide, -//.btn-toolbar.large:active > .btn-addslide {background-position: 0px -45px;} -//.btn-toolbar.large.disabled:not(.active) > .btn-addslide {background-position: 0px -85px;} -//.btn-toolbar.large.disabled > .btn-addslide {background-position: 0px -45px; opacity: 0.6;} +.button-normal-icon(btn-ic-docspell, 69, @toolbar-icon-size); @menu-icon-size: 22px; .menu-btn-icon(mnu-align-center, 0, @menu-icon-size);