diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index bafa319e4..6a308131f 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -576,31 +576,6 @@ define([
});
me.slideOnlyControls.push(me.btnColorSchemas);
- me.btnHide = new Common.UI.Button({
- id : 'id-toolbar-btn-hidebars',
- cls : 'btn-toolbar',
- iconCls : 'btn-hidebars no-mask',
- lock : [_set.menuFileOpen, _set.slideDeleted, _set.disableOnStart],
- menu : true
- });
- me.slideOnlyControls.push(me.btnHide);
-
- this.btnFitPage = {
- conf: {checked:false},
- setChecked: function(val) { this.conf.checked = val;},
- isChecked: function () { return this.conf.checked; }
- };
- this.btnFitWidth = clone(this.btnFitPage);
- this.mnuZoom = {options: {value: 100}};
-
- me.btnAdvSettings = new Common.UI.Button({
- id : 'id-toolbar-btn-settings',
- cls : 'btn-toolbar',
- iconCls : 'btn-settings no-mask',
- lock : [_set.slideDeleted, _set.disableOnStart]
- });
- me.slideOnlyControls.push(me.btnAdvSettings);
-
me.btnShapeAlign = new Common.UI.Button({
id : 'id-toolbar-btn-shape-align',
cls : 'btn-toolbar',
@@ -875,9 +850,9 @@ define([
}
});
+ me.setTab('home');
if ( me.isCompactView )
- me.setFolded(true); else
- me.setTab('home');
+ me.setFolded(true);
return this;
},
@@ -943,8 +918,6 @@ define([
_injectComponent('#slot-btn-colorschemas', this.btnColorSchemas);
_injectComponent('#slot-btn-slidesize', this.btnSlideSize);
_injectComponent('#slot-field-styles', this.listTheme);
- _injectComponent('#slot-btn-hidebars', this.btnHide);
- _injectComponent('#slot-btn-settings', this.btnAdvSettings);
function _injectBtns(opts) {
var array = createButtonSet();
@@ -1105,8 +1078,6 @@ define([
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
this.btnColorSchemas.updateHint(this.tipColorSchemas);
- this.btnHide.updateHint(this.tipViewSettings);
- this.btnAdvSettings.updateHint(this.tipAdvSettings);
this.btnShapeAlign.updateHint(this.tipShapeAlign);
this.btnShapeArrange.updateHint(this.tipShapeArrange);
this.btnSlideSize.updateHint(this.tipSlideSize);
@@ -1115,66 +1086,6 @@ define([
var me = this;
- this.btnHide.setMenu(
- new Common.UI.Menu({
- cls: 'pull-right',
- style: 'min-width: 180px;',
- items: [
- this.mnuitemCompactToolbar = new Common.UI.MenuItem({
- caption: this.textCompactView,
- checkable: true,
- checked: me.isCompactView
- }),
- this.mnuitemHideStatusBar = new Common.UI.MenuItem({
- caption: this.textHideStatusBar,
- checkable: true
- }),
- this.mnuitemHideRulers = new Common.UI.MenuItem({
- caption: this.textHideLines,
- checkable: true
- }),
- {caption: '--'},
- this.btnFitPage = new Common.UI.MenuItem({
- caption: this.textFitPage,
- checkable: true,
- checked: this.btnFitPage.isChecked()
- }),
- this.btnFitWidth = new Common.UI.MenuItem({
- caption: this.textFitWidth,
- checkable: true,
- checked: this.btnFitWidth.isChecked()
- }),
- this.mnuZoom = new Common.UI.MenuItem({
- template: _.template([
- ''
- ].join('')),
- stopPropagation: true,
- value: this.mnuZoom.options.value
- })
- ]
- })
- );
- if (this.mode.canBrandingExt && this.mode.customization && this.mode.customization.statusBar === false)
- this.mnuitemHideStatusBar.hide();
-
- this.mnuZoomOut = new Common.UI.Button({
- el: $('#id-menu-zoom-out'),
- cls: 'btn-toolbar'
- });
- this.mnuZoomIn = new Common.UI.Button({
- el: $('#id-menu-zoom-in'),
- cls: 'btn-toolbar'
- });
-
this.btnMarkers.setMenu(
new Common.UI.Menu({
style: 'min-width: 139px',
@@ -1339,9 +1250,6 @@ define([
me.mnuChangeSlidePicker._needRecalcSlideLayout = true;
});
- this.mnuitemHideStatusBar.setChecked(Common.localStorage.getBool('pe-hidden-status'), true);
- this.mnuitemHideRulers.setChecked(Common.localStorage.getBool("pe-hidden-rulers", true), true);
-
// // Enable none paragraph components
this.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.slideOnlyControls.concat(this.shapeControls)});
@@ -1747,15 +1655,6 @@ define([
mniSlideWide: 'Widescreen (16:9)',
mniSlideAdvanced: 'Advanced Settings',
tipSlideSize: 'Select Slide Size',
- tipViewSettings: 'View Settings',
- tipAdvSettings: 'Advanced Settings',
- textCompactView: 'Hide Toolbar',
- textHideTitleBar: 'Hide Title Bar',
- textHideStatusBar: 'Hide Status Bar',
- textHideLines: 'Hide Rulers',
- textFitPage: 'Fit to Slide',
- textFitWidth: 'Fit to Width',
- textZoom: 'Zoom',
tipInsertChart: 'Insert Chart',
textLine: 'Line',
textColumn: 'Column',
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index a60255b37..eb8605858 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -92,6 +92,12 @@
"Common.Views.Header.tipViewUsers": "View users and manage document access rights",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
+ "Common.Views.Header.textAdvSettings": "Advanced settings",
+ "Common.Views.Header.textCompactView": "Hide Toolbar",
+ "Common.Views.Header.textHideStatusBar": "Hide Status Bar",
+ "Common.Views.Header.textZoom": "Zoom",
+ "Common.Views.Header.tipViewSettings": "View settings",
+ "Common.Views.Header.textHideLines": "Hide Rulers",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@@ -700,6 +706,8 @@
"PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
"PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
"PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+ "PE.Controllers.Viewport.textFitPage": "Fit to Slide",
+ "PE.Controllers.Viewport.textFitWidth": "Fit to Width",
"PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"PE.Views.ChartSettings.textArea": "Area",
"PE.Views.ChartSettings.textBar": "Bar",
@@ -1405,12 +1413,12 @@
"PE.Views.Toolbar.textCancel": "Cancel",
"PE.Views.Toolbar.textCharts": "Charts",
"PE.Views.Toolbar.textColumn": "Column",
- "PE.Views.Toolbar.textCompactView": "Hide Toolbar",
- "PE.Views.Toolbar.textFitPage": "Fit to Slide",
- "PE.Views.Toolbar.textFitWidth": "Fit to Width",
- "PE.Views.Toolbar.textHideLines": "Hide Rulers",
- "PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
- "PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
+ "del_PE.Views.Toolbar.textCompactView": "Hide Toolbar",
+ "del_PE.Views.Toolbar.textFitPage": "Fit to Slide",
+ "del_PE.Views.Toolbar.textFitWidth": "Fit to Width",
+ "del_PE.Views.Toolbar.textHideLines": "Hide Rulers",
+ "del_PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
+ "del_PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
"PE.Views.Toolbar.textItalic": "Italic",
"PE.Views.Toolbar.textLine": "Line",
"PE.Views.Toolbar.textNewColor": "Custom Color",
@@ -1439,9 +1447,9 @@
"PE.Views.Toolbar.textTabProtect": "Protection",
"PE.Views.Toolbar.textTitleError": "Error",
"PE.Views.Toolbar.textUnderline": "Underline",
- "PE.Views.Toolbar.textZoom": "Zoom",
+ "del_PE.Views.Toolbar.textZoom": "Zoom",
"PE.Views.Toolbar.tipAddSlide": "Add slide",
- "PE.Views.Toolbar.tipAdvSettings": "Advanced settings",
+ "del_PE.Views.Toolbar.tipAdvSettings": "Advanced settings",
"PE.Views.Toolbar.tipBack": "Back",
"PE.Views.Toolbar.tipChangeChart": "Change chart type",
"PE.Views.Toolbar.tipChangeSlide": "Change slide layout",
@@ -1454,7 +1462,7 @@
"PE.Views.Toolbar.tipFontName": "Font",
"PE.Views.Toolbar.tipFontSize": "Font size",
"PE.Views.Toolbar.tipHAligh": "Horizontal align",
- "PE.Views.Toolbar.tipHideBars": "Hide Title bar & Status bar",
+ "del_PE.Views.Toolbar.tipHideBars": "Hide Title bar & Status bar",
"PE.Views.Toolbar.tipIncPrLeft": "Increase indent",
"PE.Views.Toolbar.tipInsertChart": "Insert chart",
"PE.Views.Toolbar.tipInsertEquation": "Insert equation",
diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
index ab413d942..7c9c69def 100644
--- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js
+++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
@@ -67,6 +67,13 @@ define([
'CellEditor': {},
'Viewport': {
'layout:resizedrag': _.bind(this.onLayoutResize, this)
+ },
+ 'Common.Views.Header': {
+ 'formulabar:hide': function (state) {
+ this.editor.setVisible(!state);
+ Common.localStorage.setBool('sse-hidden-formula', state);
+ Common.NotificationCenter.trigger('layout:changed', 'celleditor', state?'hidden':'showed');
+ }.bind(this)
}
});
},
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index c472d4f92..c6fa3a093 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -55,6 +55,7 @@ define([
'hide': _.bind(this.onHidePlugins, this)
},
'Common.Views.Header': {
+ 'file:settings': _.bind(this.clickToolbarSettings,this),
'click:users': _.bind(this.clickStatusbarUsers, this)
},
'LeftMenu': {
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 7e6a09000..59beebf6a 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -80,6 +80,7 @@ define([
'settings:apply': _.bind(this.applyFormulaSettings, this)
},
'Common.Views.Header': {
+ 'toolbar:setcompact': this.onChangeViewMode.bind(this),
'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
@@ -305,7 +306,6 @@ define([
toolbar.btnDecDecimal.on('click', _.bind(this.onDecrement, this));
toolbar.btnIncDecimal.on('click', _.bind(this.onIncrement, this));
toolbar.btnInsertFormula.on('click', _.bind(this.onInsertFormulaMenu, this));
- toolbar.btnSettings.on('click', _.bind(this.onAdvSettingsClick, this));
toolbar.btnInsertFormula.menu.on('item:click', _.bind(this.onInsertFormulaMenu, this));
toolbar.btnNamedRange.menu.on('item:click', _.bind(this.onNamedRangeMenu, this));
toolbar.btnNamedRange.menu.on('show:after', _.bind(this.onNamedRangeMenuOpen, this));
@@ -326,16 +326,12 @@ define([
toolbar.cmbFontSize.on('hide:after', _.bind(this.onHideMenus, this));
toolbar.cmbFontSize.on('combo:blur', _.bind(this.onComboBlur, this));
toolbar.cmbFontSize.on('combo:focusin', _.bind(this.onComboOpen, this, false));
- if (toolbar.mnuZoomIn) toolbar.mnuZoomIn.on('click', _.bind(this.onZoomInClick, this));
- if (toolbar.mnuZoomOut) toolbar.mnuZoomOut.on('click', _.bind(this.onZoomOutClick, this));
- if (toolbar.btnShowMode.rendered) toolbar.btnShowMode.menu.on('item:click', _.bind(this.onHideMenu, this));
toolbar.listStyles.on('click', _.bind(this.onListStyleSelect, this));
toolbar.cmbNumberFormat.on('selected', _.bind(this.onNumberFormatSelect, this));
toolbar.cmbNumberFormat.on('show:before', _.bind(this.onNumberFormatOpenBefore, this, true));
if (toolbar.cmbNumberFormat.cmpEl)
toolbar.cmbNumberFormat.cmpEl.on('click', '#id-toolbar-mnu-item-more-formats a', _.bind(this.onNumberFormatSelect, this));
toolbar.btnCurrencyStyle.menu.on('item:click', _.bind(this.onNumberFormatMenu, this));
- if (toolbar.mnuitemCompactToolbar) toolbar.mnuitemCompactToolbar.on('toggle', _.bind(this.onChangeViewMode, this));
$('#id-toolbar-menu-new-fontcolor').on('click', _.bind(this.onNewTextColor, this));
$('#id-toolbar-menu-new-paracolor').on('click', _.bind(this.onNewBackColor, this));
$('#id-toolbar-menu-new-bordercolor').on('click', _.bind(this.onNewBorderColor, this));
@@ -1361,53 +1357,6 @@ define([
}
},
- onAdvSettingsClick: function(btn, e) {
- this.toolbar.fireEvent('file:settings', this);
- btn.cmpEl.blur();
- },
-
- onZoomInClick: function(btn) {
- if (this.api) {
- var f = Math.floor(this.api.asc_getZoom() * 10)/10;
- f += .1;
- if (f > 0 && !(f > 2.)) {
- this.api.asc_setZoom(f);
- }
- }
-
- Common.NotificationCenter.trigger('edit:complete', this.toolbar);
- },
-
- onZoomOutClick: function(btn) {
- if (this.api) {
- var f = Math.ceil(this.api.asc_getZoom() * 10)/10;
- f -= .1;
- if (!(f < .5)) {
- this.api.asc_setZoom(f);
- }
- }
-
- Common.NotificationCenter.trigger('edit:complete', this.toolbar);
- },
-
- onHideMenu: function(menu, item) {
- var params = {},
- option;
-
- switch(item.value) {
- case 'title': params.title = item.checked; option = 'sse-hidden-title'; break;
- case 'formula': params.formula = item.checked; option = 'sse-hidden-formula'; break;
- case 'headings': params.headings = item.checked; break;
- case 'gridlines': params.gridlines = item.checked; break;
- case 'freezepanes': params.freezepanes = item.checked; break;
- }
-
- this.hideElements(params);
- option && Common.localStorage.setBool(option, item.checked);
-
- Common.NotificationCenter.trigger('edit:complete', this.toolbar);
- },
-
onListStyleSelect: function(combo, record) {
this._state.prstyle = undefined;
if (this.api) {
@@ -1513,7 +1462,6 @@ define([
if ( from != 'file' ) {
Common.Utils.asyncCall(function () {
this.onChangeViewMode(null, !this.toolbar.isCompact());
- this.toolbar.mnuitemCompactToolbar.setChecked(this.toolbar.isCompact(), true);
}, this);
}
},
@@ -1711,26 +1659,9 @@ define([
this.checkInsertAutoshape({action:'cancel'});
},
- onApiZoomChange: function(zf, type){
- switch (type) {
- case 1: // FitWidth
- case 2: // FitPage
- case 0:
- default: {
- this.toolbar.mnuZoom.options.value = Math.floor((zf + .005) * 100);
- $('.menu-zoom .zoom', this.toolbar.el).html(Math.floor((zf + .005) * 100) + '%');
- }
- }
- },
+ onApiZoomChange: function(zf, type){},
- onApiSheetChanged: function() {
- if ( this.api && !this.appConfig.isEditDiagram && !this.appConfig.isEditMailMerge ) {
- var params = this.api.asc_getSheetViewSettings();
- this.toolbar.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders());
- this.toolbar.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines());
- this.toolbar.mnuitemFreezePanes.setChecked(params.asc_getIsFreezePane());
- }
- },
+ onApiSheetChanged: function() {},
onApiEditorSelectionChanged: function(fontobj) {
if (!this.editMode) return;
@@ -2411,13 +2342,6 @@ define([
},
hideElements: function(opts) {
- if (!_.isUndefined(opts.title)) {
- var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
- headerView && headerView.setVisible(!opts.title);
-
- Common.NotificationCenter.trigger('layout:changed', 'header');
- }
-
if (!_.isUndefined(opts.compact)) {
this.onChangeViewMode(opts.compact);
}
@@ -2981,7 +2905,7 @@ define([
var toolbar = this.toolbar;
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
- this.toolbar.lockToolbar(SSE.enumLock.menuFileOpen, disable, {array: [toolbar.btnShowMode]});
+ this.toolbar.lockToolbar(SSE.enumLock.menuFileOpen, disable);
if(disable) {
mask = $("
").appendTo(toolbar.$el.find('.toolbar'));
Common.util.Shortcuts.suspendEvents('command+l, ctrl+l, command+shift+l, ctrl+shift+l, command+k, ctrl+k, command+alt+h, ctrl+alt+h, command+1, ctrl+1');
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index a88a191c1..ce517338f 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -71,6 +71,9 @@ define([
'menu:hide': me.onFileMenu.bind(me, 'hide'),
'menu:show': me.onFileMenu.bind(me, 'show')
},
+ 'Statusbar': {
+ 'sheet:changed': me.onApiSheetChanged.bind(me)
+ },
'Toolbar': {
'render:before' : function (toolbar) {
var config = SSE.getController('Main').appOptions;
@@ -83,6 +86,7 @@ define([
},
'view:compact' : function (toolbar, state) {
+ me.header.mnuitemCompactToolbar.setChecked(state, true);
me.viewport.vlayout.getItem('toolbar').height = state ?
Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal');
},
@@ -108,10 +112,16 @@ define([
});
Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
+ Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
+ Common.NotificationCenter.on('cells:range', this.onCellsRange.bind(this));
},
setApi: function(api) {
this.api = api;
+ this.api.asc_registerCallback('asc_onZoomChanged', this.onApiZoomChange.bind(this));
+ this.api.asc_registerCallback('asc_onSheetsChanged', this.onApiSheetChanged.bind(this));
+ this.api.asc_registerCallback('asc_onUpdateSheetViewSettings', this.onApiSheetChanged.bind(this));
+ this.api.asc_registerCallback('asc_onEditCell', this.onApiEditCell.bind(this));
},
onAppShowed: function (config) {
@@ -149,6 +159,123 @@ define([
}
},
+ onAppReady: function (config) {
+ var me = this;
+ if ( me.header.btnOptions ) {
+ var compactview = !config.isEdit;
+ if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) {
+ if ( Common.localStorage.itemExists("sse-compact-toolbar") ) {
+ compactview = Common.localStorage.getBool("sse-compact-toolbar");
+ } else
+ if ( config.customization && config.customization.compactToolbar )
+ compactview = true;
+ }
+
+ me.header.mnuitemCompactToolbar = new Common.UI.MenuItem({
+ caption : me.header.textCompactView,
+ checked : compactview,
+ checkable : true,
+ value : 'toolbar'
+ });
+
+ var mnuitemHideFormulaBar = new Common.UI.MenuItem({
+ caption : me.textHideFBar,
+ checked : Common.localStorage.getBool('sse-hidden-formula'),
+ checkable : true,
+ value : 'formula'
+ });
+
+ me.header.mnuitemHideHeadings = new Common.UI.MenuItem({
+ caption : me.textHideHeadings,
+ checkable : true,
+ checked : me.header.mnuitemHideHeadings.isChecked(),
+ value : 'headings'
+ });
+
+ me.header.mnuitemHideGridlines = new Common.UI.MenuItem({
+ caption : me.textHideGridlines,
+ checkable : true,
+ checked : me.header.mnuitemHideGridlines.isChecked(),
+ value : 'gridlines'
+ });
+
+ me.header.mnuitemFreezePanes = new Common.UI.MenuItem({
+ caption : me.textFreezePanes,
+ checkable : true,
+ checked : me.header.mnuitemFreezePanes.isChecked(),
+ value : 'freezepanes'
+ });
+
+ me.header.mnuZoom = new Common.UI.MenuItem({
+ template: _.template([
+ ''
+ ].join('')),
+ stopPropagation: true,
+ value: me.header.mnuZoom.options.value
+ });
+
+ var mnuitemAdvSettings = new Common.UI.MenuItem({
+ caption: me.header.textAdvSettings,
+ value: 'advanced'
+ });
+
+ me.header.btnOptions.setMenu(new Common.UI.Menu({
+ cls: 'pull-right',
+ style: 'min-width: 180px;',
+ items: [
+ me.header.mnuitemCompactToolbar,
+ mnuitemHideFormulaBar,
+ {caption:'--'},
+ me.header.mnuitemHideHeadings,
+ me.header.mnuitemHideGridlines,
+ {caption:'--'},
+ me.header.mnuitemFreezePanes,
+ {caption:'--'},
+ me.header.mnuZoom,
+ {caption:'--'},
+ mnuitemAdvSettings
+ ]
+ })
+ );
+
+ var _on_btn_zoom = function (btn) {
+ if ( btn == 'up' ) {
+ var _f = Math.floor(this.api.asc_getZoom() * 10)/10;
+ _f += .1;
+ if (_f > 0 && !(_f > 2.))
+ this.api.asc_setZoom(_f);
+ } else {
+ _f = Math.ceil(this.api.asc_getZoom() * 10)/10;
+ _f -= .1;
+ if (!(_f < .5))
+ this.api.asc_setZoom(_f);
+ }
+
+ Common.NotificationCenter.trigger('edit:complete', me.header);
+ };
+
+ (new Common.UI.Button({
+ el : $('#hdr-menu-zoom-out', me.header.mnuZoom.$el),
+ cls : 'btn-toolbar'
+ })).on('click', _on_btn_zoom.bind(me, 'down'));
+
+ (new Common.UI.Button({
+ el : $('#hdr-menu-zoom-in', me.header.mnuZoom.$el),
+ cls : 'btn-toolbar'
+ })).on('click', _on_btn_zoom.bind(me, 'up'));
+
+ me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
+ }
+ },
+
// When our application is ready, lets get started
onLaunch: function() {
// Create and render main view
@@ -176,6 +303,10 @@ define([
this.boxFormula = $('#cell-editing-box');
this.boxSdk.css('border-left', 'none');
this.boxFormula.css('border-left', 'none');
+
+ this.header.mnuitemHideHeadings = this.header.fakeMenuItem();
+ this.header.mnuitemHideGridlines = this.header.fakeMenuItem();
+ this.header.mnuitemFreezePanes = this.header.fakeMenuItem();
},
onLayoutChanged: function(area) {
@@ -228,6 +359,58 @@ define([
me.header.lockHeaderBtns( 'undo', _need_disable );
me.header.lockHeaderBtns( 'redo', _need_disable );
- }
- });
+ me.header.lockHeaderBtns( 'opts', _need_disable );
+ },
+
+ onApiZoomChange: function(zf, type){
+ switch (type) {
+ case 1: // FitWidth
+ case 2: // FitPage
+ case 0:
+ default: {
+ this.header.mnuZoom.options.value = Math.floor((zf + .005) * 100);
+ $('.menu-zoom .zoom', this.header.mnuZoom.$el).html(Math.floor((zf + .005) * 100) + '%');
+ }
+ }
+ },
+
+ onApiSheetChanged: function() {
+ var me = this;
+ var appConfig = me.viewport.mode;
+ if ( !!appConfig && !appConfig.isEditDiagram && !appConfig.isEditMailMerge ) {
+ var params = me.api.asc_getSheetViewSettings();
+ me.header.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders());
+ me.header.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines());
+ me.header.mnuitemFreezePanes.setChecked(params.asc_getIsFreezePane());
+ }
+ },
+
+ onApiEditCell: function(state) {
+ if ( state == Asc.c_oAscCellEditorState.editStart )
+ this.header.lockHeaderBtns('opts', true); else
+ if ( state == Asc.c_oAscCellEditorState.editEnd )
+ this.header.lockHeaderBtns('opts', false);
+ },
+
+ onCellsRange: function(status) {
+ this.onApiEditCell(status != Asc.c_oAscSelectionDialogType.None ? Asc.c_oAscCellEditorState.editStart : Asc.c_oAscCellEditorState.editEnd);
+ },
+
+ onOptionsItemClick: function (menu, item, e) {
+ var me = this;
+
+ switch ( item.value ) {
+ case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break;
+ case 'formula': me.header.fireEvent('formulabar:hide', [item.isChecked()]); break;
+ case 'headings': me.api.asc_setDisplayHeadings(!item.isChecked()); break;
+ case 'gridlines': me.api.asc_setDisplayGridlines(!item.isChecked()); break;
+ case 'freezepanes': me.api.asc_freezePane(); break;
+ case 'advanced': me.header.fireEvent('file:settings', me.header); break;
+ }
+ },
+
+ textHideFBar: 'Hide Formula Bar',
+ textHideHeadings: 'Hide Headings',
+ textHideGridlines: 'Hide Gridlines',
+ textFreezePanes: 'Freeze Panes'
});
diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template
index 6fc9e087c..5bb2ae135 100644
--- a/apps/spreadsheeteditor/main/app/template/Toolbar.template
+++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template
@@ -131,16 +131,7 @@