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

Merge branch 'develop' into feature/new-toolbar-pivot-table

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-08 17:06:32 +03:00
parent b4273408e1 50fd0152e7
commit 436588340a
58 changed files with 686 additions and 446 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
apps/common/main/lib/component/Button.js
View file

@ -296,14 +296,26 @@ define([
if (me.options.hint) { if (me.options.hint) {
var modalParents = me.cmpEl.closest('.asc-window'); var modalParents = me.cmpEl.closest('.asc-window');
me.cmpEl.attr('data-toggle', 'tooltip'); if (typeof me.options.hint == 'object' && me.options.hint.length>1 && $('button', el).length>0) {
me.cmpEl.tooltip({ var btnEl = $('button', el);
title : me.options.hint, me.btnEl = $(btnEl[0]);
me.btnMenuEl = $(btnEl[1]);
} else {
me.btnEl = me.cmpEl;
me.btnEl.attr('data-toggle', 'tooltip');
}
me.btnEl.tooltip({
title : (typeof me.options.hint == 'string') ? me.options.hint : me.options.hint[0],
placement : me.options.hintAnchor||'cursor'
});
me.btnMenuEl && me.btnMenuEl.tooltip({
title : me.options.hint[1],
placement : me.options.hintAnchor||'cursor' placement : me.options.hintAnchor||'cursor'
}); });
if (modalParents.length > 0) { if (modalParents.length > 0) {
me.cmpEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); me.btnEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
me.btnMenuEl && me.btnMenuEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
} }
} }
@ -315,7 +327,7 @@ define([
if (!me.disabled && e.which == 1) { if (!me.disabled && e.which == 1) {
me.doToggle(); me.doToggle();
if (me.options.hint) { if (me.options.hint) {
var tip = me.cmpEl.data('bs.tooltip'); var tip = me.btnEl.data('bs.tooltip');
if (tip) { if (tip) {
if (tip.dontShow===undefined) if (tip.dontShow===undefined)
tip.dontShow = true; tip.dontShow = true;
@ -364,7 +376,7 @@ define([
if (!me.disabled && e.which == 1) { if (!me.disabled && e.which == 1) {
if (isSplit) { if (isSplit) {
if (me.options.hint) { if (me.options.hint) {
var tip = me.cmpEl.data('bs.tooltip'); var tip = (me.btnMenuEl ? me.btnMenuEl : me.btnEl).data('bs.tooltip');
if (tip) { if (tip) {
if (tip.dontShow===undefined) if (tip.dontShow===undefined)
tip.dontShow = true; tip.dontShow = true;
@ -500,12 +512,19 @@ define([
isGroup && decorateBtn(el.children('button')); isGroup && decorateBtn(el.children('button'));
} }
if (disabled || !Common.Utils.isGecko) { if ((disabled || !Common.Utils.isGecko) && this.options.hint) {
var tip = this.cmpEl.data('bs.tooltip'); var tip = this.btnEl.data('bs.tooltip');
if (tip) { if (tip) {
disabled && tip.hide(); disabled && tip.hide();
!Common.Utils.isGecko && (tip.enabled = !disabled); !Common.Utils.isGecko && (tip.enabled = !disabled);
} }
if (this.btnMenuEl) {
tip = this.btnMenuEl.data('bs.tooltip');
if (tip) {
disabled && tip.hide();
!Common.Utils.isGecko && (tip.enabled = !disabled);
}
}
} }
} }
@ -537,24 +556,50 @@ define([
var cmpEl = this.cmpEl, var cmpEl = this.cmpEl,
modalParents = cmpEl.closest('.asc-window'); modalParents = cmpEl.closest('.asc-window');
if (cmpEl.data('bs.tooltip'))
cmpEl.removeData('bs.tooltip'); if (!this.btnEl) {
cmpEl.attr('data-toggle', 'tooltip'); if (typeof this.options.hint == 'object' && this.options.hint.length>1 && $('button', cmpEl).length>0) {
cmpEl.tooltip({ var btnEl = $('button', cmpEl);
title : hint, this.btnEl = $(btnEl[0]);
placement : this.options.hintAnchor || 'cursor' this.btnMenuEl = $(btnEl[1]);
} else {
this.btnEl = cmpEl;
this.btnEl.attr('data-toggle', 'tooltip');
}
}
if (this.btnEl.data('bs.tooltip'))
this.btnEl.removeData('bs.tooltip');
if (this.btnMenuEl && this.btnMenuEl.data('bs.tooltip'))
this.btnMenuEl.removeData('bs.tooltip');
this.btnEl.tooltip({
title : (typeof hint == 'string') ? hint : hint[0],
placement : this.options.hintAnchor||'cursor'
});
this.btnMenuEl && this.btnMenuEl.tooltip({
title : hint[1],
placement : this.options.hintAnchor||'cursor'
}); });
if (modalParents.length > 0) { if (modalParents.length > 0) {
cmpEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10); this.btnEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
this.btnMenuEl && this.btnMenuEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
} }
if (this.disabled || !Common.Utils.isGecko) { if (this.disabled || !Common.Utils.isGecko) {
var tip = this.cmpEl.data('bs.tooltip'); var tip = this.btnEl.data('bs.tooltip');
if (tip) { if (tip) {
this.disabled && tip.hide(); this.disabled && tip.hide();
!Common.Utils.isGecko && (tip.enabled = !this.disabled); !Common.Utils.isGecko && (tip.enabled = !this.disabled);
} }
if (this.btnMenuEl) {
tip = this.btnMenuEl.data('bs.tooltip');
if (tip) {
this.disabled && tip.hide();
!Common.Utils.isGecko && (tip.enabled = !this.disabled);
}
}
} }
}, },

23
apps/common/main/lib/component/Mixtbar.js
View file

@ -122,13 +122,17 @@ define([
if ( this.isFolded ) { if ( this.isFolded ) {
if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls'); if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls');
optsFold.$bar.toggleClass('expanded', true).addClass('folded'); optsFold.$bar.addClass('folded').toggleClass('expanded', false);
optsFold.$bar.find('.tabs .ribtab').removeClass('active');
optsFold.$box.on({ optsFold.$box.on({
mouseleave: function (e) { mouseleave: function (e) {
optsFold.timer = setTimeout(me.collapse, optsFold.timeout); // optsFold.timer = setTimeout( function(e) {
// clearTimeout(optsFold.timer);
// me.collapse();
// }, optsFold.timeout);
}, },
mouseenter: function (e) { mouseenter: function (e) {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
} }
}); });
@ -157,26 +161,27 @@ define([
// }); // });
} else { } else {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
optsFold.$bar.removeClass('folded'); optsFold.$bar.removeClass('folded');
optsFold.$box.off(); optsFold.$box.off();
} }
}, },
collapse: function() { collapse: function() {
Common.UI.Menu.Manager.hideAll();
// clearTimeout(optsFold.timer);
if ( this.isFolded && optsFold.$bar ) { if ( this.isFolded && optsFold.$bar ) {
optsFold.$bar.removeClass('expanded'); optsFold.$bar.removeClass('expanded');
optsFold.$bar.find('.tabs .ribtab').removeClass('active'); optsFold.$bar.find('.tabs .ribtab').removeClass('active');
} }
Common.UI.Menu.Manager.hideAll();
}, },
expand: function() { expand: function() {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
optsFold.$bar.addClass('expanded'); optsFold.$bar.addClass('expanded');
optsFold.timer = setTimeout(this.collapse, optsFold.timeout); // optsFold.timer = setTimeout(this.collapse, optsFold.timeout);
}, },
onResize: function(e) { onResize: function(e) {
@ -259,6 +264,8 @@ define([
}, },
hasTabInvisible: function() { hasTabInvisible: function() {
if ($boxTabs.length<1) return false;
var _left_bound_ = Math.round($boxTabs.offset().left), var _left_bound_ = Math.round($boxTabs.offset().left),
_right_bound_ = Math.round(_left_bound_ + $boxTabs.width()); _right_bound_ = Math.round(_left_bound_ + $boxTabs.width());

41
apps/common/main/lib/controller/Comments.js
View file

@ -177,6 +177,7 @@ define([
comment.asc_putText(commentVal); comment.asc_putText(commentVal);
comment.asc_putTime(this.utcDateToString(new Date())); comment.asc_putTime(this.utcDateToString(new Date()));
comment.asc_putOnlyOfficeTime(this.ooDateToString(new Date()));
comment.asc_putUserId(this.currentUserId); comment.asc_putUserId(this.currentUserId);
comment.asc_putUserName(this.currentUserName); comment.asc_putUserName(this.currentUserName);
comment.asc_putSolved(false); comment.asc_putSolved(false);
@ -212,6 +213,7 @@ define([
ascComment.asc_putText(comment.get('comment')); ascComment.asc_putText(comment.get('comment'));
ascComment.asc_putQuoteText(comment.get('quote')); ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time')))); ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(t.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserId(comment.get('userid'));
ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putUserName(comment.get('username'));
ascComment.asc_putSolved(!comment.get('resolved')); ascComment.asc_putSolved(!comment.get('resolved'));
@ -227,6 +229,7 @@ define([
if (addReply) { if (addReply) {
addReply.asc_putText(reply.get('reply')); addReply.asc_putText(reply.get('reply'));
addReply.asc_putTime(t.utcDateToString(new Date(reply.get('time')))); addReply.asc_putTime(t.utcDateToString(new Date(reply.get('time'))));
addReply.asc_putOnlyOfficeTime(t.ooDateToString(new Date(reply.get('time'))));
addReply.asc_putUserId(reply.get('userid')); addReply.asc_putUserId(reply.get('userid'));
addReply.asc_putUserName(reply.get('username')); addReply.asc_putUserName(reply.get('username'));
@ -300,6 +303,7 @@ define([
ascComment.asc_putText(commentVal); ascComment.asc_putText(commentVal);
ascComment.asc_putQuoteText(comment.get('quote')); ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time')))); ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(t.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(t.currentUserId); ascComment.asc_putUserId(t.currentUserId);
ascComment.asc_putUserName(t.currentUserName); ascComment.asc_putUserName(t.currentUserName);
ascComment.asc_putSolved(comment.get('resolved')); ascComment.asc_putSolved(comment.get('resolved'));
@ -326,6 +330,7 @@ define([
if (addReply) { if (addReply) {
addReply.asc_putText(reply.get('reply')); addReply.asc_putText(reply.get('reply'));
addReply.asc_putTime(t.utcDateToString(new Date(reply.get('time')))); addReply.asc_putTime(t.utcDateToString(new Date(reply.get('time'))));
addReply.asc_putOnlyOfficeTime(t.ooDateToString(new Date(reply.get('time'))));
addReply.asc_putUserId(reply.get('userid')); addReply.asc_putUserId(reply.get('userid'));
addReply.asc_putUserName(reply.get('username')); addReply.asc_putUserName(reply.get('username'));
@ -354,6 +359,7 @@ define([
ascComment.asc_putText(comment.get('comment')); ascComment.asc_putText(comment.get('comment'));
ascComment.asc_putQuoteText(comment.get('quote')); ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time')))); ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(me.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserId(comment.get('userid'));
ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putUserName(comment.get('username'));
ascComment.asc_putSolved(comment.get('resolved')); ascComment.asc_putSolved(comment.get('resolved'));
@ -379,6 +385,7 @@ define([
} }
addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time')))); addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time'))));
addReply.asc_putOnlyOfficeTime(me.ooDateToString(new Date(reply.get('time'))));
ascComment.asc_addReply(addReply); ascComment.asc_addReply(addReply);
} }
@ -414,6 +421,7 @@ define([
ascComment.asc_putText(comment.get('comment')); ascComment.asc_putText(comment.get('comment'));
ascComment.asc_putQuoteText(comment.get('quote')); ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time')))); ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(me.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserId(comment.get('userid'));
ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putUserName(comment.get('username'));
ascComment.asc_putSolved(comment.get('resolved')); ascComment.asc_putSolved(comment.get('resolved'));
@ -430,6 +438,7 @@ define([
if (addReply) { if (addReply) {
addReply.asc_putText(reply.get('reply')); addReply.asc_putText(reply.get('reply'));
addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time')))); addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time'))));
addReply.asc_putOnlyOfficeTime(me.ooDateToString(new Date(reply.get('time'))));
addReply.asc_putUserId(reply.get('userid')); addReply.asc_putUserId(reply.get('userid'));
addReply.asc_putUserName(reply.get('username')); addReply.asc_putUserName(reply.get('username'));
@ -442,6 +451,7 @@ define([
if (addReply) { if (addReply) {
addReply.asc_putText(replyVal); addReply.asc_putText(replyVal);
addReply.asc_putTime(me.utcDateToString(new Date())); addReply.asc_putTime(me.utcDateToString(new Date()));
addReply.asc_putOnlyOfficeTime(me.ooDateToString(new Date()));
addReply.asc_putUserId(me.currentUserId); addReply.asc_putUserId(me.currentUserId);
addReply.asc_putUserName(me.currentUserName); addReply.asc_putUserName(me.currentUserName);
@ -468,6 +478,7 @@ define([
ascComment.asc_putText(comment.get('comment')); ascComment.asc_putText(comment.get('comment'));
ascComment.asc_putQuoteText(comment.get('quote')); ascComment.asc_putQuoteText(comment.get('quote'));
ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time')))); ascComment.asc_putTime(me.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(me.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserId(comment.get('userid'));
ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putUserName(comment.get('username'));
ascComment.asc_putSolved(comment.get('resolved')); ascComment.asc_putSolved(comment.get('resolved'));
@ -484,6 +495,7 @@ define([
if (addReply) { if (addReply) {
addReply.asc_putText(reply.get('reply')); addReply.asc_putText(reply.get('reply'));
addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time')))); addReply.asc_putTime(me.utcDateToString(new Date(reply.get('time'))));
addReply.asc_putOnlyOfficeTime(me.ooDateToString(new Date(reply.get('time'))));
addReply.asc_putUserId(reply.get('userid')); addReply.asc_putUserId(reply.get('userid'));
addReply.asc_putUserName(reply.get('username')); addReply.asc_putUserName(reply.get('username'));
@ -666,8 +678,8 @@ define([
if (comment) { if (comment) {
t = this; t = this;
date = (data.asc_getTime() == '') ? date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) :
new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())); ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
comment.set('comment', data.asc_getText()); comment.set('comment', data.asc_getText());
comment.set('userid', data.asc_getUserId()); comment.set('userid', data.asc_getUserId());
@ -684,8 +696,8 @@ define([
repliesCount = data.asc_getRepliesCount(); repliesCount = data.asc_getRepliesCount();
for (i = 0; i < repliesCount; ++i) { for (i = 0; i < repliesCount; ++i) {
dateReply = (data.asc_getReply(i).asc_getTime() == '') ? dateReply = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) :
new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())); ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())));
replies.push(new Common.Models.Reply({ replies.push(new Common.Models.Reply({
id : Common.UI.getId(), id : Common.UI.getId(),
@ -1030,7 +1042,8 @@ define([
// helpers // helpers
readSDKComment: function (id, data) { readSDKComment: function (id, data) {
var date = (data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())); var date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) :
((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
var comment = new Common.Models.Comment({ var comment = new Common.Models.Comment({
uid : id, uid : id,
userid : data.asc_getUserId(), userid : data.asc_getUserId(),
@ -1067,8 +1080,8 @@ define([
var repliesCount = data.asc_getRepliesCount(); var repliesCount = data.asc_getRepliesCount();
if (repliesCount) { if (repliesCount) {
for (i = 0; i < repliesCount; ++i) { for (i = 0; i < repliesCount; ++i) {
date = (data.asc_getReply(i).asc_getTime() == '') ? date = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) :
new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())); ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())));
replies.push(new Common.Models.Reply({ replies.push(new Common.Models.Reply({
id : Common.UI.getId(), id : Common.UI.getId(),
@ -1169,6 +1182,7 @@ define([
} }
comment.asc_putText(commentVal); comment.asc_putText(commentVal);
comment.asc_putTime(this.utcDateToString(new Date())); comment.asc_putTime(this.utcDateToString(new Date()));
comment.asc_putOnlyOfficeTime(this.ooDateToString(new Date()));
comment.asc_putUserId(this.currentUserId); comment.asc_putUserId(this.currentUserId);
comment.asc_putUserName(this.currentUserName); comment.asc_putUserName(this.currentUserName);
comment.asc_putSolved(false); comment.asc_putSolved(false);
@ -1275,6 +1289,19 @@ define([
timeZoneOffsetInMs: (new Date()).getTimezoneOffset() * 60000, timeZoneOffsetInMs: (new Date()).getTimezoneOffset() * 60000,
stringOOToLocalDate: function (date) {
if (typeof date === 'string')
return parseInt(date);
return 0;
},
ooDateToString: function (date) {
if (Object.prototype.toString.call(date) === '[object Date]')
return (date.getTime()).toString();
return '';
},
stringUtcToLocalDate: function (date) { stringUtcToLocalDate: function (date) {
if (typeof date === 'string') if (typeof date === 'string')
return parseInt(date) + this.timeZoneOffsetInMs; return parseInt(date) + this.timeZoneOffsetInMs;

2
apps/common/main/lib/template/ReviewChangesPopover.template
View file

@ -3,7 +3,7 @@
<div class="user-date"><%=date%></div> <div class="user-date"><%=date%></div>
<div class="user-message limit-height"><%=changetext%></div> <div class="user-message limit-height"><%=changetext%></div>
<div class="edit-ct"> <div class="edit-ct">
<% if (scope.isReviewOnly) { %> <% if (scope.appConfig.isReviewOnly) { %>
<div class="btn-delete img-commonctrl"></div> <div class="btn-delete img-commonctrl"></div>
<% } else { %> <% } else { %>
<div class="btn-accept img-commonctrl"></div> <div class="btn-accept img-commonctrl"></div>

3
apps/common/main/lib/view/Comments.js
View file

@ -1413,6 +1413,7 @@ define([
textEnterCommentHint : 'Enter your comment here', textEnterCommentHint : 'Enter your comment here',
textEdit : 'Edit', textEdit : 'Edit',
textAdd : "Add", textAdd : "Add",
textOpenAgain : "Open Again" textOpenAgain : "Open Again",
textHintAddComment : 'Add Comment'
}, Common.Views.Comments || {})) }, Common.Views.Comments || {}))
}); });

116
apps/common/main/lib/view/Header.js
View file

@ -70,7 +70,7 @@ define([
'</ul>'); '</ul>');
var templateRightBox = '<section>' + var templateRightBox = '<section>' +
'<label id="rib-doc-name" class="status-label"></label>' + '<section id="box-doc-name"><input type="text" id="rib-doc-name" spellcheck="false" data-can-copy="false"></input></section>' +
'<a id="rib-save-status" class="status-label locked"><%= textSaveEnd %></a>' + '<a id="rib-save-status" class="status-label locked"><%= textSaveEnd %></a>' +
'<div class="hedset">' + '<div class="hedset">' +
'<div class="btn-slot" id="slot-hbtn-edit"></div>' + '<div class="btn-slot" id="slot-hbtn-edit"></div>' +
@ -256,7 +256,7 @@ define([
if ( !mode.isEdit ) { if ( !mode.isEdit ) {
if ( me.btnDownload ) { if ( me.btnDownload ) {
me.btnDownload.updateHint(me.tipDowload); me.btnDownload.updateHint(me.tipDownload);
me.btnDownload.on('click', function (e) { me.btnDownload.on('click', function (e) {
me.fireEvent('downloadas', ['original']); me.fireEvent('downloadas', ['original']);
}); });
@ -278,6 +278,42 @@ define([
} }
} }
function onDocNameKeyDown(e) {
var me = this;
var name = me.labelDocName.val();
if ( e.keyCode == Common.UI.Keys.RETURN ) {
name = name.trim();
if ( !_.isEmpty(name) && me.documentCaption !== name ) {
if ( /[\t*\+:\"<>?|\\\\/]/gim.test(name) ) {
_.defer(function() {
Common.UI.error({
msg: (new Common.Views.RenameDialog).txtInvalidName + "*+:\"<>?|\/"
, callback: function() {
_.delay(function() {
me.labelDocName.focus();
}, 50);
}
});
me.labelDocName.blur();
})
} else {
Common.Gateway.requestRename(name);
Common.NotificationCenter.trigger('edit:complete', me);
}
}
} else
if ( e.keyCode == Common.UI.Keys.ESC ) {
me.labelDocName.val(me.documentCaption);
Common.NotificationCenter.trigger('edit:complete', this);
} else {
me.labelDocName.attr('size', name.length > 10 ? name.length : 10);
}
console.log('input keydown');
}
return { return {
options: { options: {
branding: {}, branding: {},
@ -344,7 +380,20 @@ define([
textSaveEnd: this.textSaveEnd textSaveEnd: this.textSaveEnd
})); }));
if ( this.labelDocName ) this.labelDocName.off();
this.labelDocName = $html.find('#rib-doc-name'); this.labelDocName = $html.find('#rib-doc-name');
this.labelDocName.on({
'keydown': onDocNameKeyDown.bind(this)
});
if ( this.documentCaption ) {
this.labelDocName.val( this.documentCaption );
}
if ( !_.isUndefined(this.options.canRename) ) {
this.setCanRename(this.options.canRename);
}
$saveStatus = $html.find('#rib-save-status'); $saveStatus = $html.find('#rib-save-status');
$saveStatus.hide(); $saveStatus.hide();
@ -390,11 +439,6 @@ define([
} }
} }
if ( this.documentCaption ) {
$html.find('#rib-doc-name').text(
Common.Utils.String.htmlEncode(this.documentCaption) );
}
$userList = $html.find('.cousers-list'); $userList = $html.find('.cousers-list');
$panelUsers = $html.find('.box-cousers'); $panelUsers = $html.find('.box-cousers');
$btnUsers = $html.find('.btn-users'); $btnUsers = $html.find('.btn-users');
@ -440,8 +484,12 @@ define([
this.documentCaption = value; this.documentCaption = value;
this.isModified && (value += '*'); this.isModified && (value += '*');
if ( this.labelDocName ) if ( this.labelDocName ) {
this.labelDocName.html(Common.Utils.String.htmlEncode(value)); this.labelDocName.val( value );
this.labelDocName.attr('size', value.length);
this.setCanRename(true);
}
return value; return value;
}, },
@ -453,10 +501,10 @@ define([
setDocumentChanged: function (changed) { setDocumentChanged: function (changed) {
this.isModified = changed; this.isModified = changed;
var _name = Common.Utils.String.htmlEncode(this.documentCaption); var _name = this.documentCaption;
changed && (_name += '*'); changed && (_name += '*');
this.labelDocName.html(_name); this.labelDocName.val(_name);
}, },
setCanBack: function (value) { setCanBack: function (value) {
@ -470,31 +518,27 @@ define([
}, },
setCanRename: function (rename) { setCanRename: function (rename) {
// var dc = $('#header-documentcaption div'); rename = false;
// if (rename) {
// var me = this; var me = this;
// dc.tooltip({title: me.txtRename, placement: 'cursor'}); me.options.canRename = rename;
// dc.on('click', function (e) { if ( me.labelDocName ) {
// (new Common.Views.RenameDialog({ var label = me.labelDocName;
// filename: me.documentCaption, if ( rename ) {
// handler: function (result, value) { label.removeAttr('disabled').tooltip({
// if (result == 'ok' && !_.isEmpty(value.trim()) && me.documentCaption !== value.trim()) { title: me.txtRename,
// Common.Gateway.requestRename(value); placement: 'cursor'}
// } );
// Common.NotificationCenter.trigger('edit:complete', me); } else {
// } label.attr('disabled', true);
// })).show(dc.position().left - 1, 20); var tip = label.data('bs.tooltip');
// }); if ( tip ) {
// } else { tip.options.title = '';
// var tip = dc.data('bs.tooltip'); tip.setContent();
// if (tip) { }
// tip.options.title = ''; }
// tip.setContent(); label.attr('data-can-copy', rename);
// } }
// dc.off('click');
// }
// dc.css('cursor', rename ? 'pointer' : 'default');
// dc.toggleClass('renamed', rename);
}, },
setSaveStatus: function (status) { setSaveStatus: function (status) {

8
apps/common/main/lib/view/InsertTableDialog.js
View file

@ -51,7 +51,8 @@ define([
height: 170, height: 170,
header: false, header: false,
style: 'min-width: 230px;', style: 'min-width: 230px;',
cls: 'modal-dlg' cls: 'modal-dlg',
split: false
}, },
initialize : function(options) { initialize : function(options) {
@ -59,7 +60,7 @@ define([
this.template = [ this.template = [
'<div class="box">', '<div class="box">',
'<h4>' + this.txtTitle + '</h4>', '<h4>' + ((options.split) ? this.txtTitleSplit : this.txtTitle) + '</h4>',
'<div class="input-row" style="margin: 10px 0;">', '<div class="input-row" style="margin: 10px 0;">',
'<label class="text columns-text" style="width: 130px;">' + this.txtColumns + '</label><div class="columns-val" style="float: right;"></div>', '<label class="text columns-text" style="width: 130px;">' + this.txtColumns + '</label><div class="columns-val" style="float: right;"></div>',
'</div>', '</div>',
@ -132,7 +133,8 @@ define([
return false; return false;
}, },
txtTitle: 'Table size', txtTitle: 'Table Size',
txtTitleSplit: 'Split Cell',
txtColumns: 'Number of Columns', txtColumns: 'Number of Columns',
txtRows: 'Number of Rows', txtRows: 'Number of Rows',
textInvalidRowsCols: 'You need to specify valid rows and columns count.', textInvalidRowsCols: 'You need to specify valid rows and columns count.',

6
apps/common/main/lib/view/ReviewChanges.js
View file

@ -579,6 +579,7 @@ define([
] ]
}) })
); );
me.btnAccept.updateHint([me.txtAcceptCurrent, me.txtAcceptChanges]);
me.btnReject.setMenu( me.btnReject.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
@ -594,6 +595,7 @@ define([
] ]
}) })
); );
me.btnReject.updateHint([me.txtRejectCurrent, me.txtRejectChanges]);
me.btnAccept.setDisabled(config.isReviewOnly); me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly); me.btnReject.setDisabled(config.isReviewOnly);
@ -736,7 +738,9 @@ define([
txtDocLang: 'Language', txtDocLang: 'Language',
tipSetDocLang: 'Set Document Language', tipSetDocLang: 'Set Document Language',
tipSetSpelling: 'Spell checking', tipSetSpelling: 'Spell checking',
tipReview: 'Review' tipReview: 'Review',
txtAcceptChanges: 'Accept Changes',
txtRejectChanges: 'Reject Changes'
} }
}()), Common.Views.ReviewChanges || {})); }()), Common.Views.ReviewChanges || {}));

BIN
apps/common/main/resources/img/controls/common-controls@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 30 KiB

4
apps/common/main/resources/less/asc-mixins.less
View file

@ -130,9 +130,9 @@
/**/ /**/
.background-ximage(@image, @image2x, @w: auto, @h: auto) { .background-ximage(@image, @image2x, @w: auto, @h: auto, @repeat: no-repeat) {
background-image: data-uri(%("%s",@image)); background-image: data-uri(%("%s",@image));
background-repeat: no-repeat; background-repeat: @repeat;
@media @media
only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (-webkit-min-device-pixel-ratio: 2),

8
apps/common/main/resources/less/dimension-picker.less
View file

@ -20,13 +20,13 @@
} }
.dimension-picker-unhighlighted { .dimension-picker-unhighlighted {
background: transparent repeat scroll 0 0; //background: transparent repeat scroll 0 0;
.background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px); .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
} }
.dimension-picker div.dimension-picker-highlighted { .dimension-picker div.dimension-picker-highlighted {
background: transparent repeat scroll 0 0; //background: transparent repeat scroll 0 0;
.background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px); .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
} }
.dimension-picker-status { .dimension-picker-status {

15
apps/common/main/resources/less/header.less
View file

@ -83,13 +83,26 @@
} }
} }
#rib-doc-name { #box-doc-name {
flex-grow: 1; flex-grow: 1;
text-align: center;
}
#rib-doc-name {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
min-width: 50px; min-width: 50px;
text-align: center; text-align: center;
color: #fff;
background-color: transparent;
border: 0 none;
cursor: default;
&:focus {
cursor: text;
}
} }
#rib-save-status { #rib-save-status {

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

@ -2843,7 +2843,7 @@ define([
if ( this.btnsComment.length ) { if ( this.btnsComment.length ) {
var _comments = DE.getController('Common.Controllers.Comments').getView(); var _comments = DE.getController('Common.Controllers.Comments').getView();
this.btnsComment.forEach(function (btn) { this.btnsComment.forEach(function (btn) {
btn.updateHint( _comments.textAddComment ); btn.updateHint( _comments.textHintAddComment );
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
}); });

4
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -141,11 +141,11 @@
</section> </section>
<section class="panel" data-tab="layout"> <section class="panel" data-tab="layout">
<div class="group"> <div class="group">
<span class="btn-slot text x-huge btn-pagebreak"></span>
<span class="btn-slot text x-huge" id="slot-btn-pageorient"></span>
<span class="btn-slot text x-huge" id="slot-btn-pagemargins"></span> <span class="btn-slot text x-huge" id="slot-btn-pagemargins"></span>
<span class="btn-slot text x-huge" id="slot-btn-pageorient"></span>
<span class="btn-slot text x-huge" id="slot-btn-pagesize"></span> <span class="btn-slot text x-huge" id="slot-btn-pagesize"></span>
<span class="btn-slot text x-huge" id="slot-btn-columns"></span> <span class="btn-slot text x-huge" id="slot-btn-columns"></span>
<span class="btn-slot text x-huge btn-pagebreak"></span>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">

1
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -2308,6 +2308,7 @@ define([
}).on('click', function(item) { }).on('click', function(item) {
if (me.api){ if (me.api){
(new Common.Views.InsertTableDialog({ (new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {

6
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -66,7 +66,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
{panelId: 'id-adv-shape-size', panelCaption: this.textSize}, {panelId: 'id-adv-shape-size', panelCaption: this.textSize},
{panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap}, {panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap},
{panelId: 'id-adv-image-position', panelCaption: this.textPosition}, {panelId: 'id-adv-image-position', panelCaption: this.textPosition},
{panelId: 'id-adv-image-shape', panelCaption: this.textShape}, {panelId: 'id-adv-image-shape', panelCaption: this.textWeightArrows},
{panelId: 'id-adv-image-margins', panelCaption: this.strMargins}, {panelId: 'id-adv-image-margins', panelCaption: this.strMargins},
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt} {panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
], ],
@ -1334,6 +1334,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
} }
this.btnsCategory[5].setDisabled(null === margins); // Margins this.btnsCategory[5].setDisabled(null === margins); // Margins
this.btnsCategory[4].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
} else { } else {
value = props.asc_getLockAspect(); value = props.asc_getLockAspect();
@ -2031,7 +2032,8 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
textAlt: 'Alternative Text', textAlt: 'Alternative Text',
textAltTitle: 'Title', textAltTitle: 'Title',
textAltDescription: 'Description', textAltDescription: 'Description',
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.' textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
textWeightArrows: 'Weights & Arrows'
}, DE.Views.ImageSettingsAdvanced || {})); }, DE.Views.ImageSettingsAdvanced || {}));
}); });

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -551,7 +551,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -603,7 +603,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -624,7 +624,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -1029,14 +1029,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.get_width(); var w = stroke.get_width();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

1
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -237,6 +237,7 @@ define([
splitCells: function(menu, item, e) { splitCells: function(menu, item, e) {
var me = this; var me = this;
(new Common.Views.InsertTableDialog({ (new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -417,7 +417,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -469,7 +469,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -490,7 +490,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -721,14 +721,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.get_width(); var w = stroke.get_width();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

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

@ -1205,7 +1205,7 @@ define([
}); });
if ( me.isCompactView ) if ( me.isCompactView )
me.setFolded(true), me.collapse(); else me.setFolded(true); else
me.setTab('home'); me.setTab('home');
var top = Common.localStorage.getItem("de-pgmargins-top"), var top = Common.localStorage.getItem("de-pgmargins-top"),
@ -2388,7 +2388,7 @@ define([
tipHAligh: 'Horizontal Align', tipHAligh: 'Horizontal Align',
tipViewSettings: 'View Settings', tipViewSettings: 'View Settings',
tipAdvSettings: 'Advanced Settings', tipAdvSettings: 'Advanced Settings',
textCompactView: 'View Compact Toolbar', textCompactView: 'Hide Toolbar',
textHideTitleBar: 'Hide Title Bar', textHideTitleBar: 'Hide Title Bar',
textHideStatusBar: 'Hide Status Bar', textHideStatusBar: 'Hide Status Bar',
textHideLines: 'Hide Rulers', textHideLines: 'Hide Rulers',

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

@ -121,6 +121,7 @@
"Common.Views.Comments.textComments": "Comments", "Common.Views.Comments.textComments": "Comments",
"Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Enter your comment here", "Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
"Common.Views.Comments.textHintAddComment": "Add Comment",
"Common.Views.Comments.textOpenAgain": "Open Again", "Common.Views.Comments.textOpenAgain": "Open Again",
"Common.Views.Comments.textReply": "Reply", "Common.Views.Comments.textReply": "Reply",
"Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolve": "Resolve",
@ -139,21 +140,19 @@
"Common.Views.ExternalMergeEditor.textClose": "Close", "Common.Views.ExternalMergeEditor.textClose": "Close",
"Common.Views.ExternalMergeEditor.textSave": "Save & Exit", "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
"Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients", "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
"del_Common.Views.Header.itemBackNewTab": "Open in New Tab",
"del_Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.", "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
"Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.tipDownload": "Download file", "Common.Views.Header.tipDownload": "Download file",
"Common.Views.Header.tipPrint": "Print file",
"Common.Views.Header.tipGoEdit": "Edit current file", "Common.Views.Header.tipGoEdit": "Edit current file",
"Common.Views.Header.tipPrint": "Print file",
"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.History.textCloseHistory": "Close History", "Common.Views.History.textCloseHistory": "Close History",
"Common.Views.History.textHide": "Collapse", "Common.Views.History.textHide": "Collapse",
"Common.Views.History.textHideAll": "Hide detailed changes", "Common.Views.History.textHideAll": "Hide detailed changes",
@ -173,6 +172,7 @@
"Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.", "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
"Common.Views.InsertTableDialog.txtRows": "Number of Rows", "Common.Views.InsertTableDialog.txtRows": "Number of Rows",
"Common.Views.InsertTableDialog.txtTitle": "Table Size", "Common.Views.InsertTableDialog.txtTitle": "Table Size",
"Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
"Common.Views.LanguageDialog.btnCancel": "Cancel", "Common.Views.LanguageDialog.btnCancel": "Cancel",
"Common.Views.LanguageDialog.btnOk": "Ok", "Common.Views.LanguageDialog.btnOk": "Ok",
"Common.Views.LanguageDialog.labelSelect": "Select document language", "Common.Views.LanguageDialog.labelSelect": "Select document language",
@ -190,23 +190,25 @@
"Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name", "Common.Views.RenameDialog.textName": "File name",
"Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ", "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
"Common.Views.ReviewChanges.txtAccept": "Accept",
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.hintNext": "To Next Change", "Common.Views.ReviewChanges.hintNext": "To Next Change",
"Common.Views.ReviewChanges.hintPrev": "To Previous Change", "Common.Views.ReviewChanges.hintPrev": "To Previous Change",
"Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
"Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Change",
"Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtTurnon": "Turn On",
"Common.Views.ReviewChanges.txtSpelling": "Spell checking",
"Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.tipReview": "Review", "Common.Views.ReviewChanges.tipReview": "Review",
"Common.Views.ReviewChanges.tipSetDocLang": "Set Document Language", "Common.Views.ReviewChanges.tipSetDocLang": "Set Document Language",
"Common.Views.ReviewChanges.tipSetSpelling": "Spell checking", "Common.Views.ReviewChanges.tipSetSpelling": "Spell checking",
"Common.Views.ReviewChanges.txtAccept": "Accept",
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtAcceptChanges": "Accept Changes",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
"Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Change",
"Common.Views.ReviewChanges.txtRejectChanges": "Reject Changes",
"Common.Views.ReviewChanges.txtSpelling": "Spell checking",
"Common.Views.ReviewChanges.txtTurnon": "Track Changes",
"Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes",
"Common.Views.ReviewChangesDialog.txtAccept": "Accept", "Common.Views.ReviewChangesDialog.txtAccept": "Accept",
"Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes",
@ -352,8 +354,8 @@
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"DE.Controllers.Statusbar.tipReview": "Review", "DE.Controllers.Statusbar.tipReview": "Review",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"DE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?", "DE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"DE.Controllers.Toolbar.confirmDeleteFootnotes": "Do you want to delete all footnotes?", "DE.Controllers.Toolbar.confirmDeleteFootnotes": "Do you want to delete all footnotes?",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning", "DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
@ -1039,6 +1041,7 @@
"DE.Views.ImageSettings.textAdvanced": "Show advanced settings", "DE.Views.ImageSettings.textAdvanced": "Show advanced settings",
"DE.Views.ImageSettings.textEdit": "Edit", "DE.Views.ImageSettings.textEdit": "Edit",
"DE.Views.ImageSettings.textEditObject": "Edit Object", "DE.Views.ImageSettings.textEditObject": "Edit Object",
"DE.Views.ImageSettings.textFitMargins": "Fit to Margin",
"DE.Views.ImageSettings.textFromFile": "From File", "DE.Views.ImageSettings.textFromFile": "From File",
"DE.Views.ImageSettings.textFromUrl": "From URL", "DE.Views.ImageSettings.textFromUrl": "From URL",
"DE.Views.ImageSettings.textHeight": "Height", "DE.Views.ImageSettings.textHeight": "Height",
@ -1054,7 +1057,6 @@
"DE.Views.ImageSettings.txtThrough": "Through", "DE.Views.ImageSettings.txtThrough": "Through",
"DE.Views.ImageSettings.txtTight": "Tight", "DE.Views.ImageSettings.txtTight": "Tight",
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom", "DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.ImageSettings.textFitMargins": "Fit to Margin",
"DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel", "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.ImageSettingsAdvanced.okButtonText": "OK", "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding", "DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
@ -1114,6 +1116,7 @@
"DE.Views.ImageSettingsAdvanced.textTop": "Top", "DE.Views.ImageSettingsAdvanced.textTop": "Top",
"DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin", "DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin",
"DE.Views.ImageSettingsAdvanced.textVertical": "Vertical", "DE.Views.ImageSettingsAdvanced.textVertical": "Vertical",
"DE.Views.ImageSettingsAdvanced.textWeightArrows": "Weights & Arrows",
"DE.Views.ImageSettingsAdvanced.textWidth": "Width", "DE.Views.ImageSettingsAdvanced.textWidth": "Width",
"DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style", "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style",
"DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind", "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind",
@ -1126,7 +1129,6 @@
"DE.Views.LeftMenu.tipAbout": "About", "DE.Views.LeftMenu.tipAbout": "About",
"DE.Views.LeftMenu.tipChat": "Chat", "DE.Views.LeftMenu.tipChat": "Chat",
"DE.Views.LeftMenu.tipComments": "Comments", "DE.Views.LeftMenu.tipComments": "Comments",
"del_DE.Views.LeftMenu.tipFile": "File",
"DE.Views.LeftMenu.tipPlugins": "Plugins", "DE.Views.LeftMenu.tipPlugins": "Plugins",
"DE.Views.LeftMenu.tipSearch": "Search", "DE.Views.LeftMenu.tipSearch": "Search",
"DE.Views.LeftMenu.tipSupport": "Feedback & Support", "DE.Views.LeftMenu.tipSupport": "Feedback & Support",
@ -1499,6 +1501,27 @@
"DE.Views.TextArtSettings.textTemplate": "Template", "DE.Views.TextArtSettings.textTemplate": "Template",
"DE.Views.TextArtSettings.textTransform": "Transform", "DE.Views.TextArtSettings.textTransform": "Transform",
"DE.Views.TextArtSettings.txtNoBorders": "No Line", "DE.Views.TextArtSettings.txtNoBorders": "No Line",
"DE.Views.Toolbar.capBtnColumns": "Columns",
"DE.Views.Toolbar.capBtnInsChart": "Chart",
"DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
"DE.Views.Toolbar.capBtnInsEquation": "Equation",
"DE.Views.Toolbar.capBtnInsFootnote": "Footnote",
"DE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
"DE.Views.Toolbar.capBtnInsImage": "Picture",
"DE.Views.Toolbar.capBtnInsLink": "Hyperlink",
"DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
"DE.Views.Toolbar.capBtnInsShape": "Shape",
"DE.Views.Toolbar.capBtnInsTable": "Table",
"DE.Views.Toolbar.capBtnInsTextart": "Text Art",
"DE.Views.Toolbar.capBtnInsTextbox": "Text",
"DE.Views.Toolbar.capBtnMargins": "Margins",
"DE.Views.Toolbar.capBtnPageOrient": "Orientation",
"DE.Views.Toolbar.capBtnPageSize": "Size",
"DE.Views.Toolbar.capImgAlign": "Align",
"DE.Views.Toolbar.capImgBackward": "Move backward",
"DE.Views.Toolbar.capImgForward": "Move forward",
"DE.Views.Toolbar.capImgGroup": "Group",
"DE.Views.Toolbar.capImgWrapping": "Wrapping",
"DE.Views.Toolbar.mniCustomTable": "Insert Custom Table", "DE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
"DE.Views.Toolbar.mniDelFootnote": "Delete All Footnotes", "DE.Views.Toolbar.mniDelFootnote": "Delete All Footnotes",
"DE.Views.Toolbar.mniEditDropCap": "Drop Cap Settings", "DE.Views.Toolbar.mniEditDropCap": "Drop Cap Settings",
@ -1524,7 +1547,7 @@
"DE.Views.Toolbar.textColumnsRight": "Right", "DE.Views.Toolbar.textColumnsRight": "Right",
"DE.Views.Toolbar.textColumnsThree": "Three", "DE.Views.Toolbar.textColumnsThree": "Three",
"DE.Views.Toolbar.textColumnsTwo": "Two", "DE.Views.Toolbar.textColumnsTwo": "Two",
"DE.Views.Toolbar.textCompactView": "View Compact Toolbar", "DE.Views.Toolbar.textCompactView": "Hide Toolbar",
"DE.Views.Toolbar.textContPage": "Continuous Page", "DE.Views.Toolbar.textContPage": "Continuous Page",
"DE.Views.Toolbar.textEvenPage": "Even Page", "DE.Views.Toolbar.textEvenPage": "Even Page",
"DE.Views.Toolbar.textFitPage": "Fit to Page", "DE.Views.Toolbar.textFitPage": "Fit to Page",
@ -1539,8 +1562,6 @@
"DE.Views.Toolbar.textInsertPageNumber": "Insert page number", "DE.Views.Toolbar.textInsertPageNumber": "Insert page number",
"DE.Views.Toolbar.textInsPageBreak": "Insert Page Break", "DE.Views.Toolbar.textInsPageBreak": "Insert Page Break",
"DE.Views.Toolbar.textInsSectionBreak": "Insert Section Break", "DE.Views.Toolbar.textInsSectionBreak": "Insert Section Break",
"del_DE.Views.Toolbar.textInsText": "Insert text box",
"del_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.textLandscape": "Landscape",
@ -1573,6 +1594,11 @@
"DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSubscript": "Subscript",
"DE.Views.Toolbar.textSuperscript": "Superscript", "DE.Views.Toolbar.textSuperscript": "Superscript",
"DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textSurface": "Surface",
"DE.Views.Toolbar.textTabFile": "File",
"DE.Views.Toolbar.textTabHome": "Home",
"DE.Views.Toolbar.textTabInsert": "Insert",
"DE.Views.Toolbar.textTabLayout": "Layout",
"DE.Views.Toolbar.textTabReview": "Review",
"DE.Views.Toolbar.textTitleError": "Error", "DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "To current position", "DE.Views.Toolbar.textToCurrent": "To current position",
"DE.Views.Toolbar.textTop": "Top: ", "DE.Views.Toolbar.textTop": "Top: ",
@ -1599,6 +1625,9 @@
"DE.Views.Toolbar.tipFontSize": "Font Size", "DE.Views.Toolbar.tipFontSize": "Font Size",
"DE.Views.Toolbar.tipHAligh": "Horizontal Align", "DE.Views.Toolbar.tipHAligh": "Horizontal Align",
"DE.Views.Toolbar.tipHighlightColor": "Highlight Color", "DE.Views.Toolbar.tipHighlightColor": "Highlight Color",
"DE.Views.Toolbar.tipImgAlign": "Align objects",
"DE.Views.Toolbar.tipImgGroup": "Group objects",
"DE.Views.Toolbar.tipImgWrapping": "Wrap text",
"DE.Views.Toolbar.tipIncFont": "Increment Font Size", "DE.Views.Toolbar.tipIncFont": "Increment Font Size",
"DE.Views.Toolbar.tipIncPrLeft": "Increase Indent", "DE.Views.Toolbar.tipIncPrLeft": "Increase Indent",
"DE.Views.Toolbar.tipInsertChart": "Insert Chart", "DE.Views.Toolbar.tipInsertChart": "Insert Chart",
@ -1614,7 +1643,7 @@
"DE.Views.Toolbar.tipMailRecepients": "Mail Merge", "DE.Views.Toolbar.tipMailRecepients": "Mail Merge",
"DE.Views.Toolbar.tipMarkers": "Bullets", "DE.Views.Toolbar.tipMarkers": "Bullets",
"DE.Views.Toolbar.tipMultilevels": "Multilevel List", "DE.Views.Toolbar.tipMultilevels": "Multilevel List",
"DE.Views.Toolbar.tipNotes": "Footnotes", "DE.Views.Toolbar.tipNotes": "Insert or edit footnotes",
"DE.Views.Toolbar.tipNumbers": "Numbering", "DE.Views.Toolbar.tipNumbers": "Numbering",
"DE.Views.Toolbar.tipPageBreak": "Insert Page or Section break", "DE.Views.Toolbar.tipPageBreak": "Insert Page or Section break",
"DE.Views.Toolbar.tipPageMargins": "Page Margins", "DE.Views.Toolbar.tipPageMargins": "Page Margins",
@ -1627,36 +1656,12 @@
"DE.Views.Toolbar.tipRedo": "Redo", "DE.Views.Toolbar.tipRedo": "Redo",
"DE.Views.Toolbar.tipSave": "Save", "DE.Views.Toolbar.tipSave": "Save",
"DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.", "DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.",
"DE.Views.Toolbar.tipSendBackward": "Send backward",
"DE.Views.Toolbar.tipSendForward": "Send forward",
"DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting Characters", "DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting Characters",
"DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
"DE.Views.Toolbar.tipUndo": "Undo", "DE.Views.Toolbar.tipUndo": "Undo",
"DE.Views.Toolbar.tipViewSettings": "View Settings", "DE.Views.Toolbar.tipViewSettings": "View Settings",
"DE.Views.Toolbar.tipImgAlign": "Align objects",
"DE.Views.Toolbar.tipImgGroup": "Group objects",
"DE.Views.Toolbar.tipImgWrapping": "Wrap text",
"DE.Views.Toolbar.tipSendForward": "Send forward",
"DE.Views.Toolbar.tipSendBackward": "Send backward",
"DE.Views.Toolbar.capBtnInsPagebreak": "Page Break",
"DE.Views.Toolbar.capBtnInsImage": "Picture",
"DE.Views.Toolbar.capBtnInsTable": "Table",
"DE.Views.Toolbar.capBtnInsChart": "Chart",
"DE.Views.Toolbar.capBtnInsLink": "Hyperlink",
"DE.Views.Toolbar.capBtnInsShape": "Shape",
"DE.Views.Toolbar.capBtnInsTextbox": "Text",
"DE.Views.Toolbar.capBtnInsTextart": "Text Art",
"DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
"DE.Views.Toolbar.capBtnInsFootnote": "Footnotes",
"DE.Views.Toolbar.capBtnInsEquation": "Equation",
"DE.Views.Toolbar.capBtnInsHeader": "Headers/Footers",
"DE.Views.Toolbar.capBtnColumns": "Columns",
"DE.Views.Toolbar.capBtnPageOrient": "Orientation",
"DE.Views.Toolbar.capBtnMargins": "Margins",
"DE.Views.Toolbar.capBtnPageSize": "Size",
"DE.Views.Toolbar.capImgAlign": "Align",
"DE.Views.Toolbar.capImgGroup": "Group",
"DE.Views.Toolbar.capImgForward": "Move forward",
"DE.Views.Toolbar.capImgBackward": "Move backward",
"DE.Views.Toolbar.capImgWrapping": "Wrapping",
"DE.Views.Toolbar.txtScheme1": "Office", "DE.Views.Toolbar.txtScheme1": "Office",
"DE.Views.Toolbar.txtScheme10": "Median", "DE.Views.Toolbar.txtScheme10": "Median",
"DE.Views.Toolbar.txtScheme11": "Metro", "DE.Views.Toolbar.txtScheme11": "Metro",
@ -1677,10 +1682,5 @@
"DE.Views.Toolbar.txtScheme6": "Concourse", "DE.Views.Toolbar.txtScheme6": "Concourse",
"DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme7": "Equity",
"DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme8": "Flow",
"DE.Views.Toolbar.txtScheme9": "Foundry", "DE.Views.Toolbar.txtScheme9": "Foundry"
"DE.Views.Toolbar.textTabFile": "File",
"DE.Views.Toolbar.textTabHome": "Home",
"DE.Views.Toolbar.textTabInsert": "Insert",
"DE.Views.Toolbar.textTabLayout": "Page Layout",
"DE.Views.Toolbar.textTabReview": "Review"
} }

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

@ -107,6 +107,8 @@
.zoom { .zoom {
padding: 5px 3px; padding: 5px 3px;
float: right; float: right;
min-width: 40px;
text-align: center;
} }
} }

2
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6344,7 +6344,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%234066D7%22%3E%3Cg%3E%3Cpolygon%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%22%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%234066D7%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-doc-setup { i.icon.icon-doc-setup {
width: 22px; width: 22px;

2
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -5933,7 +5933,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%235a7dc9%22%3E%3Cg%3E%3Cpolygon%20id%3D%22XMLID_3_%22%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%09%22%2F%3E%3Cpolygon%20id%3D%22XMLID_6_%22%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%09%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%235a7dc9%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-doc-setup { i.icon.icon-doc-setup {
width: 22px; width: 22px;

2
apps/documenteditor/mobile/resources/less/ios/_icons.less
View file

@ -33,7 +33,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-doc-setup { &.icon-doc-setup {
width: 22px; width: 22px;

2
apps/documenteditor/mobile/resources/less/material/_icons.less
View file

@ -28,7 +28,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon id="XMLID_3_" points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon id="XMLID_6_" points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-doc-setup { &.icon-doc-setup {
width: 22px; width: 22px;

2
apps/presentationeditor/main/app.reporter.js
View file

@ -133,7 +133,7 @@ require([
// api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); // api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument);
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
window.postMessage('i:am:ready', '*'); api.sendFromReporter('i:am:ready');
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

49
apps/presentationeditor/main/app/collection/SlideThemes.js Normal file
View file

@ -0,0 +1,49 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
*
* 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 Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* 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
*
*/
/**
* SlideThemes.js
*
* Created by Julia Radzhabova on 8/07/17
* Copyright (c) 2017 Ascensio System SIA. All rights reserved.
*
*/
define([
'backbone'
], function(Backbone){ 'use strict';
PE.Collections = PE.Collections || {};
PE.Collections.SlideThemes = Backbone.Collection.extend({
});
});

11
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -229,22 +229,19 @@ define([
}, },
applySettings: function(menu) { applySettings: function(menu) {
var value = Common.localStorage.getItem("pe-settings-inputmode"); this.api.SetTextBoxInputMode(Common.localStorage.getBool("pe-settings-inputmode"));
this.api.SetTextBoxInputMode(parseInt(value) == 1);
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) { if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
value = Common.localStorage.getItem("pe-settings-coauthmode"); this.api.asc_SetFastCollaborative(Common.localStorage.getBool("pe-settings-coauthmode", true));
this.api.asc_SetFastCollaborative(value===null || parseInt(value) == 1);
} }
/** coauthoring end **/ /** coauthoring end **/
if (this.mode.isEdit) { if (this.mode.isEdit) {
value = Common.localStorage.getItem("pe-settings-autosave"); var value = Common.localStorage.getItem("pe-settings-autosave");
this.api.asc_setAutoSaveGap(parseInt(value)); this.api.asc_setAutoSaveGap(parseInt(value));
value = Common.localStorage.getItem("pe-settings-spellcheck"); this.api.asc_setSpellCheck(Common.localStorage.getBool("pe-settings-spellcheck", true));
this.api.asc_setSpellCheck(parseInt(value) == 1);
} }
this.api.put_ShowSnapLines( Common.localStorage.getBool("pe-settings-showsnaplines") ); this.api.put_ShowSnapLines( Common.localStorage.getBool("pe-settings-showsnaplines") );

23
apps/presentationeditor/main/app/controller/Main.js
View file

@ -565,8 +565,7 @@ define([
var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -1); var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -1);
(zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
value = Common.localStorage.getItem("pe-settings-spellcheck"); me.api.asc_setSpellCheck(Common.localStorage.getBool("pe-settings-spellcheck", true));
me.api.asc_setSpellCheck(value===null || parseInt(value) == 1);
function checkWarns() { function checkWarns() {
if (!window['AscDesktopEditor']) { if (!window['AscDesktopEditor']) {
@ -595,7 +594,7 @@ define([
/** coauthoring begin **/ /** coauthoring begin **/
if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) { if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) {
value = Common.localStorage.getItem("pe-settings-coauthmode"); value = Common.localStorage.getItem("pe-settings-coauthmode");
if (value===null && Common.localStorage.getItem("pe-settings-autosave")===null && if (value===null && !Common.localStorage.itemExists("pe-settings-autosave") &&
me.appOptions.customization && me.appOptions.customization.autosave===false) { me.appOptions.customization && me.appOptions.customization.autosave===false) {
value = 0; // use customization.autosave only when pe-settings-coauthmode and pe-settings-autosave are null value = 0; // use customization.autosave only when pe-settings-coauthmode and pe-settings-autosave are null
} }
@ -607,7 +606,7 @@ define([
me.api.asc_SetFastCollaborative(me._state.fastCoauth); me.api.asc_SetFastCollaborative(me._state.fastCoauth);
/** coauthoring end **/ /** coauthoring end **/
Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0); Common.localStorage.setBool("pe-settings-showsnaplines", me.api.get_ShowSnapLines());
var application = me.getApplication(); var application = me.getApplication();
var toolbarController = application.getController('Toolbar'), var toolbarController = application.getController('Toolbar'),
@ -651,8 +650,7 @@ define([
me.api.asc_setAutoSaveGap(value); me.api.asc_setAutoSaveGap(value);
if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
value = Common.localStorage.getItem("pe-settings-forcesave"); me.appOptions.forcesave = Common.localStorage.getBool("pe-settings-forcesave", me.appOptions.canForcesave);
me.appOptions.forcesave = (value===null) ? me.appOptions.canForcesave : (parseInt(value)==1);
me.api.asc_setIsForceSaveOnUserSave(me.appOptions.forcesave); me.api.asc_setIsForceSaveOnUserSave(me.appOptions.forcesave);
} }
@ -706,7 +704,7 @@ define([
$(document).on('contextmenu', _.bind(me.onContextMenu, me)); $(document).on('contextmenu', _.bind(me.onContextMenu, me));
if (this._state.licenseWarning) { if (this._state.licenseWarning) {
value = Common.localStorage.getItem("de-license-warning"); value = Common.localStorage.getItem("pe-license-warning");
value = (value!==null) ? parseInt(value) : 0; value = (value!==null) ? parseInt(value) : 0;
var now = (new Date).getTime(); var now = (new Date).getTime();
if (now - value > 86400000) { if (now - value > 86400000) {
@ -1500,8 +1498,7 @@ define([
}, },
onTryUndoInFastCollaborative: function() { onTryUndoInFastCollaborative: function() {
var val = window.localStorage.getItem("pe-hide-try-undoredo"); if (!window.localStorage.getBool("pe-hide-try-undoredo"))
if (!(val && parseInt(val) == 1))
Common.UI.info({ Common.UI.info({
width: 500, width: 500,
msg: this.textTryUndoRedo, msg: this.textTryUndoRedo,
@ -1533,15 +1530,13 @@ define([
applySettings: function() { applySettings: function() {
if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
var value = Common.localStorage.getItem("pe-settings-coauthmode"), var oldval = this._state.fastCoauth;
oldval = this._state.fastCoauth; this._state.fastCoauth = Common.localStorage.getBool("pe-settings-coauthmode", true);
this._state.fastCoauth = (value===null || parseInt(value) == 1);
if (this._state.fastCoauth && !oldval) if (this._state.fastCoauth && !oldval)
this.synchronizeChanges(); this.synchronizeChanges();
} }
if (this.appOptions.canForcesave) { if (this.appOptions.canForcesave) {
value = Common.localStorage.getItem("pe-settings-forcesave"); this.appOptions.forcesave = Common.localStorage.getBool("pe-settings-forcesave", this.appOptions.canForcesave);
this.appOptions.forcesave = (value===null) ? this.appOptions.canForcesave : (parseInt(value)==1);
this.api.asc_setIsForceSaveOnUserSave(this.appOptions.forcesave); this.api.asc_setIsForceSaveOnUserSave(this.appOptions.forcesave);
} }
}, },

7
apps/presentationeditor/main/app/controller/Statusbar.js
View file

@ -176,9 +176,7 @@ define([
}, },
createDelayedElements: function() { createDelayedElements: function() {
var value = Common.localStorage.getItem("pe-settings-spellcheck"); this.statusbar.btnSetSpelling.toggle(Common.localStorage.getBool("pe-settings-spellcheck", true), true);
this.statusbar.btnSetSpelling.toggle(value===null || parseInt(value) == 1, true);
this.statusbar.$el.css('z-index', ''); this.statusbar.$el.css('z-index', '');
}, },
@ -215,8 +213,7 @@ define([
}, },
applySettings: function(menu) { applySettings: function(menu) {
var value = Common.localStorage.getItem("pe-settings-spellcheck"); this.statusbar.btnSetSpelling.toggle(Common.localStorage.getBool("pe-settings-spellcheck", true), true);
this.statusbar.btnSetSpelling.toggle(value===null || parseInt(value) == 1, true);
}, },
zoomText : 'Zoom {0}%' zoomText : 'Zoom {0}%'

38
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -48,6 +48,7 @@ define([
'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/ImageFromUrlDialog',
'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/InsertTableDialog',
'common/main/lib/util/define', 'common/main/lib/util/define',
'presentationeditor/main/app/collection/SlideThemes',
'presentationeditor/main/app/view/Toolbar', 'presentationeditor/main/app/view/Toolbar',
'presentationeditor/main/app/view/HyperlinkSettingsDialog', 'presentationeditor/main/app/view/HyperlinkSettingsDialog',
'presentationeditor/main/app/view/SlideSizeSettings', 'presentationeditor/main/app/view/SlideSizeSettings',
@ -56,7 +57,9 @@ define([
PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({
models: [], models: [],
collections: [], collections: [
'SlideThemes'
],
views: [ views: [
'Toolbar' 'Toolbar'
], ],
@ -635,7 +638,6 @@ define([
paragraph_locked = pr.get_Locked(); paragraph_locked = pr.get_Locked();
no_paragraph = false; no_paragraph = false;
no_text = false; no_text = false;
no_object = false;
} else if (type == Asc.c_oAscTypeSelectElement.Slide) { } else if (type == Asc.c_oAscTypeSelectElement.Slide) {
slide_deleted = pr.get_LockDelete(); slide_deleted = pr.get_LockDelete();
slide_layout_lock = pr.get_LockLayout(); slide_layout_lock = pr.get_LockLayout();
@ -679,7 +681,7 @@ define([
if (this._state.no_object !== no_object ) { if (this._state.no_object !== no_object ) {
if (this._state.activated) this._state.no_object = no_object; if (this._state.activated) this._state.no_object = no_object;
this.toolbar.lockToolbar(PE.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange ]}); this.toolbar.lockToolbar(PE.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange, me.toolbar.btnVerticalAlign ]});
} }
if (slide_layout_lock !== undefined && this._state.slidelayoutdisable !== slide_layout_lock ) { if (slide_layout_lock !== undefined && this._state.slidelayoutdisable !== slide_layout_lock ) {
@ -1549,7 +1551,7 @@ define([
var headerView = this.getApplication().getController('Statusbar').getView('Statusbar'); var headerView = this.getApplication().getController('Statusbar').getView('Statusbar');
headerView && headerView.setVisible(!checked); headerView && headerView.setVisible(!checked);
Common.localStorage.setItem('pe-hidden-status', checked ? 1 : 0); Common.localStorage.setBool('pe-hidden-status', checked);
Common.NotificationCenter.trigger('layout:changed', 'status'); Common.NotificationCenter.trigger('layout:changed', 'status');
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -1560,7 +1562,7 @@ define([
this.api.asc_SetViewRulers(!checked); this.api.asc_SetViewRulers(!checked);
} }
Common.localStorage.setItem('pe-hidden-rulers', checked ? 1 : 0); Common.localStorage.setBool('pe-hidden-rulers', checked);
Common.NotificationCenter.trigger('layout:changed', 'rulers'); Common.NotificationCenter.trigger('layout:changed', 'rulers');
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -1954,13 +1956,25 @@ define([
me.toolbar.listTheme.menuPicker.store.reset([]); // remove all me.toolbar.listTheme.menuPicker.store.reset([]); // remove all
_.each(defaultThemes.concat(docThemes), function(theme) { var themeStore = this.getCollection('SlideThemes');
me.toolbar.listTheme.menuPicker.store.add({ if (themeStore) {
imageUrl: theme.get_Image(), var arr = [];
uid : Common.UI.getId(), _.each(defaultThemes.concat(docThemes), function(theme) {
themeId : theme.get_Index() arr.push(new Common.UI.DataViewModel({
imageUrl: theme.get_Image(),
uid : Common.UI.getId(),
themeId : theme.get_Index(),
itemWidth : 85,
itemHeight : 38
}));
me.toolbar.listTheme.menuPicker.store.add({
imageUrl: theme.get_Image(),
uid : Common.UI.getId(),
themeId : theme.get_Index()
});
}); });
}); themeStore.reset(arr);
}
if (me.toolbar.listTheme.menuPicker.store.length > 0 && me.toolbar.listTheme.rendered){ if (me.toolbar.listTheme.menuPicker.store.length > 0 && me.toolbar.listTheme.rendered){
me.toolbar.listTheme.fillComboView(me.toolbar.listTheme.menuPicker.store.at(0), true); me.toolbar.listTheme.fillComboView(me.toolbar.listTheme.menuPicker.store.at(0), true);
@ -2073,7 +2087,7 @@ define([
var _comments = PE.getController('Common.Controllers.Comments').getView(); var _comments = PE.getController('Common.Controllers.Comments').getView();
Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment);
this.btnsComment.forEach(function (btn) { this.btnsComment.forEach(function (btn) {
btn.updateHint( _comments.textAddComment ); btn.updateHint( _comments.textHintAddComment );
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
}); });

13
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -32,11 +32,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-copy"></span> <span class="btn-slot split" id="slot-btn-copy"></span>
<span class="btn-slot" id="slot-btn-paste"></span> <span class="btn-slot" id="slot-btn-paste"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-undo"></span> <span class="btn-slot split" id="slot-btn-undo"></span>
<span class="btn-slot" id="slot-btn-redo"></span> <span class="btn-slot" id="slot-btn-redo"></span>
</div> </div>
</div> </div>
@ -88,7 +88,7 @@
</div> </div>
<div class="separator long close"></div> <div class="separator long close"></div>
<div class="group"> <div class="group">
<span class="btn-slot text x-huge slot-inserttext"></span> <span class="btn-slot text x-huge slot-instext"></span>
<span class="btn-slot text x-huge slot-insertimg"></span> <span class="btn-slot text x-huge slot-insertimg"></span>
<span class="btn-slot text x-huge slot-insertshape"></span> <span class="btn-slot text x-huge slot-insertshape"></span>
</div> </div>
@ -103,11 +103,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-clearstyle"></span> <span class="btn-slot split" id="slot-btn-clearstyle"></span>
<span class="btn-slot split" id="slot-btn-colorschemas"></span> <span class="btn-slot split" id="slot-btn-colorschemas"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-copystyle"></span> <span class="btn-slot split" id="slot-btn-copystyle"></span>
<span class="btn-slot split" id="slot-btn-slidesize"></span> <span class="btn-slot split" id="slot-btn-slidesize"></span>
</div> </div>
</div> </div>
@ -129,7 +129,8 @@
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<span class="btn-slot text x-huge slot-inserttext"></span> <span class="btn-slot text x-huge slot-instext"></span>
<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
<span class="btn-slot text x-huge slot-insertimg"></span> <span class="btn-slot text x-huge slot-insertimg"></span>
<span class="btn-slot text x-huge slot-insertshape"></span> <span class="btn-slot text x-huge slot-insertshape"></span>
<span class="btn-slot text x-huge" id="slot-btn-insertchart"></span> <span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>

68
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -66,6 +66,7 @@ define([
me._currentParaObjDisabled = false; me._currentParaObjDisabled = false;
me._currentSpellObj = undefined; me._currentSpellObj = undefined;
me._currLang = {}; me._currLang = {};
me._state = {};
/** coauthoring begin **/ /** coauthoring begin **/
var usersStore = PE.getCollection('Common.Collections.Users'); var usersStore = PE.getCollection('Common.Collections.Users');
@ -1472,6 +1473,18 @@ define([
me._isFromSlideMenu = number; me._isFromSlideMenu = number;
}; };
var onApiUpdateThemeIndex = function(v) {
me._state.themeId = v;
};
var onApiLockDocumentTheme = function() {
me._state.themeLock = true;
};
var onApiUnLockDocumentTheme = function() {
me._state.themeLock = false;
};
this.setApi = function(o) { this.setApi = function(o) {
me.api = o; me.api = o;
@ -1501,6 +1514,9 @@ define([
me.api.asc_registerCallback('asc_onShowForeignCursorLabel', _.bind(onShowForeignCursorLabel, me)); me.api.asc_registerCallback('asc_onShowForeignCursorLabel', _.bind(onShowForeignCursorLabel, me));
me.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(onHideForeignCursorLabel, me)); me.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(onHideForeignCursorLabel, me));
me.api.asc_registerCallback('asc_onFocusObject', _.bind(onFocusObject, me)); me.api.asc_registerCallback('asc_onFocusObject', _.bind(onFocusObject, me));
me.api.asc_registerCallback('asc_onUpdateThemeIndex', _.bind(onApiUpdateThemeIndex, me));
me.api.asc_registerCallback('asc_onLockDocumentTheme', _.bind(onApiLockDocumentTheme, me));
me.api.asc_registerCallback('asc_onUnLockDocumentTheme', _.bind(onApiUnLockDocumentTheme, me));
} }
return me; return me;
@ -1739,6 +1755,16 @@ define([
}) })
}); });
var mnuChangeTheme = new Common.UI.MenuItem({
caption : me.txtChangeTheme,
menu : new Common.UI.Menu({
menuAlign: 'tl-tr',
items: [
{ template: _.template('<div id="id-docholder-menu-changetheme" style="width: 280px; margin: 0 4px;"></div>') }
]
})
});
var mnuPreview = new Common.UI.MenuItem({ var mnuPreview = new Common.UI.MenuItem({
caption : me.txtPreview caption : me.txtPreview
}).on('click', function(item) { }).on('click', function(item) {
@ -1792,10 +1818,11 @@ define([
mnuSlideHide.setChecked(value.isSlideHidden===true); mnuSlideHide.setChecked(value.isSlideHidden===true);
me.slideMenu.items[5].setVisible(value.isSlideSelect===true || value.fromThumbs!==true); me.slideMenu.items[5].setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
mnuChangeSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
menuSlideSettings.setVisible(value.fromThumbs!==true); menuSlideSettings.setVisible(value.fromThumbs!==true);
menuSlideSettings.options.value = null; menuSlideSettings.options.value = null;
for (var i = 8; i < 12; i++) { for (var i = 9; i < 13; i++) {
me.slideMenu.items[i].setVisible(value.fromThumbs===true); me.slideMenu.items[i].setVisible(value.fromThumbs===true);
} }
@ -1822,6 +1849,7 @@ define([
mnuSelectAll.setDisabled(locked || me.slidesCount<2); mnuSelectAll.setDisabled(locked || me.slidesCount<2);
mnuDeleteSlide.setDisabled(lockedDeleted || locked); mnuDeleteSlide.setDisabled(lockedDeleted || locked);
mnuChangeSlide.setDisabled(lockedLayout || locked); mnuChangeSlide.setDisabled(lockedLayout || locked);
mnuChangeTheme.setDisabled(me._state.themeLock || locked );
mnuSlideHide.setDisabled(lockedLayout || locked); mnuSlideHide.setDisabled(lockedLayout || locked);
}, },
items: [ items: [
@ -1852,6 +1880,7 @@ define([
mnuSlideHide, mnuSlideHide,
{caption: '--'}, {caption: '--'},
mnuChangeSlide, mnuChangeSlide,
mnuChangeTheme,
menuSlideSettings, menuSlideSettings,
{caption: '--'}, {caption: '--'},
mnuSelectAll, mnuSelectAll,
@ -1901,6 +1930,37 @@ define([
me.listenTo(PE.getCollection('SlideLayouts'), 'reset', function() { me.listenTo(PE.getCollection('SlideLayouts'), 'reset', function() {
me.slideLayoutMenu._needRecalcSlideLayout = true; me.slideLayoutMenu._needRecalcSlideLayout = true;
}); });
me.slideThemeMenu = new Common.UI.DataView({
el : $('#id-docholder-menu-changetheme'),
parentMenu : mnuChangeTheme.menu,
restoreHeight: 300,
style: 'max-height: 300px;',
store : PE.getCollection('SlideThemes'),
itemTemplate: _.template([
'<div class="style" id="<%= id %>" style="width: <%= itemWidth %>px;">',
'<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"/>',
'</div>'
].join(''))
}).on('item:click', function(picker, item, record, e) {
if (me.api) {
me.api.ChangeTheme(record.get('themeId'), true);
if (e.type !== 'click')
me.slideMenu.hide();
me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Change Theme');
}
});
if (me.slideMenu) {
mnuChangeTheme.menu.on('show:after', function (menu) {
var record = me.slideThemeMenu.store.findWhere({themeId: me._state.themeId});
me.slideThemeMenu.selectRecord(record, true);
me.slideThemeMenu.scroller.update({alwaysVisibleY: true});
me.slideThemeMenu.scroller.scrollTop(0);
});
}
}); });
var mnuTableMerge = new Common.UI.MenuItem({ var mnuTableMerge = new Common.UI.MenuItem({
@ -1915,6 +1975,7 @@ define([
}).on('click', function(item) { }).on('click', function(item) {
if (me.api) { if (me.api) {
(new Common.Views.InsertTableDialog({ (new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
@ -2678,7 +2739,7 @@ define([
} }
/** coauthoring begin **/ /** coauthoring begin **/
menuAddCommentPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments); menuAddCommentPara.setVisible(!isInChart && isInShape && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
/** coauthoring end **/ /** coauthoring end **/
menuCommentParaSeparator.setVisible(/** coauthoring begin **/ menuAddCommentPara.isVisible() || /** coauthoring end **/ menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible()); menuCommentParaSeparator.setVisible(/** coauthoring begin **/ menuAddCommentPara.isVisible() || /** coauthoring end **/ menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
@ -3218,7 +3279,8 @@ define([
spellcheckText: 'Spellcheck', spellcheckText: 'Spellcheck',
langText: 'Select Language', langText: 'Select Language',
textUndo: 'Undo', textUndo: 'Undo',
txtSlideHide: 'Hide Slide' txtSlideHide: 'Hide Slide',
txtChangeTheme: 'Change Theme'
}, PE.Views.DocumentHolder || {})); }, PE.Views.DocumentHolder || {}));
}); });

14
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -285,19 +285,18 @@ define([
}, },
updateSettings: function() { updateSettings: function() {
var value = Common.localStorage.getItem("pe-settings-spellcheck"); this.chSpell.setValue(Common.localStorage.getBool("pe-settings-spellcheck", true));
this.chSpell.setValue(value===null || parseInt(value) == 1);
this.chInputMode.setValue(Common.localStorage.getBool("pe-settings-inputmode")); this.chInputMode.setValue(Common.localStorage.getBool("pe-settings-inputmode"));
value = Common.localStorage.getItem("pe-settings-zoom"); var value = Common.localStorage.getItem("pe-settings-zoom");
value = (value!==null) ? parseInt(value) : (this.mode.customization && this.mode.customization.zoom ? parseInt(this.mode.customization.zoom) : -1); value = (value!==null) ? parseInt(value) : (this.mode.customization && this.mode.customization.zoom ? parseInt(this.mode.customization.zoom) : -1);
var item = this.cmbZoom.store.findWhere({value: value}); var item = this.cmbZoom.store.findWhere({value: value});
this.cmbZoom.setValue(item ? parseInt(item.get('value')) : (value>0 ? value+'%' : 100)); this.cmbZoom.setValue(item ? parseInt(item.get('value')) : (value>0 ? value+'%' : 100));
/** coauthoring begin **/ /** coauthoring begin **/
value = Common.localStorage.getItem("pe-settings-coauthmode"); value = Common.localStorage.getItem("pe-settings-coauthmode");
if (value===null && Common.localStorage.getItem("pe-settings-autosave")===null && if (value===null && !Common.localStorage.itemExists("pe-settings-autosave") &&
this.mode.customization && this.mode.customization.autosave===false) this.mode.customization && this.mode.customization.autosave===false)
value = 0; // use customization.autosave only when pe-settings-coauthmode and pe-settings-autosave are null value = 0; // use customization.autosave only when pe-settings-coauthmode and pe-settings-autosave are null
var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline) && this.mode.canCoAuthoring; var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline) && this.mode.canCoAuthoring;
@ -318,13 +317,10 @@ define([
this.chAutosave.setValue(fast_coauth || (value===null ? this.mode.canCoAuthoring : parseInt(value) == 1)); this.chAutosave.setValue(fast_coauth || (value===null ? this.mode.canCoAuthoring : parseInt(value) == 1));
if (this.mode.canForcesave) { if (this.mode.canForcesave) {
value = Common.localStorage.getItem("pe-settings-forcesave"); this.chForcesave.setValue(Common.localStorage.getBool("pe-settings-forcesave", this.mode.canForcesave));
value = (value === null) ? this.mode.canForcesave : (parseInt(value) == 1);
this.chForcesave.setValue(value);
} }
value = Common.localStorage.getItem("pe-settings-showsnaplines"); this.chAlignGuides.setValue(Common.localStorage.getBool("pe-settings-showsnaplines", true));
this.chAlignGuides.setValue(value===null || parseInt(value) == 1);
}, },
applySettings: function() { applySettings: function() {

12
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -531,7 +531,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -582,7 +582,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -602,7 +602,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -942,14 +942,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.get_width(); var w = stroke.get_width();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

2
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -538,6 +538,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
if (props ){ if (props ){
var stroke = props.get_stroke(); var stroke = props.get_stroke();
if (stroke) { if (stroke) {
this.btnsCategory[1].setDisabled(stroke.get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
var value = stroke.get_linejoin(); var value = stroke.get_linejoin();
for (var i=0; i<this._arrJoinType.length; i++) { for (var i=0; i<this._arrJoinType.length; i++) {
if (value == this._arrJoinType[i].value) { if (value == this._arrJoinType[i].value) {

1
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -203,6 +203,7 @@ define([
splitCells: function(menu, item, e) { splitCells: function(menu, item, e) {
var me = this; var me = this;
(new Common.Views.InsertTableDialog({ (new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {

12
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -538,7 +538,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -590,7 +590,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -611,7 +611,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -920,14 +920,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.get_width(); var w = stroke.get_width();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

102
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -466,7 +466,7 @@ define([
me.btnVerticalAlign = new Common.UI.Button({ me.btnVerticalAlign = new Common.UI.Button({
id : 'id-toolbar-btn-valign', id : 'id-toolbar-btn-valign',
cls : 'btn-toolbar', cls : 'btn-toolbar',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.noObjectSelected],
iconCls : 'btn-align-middle', iconCls : 'btn-align-middle',
icls : 'btn-align-middle', icls : 'btn-align-middle',
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -586,6 +586,20 @@ define([
}); });
me.paragraphControls.push(me.btnInsertHyperlink); me.paragraphControls.push(me.btnInsertHyperlink);
me.btnInsertTextArt = new Common.UI.Button({
id: 'tlb-btn-instextart',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-textart',
caption: me.capInsertTextArt,
menu: new Common.UI.Menu({
cls: 'menu-shapes',
items: [
{template: _.template('<div id="view-insert-art" style="width: 239px; margin-left: 5px;"></div>')}
]
})
});
me.paragraphControls.push(me.btnInsertTextArt);
me.btnColorSchemas = new Common.UI.Button({ me.btnColorSchemas = new Common.UI.Button({
id : 'id-toolbar-btn-colorschemas', id : 'id-toolbar-btn-colorschemas',
cls : 'btn-toolbar', cls : 'btn-toolbar',
@ -780,7 +794,7 @@ define([
enableKeyEvents: true, enableKeyEvents: true,
itemHeight : 38, itemHeight : 38,
hint: this.tipSlideTheme, hint: this.tipSlideTheme,
lock: [_set.lostConnect, _set.noSlides], lock: [_set.themeLock, _set.lostConnect, _set.noSlides],
beforeOpenHandler: function(e) { beforeOpenHandler: function(e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu, menu = cmp.openButton.menu,
@ -933,7 +947,7 @@ define([
}); });
if ( me.isCompactView ) if ( me.isCompactView )
me.setFolded(true), me.collapse(); else me.setFolded(true); else
me.setTab('home'); me.setTab('home');
return this; return this;
@ -982,6 +996,7 @@ define([
_injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink); _injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink);
_injectComponent('#slot-btn-inserttable', this.btnInsertTable); _injectComponent('#slot-btn-inserttable', this.btnInsertTable);
_injectComponent('#slot-btn-insertchart', this.btnInsertChart); _injectComponent('#slot-btn-insertchart', this.btnInsertChart);
_injectComponent('#slot-btn-instextart', this.btnInsertTextArt);
_injectComponent('#slot-btn-colorschemas', this.btnColorSchemas); _injectComponent('#slot-btn-colorschemas', this.btnColorSchemas);
_injectComponent('#slot-btn-slidesize', this.btnSlideSize); _injectComponent('#slot-btn-slidesize', this.btnSlideSize);
_injectComponent('#slot-field-styles', this.listTheme); _injectComponent('#slot-field-styles', this.listTheme);
@ -1014,15 +1029,13 @@ define([
}); });
me.btnsInsertText = _injectBtns({ me.btnsInsertText = _injectBtns({
slot: '.slot-inserttext', slot: '.slot-instext',
btnconfig: { btnconfig: {
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text', iconCls : 'btn-text',
caption : me.capInsertText, caption : me.capInsertText,
lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
enableToggle: true, enableToggle: true
split : true,
menu : true
} }
}); });
@ -1067,25 +1080,6 @@ define([
me.btnsInsertText.forEach(function (btn) { me.btnsInsertText.forEach(function (btn) {
btn.updateHint(me.tipInsertText); btn.updateHint(me.tipInsertText);
btn.setMenu(
new Common.UI.Menu({
items: [
{caption: me.textInsText, value: 'text'},
{caption: me.textInsTextArt, value: 'art',
menu: new Common.UI.Menu({
menuAlign: 'tl-tr',
cls: 'menu-shapes',
items: [
{template: _.template('<div class="view-insert-art" style="width: 239px; margin-left: 5px;"></div>')}
]
})
}
]
}).on('item:click', function (menu, item, e) {
if (item.value == 'text')
me.fireEvent('insert:text', ['begin']);
})
);
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
me.fireEvent('insert:text', [btn.pressed ? 'begin' : 'end']); me.fireEvent('insert:text', [btn.pressed ? 'begin' : 'end']);
}); });
@ -1134,6 +1128,7 @@ define([
this.btnInsertChart.updateHint(this.tipInsertChart); this.btnInsertChart.updateHint(this.tipInsertChart);
this.btnInsertEquation.updateHint(this.tipInsertEquation); this.btnInsertEquation.updateHint(this.tipInsertEquation);
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
this.btnColorSchemas.updateHint(this.tipColorSchemas); this.btnColorSchemas.updateHint(this.tipColorSchemas);
this.btnHide.updateHint(this.tipViewSettings); this.btnHide.updateHint(this.tipViewSettings);
this.btnAdvSettings.updateHint(this.tipAdvSettings); this.btnAdvSettings.updateHint(this.tipAdvSettings);
@ -1396,7 +1391,7 @@ define([
}); });
this.mnuitemHideStatusBar.setChecked(Common.localStorage.getBool('pe-hidden-status'), true); this.mnuitemHideStatusBar.setChecked(Common.localStorage.getBool('pe-hidden-status'), true);
this.mnuitemHideRulers.setChecked(Common.localStorage.getItem("pe-hidden-rulers"), true); this.mnuitemHideRulers.setChecked(Common.localStorage.getBool("pe-hidden-rulers"), true);
// // Enable none paragraph components // // Enable none paragraph components
this.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.slideOnlyControls.concat(this.shapeControls)}); this.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.slideOnlyControls.concat(this.shapeControls)});
@ -1641,31 +1636,30 @@ define([
updateTextartMenu: function (collection) { updateTextartMenu: function (collection) {
var me = this; var me = this;
me.btnsInsertText.forEach(function (btn) { var btn = me.btnInsertTextArt;
if ( btn.textartPicker ) { if ( btn.textartPicker ) {
if ( btn.textartPicker.store.size() == collection.size() ) { if ( btn.textartPicker.store.size() == collection.size() ) {
btn.textartPicker.store.each(function (model, index) { btn.textartPicker.store.each(function (model, index) {
model.set('imageUrl', collection.at(index).get('imageUrl')); model.set('imageUrl', collection.at(index).get('imageUrl'));
}); });
} else {
btn.textartPicker.store.reset( collection.models );
}
} else { } else {
btn.textartPicker = new Common.UI.DataView({ btn.textartPicker.store.reset( collection.models );
el: $('.view-insert-art', btn.menu.items[1].$el),
store: collection,
parentMenu: btn.menu.items[1],
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
btn.textartPicker.on('item:click', function(picker, item, record, e) {
me.fireEvent('insert:textart', [record.get('data')]);
if (e.type !== 'click') this.menu.hide();
});
} }
}); } else {
btn.textartPicker = new Common.UI.DataView({
el: $('#view-insert-art', btn.menu.$el),
store: collection,
parentMenu: btn.menu,
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
btn.textartPicker.on('item:click', function(picker, item, record, e) {
me.fireEvent('insert:textart', [record.get('data')]);
if (e.type !== 'click') this.menu.hide();
});
}
}, },
updateAutoshapeMenu: function (collection) { updateAutoshapeMenu: function (collection) {
@ -1740,6 +1734,7 @@ define([
mniCustomTable: 'Insert Custom Table', mniCustomTable: 'Insert Custom Table',
tipInsertHyperlink: 'Add Hyperlink', tipInsertHyperlink: 'Add Hyperlink',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',
tipInsertTextArt: 'Insert Text Art',
tipInsertShape: 'Insert Autoshape', tipInsertShape: 'Insert Autoshape',
tipPreview: 'Start Slideshow', tipPreview: 'Start Slideshow',
tipAddSlide: 'Add Slide', tipAddSlide: 'Add Slide',
@ -1770,7 +1765,7 @@ define([
tipSlideSize: 'Select Slide Size', tipSlideSize: 'Select Slide Size',
tipViewSettings: 'View Settings', tipViewSettings: 'View Settings',
tipAdvSettings: 'Advanced Settings', tipAdvSettings: 'Advanced Settings',
textCompactView: 'View Compact Toolbar', textCompactView: 'Hide Toolbar',
textHideTitleBar: 'Hide Title Bar', textHideTitleBar: 'Hide Title Bar',
textHideStatusBar: 'Hide Status Bar', textHideStatusBar: 'Hide Status Bar',
textHideLines: 'Hide Rulers', textHideLines: 'Hide Rulers',
@ -1809,15 +1804,14 @@ define([
txtScheme21: 'Verve', txtScheme21: 'Verve',
tipSlideTheme: 'Slide Theme', tipSlideTheme: 'Slide Theme',
tipSaveCoauth: 'Save your changes for the other users to see them.', tipSaveCoauth: 'Save your changes for the other users to see them.',
textInsText: 'Insert text box',
textInsTextArt: 'Insert Text Art',
textShowBegin: 'Show from Beginning', textShowBegin: 'Show from Beginning',
textShowCurrent: 'Show from Current slide', textShowCurrent: 'Show from Current slide',
textShowSettings: 'Show Settings', textShowSettings: 'Show Settings',
tipInsertEquation: 'Insert Equation', tipInsertEquation: 'Insert Equation',
textCharts: 'Charts', textCharts: 'Charts',
tipChangeChart: 'Change Chart Type', tipChangeChart: 'Change Chart Type',
capInsertText: 'Text Box', capInsertText: 'Text',
capInsertTextArt: 'Text Art',
capInsertImage: 'Picture', capInsertImage: 'Picture',
capInsertShape: 'Shape', capInsertShape: 'Shape',
capInsertTable: 'Table', capInsertTable: 'Table',

78
apps/presentationeditor/main/locale/en.json
View file

@ -63,6 +63,7 @@
"Common.Views.Comments.textComments": "Comments", "Common.Views.Comments.textComments": "Comments",
"Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Enter your comment here", "Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
"Common.Views.Comments.textHintAddComment": "Add Comment",
"Common.Views.Comments.textOpenAgain": "Open Again", "Common.Views.Comments.textOpenAgain": "Open Again",
"Common.Views.Comments.textReply": "Reply", "Common.Views.Comments.textReply": "Reply",
"Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolve": "Resolve",
@ -78,24 +79,19 @@
"Common.Views.ExternalDiagramEditor.textClose": "Close", "Common.Views.ExternalDiagramEditor.textClose": "Close",
"Common.Views.ExternalDiagramEditor.textSave": "Save & Exit", "Common.Views.ExternalDiagramEditor.textSave": "Save & Exit",
"Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor", "Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
"del_Common.Views.Header.openNewTabText": "Open in New Tab",
"del_Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
"Common.Views.Header.txtRename": "Rename",
"del_Common.Views.Header.itemBackNewTab": "Open in New Tab",
"del_Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.", "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
"Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.tipDownload": "Download file", "Common.Views.Header.tipDownload": "Download file",
"Common.Views.Header.tipPrint": "Print file",
"Common.Views.Header.tipGoEdit": "Edit current file", "Common.Views.Header.tipGoEdit": "Edit current file",
"Common.Views.Header.tipPrint": "Print file",
"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.ImageFromUrlDialog.cancelButtonText": "Cancel", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@ -109,6 +105,7 @@
"Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.", "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
"Common.Views.InsertTableDialog.txtRows": "Number of Rows", "Common.Views.InsertTableDialog.txtRows": "Number of Rows",
"Common.Views.InsertTableDialog.txtTitle": "Table Size", "Common.Views.InsertTableDialog.txtTitle": "Table Size",
"Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
"Common.Views.LanguageDialog.btnCancel": "Cancel", "Common.Views.LanguageDialog.btnCancel": "Cancel",
"Common.Views.LanguageDialog.btnOk": "Ok", "Common.Views.LanguageDialog.btnOk": "Ok",
"Common.Views.LanguageDialog.labelSelect": "Select document language", "Common.Views.LanguageDialog.labelSelect": "Select document language",
@ -185,14 +182,11 @@
"PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
"PE.Controllers.Main.savePreparingText": "Preparing to save", "PE.Controllers.Main.savePreparingText": "Preparing to save",
"PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"del_PE.Controllers.Main.saveTextText": "Saving presentation...",
"del_PE.Controllers.Main.saveTitleText": "Saving Presentation",
"PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.", "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.",
"PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.", "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.",
"PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
"PE.Controllers.Main.textAnonymous": "Anonymous", "PE.Controllers.Main.textAnonymous": "Anonymous",
"PE.Controllers.Main.textBuyNow": "Visit website", "PE.Controllers.Main.textBuyNow": "Visit website",
"del_PE.Controllers.Main.textChangesSaved": "All changes saved",
"PE.Controllers.Main.textCloseTip": "Click to close the tip", "PE.Controllers.Main.textCloseTip": "Click to close the tip",
"PE.Controllers.Main.textContactUs": "Contact sales", "PE.Controllers.Main.textContactUs": "Contact sales",
"PE.Controllers.Main.textLoadingDocument": "Loading presentation", "PE.Controllers.Main.textLoadingDocument": "Loading presentation",
@ -715,6 +709,7 @@
"PE.Views.DocumentHolder.txtBorderProps": "Border properties", "PE.Views.DocumentHolder.txtBorderProps": "Border properties",
"PE.Views.DocumentHolder.txtBottom": "Bottom", "PE.Views.DocumentHolder.txtBottom": "Bottom",
"PE.Views.DocumentHolder.txtChangeLayout": "Change Layout", "PE.Views.DocumentHolder.txtChangeLayout": "Change Layout",
"PE.Views.DocumentHolder.txtChangeTheme": "Change Theme",
"PE.Views.DocumentHolder.txtColumnAlign": "Column alignment", "PE.Views.DocumentHolder.txtColumnAlign": "Column alignment",
"PE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size", "PE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size",
"PE.Views.DocumentHolder.txtDeleteArg": "Delete argument", "PE.Views.DocumentHolder.txtDeleteArg": "Delete argument",
@ -780,12 +775,12 @@
"PE.Views.DocumentHolder.txtShowPlaceholder": "Show placeholder", "PE.Views.DocumentHolder.txtShowPlaceholder": "Show placeholder",
"PE.Views.DocumentHolder.txtShowTopLimit": "Show top limit", "PE.Views.DocumentHolder.txtShowTopLimit": "Show top limit",
"PE.Views.DocumentHolder.txtSlide": "Slide", "PE.Views.DocumentHolder.txtSlide": "Slide",
"PE.Views.DocumentHolder.txtSlideHide": "Hide Slide",
"PE.Views.DocumentHolder.txtStretchBrackets": "Stretch brackets", "PE.Views.DocumentHolder.txtStretchBrackets": "Stretch brackets",
"PE.Views.DocumentHolder.txtTop": "Top", "PE.Views.DocumentHolder.txtTop": "Top",
"PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
"PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.txtUngroup": "Ungroup",
"PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"PE.Views.DocumentHolder.txtSlideHide": "Hide Slide",
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
"PE.Views.DocumentPreview.txtClose": "Close Slideshow", "PE.Views.DocumentPreview.txtClose": "Close Slideshow",
@ -908,7 +903,6 @@
"PE.Views.LeftMenu.tipAbout": "About", "PE.Views.LeftMenu.tipAbout": "About",
"PE.Views.LeftMenu.tipChat": "Chat", "PE.Views.LeftMenu.tipChat": "Chat",
"PE.Views.LeftMenu.tipComments": "Comments", "PE.Views.LeftMenu.tipComments": "Comments",
"del_PE.Views.LeftMenu.tipFile": "File",
"PE.Views.LeftMenu.tipPlugins": "Plugins", "PE.Views.LeftMenu.tipPlugins": "Plugins",
"PE.Views.LeftMenu.tipSearch": "Search", "PE.Views.LeftMenu.tipSearch": "Search",
"PE.Views.LeftMenu.tipSlides": "Slides", "PE.Views.LeftMenu.tipSlides": "Slides",
@ -1138,18 +1132,13 @@
"PE.Views.Statusbar.tipAccessRights": "Manage document access rights", "PE.Views.Statusbar.tipAccessRights": "Manage document access rights",
"PE.Views.Statusbar.tipFitPage": "Fit to Slide", "PE.Views.Statusbar.tipFitPage": "Fit to Slide",
"PE.Views.Statusbar.tipFitWidth": "Fit to Width", "PE.Views.Statusbar.tipFitWidth": "Fit to Width",
"del_PE.Views.Statusbar.tipMoreUsers": "and %1 users.",
"PE.Views.Statusbar.tipPreview": "Start Slideshow", "PE.Views.Statusbar.tipPreview": "Start Slideshow",
"del_PE.Views.Statusbar.tipShowUsers": "To see all users click the icon below.", "PE.Views.Statusbar.tipSetDocLang": "Set Document Language",
"del_PE.Views.Statusbar.tipUsers": "Document is currently being edited by several users.", "PE.Views.Statusbar.tipSetLang": "Set Text Language",
"del_PE.Views.Statusbar.tipViewUsers": "View users and manage document access rights", "PE.Views.Statusbar.tipSetSpelling": "Spell checking",
"PE.Views.Statusbar.tipZoomFactor": "Magnification", "PE.Views.Statusbar.tipZoomFactor": "Magnification",
"PE.Views.Statusbar.tipZoomIn": "Zoom In", "PE.Views.Statusbar.tipZoomIn": "Zoom In",
"PE.Views.Statusbar.tipZoomOut": "Zoom Out", "PE.Views.Statusbar.tipZoomOut": "Zoom Out",
"PE.Views.Statusbar.tipSetLang": "Set Text Language",
"PE.Views.Statusbar.tipSetDocLang": "Set Document Language",
"PE.Views.Statusbar.tipSetSpelling": "Spell checking",
"del_PE.Views.Statusbar.txAccessRights": "Change access rights",
"PE.Views.Statusbar.txtPageNumInvalid": "Invalid slide number", "PE.Views.Statusbar.txtPageNumInvalid": "Invalid slide number",
"PE.Views.TableSettings.deleteColumnText": "Delete Column", "PE.Views.TableSettings.deleteColumnText": "Delete Column",
"PE.Views.TableSettings.deleteRowText": "Delete Row", "PE.Views.TableSettings.deleteRowText": "Delete Row",
@ -1249,6 +1238,17 @@
"PE.Views.TextArtSettings.txtNoBorders": "No Line", "PE.Views.TextArtSettings.txtNoBorders": "No Line",
"PE.Views.TextArtSettings.txtPapyrus": "Papyrus", "PE.Views.TextArtSettings.txtPapyrus": "Papyrus",
"PE.Views.TextArtSettings.txtWood": "Wood", "PE.Views.TextArtSettings.txtWood": "Wood",
"PE.Views.Toolbar.capAddSlide": "Add Slide",
"PE.Views.Toolbar.capInsertChart": "Chart",
"PE.Views.Toolbar.capInsertEquation": "Equation",
"PE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"PE.Views.Toolbar.capInsertImage": "Picture",
"PE.Views.Toolbar.capInsertShape": "Shape",
"PE.Views.Toolbar.capInsertTable": "Table",
"PE.Views.Toolbar.capInsertText": "Text Box",
"PE.Views.Toolbar.capTabFile": "File",
"PE.Views.Toolbar.capTabHome": "Home",
"PE.Views.Toolbar.capTabInsert": "Insert",
"PE.Views.Toolbar.mniCustomTable": "Insert Custom Table", "PE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
"PE.Views.Toolbar.mniImageFromFile": "Picture from File", "PE.Views.Toolbar.mniImageFromFile": "Picture from File",
"PE.Views.Toolbar.mniImageFromUrl": "Picture from URL", "PE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
@ -1272,14 +1272,14 @@
"PE.Views.Toolbar.textCancel": "Cancel", "PE.Views.Toolbar.textCancel": "Cancel",
"PE.Views.Toolbar.textCharts": "Charts", "PE.Views.Toolbar.textCharts": "Charts",
"PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textColumn": "Column",
"PE.Views.Toolbar.textCompactView": "View Compact Toolbar", "PE.Views.Toolbar.textCompactView": "Hide Toolbar",
"PE.Views.Toolbar.textFitPage": "Fit to Slide", "PE.Views.Toolbar.textFitPage": "Fit to Slide",
"PE.Views.Toolbar.textFitWidth": "Fit to Width", "PE.Views.Toolbar.textFitWidth": "Fit to Width",
"PE.Views.Toolbar.textHideLines": "Hide Rulers", "PE.Views.Toolbar.textHideLines": "Hide Rulers",
"PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar", "PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
"PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar", "PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
"PE.Views.Toolbar.textInsText": "Insert text box", "del_PE.Views.Toolbar.textInsText": "Insert text box",
"PE.Views.Toolbar.textInsTextArt": "Insert Text Art", "del_PE.Views.Toolbar.textInsTextArt": "Insert Text Art",
"PE.Views.Toolbar.textItalic": "Italic", "PE.Views.Toolbar.textItalic": "Italic",
"PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textLine": "Line",
"PE.Views.Toolbar.textNewColor": "Custom Color", "PE.Views.Toolbar.textNewColor": "Custom Color",
@ -1299,24 +1299,13 @@
"PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textStrikeout": "Strikeout",
"PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript", "PE.Views.Toolbar.textSuperscript": "Superscript",
"PE.Views.Toolbar.textSurface": "Surface",
"PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabFile": "File",
"PE.Views.Toolbar.textTabHome": "Home", "PE.Views.Toolbar.textTabHome": "Home",
"PE.Views.Toolbar.textTabInsert": "Insert", "PE.Views.Toolbar.textTabInsert": "Insert",
"PE.Views.Toolbar.textSurface": "Surface",
"PE.Views.Toolbar.textTitleError": "Error", "PE.Views.Toolbar.textTitleError": "Error",
"PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.textUnderline": "Underline",
"PE.Views.Toolbar.textZoom": "Zoom", "PE.Views.Toolbar.textZoom": "Zoom",
"PE.Views.Toolbar.capInsertText": "Text Box",
"PE.Views.Toolbar.capInsertImage": "Picture",
"PE.Views.Toolbar.capInsertShape": "Shape",
"PE.Views.Toolbar.capInsertTable": "Table",
"PE.Views.Toolbar.capInsertChart": "Chart",
"PE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"PE.Views.Toolbar.capInsertEquation": "Equation",
"PE.Views.Toolbar.capAddSlide": "Add Slide",
"PE.Views.Toolbar.capTabFile": "File",
"PE.Views.Toolbar.capTabHome": "Home",
"PE.Views.Toolbar.capTabInsert": "Insert",
"PE.Views.Toolbar.tipAddSlide": "Add Slide", "PE.Views.Toolbar.tipAddSlide": "Add Slide",
"PE.Views.Toolbar.tipAdvSettings": "Advanced Settings", "PE.Views.Toolbar.tipAdvSettings": "Advanced Settings",
"PE.Views.Toolbar.tipBack": "Back", "PE.Views.Toolbar.tipBack": "Back",
@ -1340,11 +1329,10 @@
"PE.Views.Toolbar.tipInsertShape": "Insert Autoshape", "PE.Views.Toolbar.tipInsertShape": "Insert Autoshape",
"PE.Views.Toolbar.tipInsertTable": "Insert Table", "PE.Views.Toolbar.tipInsertTable": "Insert Table",
"PE.Views.Toolbar.tipInsertText": "Insert Text", "PE.Views.Toolbar.tipInsertText": "Insert Text",
"PE.Views.Toolbar.tipInsertTextArt": "Insert Text Art",
"PE.Views.Toolbar.tipLineSpace": "Line Spacing", "PE.Views.Toolbar.tipLineSpace": "Line Spacing",
"PE.Views.Toolbar.tipMarkers": "Bullets", "PE.Views.Toolbar.tipMarkers": "Bullets",
"del_PE.Views.Toolbar.tipNewDocument": "New Presentation",
"PE.Views.Toolbar.tipNumbers": "Numbering", "PE.Views.Toolbar.tipNumbers": "Numbering",
"del_PE.Views.Toolbar.tipOpenDocument": "Open Presentation",
"PE.Views.Toolbar.tipPaste": "Paste", "PE.Views.Toolbar.tipPaste": "Paste",
"PE.Views.Toolbar.tipPreview": "Start Slideshow", "PE.Views.Toolbar.tipPreview": "Start Slideshow",
"PE.Views.Toolbar.tipPrint": "Print", "PE.Views.Toolbar.tipPrint": "Print",

2
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -101,6 +101,8 @@
.zoom { .zoom {
padding: 5px 3px; padding: 5px 3px;
float: right; float: right;
min-width: 40px;
text-align: center;
} }
} }

2
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

@ -6308,7 +6308,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%23DF6737%22%3E%3Cg%3E%3Cpolygon%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%09%22%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%09%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23DF6737%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-info { i.icon.icon-info {
width: 22px; width: 22px;

2
apps/presentationeditor/mobile/resources/css/app-material.css
View file

@ -5908,7 +5908,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%23DF6737%22%3E%3Cg%3E%3Cpolygon%20id%3D%22XMLID_3_%22%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%09%22%2F%3E%3Cpolygon%20id%3D%22XMLID_6_%22%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%09%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%23DF6737%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-info { i.icon.icon-info {
width: 22px; width: 22px;

2
apps/presentationeditor/mobile/resources/less/ios/_icons.less
View file

@ -38,7 +38,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-info { &.icon-info {
width: 22px; width: 22px;

2
apps/presentationeditor/mobile/resources/less/material/_icons.less
View file

@ -33,7 +33,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon id="XMLID_3_" points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon id="XMLID_6_" points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-info { &.icon-info {
width: 22px; width: 22px;

46
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -209,6 +209,10 @@ define([
* UI Events * UI Events
*/ */
if ( me.appConfig.isEditDiagram ) { if ( me.appConfig.isEditDiagram ) {
toolbar.btnUndo.on('click', _.bind(this.onUndo, this));
toolbar.btnRedo.on('click', _.bind(this.onRedo, this));
toolbar.btnCopy.on('click', _.bind(this.onCopyPaste, this, true));
toolbar.btnPaste.on('click', _.bind(this.onCopyPaste, this, false));
toolbar.btnInsertFormula.on('click', _.bind(this.onInsertFormulaMenu, this)); toolbar.btnInsertFormula.on('click', _.bind(this.onInsertFormulaMenu, this));
toolbar.btnInsertFormula.menu.on('item:click', _.bind(this.onInsertFormulaMenu, this)); toolbar.btnInsertFormula.menu.on('item:click', _.bind(this.onInsertFormulaMenu, this));
toolbar.btnDecDecimal.on('click', _.bind(this.onDecrement, this)); toolbar.btnDecDecimal.on('click', _.bind(this.onDecrement, this));
@ -220,6 +224,10 @@ define([
toolbar.btnEditChart.on('click', _.bind(this.onEditChart, this)); toolbar.btnEditChart.on('click', _.bind(this.onEditChart, this));
} else } else
if ( me.appConfig.isEditMailMerge ) { if ( me.appConfig.isEditMailMerge ) {
toolbar.btnUndo.on('click', _.bind(this.onUndo, this));
toolbar.btnRedo.on('click', _.bind(this.onRedo, this));
toolbar.btnCopy.on('click', _.bind(this.onCopyPaste, this, true));
toolbar.btnPaste.on('click', _.bind(this.onCopyPaste, this, false));
toolbar.btnSearch.on('click', _.bind(this.onSearch, this)); toolbar.btnSearch.on('click', _.bind(this.onSearch, this));
toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending)); toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending));
toolbar.btnSortUp.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Descending)); toolbar.btnSortUp.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Descending));
@ -264,7 +272,6 @@ define([
toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlink, this)); toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlink, this));
toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this)); toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this));
toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this));
toolbar.btnInsertText.menu.on('item:click', _.bind(this.onInsertTextClick, this));
toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this));
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending)); toolbar.btnSortDown.on('click', _.bind(this.onSortType, this, Asc.c_oAscSortOptions.Ascending));
@ -911,20 +918,6 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Add Text'); Common.component.Analytics.trackEvent('ToolBar', 'Add Text');
}, },
onInsertTextClick: function(menu, item, e) {
if (item.value === 'text') {
if (this.api)
this._addAutoshape(true, 'textRect');
this.toolbar.btnInsertText.toggle(true, true);
if (this.toolbar.btnInsertShape.pressed)
this.toolbar.btnInsertShape.toggle(false, true);
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertShape);
Common.component.Analytics.trackEvent('ToolBar', 'Add Text');
}
},
onInsertShapeHide: function(btn, e) { onInsertShapeHide: function(btn, e) {
if (this.toolbar.btnInsertShape.pressed && !this._isAddingShape) { if (this.toolbar.btnInsertShape.pressed && !this._isAddingShape) {
this.toolbar.btnInsertShape.toggle(false, true); this.toolbar.btnInsertShape.toggle(false, true);
@ -2387,11 +2380,11 @@ define([
}, },
fillTextArt: function() { fillTextArt: function() {
if (!this.toolbar.btnInsertText.rendered) return; if (!this.toolbar.btnInsertTextArt.rendered) return;
var me = this; var me = this;
if (this.toolbar.mnuTextArtPicker) { if ( this.toolbar.mnuTextArtPicker ) {
var models = this.getApplication().getCollection('Common.Collections.TextArt').models, var models = this.getApplication().getCollection('Common.Collections.TextArt').models,
count = this.toolbar.mnuTextArtPicker.store.length; count = this.toolbar.mnuTextArtPicker.store.length;
if (count>0 && count==models.length) { if (count>0 && count==models.length) {
@ -2406,25 +2399,26 @@ define([
this.toolbar.mnuTextArtPicker = new Common.UI.DataView({ this.toolbar.mnuTextArtPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-insart'), el: $('#id-toolbar-menu-insart'),
store: this.getApplication().getCollection('Common.Collections.TextArt'), store: this.getApplication().getCollection('Common.Collections.TextArt'),
parentMenu: this.toolbar.mnuInsertTextArt.menu, parentMenu: this.toolbar.btnInsertTextArt.menu,
showLast: false, showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>') itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
}); });
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) { this.toolbar.mnuTextArtPicker.on('item:click',
if (me.api) { function(picker, item, record, e) {
me.toolbar.fireEvent('inserttextart', me.toolbar); me.toolbar.fireEvent('inserttextart', me.toolbar);
me.api.asc_addTextArt(record.get('data')); me.api.asc_addTextArt(record.get('data'));
if (me.toolbar.btnInsertShape.pressed) if ( me.toolbar.btnInsertShape.pressed )
me.toolbar.btnInsertShape.toggle(false, true); me.toolbar.btnInsertShape.toggle(false, true);
if (e.type !== 'click') if ( e.type !== 'click' )
me.toolbar.btnInsertText.menu.hide(); me.toolbar.btnInsertTextArt.menu.hide();
Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertText);
Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertTextArt);
Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art'); Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art');
} }
}); );
} }
}, },
@ -2949,7 +2943,7 @@ define([
var _comments = SSE.getController('Common.Controllers.Comments').getView(); var _comments = SSE.getController('Common.Controllers.Comments').getView();
Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment);
this.btnsComment.forEach(function (btn) { this.btnsComment.forEach(function (btn) {
btn.updateHint( _comments.textAddComment ); btn.updateHint( _comments.textHintAddComment );
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells); Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells);
}); });

25
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -33,11 +33,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-copy"></span> <span class="btn-slot split" id="slot-btn-copy"></span>
<span class="btn-slot" id="slot-btn-paste"></span> <span class="btn-slot" id="slot-btn-paste"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-undo"></span> <span class="btn-slot split" id="slot-btn-undo"></span>
<span class="btn-slot" id="slot-btn-redo"></span> <span class="btn-slot" id="slot-btn-redo"></span>
</div> </div>
</div> </div>
@ -64,17 +64,17 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-top"></span> <span class="btn-slot split" id="slot-btn-top"></span>
<span class="btn-slot adding" id="slot-btn-middle"></span> <span class="btn-slot split" id="slot-btn-middle"></span>
<span class="btn-slot adding" id="slot-btn-bottom"></span> <span class="btn-slot split" id="slot-btn-bottom"></span>
<span class="btn-slot adding" id="slot-btn-wrap"></span> <span class="btn-slot split" id="slot-btn-wrap"></span>
<span class="btn-slot split" id="slot-btn-text-orient"></span> <span class="btn-slot split" id="slot-btn-text-orient"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-align-left"></span> <span class="btn-slot split" id="slot-btn-align-left"></span>
<span class="btn-slot adding" id="slot-btn-align-center"></span> <span class="btn-slot split" id="slot-btn-align-center"></span>
<span class="btn-slot adding" id="slot-btn-align-right"></span> <span class="btn-slot split" id="slot-btn-align-right"></span>
<span class="btn-slot adding" id="slot-btn-align-just"></span> <span class="btn-slot split" id="slot-btn-align-just"></span>
<span class="btn-slot split" id="slot-btn-merge"></span> <span class="btn-slot split" id="slot-btn-merge"></span>
</div> </div>
</div> </div>
@ -90,11 +90,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-sortdesc"></span> <span class="btn-slot split" id="slot-btn-sortdesc"></span>
<span class="btn-slot" id="slot-btn-sortasc"></span> <span class="btn-slot" id="slot-btn-sortasc"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-setfilter"></span> <span class="btn-slot split" id="slot-btn-setfilter"></span>
<span class="btn-slot" id="slot-btn-clear-filter"></span> <span class="btn-slot" id="slot-btn-clear-filter"></span>
</div> </div>
</div> </div>
@ -152,6 +152,7 @@
<span class="btn-slot text x-huge" id="slot-btn-insimage"></span> <span class="btn-slot text x-huge" id="slot-btn-insimage"></span>
<span class="btn-slot text x-huge" id="slot-btn-insshape"></span> <span class="btn-slot text x-huge" id="slot-btn-insshape"></span>
<span class="btn-slot text x-huge" id="slot-btn-instext"></span> <span class="btn-slot text x-huge" id="slot-btn-instext"></span>
<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
<span class="btn-slot text x-huge" id="slot-btn-inschart"></span> <span class="btn-slot text x-huge" id="slot-btn-inschart"></span>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>

12
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -547,7 +547,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -599,7 +599,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -620,7 +620,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_CShapeProperty(); var props = new Asc.asc_CShapeProperty();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -966,14 +966,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.asc_getWidth(); var w = stroke.asc_getWidth();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

2
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -571,6 +571,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
if (props ){ if (props ){
var stroke = props.asc_getStroke(); var stroke = props.asc_getStroke();
if (stroke) { if (stroke) {
this.btnsCategory[1].setDisabled(stroke.asc_getType() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
var value = stroke.asc_getLinejoin(); var value = stroke.asc_getLinejoin();
for (var i=0; i<this._arrJoinType.length; i++) { for (var i=0; i<this._arrJoinType.length; i++) {
if (value == this._arrJoinType[i].value) { if (value == this._arrJoinType[i].value) {

12
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -539,7 +539,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE);
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
} else { } else {
@ -591,7 +591,7 @@ define([
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -612,7 +612,7 @@ define([
if (this.api && this.BorderSize>0 && !this._noApply) { if (this.api && this.BorderSize>0 && !this._noApply) {
var props = new Asc.asc_TextArtProperties(); var props = new Asc.asc_TextArtProperties();
var stroke = new Asc.asc_CStroke(); var stroke = new Asc.asc_CStroke();
if (this.BorderSize<0.01) { if (this.BorderSize<0.00001) {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR);
@ -924,14 +924,14 @@ define([
if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) {
var w = stroke.asc_getWidth(); var w = stroke.asc_getWidth();
var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue()));
if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value ||
(this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) {
this._state.StrokeWidth = w; this._state.StrokeWidth = w;
if (w!==null) w = this._mm2pt(w); if (w!==null) w = this._mm2pt(w);
var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) {
if ( w<item.attributes.value+0.01 && w>item.attributes.value-0.01) { if ( w<item.attributes.value+0.00001 && w>item.attributes.value-0.00001) {
return true; return true;
} }
}); });

51
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -647,27 +647,24 @@ define([
}); });
me.btnInsertText = new Common.UI.Button({ me.btnInsertText = new Common.UI.Button({
id : 'id-toolbar-btn-inserttext', id : 'tlb-btn-inserttext',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text', iconCls : 'btn-text',
caption : me.capInsertText, caption : me.capInsertText,
lock : [_set.editCell, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], lock : [_set.editCell, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
enableToggle: true, enableToggle: true
split : true, });
me.btnInsertTextArt = new Common.UI.Button({
id : 'tlb-btn-instextart',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-textart',
caption : me.capInsertTextart,
lock : [_set.editCell, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items : [ cls: 'menu-shapes',
{caption: this.textInsText, value: 'text'}, items: [
this.mnuInsertTextArt = new Common.UI.MenuItem({ {template: _.template('<div id="id-toolbar-menu-insart" style="width: 239px; margin-left: 5px;"></div>')}
caption: this.textInsTextArt,
value: 'art',
menu: new Common.UI.Menu({
menuAlign: 'tl-tr',
cls: 'menu-shapes',
items: [
{ template: _.template('<div id="id-toolbar-menu-insart" style="width: 239px; margin-left: 5px;"></div>') }
]
})
})
] ]
}) })
}); });
@ -1205,8 +1202,8 @@ define([
me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop, me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop,
me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor,
me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation,
me.btnInsertText, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter, me.btnTableTemplate, me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter,
me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell, me.btnTableTemplate, me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell,
me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink, me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink,
me.btnInsertChart, me.btnColorSchemas, me.btnInsertChart, me.btnColorSchemas,
me.btnAutofilter, me.btnCopy, me.btnPaste, me.btnSettings, me.listStyles, me.btnPrint, me.btnShowMode, me.btnAutofilter, me.btnCopy, me.btnPaste, me.btnSettings, me.listStyles, me.btnPrint, me.btnShowMode,
@ -1215,8 +1212,8 @@ define([
var _temp_array = [me.cmbFontName, me.cmbFontSize, me.btnAlignLeft,me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust,me.btnAlignTop, var _temp_array = [me.cmbFontName, me.cmbFontSize, me.btnAlignLeft,me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust,me.btnAlignTop,
me.btnAlignMiddle, me.btnAlignBottom, me.btnHorizontalAlign, me.btnVerticalAlign, me.btnAlignMiddle, me.btnAlignBottom, me.btnHorizontalAlign, me.btnVerticalAlign,
me.btnInsertImage, me.btnInsertText, me.btnInsertShape, me.btnInsertEquation, me.btnIncFontSize, me.btnDecFontSize, me.btnInsertImage, me.btnInsertText, me.btnInsertTextArt, me.btnInsertShape, me.btnInsertEquation, me.btnIncFontSize,
me.btnBold, me.btnItalic, me.btnUnderline, me.btnTextColor, me.btnBackColor, me.btnDecFontSize, me.btnBold, me.btnItalic, me.btnUnderline, me.btnTextColor, me.btnBackColor,
me.btnInsertHyperlink, me.btnBorders, me.btnTextOrient, me.btnPercentStyle, me.btnCurrencyStyle, me.btnColorSchemas, me.btnInsertHyperlink, me.btnBorders, me.btnTextOrient, me.btnPercentStyle, me.btnCurrencyStyle, me.btnColorSchemas,
me.btnSettings, me.btnInsertFormula, me.btnNamedRange, me.btnDecDecimal, me.btnIncDecimal, me.cmbNumberFormat, me.btnWrap, me.btnSettings, me.btnInsertFormula, me.btnNamedRange, me.btnDecDecimal, me.btnIncDecimal, me.cmbNumberFormat, me.btnWrap,
me.btnInsertChart, me.btnMerge, me.btnAddCell, me.btnDeleteCell, me.btnShowMode, me.btnPrint, me.btnInsertChart, me.btnMerge, me.btnAddCell, me.btnDeleteCell, me.btnShowMode, me.btnPrint,
@ -1280,7 +1277,7 @@ define([
}); });
if ( me.isCompactView ) if ( me.isCompactView )
me.setFolded(true), me.collapse(); else me.setFolded(true); else
me.setTab('home'); me.setTab('home');
return this; return this;
@ -1328,6 +1325,7 @@ define([
_injectComponent('#slot-btn-inshyperlink', this.btnInsertHyperlink); _injectComponent('#slot-btn-inshyperlink', this.btnInsertHyperlink);
_injectComponent('#slot-btn-insshape', this.btnInsertShape); _injectComponent('#slot-btn-insshape', this.btnInsertShape);
_injectComponent('#slot-btn-instext', this.btnInsertText); _injectComponent('#slot-btn-instext', this.btnInsertText);
_injectComponent('#slot-btn-instextart', this.btnInsertTextArt);
_injectComponent('#slot-btn-insequation', this.btnInsertEquation); _injectComponent('#slot-btn-insequation', this.btnInsertEquation);
_injectComponent('#slot-btn-sortdesc', this.btnSortDown); _injectComponent('#slot-btn-sortdesc', this.btnSortDown);
_injectComponent('#slot-btn-sortasc', this.btnSortUp); _injectComponent('#slot-btn-sortasc', this.btnSortUp);
@ -1394,6 +1392,7 @@ define([
_updateHint(this.btnInsertImage, this.tipInsertImage); _updateHint(this.btnInsertImage, this.tipInsertImage);
_updateHint(this.btnInsertChart, this.tipInsertChartSpark); _updateHint(this.btnInsertChart, this.tipInsertChartSpark);
_updateHint(this.btnInsertText, this.tipInsertText); _updateHint(this.btnInsertText, this.tipInsertText);
_updateHint(this.btnInsertTextArt, this.tipInsertTextart);
_updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); _updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
_updateHint(this.btnInsertShape, this.tipInsertShape); _updateHint(this.btnInsertShape, this.tipInsertShape);
_updateHint(this.btnInsertEquation, this.tipInsertEquation); _updateHint(this.btnInsertEquation, this.tipInsertEquation);
@ -1950,6 +1949,7 @@ define([
tipIncFont: 'Increment font size', tipIncFont: 'Increment font size',
tipDecFont: 'Decrement font size', tipDecFont: 'Decrement font size',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',
tipInsertTextart: 'Insert Text Art',
tipInsertShape: 'Insert Autoshape', tipInsertShape: 'Insert Autoshape',
tipDigStylePercent: 'Percent Style', tipDigStylePercent: 'Percent Style',
// tipDigStyleCurrency:'Currency Style', // tipDigStyleCurrency:'Currency Style',
@ -1998,7 +1998,7 @@ define([
textDelLeft: 'Shift Cells Left', textDelLeft: 'Shift Cells Left',
textDelUp: 'Shift Cells Up', textDelUp: 'Shift Cells Up',
textZoom: 'Zoom', textZoom: 'Zoom',
textCompactToolbar: 'Compact Toolbar', textCompactToolbar: 'Hide Toolbar',
textHideTBar: 'Hide Title Bar', textHideTBar: 'Hide Title Bar',
textHideFBar: 'Hide Formula Bar', textHideFBar: 'Hide Formula Bar',
textHideHeadings: 'Hide Headings', textHideHeadings: 'Hide Headings',
@ -2032,8 +2032,6 @@ define([
txtNewRange: 'Define Name', txtNewRange: 'Define Name',
txtManageRange: 'Name manager', txtManageRange: 'Name manager',
txtPasteRange: 'Paste name', txtPasteRange: 'Paste name',
textInsText: 'Insert text box',
textInsTextArt: 'Insert Text Art',
textInsCharts: 'Charts', textInsCharts: 'Charts',
textLine: 'Line', textLine: 'Line',
textColumn: 'Column', textColumn: 'Column',
@ -2050,7 +2048,8 @@ define([
textSparks: 'Sparklines', textSparks: 'Sparklines',
tipInsertChartSpark: 'Insert Chart or Sparkline', tipInsertChartSpark: 'Insert Chart or Sparkline',
textMoreFormats: 'More formats', textMoreFormats: 'More formats',
capInsertText: 'Text Box', capInsertText: 'Text',
capInsertTextart: 'Text Art',
capInsertImage: 'Picture', capInsertImage: 'Picture',
capInsertShape: 'Shape', capInsertShape: 'Shape',
capInsertChart: 'Chart', capInsertChart: 'Chart',

51
apps/spreadsheeteditor/main/locale/en.json
View file

@ -60,6 +60,7 @@
"Common.Views.Comments.textComments": "Comments", "Common.Views.Comments.textComments": "Comments",
"Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Enter your comment here", "Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
"Common.Views.Comments.textHintAddComment": "Add Comment",
"Common.Views.Comments.textOpenAgain": "Open Again", "Common.Views.Comments.textOpenAgain": "Open Again",
"Common.Views.Comments.textReply": "Reply", "Common.Views.Comments.textReply": "Reply",
"Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolve": "Resolve",
@ -72,20 +73,19 @@
"Common.Views.CopyWarningDialog.textToPaste": "for Paste", "Common.Views.CopyWarningDialog.textToPaste": "for Paste",
"Common.Views.DocumentAccessDialog.textLoading": "Loading...", "Common.Views.DocumentAccessDialog.textLoading": "Loading...",
"Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings", "Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings",
"del_Common.Views.Header.openNewTabText": "Open in New Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.", "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
"Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
"Common.Views.Header.tipDownload": "Download file", "Common.Views.Header.tipDownload": "Download file",
"Common.Views.Header.tipPrint": "Print file",
"Common.Views.Header.tipGoEdit": "Edit current file", "Common.Views.Header.tipGoEdit": "Edit current file",
"Common.Views.Header.tipPrint": "Print file",
"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.ImageFromUrlDialog.cancelButtonText": "Cancel", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@ -1476,18 +1476,14 @@
"SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color",
"SSE.Views.Statusbar.textNoColor": "No Color", "SSE.Views.Statusbar.textNoColor": "No Color",
"SSE.Views.Statusbar.textSum": "SUM", "SSE.Views.Statusbar.textSum": "SUM",
"del_SSE.Views.Statusbar.tipAccessRights": "Manage document access rights",
"SSE.Views.Statusbar.tipAddTab": "Add worksheet", "SSE.Views.Statusbar.tipAddTab": "Add worksheet",
"SSE.Views.Statusbar.tipFirst": "Scroll to First Sheet", "SSE.Views.Statusbar.tipFirst": "Scroll to First Sheet",
"SSE.Views.Statusbar.tipLast": "Scroll to Last Sheet", "SSE.Views.Statusbar.tipLast": "Scroll to Last Sheet",
"SSE.Views.Statusbar.tipNext": "Scroll Sheet List Right", "SSE.Views.Statusbar.tipNext": "Scroll Sheet List Right",
"SSE.Views.Statusbar.tipPrev": "Scroll Sheet List Left", "SSE.Views.Statusbar.tipPrev": "Scroll Sheet List Left",
"del_SSE.Views.Statusbar.tipUsers": "Document is currently being edited by several users.",
"del_SSE.Views.Statusbar.tipViewUsers": "View users and manage document access rights",
"SSE.Views.Statusbar.tipZoomFactor": "Magnification", "SSE.Views.Statusbar.tipZoomFactor": "Magnification",
"SSE.Views.Statusbar.tipZoomIn": "Zoom In", "SSE.Views.Statusbar.tipZoomIn": "Zoom In",
"SSE.Views.Statusbar.tipZoomOut": "Zoom Out", "SSE.Views.Statusbar.tipZoomOut": "Zoom Out",
"del_SSE.Views.Statusbar.txAccessRights": "Change access rights",
"SSE.Views.Statusbar.zoomText": "Zoom {0}%", "SSE.Views.Statusbar.zoomText": "Zoom {0}%",
"SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.", "SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.<br>Select a uniform data range different from the existing one and try again.",
"SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.", "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.",
@ -1582,6 +1578,13 @@
"SSE.Views.TextArtSettings.txtNoBorders": "No Line", "SSE.Views.TextArtSettings.txtNoBorders": "No Line",
"SSE.Views.TextArtSettings.txtPapyrus": "Papyrus", "SSE.Views.TextArtSettings.txtPapyrus": "Papyrus",
"SSE.Views.TextArtSettings.txtWood": "Wood", "SSE.Views.TextArtSettings.txtWood": "Wood",
"SSE.Views.Toolbar.capInsertChart": "Chart",
"SSE.Views.Toolbar.capInsertEquation": "Equation",
"SSE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"SSE.Views.Toolbar.capInsertImage": "Picture",
"SSE.Views.Toolbar.capInsertShape": "Shape",
"SSE.Views.Toolbar.capInsertTable": "Table",
"SSE.Views.Toolbar.capInsertText": "Text Box",
"SSE.Views.Toolbar.mniImageFromFile": "Picture from File", "SSE.Views.Toolbar.mniImageFromFile": "Picture from File",
"SSE.Views.Toolbar.mniImageFromUrl": "Picture from URL", "SSE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
"SSE.Views.Toolbar.textAlignBottom": "Align Bottom", "SSE.Views.Toolbar.textAlignBottom": "Align Bottom",
@ -1603,7 +1606,7 @@
"SSE.Views.Toolbar.textClockwise": "Angle Clockwise", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise",
"SSE.Views.Toolbar.textColumn": "Column", "SSE.Views.Toolbar.textColumn": "Column",
"SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textColumnSpark": "Column",
"SSE.Views.Toolbar.textCompactToolbar": "View Compact Toolbar", "SSE.Views.Toolbar.textCompactToolbar": "Hide Toolbar",
"SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise",
"SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left",
"SSE.Views.Toolbar.textDelUp": "Shift Cells Up", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up",
@ -1620,8 +1623,8 @@
"SSE.Views.Toolbar.textInsDown": "Shift Cells Down", "SSE.Views.Toolbar.textInsDown": "Shift Cells Down",
"SSE.Views.Toolbar.textInsideBorders": "Inside Borders", "SSE.Views.Toolbar.textInsideBorders": "Inside Borders",
"SSE.Views.Toolbar.textInsRight": "Shift Cells Right", "SSE.Views.Toolbar.textInsRight": "Shift Cells Right",
"SSE.Views.Toolbar.textInsText": "Insert text box", "del_SSE.Views.Toolbar.textInsText": "Insert text box",
"SSE.Views.Toolbar.textInsTextArt": "Insert Text Art", "del_SSE.Views.Toolbar.textInsTextArt": "Insert Text Art",
"SSE.Views.Toolbar.textItalic": "Italic", "SSE.Views.Toolbar.textItalic": "Italic",
"SSE.Views.Toolbar.textLeftBorders": "Left Borders", "SSE.Views.Toolbar.textLeftBorders": "Left Borders",
"SSE.Views.Toolbar.textLine": "Line", "SSE.Views.Toolbar.textLine": "Line",
@ -1640,10 +1643,10 @@
"SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up",
"SSE.Views.Toolbar.textSparks": "Sparklines", "SSE.Views.Toolbar.textSparks": "Sparklines",
"SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStock": "Stock",
"SSE.Views.Toolbar.textSurface": "Surface",
"SSE.Views.Toolbar.textTabFile": "File", "SSE.Views.Toolbar.textTabFile": "File",
"SSE.Views.Toolbar.textTabHome": "Home", "SSE.Views.Toolbar.textTabHome": "Home",
"SSE.Views.Toolbar.textTabInsert": "Insert", "SSE.Views.Toolbar.textTabInsert": "Insert",
"SSE.Views.Toolbar.textSurface": "Surface",
"SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textTopBorders": "Top Borders",
"SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textUnderline": "Underline",
"SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss",
@ -1685,10 +1688,9 @@
"SSE.Views.Toolbar.tipInsertOpt": "Insert Cells", "SSE.Views.Toolbar.tipInsertOpt": "Insert Cells",
"SSE.Views.Toolbar.tipInsertShape": "Insert Autoshape", "SSE.Views.Toolbar.tipInsertShape": "Insert Autoshape",
"SSE.Views.Toolbar.tipInsertText": "Insert Text", "SSE.Views.Toolbar.tipInsertText": "Insert Text",
"SSE.Views.Toolbar.tipInsertTextart": "Insert Text Art",
"SSE.Views.Toolbar.tipMerge": "Merge", "SSE.Views.Toolbar.tipMerge": "Merge",
"del_SSE.Views.Toolbar.tipNewDocument": "New Document",
"SSE.Views.Toolbar.tipNumFormat": "Number Format", "SSE.Views.Toolbar.tipNumFormat": "Number Format",
"del_SSE.Views.Toolbar.tipOpenDocument": "Open Document",
"SSE.Views.Toolbar.tipPaste": "Paste", "SSE.Views.Toolbar.tipPaste": "Paste",
"SSE.Views.Toolbar.tipPrColor": "Background Color", "SSE.Views.Toolbar.tipPrColor": "Background Color",
"SSE.Views.Toolbar.tipPrint": "Print", "SSE.Views.Toolbar.tipPrint": "Print",
@ -1769,13 +1771,6 @@
"SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtTime": "Time",
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
"SSE.Views.Toolbar.txtYen": "¥ Yen", "SSE.Views.Toolbar.txtYen": "¥ Yen",
"SSE.Views.Toolbar.capInsertText": "Text Box",
"SSE.Views.Toolbar.capInsertImage": "Picture",
"SSE.Views.Toolbar.capInsertShape": "Shape",
"SSE.Views.Toolbar.capInsertTable": "Table",
"SSE.Views.Toolbar.capInsertChart": "Chart",
"SSE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"SSE.Views.Toolbar.capInsertEquation": "Equation",
"SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel", "SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel",
"SSE.Views.Top10FilterDialog.okButtonText": "OK", "SSE.Views.Top10FilterDialog.okButtonText": "OK",
"SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.textType": "Show",

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -89,6 +89,8 @@
.zoom { .zoom {
padding: 5px 3px; padding: 5px 3px;
float: right; float: right;
min-width: 40px;
text-align: center;
} }
} }

2
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -6267,7 +6267,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%234F9E4F%22%3E%3Cg%3E%3Cpolygon%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%09%22%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%09%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%234F9E4F%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-info { i.icon.icon-info {
width: 22px; width: 22px;

2
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -5943,7 +5943,7 @@ i.icon.icon-reader {
i.icon.icon-download { i.icon.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%22-1%203%2022%2028%22%20fill%3D%22%234F9E4F%22%3E%3Cg%3E%3Cpolygon%20id%3D%22XMLID_3_%22%20points%3D%2210%2C5.6%2010%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%20%09%22%2F%3E%3Cpolygon%20id%3D%22XMLID_6_%22%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%09%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-1%203%2022%2028%22%20y%3D%220px%22%20x%3D%220px%22%20fill%3D%22%234F9E4F%22%3E%3Cg%3E%3Cpolygon%20transform%3D%22rotate(180%2C10.5%2C12.4)%22%20points%3D%2210%2C21.2%2011%2C21.2%2011%2C5.6%2014.6%2C9.3%2015.3%2C8.5%2010.5%2C3.6%205.7%2C8.5%206.4%2C9.3%2010%2C5.6%20%22%20%2F%3E%3Cpolygon%20points%3D%2213%2C12%2013%2C13%2019%2C13%2019%2C30%202%2C30%202%2C13%208%2C13%208%2C12%201%2C12%201%2C13%201%2C30%201%2C31%2020%2C31%2020%2C30%2020%2C13%2020%2C12%20%20%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
} }
i.icon.icon-info { i.icon.icon-info {
width: 22px; width: 22px;

2
apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
View file

@ -28,7 +28,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-info { &.icon-info {
width: 22px; width: 22px;

2
apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
View file

@ -28,7 +28,7 @@ i.icon {
&.icon-download { &.icon-download {
width: 22px; width: 22px;
height: 28px; height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-1 3 22 28" fill="@{themeColor}"><g><polygon id="XMLID_3_" points="10,5.6 10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 "/><polygon id="XMLID_6_" points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 "/></g></svg>'); .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-1 3 22 28" y="0px" x="0px" fill="@{themeColor}"><g><polygon transform="rotate(180,10.5,12.4)" points="10,21.2 11,21.2 11,5.6 14.6,9.3 15.3,8.5 10.5,3.6 5.7,8.5 6.4,9.3 10,5.6 " /><polygon points="13,12 13,13 19,13 19,30 2,30 2,13 8,13 8,12 1,12 1,13 1,30 1,31 20,31 20,30 20,13 20,12 " /></g></svg>');
} }
&.icon-info { &.icon-info {
width: 22px; width: 22px;