Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Change page orientation using pop-up menu.

Browse source
This commit is contained in:
Julia Radzhabova 2016-07-04 16:04:05 +03:00
parent d7e63930e0
commit 74eb399f59
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -240,7 +240,7 @@ define([
toolbar.btnDropCap.menu.on('item:click', _.bind(this.onDropCapSelect, this)); toolbar.btnDropCap.menu.on('item:click', _.bind(this.onDropCapSelect, this));
toolbar.mnuDropCapAdvanced.on('click', _.bind(this.onDropCapAdvancedClick, this)); toolbar.mnuDropCapAdvanced.on('click', _.bind(this.onDropCapAdvancedClick, this));
toolbar.btnColumns.menu.on('item:click', _.bind(this.onColumnsSelect, this)); toolbar.btnColumns.menu.on('item:click', _.bind(this.onColumnsSelect, this));
toolbar.btnPageOrient.on('toggle', _.bind(this.onPageOrientToggle, this)); toolbar.btnPageOrient.menu.on('item:click', _.bind(this.onPageOrientSelect, this));
toolbar.btnPageMargins.menu.on('item:click', _.bind(this.onPageMarginsSelect, this)); toolbar.btnPageMargins.menu.on('item:click', _.bind(this.onPageMarginsSelect, this));
toolbar.btnClearStyle.on('click', _.bind(this.onClearStyleClick, this)); toolbar.btnClearStyle.on('click', _.bind(this.onClearStyleClick, this));
toolbar.btnCopyStyle.on('toggle', _.bind(this.onCopyStyleToggle, this)); toolbar.btnCopyStyle.on('toggle', _.bind(this.onCopyStyleToggle, this));
@ -723,7 +723,7 @@ define([
onApiPageOrient: function(isportrait) { onApiPageOrient: function(isportrait) {
if (this._state.pgorient !== isportrait) { if (this._state.pgorient !== isportrait) {
this.toolbar.btnPageOrient.toggle(!isportrait, true); this.toolbar.btnPageOrient.menu.items[isportrait ? 0 : 1].setChecked(true);
this._state.pgorient = isportrait; this._state.pgorient = isportrait;
} }
}, },
@ -1387,10 +1387,11 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertShape); Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertShape);
}, },
onPageOrientToggle: function(btn, state, e) { onPageOrientSelect: function(menu, item) {
this._state.pgorient = undefined; this._state.pgorient = undefined;
if (this.api) if (this.api && item.checked) {
this.api.change_PageOrient(!state); this.api.change_PageOrient(item.value);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Page Orientation'); Common.component.Analytics.trackEvent('ToolBar', 'Page Orientation');

14
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -679,7 +679,13 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'btn-pageorient', iconCls : 'btn-pageorient',
hint : this.tipPageOrient, hint : this.tipPageOrient,
enableToggle: true menu : new Common.UI.Menu({
cls: 'ppm-toolbar',
items: [
{ caption: this.textPortrait, iconCls: 'mnu-orient-portrait', checkable: true, toggleGroup: 'menuOrient', value: true },
{ caption: this.textLandscape, iconCls: 'mnu-orient-landscape', checkable: true, toggleGroup: 'menuOrient', value: false }
]
})
}); });
this.toolbarControls.push(this.btnPageOrient); this.toolbarControls.push(this.btnPageOrient);
@ -1853,7 +1859,9 @@ define([
textLeft: 'Left: ', textLeft: 'Left: ',
textBottom: 'Bottom: ', textBottom: 'Bottom: ',
textRight: 'Right: ', textRight: 'Right: ',
textPageSizeCustom: 'Custom Page Size' textPageSizeCustom: 'Custom Page Size',
textPortrait: 'Portrait',
textLandscape: 'Landscape'
}, DE.Views.Toolbar || {})); }, DE.Views.Toolbar || {}));
}); });

2
apps/documenteditor/main/locale/en.json
View file

@ -1440,6 +1440,7 @@
"DE.Views.Toolbar.textInsTextArt": "Insert Text Art", "DE.Views.Toolbar.textInsTextArt": "Insert Text Art",
"DE.Views.Toolbar.textInText": "In Text", "DE.Views.Toolbar.textInText": "In Text",
"DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textItalic": "Italic",
"DE.Views.Toolbar.textLandscape": "Landscape",
"DE.Views.Toolbar.textLeft": "Left: ", "DE.Views.Toolbar.textLeft": "Left: ",
"DE.Views.Toolbar.textLine": "Line Chart", "DE.Views.Toolbar.textLine": "Line Chart",
"DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsLast": "Last Custom",
@ -1456,6 +1457,7 @@
"DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
"DE.Views.Toolbar.textPie": "Pie Chart", "DE.Views.Toolbar.textPie": "Pie Chart",
"DE.Views.Toolbar.textPoint": "Point Chart", "DE.Views.Toolbar.textPoint": "Point Chart",
"DE.Views.Toolbar.textPortrait": "Portrait",
"DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textStandartColors": "Standard Colors", "DE.Views.Toolbar.textStandartColors": "Standard Colors",
"DE.Views.Toolbar.textStock": "Stock Chart", "DE.Views.Toolbar.textStock": "Stock Chart",

3
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -387,6 +387,9 @@
.menu-icon-normal(mnu-direct-horiz, 33, @menu-icon-size); .menu-icon-normal(mnu-direct-horiz, 33, @menu-icon-size);
.menu-icon-normal(mnu-direct-rup, 34, @menu-icon-size); .menu-icon-normal(mnu-direct-rup, 34, @menu-icon-size);
.menu-icon-normal(mnu-direct-rdown, 35, @menu-icon-size); .menu-icon-normal(mnu-direct-rdown, 35, @menu-icon-size);
.menu-icon-normal(mnu-orient-portrait, 36, @menu-icon-size);
.menu-icon-normal(mnu-orient-landscape, 37, @menu-icon-size);
.menu-otherstates-icon(ppm-toolbar, @menu-icon-size); .menu-otherstates-icon(ppm-toolbar, @menu-icon-size);