' +
(isAndroid ? '' : '') +
'' +
@@ -401,7 +402,7 @@ define([
'
' + initial + '
' : '') +
- '
' + name + '
' +
+ '' + this.getUserName(name) + '
' +
'' + date + '
' +
(isAndroid ? '' +
'',
+ '',
'
' +
(isAndroid ? '' : '') +
'' +
@@ -427,7 +428,7 @@ define([
'',
+ '
',
+ '
',
+ '' + comment.userInitials + '
' : '') +
- '
' + comment.username + '
' +
+ '' + this.getUserName(comment.username) + '
' +
'' + comment.date + '
' +
(isAndroid ? '' +
'',
+ '
',
+ '
'
].join('')),
initialize: function(options) {
@@ -333,7 +339,7 @@ define([
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
- menuStyle : 'max-height: 210px;',
+ menuStyle : 'max-height: 157px;',
data : [
{ value: -1, displayValue: this.txtFitPage },
{ value: -2, displayValue: this.txtFitWidth },
@@ -446,15 +452,24 @@ define([
this.btnApply.on('click', this.applySettings.bind(this));
+ this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
+
this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: this.$el,
+ el: this.pnlSettings,
suppressScrollX: true,
alwaysVisibleY: true
});
}
+
+ Common.NotificationCenter.on({
+ 'window:resize': function() {
+ me.isVisible() && me.updateScroller();
+ }
+ });
+
return this;
},
@@ -462,7 +477,14 @@ define([
Common.UI.BaseView.prototype.show.call(this,arguments);
this.updateSettings();
- this.scroller && this.scroller.update();
+ this.updateScroller();
+ },
+
+ updateScroller: function() {
+ if (this.scroller) {
+ this.scroller.update();
+ this.pnlSettings.toggleClass('bordered', this.scroller.isVisible());
+ }
},
setMode: function(mode) {
@@ -609,25 +631,14 @@ define([
},
autoCorrect: function() {
- if (!this._mathCorrect) {
- var arr = (this.api) ? this.api.asc_getAutoCorrectMathSymbols() : [],
- data = [];
- _.each(arr, function(item, index){
- var itm = {replaced: item[0]};
- if (typeof item[1]=='object') {
- itm.by = '';
- _.each(item[1], function(ch){
- itm.by += Common.Utils.String.encodeSurrogateChar(ch);
- });
- } else {
- itm.by = Common.Utils.String.encodeSurrogateChar(item[1]);
- }
- data.push(itm);
- });
- this._mathCorrect = data;
- }
+ if (!this._mathCorrect)
+ this._mathCorrect = new Common.UI.DataViewStore();
+ if (!this._funcCorrect)
+ this._funcCorrect = new Common.UI.DataViewStore();
(new Common.Views.AutoCorrectDialog({
- props: this._mathCorrect
+ mathStore: this._mathCorrect,
+ functionsStore: this._funcCorrect,
+ api: this.api
})).show();
},
@@ -838,7 +849,8 @@ define([
this.rendered = false;
this.template = _.template([
- '' +
(isAndroid ? '' : '') +
'' +
@@ -442,13 +443,17 @@ define([
renderChangeReview: function(change) {
var isAndroid = Framework7.prototype.device.android === true;
var template = (isAndroid ? '' : '') +
'
' + reply.userInitials + '
' : '') +
- '
' + reply.username + '
' +
+ '' + this.getUserName(reply.username) + '
' +
'' + reply.date + '
' +
(isAndroid ? '' + change.initials + '
' : '') +
- '
' + change.user + '
' +
+ '' + this.getUserName(change.user) + '
' +
'' + change.date + '
' +
(isAndroid ? '' + change.text + '
';
$('#current-change').html(_.template(template));
},
+ getUserName: function (username) {
+ return Common.Utils.String.htmlEncode(Common.Utils.UserInfoParser.getParsedName(username));
+ },
+
textCollaboration: 'Collaboration',
textReviewing: 'Review',
textСomments: 'Сomments',
diff --git a/apps/common/mobile/utils/utils.js b/apps/common/mobile/utils/utils.js
index d0ea75a52..5a3481c5b 100644
--- a/apps/common/mobile/utils/utils.js
+++ b/apps/common/mobile/utils/utils.js
@@ -126,5 +126,5 @@ define([
new IScroll(targetSelector);
}, 500);
}
- }
+ };
});
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index 8eef26616..1798f3976 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -229,6 +229,9 @@ DE.ApplicationController = new(function(){
if ( !embedConfig.saveUrl && permissions.print === false)
$('#idt-download').hide();
+ if ( permissions.print === false)
+ $('#idt-print').hide();
+
if ( !embedConfig.shareUrl )
$('#idt-share').hide();
@@ -276,6 +279,12 @@ DE.ApplicationController = new(function(){
Common.Analytics.trackEvent('Save');
});
+ DE.ApplicationView.tools.get('#idt-print')
+ .on('click', function(){
+ api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
+ Common.Analytics.trackEvent('Print');
+ });
+
$('#id-btn-close').on('click', function(){
if (config.customization && config.customization.goback) {
if (config.customization.goback.requestClose && config.canRequestClose)
diff --git a/apps/documenteditor/embed/js/ApplicationView.js b/apps/documenteditor/embed/js/ApplicationView.js
index 1c3aca46f..9a07a68ea 100644
--- a/apps/documenteditor/embed/js/ApplicationView.js
+++ b/apps/documenteditor/embed/js/ApplicationView.js
@@ -46,6 +46,7 @@ DE.ApplicationView = new(function(){
$btnTools.parent().append(
'
-
-
+
-
+
-
-
+
-
-
+
-
-
+
+
-
+
diff --git a/apps/documenteditor/main/app/template/ShapeSettings.template b/apps/documenteditor/main/app/template/ShapeSettings.template
index 1418afb3b..1c2ba2c8e 100644
--- a/apps/documenteditor/main/app/template/ShapeSettings.template
+++ b/apps/documenteditor/main/app/template/ShapeSettings.template
@@ -52,21 +52,50 @@
-
-
+
-
-
+
-
-
+
-
+
+
-
+
diff --git a/apps/documenteditor/main/app/template/TextArtSettings.template b/apps/documenteditor/main/app/template/TextArtSettings.template
index d64e7d07d..711f3e443 100644
--- a/apps/documenteditor/main/app/template/TextArtSettings.template
+++ b/apps/documenteditor/main/app/template/TextArtSettings.template
@@ -30,21 +30,50 @@
-
-
+
-
-
-
-
-
-
-
- |
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
| + + | ++ + | +|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index 15ba936c1..5b4d78bee 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -132,7 +132,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
additionalItems: [{
id: 'control-settings-system-color',
caption: this.textSystemColor,
- template: _.template('<%= caption %>')
+ template: _.template('<%= caption %>')
},
{caption: '--'}],
additionalAlign: this.menuAddAlign,
diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
index 78c9a7543..cdf111af9 100644
--- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js
+++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
@@ -99,6 +99,8 @@ define([
this.spnColumns.on('change', function(field, newValue, oldValue, eOpts){
var space = Common.Utils.Metric.fnRecalcToMM(me.spnSpacing.getNumberValue()),
num = me.spnColumns.getNumberValue();
+ me.chSeparator.setDisabled(num<2);
+ me.spnSpacing.setDisabled(num<2);
(num<2) && (num = 2);
var maxspace = parseFloat(((me.totalWidth-num*12.7)/(num-1)).toFixed(1));
me.spnSpacing.setMaxValue(Common.Utils.Metric.fnRecalcFromMM(maxspace));
@@ -158,6 +160,8 @@ define([
maxcols = parseInt((total+minspace)/(12.7+minspace));
this.spnColumns.setMaxValue(maxcols);
this.spnColumns.setValue(num, true);
+ this.chSeparator.setDisabled(num<2);
+ this.spnSpacing.setDisabled(num<2);
(num<2) && (num = 2);
(num>maxcols) && (num = maxcols);
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 292e00327..c6e99822e 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -359,7 +359,7 @@ define([
if (usersStore){
var rec = usersStore.findUser(id);
if (rec)
- return rec.get('username');
+ return Common.Utils.UserInfoParser.getParsedName(rec.get('username'));
}
return me.guestText;
};
@@ -883,6 +883,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1053,6 +1054,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1080,6 +1082,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1099,6 +1102,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1128,6 +1132,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1180,6 +1185,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -1986,11 +1992,13 @@ define([
var me = this;
var menuViewCopy = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-copy',
caption: me.textCopy,
value: 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuViewUndo = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-undo',
caption: me.textUndo
}).on('click', function () {
me.api.Undo();
@@ -2001,6 +2009,7 @@ define([
});
var menuViewAddComment = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-menu-comments',
caption: me.addCommentText
}).on('click', _.bind(me.addComment, me));
@@ -2011,10 +2020,12 @@ define([
var menuViewSignSeparator = new Common.UI.MenuItem({caption: '--' });
var menuViewPrint = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', _.bind(me.onPrintSelection, me));
this.viewModeMenu = new Common.UI.Menu({
+ cls: 'shifted-right',
initMenu: function (value) {
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())),
@@ -2118,7 +2129,7 @@ define([
me.fireEvent('editcomplete', me);
}
return new Common.UI.Menu({
- cls: 'ppm-toolbar',
+ cls: 'ppm-toolbar shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@@ -2204,7 +2215,7 @@ define([
}
return new Common.UI.Menu({
- cls: 'ppm-toolbar',
+ cls: 'ppm-toolbar shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@@ -2246,6 +2257,7 @@ define([
});
this.menuImageWrap = new Common.UI.MenuItem({
+ iconCls: 'menu__icon wrap-inline',
caption : me.textWrap,
menu : (function(){
function onItemClick(item, e) {
@@ -2272,7 +2284,7 @@ define([
}
return new Common.UI.Menu({
- cls: 'ppm-toolbar',
+ cls: 'ppm-toolbar shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@@ -2339,6 +2351,7 @@ define([
});
var menuImageAdvanced = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-menu-image',
caption : me.advancedText
}).on('click', function(item, e) {
var elType, elValue;
@@ -2405,6 +2418,7 @@ define([
var menuImgReplace = new Common.UI.MenuItem({
caption : me.textReplace,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@@ -2444,21 +2458,25 @@ define([
});
var menuImgCopy = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuImgPaste = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuImgCut = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-cut',
caption : me.textCut,
value : 'cut'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuImgPrint = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', _.bind(me.onPrintSelection, me));
@@ -2469,22 +2487,27 @@ define([
var menuImgRotate = new Common.UI.MenuItem({
caption : me.textRotate,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-rotate-90',
caption: this.textRotate90,
value : 1
}).on('click', _.bind(me.onImgRotate, me)),
new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-rotate-270',
caption: this.textRotate270,
value : 0
}).on('click', _.bind(me.onImgRotate, me)),
{ caption: '--' },
new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-flip-hor',
caption: this.textFlipH,
value : 1
}).on('click', _.bind(me.onImgFlip, me)),
new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-flip-vert',
caption: this.textFlipV,
value : 0
}).on('click', _.bind(me.onImgFlip, me))
@@ -2495,6 +2518,7 @@ define([
me.menuImgCrop = new Common.UI.MenuItem({
caption : me.textCrop,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@@ -2516,6 +2540,7 @@ define([
});
this.pictureMenu = new Common.UI.Menu({
+ cls: 'shifted-right',
initMenu: function(value){
if (_.isUndefined(value.imgProps))
return;
@@ -2525,50 +2550,63 @@ define([
me.menuImageWrap._originalProps = value.imgProps.value;
+ var cls = 'menu__icon ';
if (notflow) {
for (var i = 0; i < 6; i++) {
me.menuImageWrap.menu.items[i].setChecked(false);
}
+ cls += 'wrap-inline';
} else {
switch (wrapping) {
case Asc.c_oAscWrapStyle2.Inline:
me.menuImageWrap.menu.items[0].setChecked(true);
+ cls += 'wrap-inline';
break;
case Asc.c_oAscWrapStyle2.Square:
me.menuImageWrap.menu.items[1].setChecked(true);
+ cls += 'wrap-square';
break;
case Asc.c_oAscWrapStyle2.Tight:
me.menuImageWrap.menu.items[2].setChecked(true);
+ cls += 'wrap-tight';
break;
case Asc.c_oAscWrapStyle2.Through:
me.menuImageWrap.menu.items[3].setChecked(true);
+ cls += 'wrap-through';
break;
case Asc.c_oAscWrapStyle2.TopAndBottom:
me.menuImageWrap.menu.items[4].setChecked(true);
+ cls += 'wrap-topandbottom';
break;
case Asc.c_oAscWrapStyle2.Behind:
me.menuImageWrap.menu.items[6].setChecked(true);
+ cls += 'wrap-behind';
break;
case Asc.c_oAscWrapStyle2.InFront:
me.menuImageWrap.menu.items[5].setChecked(true);
+ cls += 'wrap-infront';
break;
default:
for (var i = 0; i < 6; i++) {
me.menuImageWrap.menu.items[i].setChecked(false);
}
+ cls += 'wrap-infront';
break;
}
}
+ me.menuImageWrap.setIconCls(cls);
_.each(me.menuImageWrap.menu.items, function(item) {
item.setDisabled(notflow);
});
var onlyCommonProps = ( value.imgProps.isImg && value.imgProps.isChart || value.imgProps.isImg && value.imgProps.isShape ||
value.imgProps.isShape && value.imgProps.isChart);
- if (onlyCommonProps)
+ if (onlyCommonProps) {
menuImageAdvanced.setCaption(me.advancedText, true);
- else {
+ menuImageAdvanced.setIconCls('menu__icon btn-menu-image');
+ } else {
menuImageAdvanced.setCaption((value.imgProps.isImg) ? me.imageText : ((value.imgProps.isChart) ? me.chartText : me.shapeText), true);
+ menuImageAdvanced.setIconCls('menu__icon ' + (value.imgProps.isImg ? 'btn-menu-image' : (value.imgProps.isChart ? 'btn-menu-chart' : 'btn-menu-shape')));
}
menuChartEdit.setVisible(!_.isNull(value.imgProps.value.get_ChartProperties()) && !onlyCommonProps);
@@ -2672,6 +2710,7 @@ define([
}).on('click', _.bind(me.onInsertCaption, me));
var mnuTableMerge = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-merge',
caption : me.mergeCellsText
}).on('click', function(item) {
if (me.api)
@@ -2706,27 +2745,35 @@ define([
};
var menuTableCellAlign = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-top',
caption : me.cellAlignText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuTableCellTop = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-top',
caption : me.textShapeAlignTop,
toggleGroup : 'popuptablecellalign',
+ checkmark : false,
checkable : true,
checked : false,
valign : Asc.c_oAscVertAlignJc.Top
}).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellCenter = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-middle',
caption : me.textShapeAlignMiddle,
toggleGroup : 'popuptablecellalign',
+ checkmark : false,
checkable : true,
checked : false,
valign : Asc.c_oAscVertAlignJc.Center
}).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellBottom = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-bottom',
caption : me.textShapeAlignBottom,
toggleGroup : 'popuptablecellalign',
+ checkmark : false,
checkable : true,
checked : false,
valign : Asc.c_oAscVertAlignJc.Bottom
@@ -2736,10 +2783,12 @@ define([
});
var menuTableAdvanced = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-menu-table',
caption : me.advancedTableText
}).on('click', _.bind(me.advancedTableClick, me));
var menuParagraphAdvancedInTable = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-paragraph',
caption : me.advancedParagraphText
}).on('click', _.bind(me.advancedParagraphClick, me));
@@ -2759,8 +2808,10 @@ define([
});
var menuHyperlinkTable = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-inserthyperlink',
caption : me.hyperlinkText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
menuEditHyperlinkTable,
@@ -2782,6 +2833,7 @@ define([
var menuTableControl = new Common.UI.MenuItem({
caption: me.textContentControls,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
menuTableRemoveControl,
@@ -2793,6 +2845,7 @@ define([
var menuTableTOC = new Common.UI.MenuItem({
caption : me.textTOC,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -2816,11 +2869,13 @@ define([
/** coauthoring begin **/
var menuAddCommentTable = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-menu-comments',
caption : me.addCommentText
}).on('click', _.bind(me.addComment, me));
/** coauthoring end **/
var menuAddHyperlinkTable = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-inserthyperlink',
caption : me.hyperlinkText
}).on('click', _.bind(me.addHyperlink, me));
@@ -2836,6 +2891,7 @@ define([
me.menuSpellMoreTable = new Common.UI.MenuItem({
caption : me.moreText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
restoreHeight: true,
items : [
@@ -2851,6 +2907,7 @@ define([
].join(''));
me.langTableMenu = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-ic-doclang',
caption : me.langText,
menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
@@ -2896,8 +2953,10 @@ define([
});
me.menuSpellCheckTable = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-ic-docspell',
caption : me.spellcheckText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuSpellTable,
@@ -2913,21 +2972,25 @@ define([
});
var menuTableCopy = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuTablePaste = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuTableCut = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-cut',
caption : me.textCut,
value : 'cut'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuTablePrint = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', _.bind(me.onPrintSelection, me));
@@ -2961,9 +3024,10 @@ define([
};
var menuTableDirection = new Common.UI.MenuItem({
+ iconCls: 'menu__icon text-orient-hor',
caption : me.directionText,
menu : new Common.UI.Menu({
- cls: 'ppm-toolbar',
+ cls: 'ppm-toolbar shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuTableDirectH = new Common.UI.MenuItem({
@@ -3012,6 +3076,7 @@ define([
var menuNumberingTable = new Common.UI.MenuItem({
caption : me.bulletsText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
menuTableStartNewList,
@@ -3033,6 +3098,7 @@ define([
});
this.tableMenu = new Common.UI.Menu({
+ cls: 'shifted-right',
initMenu: function(value){
// table properties
if (_.isUndefined(value.tableProps))
@@ -3045,11 +3111,37 @@ define([
}
var align = value.tableProps.value.get_CellsVAlign();
+ var cls = '';
+ switch (align) {
+ case Asc.c_oAscVertAlignJc.Top:
+ cls = 'menu__icon btn-align-top';
+ break;
+ case Asc.c_oAscVertAlignJc.Center:
+ cls = 'menu__icon btn-align-middle';
+ break;
+ case Asc.c_oAscVertAlignJc.Bottom:
+ cls = 'menu__icon btn-align-bottom';
+ break;
+ }
+ menuTableCellAlign.setIconCls(cls);
me.menuTableCellTop.setChecked(align == Asc.c_oAscVertAlignJc.Top);
me.menuTableCellCenter.setChecked(align == Asc.c_oAscVertAlignJc.Center);
me.menuTableCellBottom.setChecked(align == Asc.c_oAscVertAlignJc.Bottom);
var dir = value.tableProps.value.get_CellsTextDirection();
+ cls = '';
+ switch (dir) {
+ case Asc.c_oAscCellTextDirection.LRTB:
+ cls = 'menu__icon text-orient-hor';
+ break;
+ case Asc.c_oAscCellTextDirection.TBRL:
+ cls = 'menu__icon text-orient-rdown';
+ break;
+ case Asc.c_oAscCellTextDirection.BTLR:
+ cls = 'menu__icon btn-align-rup';
+ break;
+ }
+ menuTableDirection.setIconCls(cls);
me.menuTableDirectH.setChecked(dir == Asc.c_oAscCellTextDirection.LRTB);
me.menuTableDirect90.setChecked(dir == Asc.c_oAscCellTextDirection.TBRL);
me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR);
@@ -3067,7 +3159,6 @@ define([
menuTableDistCols.setDisabled(disabled);
menuTableCellAlign.setDisabled(disabled);
menuTableDirection.setDisabled(disabled);
-
menuTableAdvanced.setDisabled(disabled);
var cancopy = me.api && me.api.can_CopyCut();
@@ -3204,6 +3295,7 @@ define([
{
caption : me.selectText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
style : 'width: 100px',
items : [
@@ -3235,8 +3327,10 @@ define([
})
},
{
+ iconCls: 'menu__icon btn-addcell',
caption : me.insertText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
style : 'width: 100px',
items : [
@@ -3273,8 +3367,10 @@ define([
})
},
{
+ iconCls: 'menu__icon btn-delcell',
caption : me.deleteText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
style : 'width: 100px',
items : [
@@ -3365,26 +3461,34 @@ define([
};
var menuParagraphVAlign = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-top',
caption : me.vertAlignText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuParagraphTop = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-top',
caption : me.textShapeAlignTop,
+ checkmark : false,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-middle',
caption : me.textShapeAlignMiddle,
+ checkmark : false,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-align-bottom',
caption : me.textShapeAlignBottom,
+ checkmark : false,
checkable : true,
checked : false,
toggleGroup : 'popupparagraphvalign',
@@ -3403,9 +3507,10 @@ define([
};
var menuParagraphDirection = new Common.UI.MenuItem({
+ iconCls: 'menu__icon text-orient-hor',
caption : me.directionText,
menu : new Common.UI.Menu({
- cls: 'ppm-toolbar',
+ cls: 'ppm-toolbar shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuParagraphDirectH = new Common.UI.MenuItem({
@@ -3440,6 +3545,7 @@ define([
});
var menuParagraphAdvanced = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-paragraph',
caption : me.advancedParagraphText
}).on('click', _.bind(me.advancedParagraphClick, me));
@@ -3453,6 +3559,7 @@ define([
});
var menuAddCommentPara = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-menu-comments',
caption : me.addCommentText
}).on('click', _.bind(me.addComment, me));
/** coauthoring end **/
@@ -3462,6 +3569,7 @@ define([
});
var menuAddHyperlinkPara = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-inserthyperlink',
caption : me.hyperlinkText
}).on('click', _.bind(me.addHyperlink, me));
@@ -3477,8 +3585,10 @@ define([
});
var menuHyperlinkPara = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-inserthyperlink',
caption : me.hyperlinkText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
menuEditHyperlinkPara,
@@ -3491,6 +3601,7 @@ define([
var menuStyle = new Common.UI.MenuItem({
caption: me.styleText,
menu: new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
me.menuStyleSave = new Common.UI.MenuItem({
@@ -3511,6 +3622,7 @@ define([
me.menuSpellMorePara = new Common.UI.MenuItem({
caption : me.moreText,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
restoreHeight: true,
items: []
@@ -3518,6 +3630,7 @@ define([
});
me.langParaMenu = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-ic-doclang',
caption : me.langText,
menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
@@ -3559,21 +3672,25 @@ define([
});
var menuParaCopy = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuParaPaste = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuParaCut = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-cut',
caption : me.textCut,
value : 'cut'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuParaPrint = new Common.UI.MenuItem({
+ iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', _.bind(me.onPrintSelection, me));
@@ -3606,6 +3723,7 @@ define([
var menuParaTOCRefresh = new Common.UI.MenuItem({
caption : me.textUpdateTOC,
menu : new Common.UI.Menu({
+ cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@@ -3663,6 +3781,7 @@ define([
});
this.textMenu = new Common.UI.Menu({
+ cls: 'shifted-right',
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
@@ -3672,11 +3791,37 @@ define([
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if ( isInShape || isInChart ) {
var align = value.imgProps.value.get_VerticalTextAlign();
+ var cls = '';
+ switch (align) {
+ case Asc.c_oAscVAlign.Top:
+ cls = 'menu__icon btn-align-top';
+ break;
+ case Asc.c_oAscVAlign.Center:
+ cls = 'menu__icon btn-align-middle';
+ break;
+ case Asc.c_oAscVAlign.Bottom:
+ cls = 'menu__icon btn-align-bottom';
+ break;
+ }
+ menuParagraphVAlign.setIconCls(cls);
me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
var dir = value.imgProps.value.get_Vert();
+ cls = '';
+ switch (dir) {
+ case Asc.c_oAscVertDrawingText.normal:
+ cls = 'menu__icon text-orient-hor';
+ break;
+ case Asc.c_oAscVertDrawingText.vert:
+ cls = 'menu__icon text-orient-rdown';
+ break;
+ case Asc.c_oAscVertDrawingText.vert270:
+ cls = 'menu__icon btn-align-rup';
+ break;
+ }
+ menuParagraphDirection.setIconCls(cls);
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);
me.menuParagraphDirect90.setChecked(dir == Asc.c_oAscVertDrawingText.vert);
me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270);
@@ -3896,6 +4041,7 @@ define([
});
this.hdrMenu = new Common.UI.Menu({
+ cls: 'shifted-right',
initMenu: function(value){
menuEditHeaderFooter.setCaption(value.Header ? me.editHeaderText : me.editFooterText, true);
menuEditHeaderFooter.off('click').on('click', function(item) {
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 2d46a8e45..13e08e864 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -188,7 +188,8 @@ define([
menu: undefined,
template: _.template([
- '
-
-
+
-
-
-
-
-
-
-
- |
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
| + + | ++ + | +|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | ', @@ -261,11 +262,16 @@ define([ ' |
',
+ '',
'
'
+ '
| ', - ' | ', + ' | ', + ' | ', ' |
| ', ' | ', @@ -921,12 +933,17 @@ define([ ' |
',
+ '',
'
'
+ '',
+ '
'
].join(''));
this.infoObj = {PageCount: 0, WordsCount: 0, ParagraphCount: 0, SymbolsCount: 0, SymbolsWSCount:0};
@@ -1003,6 +1020,7 @@ define([
idx = me.tblAuthor.find('tr').index(el);
el.remove();
me.authors.splice(idx, 1);
+ me.updateScroller(true);
}
});
@@ -1024,6 +1042,7 @@ define([
if (!isFromApply) {
var div = $(Common.Utils.String.format(me.authorTpl, Common.Utils.String.htmlEncode(str)));
me.trAuthor.before(div);
+ me.updateScroller();
}
}
});
@@ -1036,6 +1055,9 @@ define([
});
this.btnApply.on('click', _.bind(this.applySettings, this));
+ this.pnlInfo = $markup.find('.flex-settings').addBack().filter('.flex-settings');
+ this.pnlApply = $markup.findById('#fms-flex-apply');
+
this.rendered = true;
this.updateInfo(this.doc);
@@ -1043,11 +1065,18 @@ define([
this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: this.$el,
+ el: this.pnlInfo,
suppressScrollX: true,
alwaysVisibleY: true
});
}
+
+ Common.NotificationCenter.on({
+ 'window:resize': function() {
+ me.isVisible() && me.updateScroller();
+ }
+ });
+
return this;
},
@@ -1056,7 +1085,8 @@ define([
this.updateStatisticInfo();
this.updateFileInfo();
- this.scroller && this.scroller.update();
+ this.scroller && this.scroller.scrollTop(0);
+ this.updateScroller();
},
hide: function() {
@@ -1065,6 +1095,13 @@ define([
this.stopUpdatingStatisticInfo();
},
+ updateScroller: function(destroy) {
+ if (this.scroller) {
+ this.scroller.update(destroy ? {} : undefined);
+ this.pnlInfo.toggleClass('bordered', this.scroller.isVisible());
+ }
+ },
+
updateInfo: function(doc) {
if (!this.doc && doc && doc.info) {
doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead.");
@@ -1135,7 +1172,7 @@ define([
visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
value = props.asc_getLastModifiedBy();
if (value)
- this.lblModifyBy.text(value);
+ this.lblModifyBy.text(Common.Utils.UserInfoParser.getParsedName(value));
visible = this._ShowHideInfoItem(this.lblModifyBy, !!value) || visible;
$('tr.divider.modify', this.el)[visible?'show':'hide']();
@@ -1199,7 +1236,7 @@ define([
setMode: function(mode) {
this.mode = mode;
this.inputAuthor.setVisible(mode.isEdit);
- this.btnApply.setVisible(mode.isEdit);
+ this.pnlApply.toggleClass('hidden', !mode.isEdit);
this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
if (!mode.isEdit) {
this.inputTitle._input.attr('placeholder', '');
@@ -1314,7 +1351,7 @@ define([
this.rendered = false;
this.template = _.template([
- '| ', ' | ', ' |
| ', ' | ', @@ -1529,7 +1566,7 @@ define([ }); this.viewHelpPicker.on('item:select', function(dataview, itemview, record) { - me.iFrame.src = me.urlPref + record.get('src'); + me.onSelectItem(record.get('src')); }); this.iFrame = document.createElement('iframe'); @@ -1575,10 +1612,14 @@ define([ } }, success: function () { - var rec = (me.openUrl) ? store.findWhere({ src: me.openUrl }) || store.at(0) : store.at(0); - me.viewHelpPicker.selectRecord(rec); - me.viewHelpPicker.scrollToRecord(rec); - me.iFrame.src = me.urlPref + rec.get('src'); + var rec = me.openUrl ? store.find(function(record){ + return (me.openUrl.indexOf(record.get('src'))>=0); + }) : store.at(0); + if (rec) { + me.viewHelpPicker.selectRecord(rec, true); + me.viewHelpPicker.scrollToRecord(rec); + } + me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src')); } }; store.url = 'resources/help/' + lang + '/Contents.json'; @@ -1594,15 +1635,22 @@ define([ this._scrollerInited = true; } if (url) { - var rec = this.viewHelpPicker.store.findWhere({ - src: url - }); - if (rec) { - this.viewHelpPicker.selectRecord(rec); - this.viewHelpPicker.scrollToRecord(rec); + if (this.viewHelpPicker.store.length>0) { + var rec = this.viewHelpPicker.store.find(function(record){ + return (url.indexOf(record.get('src'))>=0); + }); + if (rec) { + this.viewHelpPicker.selectRecord(rec, true); + this.viewHelpPicker.scrollToRecord(rec); + } + this.onSelectItem(url); } else this.openUrl = url; } + }, + + onSelectItem: function(src) { + this.iFrame.src = this.urlPref + src; } }); diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index eb641576a..f3fcf5c7f 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -82,6 +82,9 @@ define([ button.on('click', function (b, e) { me.fireEvent('links:notes', ['ins_footnote']); }); + button.menu.items[7].menu.on('item:click', function (menu, item, e) {//convert + me.fireEvent('links:notes', [item.value]); + }); }); this.btnsPrevNote.forEach(function(button) { @@ -96,6 +99,18 @@ define([ }); }); + this.btnsPrevEndNote.forEach(function(button) { + button.on('click', function (b, e) { + me.fireEvent('links:notes', ['prev-end']); + }); + }); + + this.btnsNextEndNote.forEach(function(button) { + button.on('click', function (b, e) { + me.fireEvent('links:notes', ['next-end']); + }); + }); + this.btnsHyperlink.forEach(function(button) { button.on('click', function (b, e) { me.fireEvent('links:hyperlink'); @@ -121,6 +136,8 @@ define([ this.btnsPrevNote = []; this.btnsNextNote = []; + this.btnsPrevEndNote = []; + this.btnsNextEndNote = []; this.paragraphControls = []; var me = this, @@ -178,7 +195,7 @@ define([ btn.updateHint( me.tipContents ); var _menu = new Common.UI.Menu({ - cls: 'toc-menu', + cls: 'toc-menu shifted-left', items: [ {template: contentsTemplate, offsety: 0, value: 0}, {template: contentsTemplate, offsety: 72, value: 1}, @@ -191,7 +208,7 @@ define([ }); me.contentsMenu = new Common.UI.Menu({ - cls: 'toc-menu', + cls: 'toc-menu shifted-left', items: [ {template: contentsTemplate, offsety: 0, value: 0}, {template: contentsTemplate, offsety: 72, value: 1}, @@ -221,6 +238,7 @@ define([ var _menu = new Common.UI.Menu({ items: [ {caption: me.mniInsFootnote, value: 'ins_footnote'}, + {caption: me.mniInsEndnote, value: 'ins_endnote'}, {caption: '--'}, new Common.UI.MenuItem({ template: _.template([ @@ -235,8 +253,32 @@ define([ ].join('')), stopPropagation: true }), + new Common.UI.MenuItem({ + template: _.template([ + '' + ].join('')), + stopPropagation: true + }), {caption: '--'}, {caption: me.mniDelFootnote, value: 'delele'}, + { + caption: me.mniConvertNote, value: 'convert', + menu: new Common.UI.Menu({ + menuAlign : 'tl-tr', + items: [ + {caption: me.textConvertToEndnotes, value: 'to-endnotes'}, + {caption: me.textConvertToFootnotes, value: 'to-footnotes'}, + {caption: me.textSwapNotes, value: 'swap'} + ] + }) + }, {caption: me.mniNoteSettings, value: 'settings'} ] }); @@ -250,6 +292,14 @@ define([ el: $('#id-menu-goto-footnote-next-'+index), cls: 'btn-toolbar' })); + me.btnsPrevEndNote.push(new Common.UI.Button({ + el: $('#id-menu-goto-endnote-prev-'+index), + cls: 'btn-toolbar' + })); + me.btnsNextEndNote.push(new Common.UI.Button({ + el: $('#id-menu-goto-endnote-next-'+index), + cls: 'btn-toolbar' + })); }); me.btnsHyperlink.forEach( function(btn) { @@ -291,7 +341,7 @@ define([ textUpdatePages: 'Refresh page numbers only', tipNotes: 'Footnotes', mniInsFootnote: 'Insert Footnote', - mniDelFootnote: 'Delete All Footnotes', + mniDelFootnote: 'Delete All Notes', mniNoteSettings: 'Notes Settings', textGotoFootnote: 'Go to Footnotes', capBtnInsFootnote: 'Footnotes', @@ -301,7 +351,13 @@ define([ capBtnBookmarks: 'Bookmark', tipBookmarks: 'Create a bookmark', capBtnCaption: 'Caption', - tipCaption: 'Insert caption' + tipCaption: 'Insert caption', + mniConvertNote: 'Convert All Notes', + textGotoEndnote: 'Go to Endnotes', + mniInsEndnote: 'Insert Endnote', + textConvertToEndnotes: 'Convert All Footnotes to Endnotes', + textConvertToFootnotes: 'Convert All Endnotes to Footnotes', + textSwapNotes: 'Swap Footnotes and Endnotes' } }()), DE.Views.Links || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index 2c4bfc099..3f13ac7ef 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -65,18 +65,19 @@ define([ ' |
| ', - '', + '', ' | ', '|||||||||||||||||||||||||||||||||||||||||||||||||||
| ', - '', + ' | ', + '', '', ' | ', '||||||||||||||||||||||||||||||||||||||||||||||||||
| ', - '', + ' | ', + '', + '', ' | ', '||||||||||||||||||||||||||||||||||||||||||||||||||
| ', - '', - ' | ', - '|||||||||||||||||||||||||||||||||||||||||||||||||||
| ',
'',
@@ -133,17 +129,50 @@ define([
this.api = options.api;
this.handler = options.handler;
this.props = options.props;
+ this.isEndNote = options.isEndNote || false;
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
- this.FormatType = 1;
- this.StartValue = 1;
+ this._state = {
+ footnote: {
+ numbering: Asc.c_oAscFootnoteRestart.Continuous,
+ format: Asc.c_oAscNumberingFormat.Decimal,
+ start: 1
+ },
+ endnote: {
+ numbering: Asc.c_oAscFootnoteRestart.Continuous,
+ format: Asc.c_oAscNumberingFormat.LowerRoman,
+ start: 1
+ }};
},
render: function() {
Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
var me = this;
+ this.radioFootnote = new Common.UI.RadioBox({
+ el: $('#note-settings-radio-foot'),
+ name: 'asc-radio-notes',
+ labelText: this.textFootnote,
+ checked: true
+ });
+ this.radioFootnote.on('change', function(field, newValue, eOpts) {
+ if (newValue) {
+ me.changeNoteType(false);
+ }
+ });
+
+ this.radioEndnote = new Common.UI.RadioBox({
+ el: $('#note-settings-radio-end'),
+ labelText: this.textEndnote,
+ name: 'asc-radio-notes'
+ });
+ this.radioEndnote.on('change', function(field, newValue, eOpts) {
+ if (newValue) {
+ me.changeNoteType(true);
+ }
+ });
+
this.cmbFootnote = new Common.UI.ComboBox({
el: $('#note-settings-combo-footnote'),
cls: 'input-group-nr',
@@ -156,6 +185,18 @@ define([
});
this.cmbFootnote.setValue(Asc.c_oAscFootnotePos.PageBottom);
+ this.cmbEndnote = new Common.UI.ComboBox({
+ el: $('#note-settings-combo-endnote'),
+ cls: 'input-group-nr',
+ menuStyle: 'min-width: 150px;',
+ editable: false,
+ data: [
+ { displayValue: this.textSectEnd, value: Asc.c_oAscFootnotePos.SectEnd },
+ { displayValue: this.textPageBottom, value: Asc.c_oAscFootnotePos.PageBottom }
+ ]
+ });
+ this.cmbEndnote.setValue(Asc.c_oAscFootnotePos.PageBottom);
+
this.cmbFormat = new Common.UI.ComboBox({
el: $('#note-settings-combo-format'),
cls: 'input-group-nr',
@@ -169,10 +210,9 @@ define([
{ displayValue: 'I, II, III,...', value: Asc.c_oAscNumberingFormat.UpperRoman, maskExp: /[IVXLCDM]/, defValue: 'I' }
]
});
- this.cmbFormat.setValue(this.FormatType);
+ this.cmbFormat.setValue(this._state.footnote.format);
this.cmbFormat.on('selected', _.bind(this.onFormatSelect, this));
- // this.spnStart = new Common.UI.MetricSpinner({
this.spnStart = new Common.UI.CustomSpinner({
el: $('#note-settings-spin-start'),
step: 1,
@@ -185,16 +225,17 @@ define([
maskExp: /[0-9]/
});
+ this._arrNumbering = [
+ { displayValue: this.textContinue, value: Asc.c_oAscFootnoteRestart.Continuous },
+ { displayValue: this.textEachSection, value: Asc.c_oAscFootnoteRestart.EachSect },
+ { displayValue: this.textEachPage, value: Asc.c_oAscFootnoteRestart.EachPage }
+ ];
this.cmbNumbering = new Common.UI.ComboBox({
el: $('#note-settings-combo-numbering'),
cls: 'input-group-nr',
menuStyle: 'min-width: 150px;',
editable: false,
- data: [
- { displayValue: this.textContinue, value: Asc.c_oAscFootnoteRestart.Continuous },
- { displayValue: this.textEachSection, value: Asc.c_oAscFootnoteRestart.EachSect },
- { displayValue: this.textEachPage, value: Asc.c_oAscFootnoteRestart.EachPage }
- ]
+ data: this._arrNumbering
});
this.cmbNumbering.setValue(Asc.c_oAscFootnoteRestart.Continuous);
@@ -239,9 +280,13 @@ define([
},
_setDefaults: function (props) {
+
+ this.isEndNote ? this.radioEndnote.setValue(true, true) : this.radioFootnote.setValue(true, true);
+ this.changeNoteType(this.isEndNote);
+
if (props) {
var val = props.get_Pos();
- this.cmbFootnote.setValue(val);
+ this.isEndNote ? this.cmbEndnote.setValue(val) : this.cmbFootnote.setValue(val);
val = props.get_NumFormat();
this.cmbFormat.setValue(val);
@@ -258,7 +303,7 @@ define([
getSettings: function () {
var props = new Asc.CAscFootnotePr();
- props.put_Pos(this.cmbFootnote.getValue());
+ props.put_Pos(this.isEndNote ? this.cmbEndnote.getValue() : this.cmbFootnote.getValue());
props.put_NumRestart(this.cmbNumbering.getValue());
var val = this.txtCustom.getValue();
@@ -268,7 +313,7 @@ define([
props.put_NumStart(this.spnStart.getNumberValue());
}
- return {props: props, applyToAll: (this.cmbApply.getValue()==1), custom: _.isEmpty(val) ? undefined : val};
+ return {props: props, applyToAll: (this.cmbApply.getValue()==1), custom: _.isEmpty(val) ? undefined : val, isEndNote: this.isEndNote};
},
onDlgBtnClick: function(event) {
@@ -315,7 +360,7 @@ define([
}
this.spnStart.setValue(this.spnStart.getValue());
- this.FormatType = record.value;
+ this._state[this.isEndNote ? 'endnote' : 'footnote'].format = record.value;
},
_10toS: function(value) {
@@ -411,6 +456,26 @@ define([
return result;
},
+ changeNoteType: function(isEndNote) {
+ this._state[this.isEndNote ? 'endnote' : 'footnote'].start = this.spnStart.getNumberValue(); // save prev start
+ this._state[this.isEndNote ? 'endnote' : 'footnote'].numbering = this.cmbNumbering.getValue(); // save prev numbering
+
+ this.isEndNote = isEndNote;
+
+ this.cmbFootnote.setDisabled(isEndNote);
+ this.cmbEndnote.setDisabled(!isEndNote);
+
+ var state = this._state[isEndNote ? 'endnote' : 'footnote'],
+ arr = isEndNote ? this._arrNumbering.slice(0,2) : this._arrNumbering;
+ this.cmbNumbering.setData(arr);
+ this.cmbNumbering.setValue(state.numbering);
+
+ this.cmbFormat.setValue(state.format);
+ this.onFormatSelect(this.cmbFormat, this.cmbFormat.getSelectedRecord());
+
+ this.spnStart.setValue(state.start);
+ },
+
textTitle: 'Notes Settings',
textLocation: 'Location',
textFootnote: 'Footnote',
@@ -428,7 +493,9 @@ define([
textSection: 'Current section',
textApply: 'Apply',
textInsert: 'Insert',
- textCustom: 'Custom Mark'
+ textCustom: 'Custom Mark',
+ textSectEnd: 'End of section',
+ textEndnote: 'Endnote'
}, DE.Views.NoteSettingsDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/NotesRemoveDialog.js b/apps/documenteditor/main/app/view/NotesRemoveDialog.js
new file mode 100644
index 000000000..2782ccddb
--- /dev/null
+++ b/apps/documenteditor/main/app/view/NotesRemoveDialog.js
@@ -0,0 +1,115 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * 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
+ *
+ */
+/**
+ * NotesRemoveDialog.js
+ *
+ * Created by Julia Radzhabova on 29.07.2020
+ * Copyright (c) 2020 Ascensio System SIA. All rights reserved.
+ *
+ */
+define([
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/RadioBox'
+], function () { 'use strict';
+
+ DE.Views.NotesRemoveDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ width: 214,
+ height: 138,
+ header: true,
+ style: 'min-width: 214px;',
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel']
+ },
+
+ initialize : function(options) {
+ _.extend(this.options, {
+ title: this.textTitle
+ }, options);
+
+ this.template = [
+ ' ',
+ '',
+ '',
+ ' '
+ ].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();
+ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+ this.chFootnote = new Common.UI.CheckBox({
+ el: $window.find('#notes-remove-chk-foot'),
+ labelText: this.textFoot,
+ value: true
+ });
+
+ this.chEndnote = new Common.UI.CheckBox({
+ el: $window.find('#notes-remove-chk-end'),
+ labelText: this.textEnd,
+ value: true
+ });
+ },
+
+ _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);
+ },
+
+ getSettings: function() {
+ return {footnote: this.chFootnote.isChecked(), endnote: this.chEndnote.isChecked()};
+ },
+
+ onPrimary: function() {
+ this._handleInput('ok');
+ return false;
+ },
+ textTitle: 'Delete Notes',
+ textFoot: 'Delete All Footnotes',
+ textEnd: 'Delete All Endnotes'
+ }, DE.Views.NotesRemoveDialog || {}))
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/NumberingValueDialog.js b/apps/documenteditor/main/app/view/NumberingValueDialog.js
index c7c31cc22..399289f67 100644
--- a/apps/documenteditor/main/app/view/NumberingValueDialog.js
+++ b/apps/documenteditor/main/app/view/NumberingValueDialog.js
@@ -81,7 +81,7 @@ define([
defaultUnit : "",
value: 1,
maxValue: 16383,
- minValue: 1,
+ minValue: 0,
allowDecimal: false,
maskExp: /[0-9]/
});
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 8fd41e2e5..20609da09 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -410,6 +410,8 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
+ this.numGradientAngle.setValue(this.GradLinearDirectionType);
+ this.numGradientAngle.setDisabled(this._locked);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial);
this.mnuDirectionPicker.cmpEl.width(60);
@@ -419,6 +421,8 @@ define([
this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
else
this.btnDirection.setIconCls('');
+ this.numGradientAngle.setValue(0);
+ this.numGradientAngle.setDisabled(true);
}
if (this.api && !this._noApply) {
@@ -455,11 +459,12 @@ define([
} else {
rawData = record;
}
-
this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls);
(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
if (this.api) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
+ this.numGradientAngle.setValue(rawData.type);
+
var props = new Asc.asc_CShapeProperty();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_GRAD);
@@ -513,6 +518,7 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
+ this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -935,8 +941,10 @@ define([
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
else
this.btnDirection.setIconCls('');
+ this.numGradientAngle.setValue(value);
}
- }
+ } else
+ this.numGradientAngle.setValue(0);
var me = this;
var colors = fill.get_colors(),
@@ -973,6 +981,7 @@ define([
me.GradColor.currentIdx = 0;
}
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
+ this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1298,7 +1307,7 @@ define([
this.cmbGradType = new Common.UI.ComboBox({
el: $('#shape-combo-grad-type'),
cls: 'input-group-nr',
- menuStyle: 'min-width: 90px;',
+ menuStyle: 'min-width: 100%;',
editable: false,
data: this._arrGradType
});
@@ -1348,7 +1357,7 @@ define([
this.sldrGradient = new Common.UI.MultiSliderGradient({
el: $('#shape-slider-gradient'),
- width: 125,
+ width: 192,
minValue: 0,
maxValue: 100,
values: [0, 100]
@@ -1360,6 +1369,8 @@ define([
var color = me.GradColor.colors[me.GradColor.currentIdx];
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
+ var pos = me.GradColor.values[me.GradColor.currentIdx];
+ me.spnGradPosition.setValue(pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1376,18 +1387,75 @@ define([
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
- this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
- me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+ this.sldrGradient.on('addthumb', function(cmp, index, pos){
+ me.GradColor.colors[index] = me.GradColor.colors[me.GradColor.currentIdx];
me.GradColor.currentIdx = index;
- me.sldrGradient.addNewThumb(index, color);
+ var color = me.sldrGradient.addNewThumb(index, pos);
+ me.GradColor.colors[me.GradColor.currentIdx] = color;
});
this.sldrGradient.on('removethumb', function(cmp, index){
me.sldrGradient.removeThumb(index);
me.GradColor.values.splice(index, 1);
me.sldrGradient.changeGradientStyle();
+ if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= me.GradColor.colors.length) {
+ var newIndex = index > 0 ? index - 1 : index;
+ newIndex = (newIndex === 0 && me.GradColor.values.length > 2) ? me.GradColor.values.length - 2 : newIndex;
+ me.GradColor.currentIdx = newIndex;
+ }
+ me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
});
this.fillControls.push(this.sldrGradient);
+ this.spnGradPosition = new Common.UI.MetricSpinner({
+ el: $('#shape-gradient-position'),
+ step: 1,
+ width: 60,
+ defaultUnit : "%",
+ value: '50 %',
+ allowDecimal: false,
+ maxValue: 100,
+ minValue: 0,
+ disabled: this._locked
+ });
+ this.fillControls.push(this.spnGradPosition);
+ this.spnGradPosition.on('change', _.bind(this.onPositionChange, this));
+ this.spnGradPosition.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+ this.btnAddGradientStep = new Common.UI.Button({
+ parentEl: $('#shape-gradient-add-step'),
+ cls: 'btn-toolbar',
+ iconCls: 'toolbar__icon btn-add-breakpoint',
+ disabled: this._locked,
+ hint: this.tipAddGradientPoint
+ });
+ this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this));
+ this.fillControls.push(this.btnAddGradientStep);
+
+ this.btnRemoveGradientStep = new Common.UI.Button({
+ parentEl: $('#shape-gradient-remove-step'),
+ cls: 'btn-toolbar',
+ iconCls: 'toolbar__icon btn-remove-breakpoint',
+ disabled: this._locked,
+ hint: this.tipRemoveGradientPoint
+ });
+ this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this));
+ this.fillControls.push(this.btnRemoveGradientStep);
+
+ this.numGradientAngle = new Common.UI.MetricSpinner({
+ el: $('#shape-spin-gradient-angle'),
+ step: 10,
+ width: 60,
+ defaultUnit : "°",
+ value: '0 °',
+ allowDecimal: true,
+ maxValue: 359.9,
+ minValue: 0,
+ disabled: this._locked
+ });
+ this.fillControls.push(this.numGradientAngle);
+ this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
+ this.numGradientAngle.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
el: $('#shape-combo-border-size'),
style: "width: 93px;",
@@ -1775,6 +1843,7 @@ define([
});
this.lblTransparencyStart.toggleClass('disabled', disable);
this.lblTransparencyEnd.toggleClass('disabled', disable);
+ this.numGradientAngle.setDisabled(disable || this.GradFillType !== Asc.c_oAscFillGradType.GRAD_LINEAR);
}
},
@@ -1817,6 +1886,79 @@ define([
}
},
+ onPositionChange: function(btn) {
+ var pos = btn.getNumberValue(),
+ minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ maxValue = (this.GradColor.currentIdx+1Please enter a value between 0 pt and 1584 pt.', textTransform: 'Transform', textTemplate: 'Template', - strType: 'Type' + strType: 'Type', + textPosition: 'Position', + tipAddGradientPoint: 'Add gradient point', + tipRemoveGradientPoint: 'Remove gradient point', + textAngle: 'Angle' }, DE.Views.TextArtSettings || {})); }); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index b740bd2d8..029d2ac39 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -260,15 +260,16 @@ define([ iconCls: 'toolbar__icon btn-fontcolor', split: true, menu: new Common.UI.Menu({ + cls: 'shifted-left', items: [ { id: 'id-toolbar-menu-auto-fontcolor', caption: this.textAutoColor, - template: _.template('<%= caption %>') + template: _.template('<%= caption %>') }, {caption: '--'}, {template: _.template('')}, - {template: _.template('' + this.textNewColor + '')} + {template: _.template('' + this.textNewColor + '')} ] }) }); @@ -436,6 +437,7 @@ define([ iconCls: 'toolbar__icon btn-inserttable', caption: me.capBtnInsTable, menu: new Common.UI.Menu({ + cls: 'shifted-left', items: [ {template: _.template('')}, {caption: this.mniCustomTable, value: 'custom'}, @@ -565,7 +567,7 @@ define([ iconCls: 'toolbar__icon btn-dropcap', caption: me.capBtnInsDropcap, menu: new Common.UI.Menu({ - cls: 'ppm-toolbar', + cls: 'ppm-toolbar shifted-right', items: [ { caption: this.textNone, @@ -605,16 +607,16 @@ define([ iconCls: 'toolbar__icon btn-controls', caption: me.capBtnInsControls, menu: new Common.UI.Menu({ - cls: 'ppm-toolbar', + cls: 'ppm-toolbar shifted-right', items: [ { caption: this.textPlainControl, - // iconCls: 'menu__icon cc-plaintext', + iconCls: 'menu__icon cc-plaintext', value: 'plain' }, { caption: this.textRichControl, - // iconCls: 'menu__icon cc-richtext', + iconCls: 'menu__icon cc-richtext', value: 'rich' }, { @@ -670,7 +672,7 @@ define([ {caption: '--'}, { caption: this.textRemoveControl, - // iconCls: 'menu__icon cc-remove', + iconCls: 'menu__icon cc-remove', value: 'remove' }, {caption: '--'}, @@ -706,7 +708,7 @@ define([ iconCls: 'toolbar__icon btn-columns', caption: me.capBtnColumns, menu: new Common.UI.Menu({ - cls: 'ppm-toolbar', + cls: 'ppm-toolbar shifted-right', items: [ { caption: this.textColumnsOne, @@ -992,6 +994,7 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-colorschemas', menu: new Common.UI.Menu({ + cls: 'shifted-left', items: [], restoreHeight: true }) @@ -1467,6 +1470,7 @@ define([ }); me.btnImgAlign.setMenu(new Common.UI.Menu({ + cls: 'shifted-right', items: [{ caption : _holder_view.textShapeAlignLeft, iconCls : 'menu__icon shape-align-left', @@ -1645,9 +1649,10 @@ define([ this.btnMarkers.setMenu( new Common.UI.Menu({ + cls: 'shifted-left', style: 'min-width: 139px', items: [ - {template: _.template('')}, + {template: _.template('')}, this.mnuMarkerSettings = new Common.UI.MenuItem({ caption: this.textListSettings, disabled: (this.mnuMarkersPicker.conf.index || 0)==0, @@ -1659,8 +1664,9 @@ define([ this.btnNumbers.setMenu( new Common.UI.Menu({ + cls: 'shifted-left', items: [ - {template: _.template('')}, + {template: _.template('')}, this.mnuNumberSettings = new Common.UI.MenuItem({ caption: this.textListSettings, disabled: (this.mnuNumbersPicker.conf.index || 0)==0, @@ -1672,9 +1678,10 @@ define([ this.btnMultilevels.setMenu( new Common.UI.Menu({ + cls: 'shifted-left', style: 'min-width: 90px', items: [ - {template: _.template('')}, + {template: _.template('')}, this.mnuMultilevelSettings = new Common.UI.MenuItem({ caption: this.textListSettings, disabled: (this.mnuMultilevelPicker.conf.index || 0)==0, @@ -1694,7 +1701,9 @@ define([ caption: this.textInsertPageNumber, disabled: this.mnuInsertPageNum.isDisabled(), menu: new Common.UI.Menu({ + cls: 'shifted-left', menuAlign: 'tl-tr', + style: 'min-width: 90px;', items: [ {template: _.template('')}, this.mnuPageNumCurrentPos = new Common.UI.MenuItem({ @@ -1997,6 +2006,7 @@ define([ if (this.mnuColorSchema == null) { this.mnuColorSchema = new Common.UI.Menu({ + cls: 'shifted-left', restoreHeight: true }); } diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js index dd3c195bc..a1a3ef401 100644 --- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js @@ -329,15 +329,16 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', iconCls : 'toolbar__icon btn-fontcolor', hint : this.textColor, menu : new Common.UI.Menu({ + cls: 'shifted-left', items: [ { id: 'watermark-auto-color', caption: this.textAuto, - template: _.template('<%= caption %>') + template: _.template('<%= caption %>') }, {caption: '--'}, { template: _.template('') }, - { template: _.template('' + this.textNewColor + '') } + { template: _.template('' + this.textNewColor + '') } ] }) }); @@ -603,8 +604,9 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', var val = this.props.get_Type(); if (val == Asc.c_oAscWatermarkType.Image) { - val = this.cmbScale.getValue(); - val = props.put_Scale((val<0) ? val : val/100); + val = parseInt(this.cmbScale.getValue()); + isNaN(val) && (val = -1); + props.put_Scale((val<0) ? val : val/100); } else { props.put_Text(this.cmbText.getValue()); props.put_IsDiagonal(this.radioDiag.getValue()); diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 81e239298..033f6c1e3 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -144,7 +144,9 @@ + + Tastenkombinationen-
|
und wählen Sie, welche Oberflächenelemente ein- oder ausgeblendet werden sollen. Folgende Optionen stehen Ihnen im Menü Ansichtseinstellungen zur Verfügung:
oder Verkleinern 
. Klicken Sie auf das Symbol Eine Seite, 
um die ganze Seite im Fenster anzuzeigen. Um das ganze Dokument an den sichtbaren Teil des Arbeitsbereichs anzupassen, klicken Sie auf das Symbol Seitenbreite 
. Die Zoom-Einstellungen sind auch in der Gruppe Ansichtseinstellungen 
Dateispeicherort öffnen - 
Zugriffsrechte verwalten (nur in der Online-Version verfügbar - 
Kopieren und 
Einfügen stehen unabhängig von der ausgewählten Registerkarte jederzeit im linken Teil der oberen Menüleiste zur Verfügung.
- die Funktion 
- 
- 
(nur in der Online-Version verfügbar) - hier können Sie das 
