diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 4d543ef61..4fc5381db 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -259,7 +259,7 @@ define([ id: 'id-toolbar-btn-cut', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-cut', - lock: [_set.copyLock, _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.copyLock, _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.imageLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top', dataHintTitle: 'X' diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 163fa50f0..da43d5d7b 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -284,8 +284,10 @@ define([ toolbar.btnUndo.on('disabled', _.bind(this.onBtnChangeState, this, 'undo:disabled')); toolbar.btnRedo.on('click', _.bind(this.onRedo, this)); toolbar.btnRedo.on('disabled', _.bind(this.onBtnChangeState, this, 'redo:disabled')); - toolbar.btnCopy.on('click', _.bind(this.onCopyPaste, this, true)); - toolbar.btnPaste.on('click', _.bind(this.onCopyPaste, this, false)); + toolbar.btnCopy.on('click', _.bind(this.onCopyPaste, this, 'copy')); + toolbar.btnPaste.on('click', _.bind(this.onCopyPaste, this, 'paste')); + toolbar.btnCut.on('click', _.bind(this.onCopyPaste, this, 'cut')); + toolbar.btnSelectAll.on('click', _.bind(this.onSelectAll, this)); toolbar.btnIncFontSize.on('click', _.bind(this.onIncrease, this)); toolbar.btnDecFontSize.on('click', _.bind(this.onDecrease, this)); toolbar.btnBold.on('click', _.bind(this.onBold, this)); @@ -717,7 +719,7 @@ define([ this._state.no_slides = (count<=0); this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.paragraphControls}); this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: [ - this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnPaste, + this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnCut, this.toolbar.btnSelectAll, this.toolbar.btnPaste, this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart, this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign, this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme, this.toolbar.btnEditHeader, this.toolbar.btnInsDateTime, this.toolbar.btnInsSlideNum @@ -1109,10 +1111,10 @@ define([ Common.component.Analytics.trackEvent('ToolBar', 'Redo'); }, - onCopyPaste: function(copy, e) { + onCopyPaste: function(type, e) { var me = this; if (me.api) { - var res = (copy) ? me.api.Copy() : me.api.Paste(); + var res = (type === 'cut') ? me.api.Cut() : ((type === 'copy') ? me.api.Copy() : me.api.Paste()); if (!res) { if (!Common.localStorage.getBool("pe-hide-copywarning")) { (new Common.Views.CopyWarningDialog({ @@ -1128,6 +1130,14 @@ define([ Common.NotificationCenter.trigger('edit:complete', me.toolbar); }, + onSelectAll: function(e) { + if (this.api) + this.api.asc_EditSelectAll(); + + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + Common.component.Analytics.trackEvent('ToolBar', 'Select All'); + }, + onIncrease: function(e) { if (this.api) this.api.FontSizeIn(); diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index f221d4c87..e0efc5b52 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -25,6 +25,14 @@ +
+
+ +
+
+ +
+
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 9690619b1..de669b96c 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -274,6 +274,27 @@ define([ }); me.paragraphControls.push(me.btnPaste); + me.btnCut = new Common.UI.Button({ + id: 'id-toolbar-btn-cut', + cls: 'btn-toolbar', + iconCls: 'toolbar__icon btn-cut', + lock: [_set.slideDeleted, _set.paragraphLock, _set.shapeLock, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], + dataHint: '1', + dataHintDirection: 'top', + dataHintTitle: 'X' + }); + me.paragraphControls.push(me.btnCut); + + me.btnSelectAll = new Common.UI.Button({ + id: 'id-toolbar-btn-select-all', + cls: 'btn-toolbar', + iconCls: 'toolbar__icon select-all', + lock: [_set.noSlides, _set.disableOnStart], + dataHint: '1', + dataHintDirection: 'bottom' + }); + me.slideOnlyControls.push(me.btnSelectAll); + me.cmbFontName = new Common.UI.ComboBoxFonts({ cls: 'input-group-nr', menuCls: 'scrollable-menu', @@ -1100,7 +1121,7 @@ define([ }); this.lockControls = [this.btnChangeSlide, this.btnSave, - this.btnCopy, this.btnPaste, this.btnUndo, this.btnRedo, this.cmbFontName, this.cmbFontSize, this.btnIncFontSize, this.btnDecFontSize, + this.btnCopy, this.btnPaste, this.btnCut, this.btnSelectAll,this.btnUndo, this.btnRedo, this.cmbFontName, this.cmbFontSize, this.btnIncFontSize, this.btnDecFontSize, this.btnBold, this.btnItalic, this.btnUnderline, this.btnStrikeout, this.btnSuperscript, this.btnChangeCase, this.btnHighlightColor, this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers, this.btnNumbers, this.btnDecLeftOffset, this.btnIncLeftOffset, this.btnLineSpace, this.btnHorizontalAlign, this.btnColumns, @@ -1206,6 +1227,8 @@ define([ _injectComponent('#slot-btn-redo', this.btnRedo); _injectComponent('#slot-btn-copy', this.btnCopy); _injectComponent('#slot-btn-paste', this.btnPaste); + _injectComponent('#slot-btn-cut', this.btnCut); + _injectComponent('#slot-btn-select-all', this.btnSelectAll); _injectComponent('#slot-btn-bold', this.btnBold); _injectComponent('#slot-btn-italic', this.btnItalic); _injectComponent('#slot-btn-underline', this.btnUnderline); @@ -1338,6 +1361,8 @@ define([ this.btnRedo.updateHint(this.tipRedo + Common.Utils.String.platformKey('Ctrl+Y')); this.btnCopy.updateHint(this.tipCopy + Common.Utils.String.platformKey('Ctrl+C')); this.btnPaste.updateHint(this.tipPaste + Common.Utils.String.platformKey('Ctrl+V')); + this.btnCut.updateHint(this.tipCut + Common.Utils.String.platformKey('Ctrl+X')); + this.btnSelectAll.updateHint(this.tipSelectAll + Common.Utils.String.platformKey('Ctrl+A')); this.btnIncFontSize.updateHint(this.tipIncFont + Common.Utils.String.platformKey('Ctrl+]')); this.btnDecFontSize.updateHint(this.tipDecFont + Common.Utils.String.platformKey('Ctrl+[')); this.btnBold.updateHint(this.textBold + Common.Utils.String.platformKey('Ctrl+B')); @@ -2031,7 +2056,9 @@ define([ tipMarkersDash: 'Dash bullets', tipNone: 'None', textTabView: 'View', - mniInsertSSE: 'Insert Spreadsheet' + mniInsertSSE: 'Insert Spreadsheet', + tipSelectAll: 'Select all', + tipCut: 'Cut' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 9011ca82b..4d98d0076 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -121,7 +121,7 @@ } .loadmask > .sktoolbar li.big { - width: 55px; + width: 50px; height: 46px; margin-top: -46px; } @@ -131,7 +131,7 @@ right: 0; top: 0; bottom: 0; - left: 758px; + left: 800px; width: inherit; height: 44px; } @@ -287,8 +287,8 @@