Merge branch 'develop' into feature/de-controls
This commit is contained in:
Julia Radzhabova
commit
01ff598622
|
|
@ -798,7 +798,8 @@
|
|||
iframe.allowFullscreen = true;
|
||||
iframe.setAttribute("allowfullscreen",""); // for IE11
|
||||
iframe.setAttribute("onmousewheel",""); // for Safari on Mac
|
||||
|
||||
iframe.setAttribute("allow", "autoplay");
|
||||
|
||||
if (config.type == "mobile")
|
||||
{
|
||||
iframe.style.position = "fixed";
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ define([
|
|||
var me = this,
|
||||
length = me.bar.tabs.length,
|
||||
barBounds = me.bar.$bar.get(0).getBoundingClientRect();
|
||||
me.leftBorder = barBounds.left;
|
||||
me.rightBorder = barBounds.right;
|
||||
|
||||
if (barBounds) {
|
||||
me.bounds = [];
|
||||
|
|
@ -324,19 +326,30 @@ define([
|
|||
function dragMove (event) {
|
||||
if (!_.isUndefined(me.drag)) {
|
||||
me.drag.moveX = event.clientX*Common.Utils.zoom();
|
||||
if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
|
||||
if (me.drag.moveX < me.leftBorder) {
|
||||
me.scrollLeft -= 20;
|
||||
me.bar.$bar.scrollLeft(me.scrollLeft);
|
||||
me.calculateBounds();
|
||||
} else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
|
||||
var name = $(event.target).parent().data('label'),
|
||||
currentTab = _.findIndex(bar.tabs, {label: name});
|
||||
if (currentTab !== -1 && (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft)) {
|
||||
if (currentTab === -1) {
|
||||
bar.$el.find('li.mousemove').removeClass('mousemove right');
|
||||
me.drag.place = undefined;
|
||||
} else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) {
|
||||
me.drag.place = currentTab;
|
||||
$(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
|
||||
$(event.target).parent().addClass('mousemove');
|
||||
}
|
||||
} else if ((me.drag.moveX > me.lastTabRight - me.scrollLeft) && (me.tabBarRight >= me.lastTabRight - me.scrollLeft)) { //move to end of list, right border of the right tab is visible
|
||||
} else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible
|
||||
bar.$el.find('li.mousemove').removeClass('mousemove right');
|
||||
bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right');
|
||||
me.drag.place = bar.tabs.length;
|
||||
}
|
||||
} else if (me.drag.moveX - me.rightBorder > 3) {
|
||||
me.scrollLeft += 20;
|
||||
me.bar.$bar.scrollLeft(me.scrollLeft);
|
||||
me.calculateBounds();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) {
|
||||
|
|
|
|||
|
|
@ -348,20 +348,11 @@ define([
|
|||
maxwidth = (this.initConfig.maxwidth) ? this.initConfig.maxwidth : main_width,
|
||||
maxheight = (this.initConfig.maxheight) ? this.initConfig.maxheight : main_height;
|
||||
|
||||
if (this.resizing.type[0]>0) {
|
||||
this.resizing.maxx = Math.min(main_width, left+maxwidth);
|
||||
this.resizing.minx = left+this.initConfig.minwidth;
|
||||
} else if (this.resizing.type[0]<0) {
|
||||
this.resizing.maxx = left+this.resizing.initw-this.initConfig.minwidth;
|
||||
this.resizing.minx = Math.max(0, left+this.resizing.initw-maxwidth);
|
||||
}
|
||||
if (this.resizing.type[1]>0) {
|
||||
this.resizing.maxy = Math.min(main_height, top+maxheight);
|
||||
this.resizing.miny = top+this.initConfig.minheight;
|
||||
} else if (this.resizing.type[1]<0) {
|
||||
this.resizing.maxy = top+this.resizing.inith-this.initConfig.minheight;
|
||||
this.resizing.miny = Math.max(0, top+this.resizing.inith-maxheight);
|
||||
}
|
||||
this.resizing.minw = this.initConfig.minwidth;
|
||||
this.resizing.maxw = (this.resizing.type[0]>0) ? Math.min(main_width-left, maxwidth) : Math.min(left+this.resizing.initw, maxwidth);
|
||||
|
||||
this.resizing.minh = this.initConfig.minheight;
|
||||
this.resizing.maxh = (this.resizing.type[1]>0) ? Math.min(main_height-top, maxheight) : Math.min(top+this.resizing.inith, maxheight);
|
||||
|
||||
$(document.body).css('cursor', el.css('cursor'));
|
||||
this.$window.find('.resize-border').addClass('resizing');
|
||||
|
|
@ -378,16 +369,34 @@ define([
|
|||
zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1,
|
||||
pageX = event.pageX*zoom,
|
||||
pageY = event.pageY*zoom;
|
||||
if (this.resizing.type[0] && pageX<this.resizing.maxx && pageX>this.resizing.minx) {
|
||||
if (this.resizing.type[0]) {
|
||||
var new_width = this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0];
|
||||
if (new_width>this.resizing.maxw) {
|
||||
pageX = pageX - (new_width-this.resizing.maxw) * this.resizing.type[0];
|
||||
new_width = this.resizing.maxw;
|
||||
} else if (new_width<this.resizing.minw) {
|
||||
pageX = pageX - (new_width-this.resizing.minw) * this.resizing.type[0];
|
||||
new_width = this.resizing.minw;
|
||||
}
|
||||
|
||||
if (this.resizing.type[0]<0)
|
||||
this.$window.css({left: pageX - this.resizing.initx});
|
||||
this.setWidth(this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0]);
|
||||
this.setWidth(new_width);
|
||||
resized = true;
|
||||
}
|
||||
if (this.resizing.type[1] && pageY<this.resizing.maxy && pageY>this.resizing.miny) {
|
||||
if (this.resizing.type[1]) {
|
||||
var new_height = this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1];
|
||||
if (new_height>this.resizing.maxh) {
|
||||
pageY = pageY - (new_height-this.resizing.maxh) * this.resizing.type[1];
|
||||
new_height = this.resizing.maxh;
|
||||
} else if (new_height<this.resizing.minh) {
|
||||
pageY = pageY - (new_height-this.resizing.minh) * this.resizing.type[1];
|
||||
new_height = this.resizing.minh;
|
||||
}
|
||||
|
||||
if (this.resizing.type[1]<0)
|
||||
this.$window.css({top: pageY - this.resizing.inity});
|
||||
this.setHeight(this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1]);
|
||||
this.setHeight(new_height);
|
||||
resized = true;
|
||||
}
|
||||
if (resized) this.fireEvent('resizing');
|
||||
|
|
|
|||
|
|
@ -821,6 +821,7 @@ define([
|
|||
}
|
||||
},
|
||||
onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
|
||||
var apihint = hint;
|
||||
var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
|
||||
|
||||
if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
|
||||
|
|
@ -886,7 +887,7 @@ define([
|
|||
this.animate = false;
|
||||
}
|
||||
|
||||
this.isSelectedComment = !hint || !this.hintmode;
|
||||
this.isSelectedComment = !apihint || !this.hintmode;
|
||||
this.uids = _.clone(uids);
|
||||
|
||||
comments.push(comment);
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ define([
|
|||
if (historyStore && data!==null) {
|
||||
var rev, revisions = historyStore.findRevisions(data.version),
|
||||
urlGetTime = new Date();
|
||||
var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
|
||||
var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
|
||||
url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url,
|
||||
docId = opts.data.key ? opts.data.key : this.currentDocId,
|
||||
docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev,
|
||||
|
|
|
|||
1335
apps/common/main/lib/util/character.js
Normal file
1335
apps/common/main/lib/util/character.js
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -39,6 +39,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
if (Common === undefined)
|
||||
var Common = {};
|
||||
|
||||
define([
|
||||
'common/main/lib/component/Window',
|
||||
'common/main/lib/component/MetricSpinner',
|
||||
|
|
@ -46,7 +49,7 @@ define([
|
|||
'common/main/lib/component/ColorButton'
|
||||
], function () { 'use strict';
|
||||
|
||||
PE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
|
||||
Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
|
||||
options: {
|
||||
type: 0, // 0 - markers, 1 - numbers
|
||||
width: 230,
|
||||
|
|
@ -97,7 +100,7 @@ define([
|
|||
this.spnSize = new Common.UI.MetricSpinner({
|
||||
el : $window.find('#id-dlg-list-size'),
|
||||
step : 1,
|
||||
width : 45,
|
||||
width : 53,
|
||||
value : 100,
|
||||
defaultUnit : '',
|
||||
maxValue : 400,
|
||||
|
|
@ -110,7 +113,7 @@ define([
|
|||
});
|
||||
|
||||
this.btnColor = new Common.UI.ColorButton({
|
||||
style: "width:45px;",
|
||||
style: "width:53px;",
|
||||
menu : new Common.UI.Menu({
|
||||
additionalAlign: this.menuAddAlign,
|
||||
items: [
|
||||
|
|
@ -148,7 +151,7 @@ define([
|
|||
this.spnStart = new Common.UI.MetricSpinner({
|
||||
el : $window.find('#id-dlg-list-start'),
|
||||
step : 1,
|
||||
width : 45,
|
||||
width : 53,
|
||||
value : 1,
|
||||
defaultUnit : '',
|
||||
maxValue : 32767,
|
||||
|
|
@ -235,5 +238,5 @@ define([
|
|||
txtOfText: '% of text',
|
||||
textNewColor: 'Add New Custom Color',
|
||||
txtStart: 'Start at'
|
||||
}, PE.Views.ListSettingsDialog || {}))
|
||||
}, Common.Views.ListSettingsDialog || {}))
|
||||
});
|
||||
1333
apps/common/main/lib/view/SymbolTableDialog.js
Normal file
1333
apps/common/main/lib/view/SymbolTableDialog.js
Normal file
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 9.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 53 KiB |
54
apps/common/main/resources/less/symboltable.less
Normal file
54
apps/common/main/resources/less/symboltable.less
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
#symbol-table-scrollable-div, #symbol-table-recent {
|
||||
div{
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.cell{
|
||||
width: 31px;
|
||||
height: 33px;
|
||||
border-right: 1px solid @gray-soft;
|
||||
border-bottom: 1px solid @gray-soft;
|
||||
background: #ffffff;
|
||||
align-content: center;
|
||||
vertical-align: middle;
|
||||
text-align: center;
|
||||
font-size: 22px;
|
||||
-khtml-user-select: none;
|
||||
user-select: none;
|
||||
-moz-user-select: none;
|
||||
-webkit-user-select: none;
|
||||
cursor: default;
|
||||
overflow:hidden;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.cell-selected{
|
||||
background-color: @gray-darker;
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
|
||||
#symbol-table-recent {
|
||||
width: 100%;
|
||||
height: 32px;
|
||||
overflow: hidden;
|
||||
border: @gray-soft solid 1px;
|
||||
}
|
||||
|
||||
#symbol-table-scrollable-div {
|
||||
#id-preview {
|
||||
width: 100%;
|
||||
height: 132px;
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
border: @gray-soft solid 1px;
|
||||
}
|
||||
|
||||
#id-preview-data {
|
||||
width: 100%;
|
||||
height: 132px;
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
}
|
||||
}
|
||||
|
|
@ -533,6 +533,7 @@
|
|||
.button-normal-icon(btn-caption, 76, @toolbar-big-icon-size);
|
||||
.button-normal-icon(btn-calculation, 80, @toolbar-big-icon-size);
|
||||
.button-normal-icon(btn-scale, 81, @toolbar-big-icon-size);
|
||||
.button-normal-icon(btn-symbol, 84, @toolbar-big-icon-size);
|
||||
|
||||
[applang=ru] {
|
||||
.btn-toolbar {
|
||||
|
|
|
|||
275
apps/common/main/resources/symboltable/ru.json
Normal file
275
apps/common/main/resources/symboltable/ru.json
Normal file
|
|
@ -0,0 +1,275 @@
|
|||
{
|
||||
"Basic Latin": "Основная латиница",
|
||||
"Latin 1 Supplement": "Дополнительная латиница-1",
|
||||
"Latin Extended A": "Расширенная латиница-A",
|
||||
"Latin Extended B": "Расширенная латиница-B",
|
||||
"IPA Extensions": "Международный фонетический алфавит",
|
||||
"Spacing Modifier Letters": "Некомбинируемые протяжённые символы-модификаторы",
|
||||
"Combining Diacritical Marks": "Комбинируемые диакритические знаки",
|
||||
"Greek and Coptic": "Греческий и коптский алфавиты",
|
||||
"Cyrillic": "Кириллица",
|
||||
"Cyrillic Supplement": "Кириллица. Дополнительные символы",
|
||||
"Armenian": "Армянский алфавит",
|
||||
"Hebrew": "Иврит",
|
||||
"Arabic": "Арабский",
|
||||
"Syriac": "Сирийский",
|
||||
"Arabic Supplement": "Дополнительные символы арабского письма",
|
||||
"Thaana": "Тана",
|
||||
"NKo": "Нко",
|
||||
"Samaritan": "Самаритянское письмо",
|
||||
"Mandaic": "Мандейский алфавит",
|
||||
"Arabic Extended A": "Расширенный набор символов арабского письма-A",
|
||||
"Devanagari": "Деванагари",
|
||||
"Bengali": "Бенгальский",
|
||||
"Gurmukhi": "Гурмукхи",
|
||||
"Gujarati": "Гуджарати",
|
||||
"Oriya": "Ория",
|
||||
"Tamil": "Тамильская письменность",
|
||||
"Telugu": "Телугу",
|
||||
"Kannada": "Каннада",
|
||||
"Malayalam": "Малаялам",
|
||||
"Sinhala": "Сингальская письменность",
|
||||
"Thai": "Тайская письменность",
|
||||
"Lao": "Лаосская письменность",
|
||||
"Tibetan": "Тибетская письменность",
|
||||
"Myanmar": "Бирманский",
|
||||
"Georgian": "Грузинский",
|
||||
"Hangul Jamo": "Хангыль чамо",
|
||||
"Ethiopic": "Эфиопская слоговая письменность",
|
||||
"Ethiopic Supplement": "Дополнительные символы эфиопской письменности",
|
||||
"Cherokee": "Письменность чероки",
|
||||
"Unified Canadian Aboriginal Syllabics": "Канадское слоговое письмо",
|
||||
"Ogham": "Огамическое письмо",
|
||||
"Runic": "Руническая письменность",
|
||||
"Tagalog": "Тагальская письменность. Байбайин",
|
||||
"Hanunoo": "Хануноо",
|
||||
"Buhid": "Бухид",
|
||||
"Tagbanwa": "Тагбанва",
|
||||
"Khmer": "Кхмерская письменность",
|
||||
"Mongolian": "Старомонгольская письменность",
|
||||
"Unified Canadian Aboriginal Syllabics Extended": "Расширенный набор символов канадского слогового письма",
|
||||
"Limbu": "Письменность лимбу",
|
||||
"Tai Le": "Письменность тай лы",
|
||||
"New Tai Lue": "Новый алфавит тай лы",
|
||||
"Khmer Symbols": "Кхмерские символы",
|
||||
"Buginese": "Бугийская письменность. Лонтара",
|
||||
"Tai Tham": "Тай Тхам",
|
||||
"Combining Diacritical Marks Extended": "Комбинируемые диакритические знаки (расширение)",
|
||||
"Balinese": "Балийское письмо",
|
||||
"Sundanese": "Сунданское письмо",
|
||||
"Batak": "Батакское письмо",
|
||||
"Lepcha": "Письмо лепча",
|
||||
"Ol Chiki": "Письменность Ол-чики",
|
||||
"Cyrillic Extended C": "Расширенная кириллица C",
|
||||
"Sundanese Supplement": "Сунданское расширенное письмо",
|
||||
"Vedic Extensions": "Ведические символы",
|
||||
"Phonetic Extensions": "Фонетические расширения",
|
||||
"Phonetic Extensions Supplement": "Дополнительные фонетические расширения",
|
||||
"Combining Diacritical Marks Supplement": "Дополнительные комбинируемые диакритические знаки",
|
||||
"Latin Extended Additional": "Дополнительная расширенная латиница",
|
||||
"Greek Extended": "Расширенный набор символов греческого алфавита",
|
||||
"General Punctuation": "Знаки пунктуации",
|
||||
"Superscripts and Subscripts": "Надстрочные и подстрочные знаки",
|
||||
"Currency Symbols": "Символы валют",
|
||||
"Combining Diacritical Marks for Symbols": "Комбинируемые диакритические знаки для символов",
|
||||
"Letterlike Symbols": "Буквоподобные символы",
|
||||
"Number Forms": "Числовые формы",
|
||||
"Arrows": "Стрелки",
|
||||
"Mathematical Operators": "Математические операторы",
|
||||
"Miscellaneous Technical": "Разнообразные технические символы",
|
||||
"Control Pictures": "Значки управляющих кодов",
|
||||
"Optical Character Recognition": "Символы оптического распознавания",
|
||||
"Enclosed Alphanumerics": "Вложенные буквы и цифры",
|
||||
"Box Drawing": "Символы для рисования рамок",
|
||||
"Block Elements": "Символы заполнения",
|
||||
"Geometric Shapes": "Геометрические фигуры",
|
||||
"Miscellaneous Symbols": "Разнообразные символы",
|
||||
"Dingbats": "Дингбаты",
|
||||
"Miscellaneous Mathematical Symbols A": "Разнообразные математические символы-A",
|
||||
"Supplemental Arrows A": "Дополнительные стрелки-A",
|
||||
"Braille Patterns": "Азбука Брайля",
|
||||
"Supplemental Arrows B": "Дополнительные стрелки-B",
|
||||
"Miscellaneous Mathematical Symbols B": "Разнообразные математические символы-B",
|
||||
"Supplemental Mathematical Operators": "Дополнительные математические операторы",
|
||||
"Miscellaneous Symbols and Arrows": "Разнообразные символы и стрелки",
|
||||
"Glagolitic": "Глаголица",
|
||||
"Latin Extended C": "Расширенная латиница C",
|
||||
"Coptic": "Коптский алфавит",
|
||||
"Georgian Supplement": "Дополнительные символы грузинского алфавита",
|
||||
"Tifinagh": "Тифинаг (Древнеливийское письмо)",
|
||||
"Ethiopic Extended": "Расширенный набор символов эфиопского письма",
|
||||
"Cyrillic Extended A": "Расширенная кириллица A",
|
||||
"Supplemental Punctuation": "Дополнительные знаки пунктуации",
|
||||
"CJK Radicals Supplement": "Дополнительные иероглифические ключи ККЯ",
|
||||
"Kangxi Radicals": "Иероглифические ключи словаря Канси",
|
||||
"Ideographic Description Characters": "Символы описания иероглифов",
|
||||
"CJK Symbols and Punctuation": "Символы и пунктуация ККЯ",
|
||||
"Hiragana": "Хирагана",
|
||||
"Katakana": "Катакана",
|
||||
"Bopomofo": "Чжуинь. Бопомофо",
|
||||
"Hangul Compatibility Jamo": "Комбинируемые чамо Хангыля",
|
||||
"Kanbun": "Канбун(китайский)",
|
||||
"Bopomofo Extended": "Расширенный набор символов бопомофо, чжуинь",
|
||||
"CJK Strokes": "Черты ККЯ",
|
||||
"Katakana Phonetic Extensions": "Фонетические расширения катаканы",
|
||||
"Enclosed CJK Letters and Months": "Вложенные буквы и месяцы ККЯ",
|
||||
"CJK Compatibility": "Знаки совместимости ККЯ",
|
||||
"CJK Unified Ideographs Extension": "Унифицированные иероглифы ККЯ. Расширение А",
|
||||
"Yijing Hexagram Symbols": "Гексаграммы И-Цзин",
|
||||
"CJK Unified Ideographs": "Унифицированные иероглифы ККЯ",
|
||||
"Yi Syllables": "Слоги. Письмо И",
|
||||
"Yi Radicals": "Радикалы. Письмо И",
|
||||
"Lisu": "Лису",
|
||||
"Vai": "Слоговая письменность ваи",
|
||||
"Cyrillic Extended B": "Расширенная кириллица-B",
|
||||
"Bamum": "Письмо бамум",
|
||||
"Modifier Tone Letters": "Символы изменения тона",
|
||||
"Latin Extended D": "Расширенная латиница-D",
|
||||
"Syloti Nagri": "Силоти нагри",
|
||||
"Common Indic Number Forms": "Индийские числовые символы",
|
||||
"Phags pa": "Квадратное письмо Пагба-ламы",
|
||||
"Saurashtra": "Саураштра",
|
||||
"Devanagari Extended": "Расширенный набор символов деванагари",
|
||||
"Kayah Li": "Кайях Ли",
|
||||
"Rejang": "Реджанг",
|
||||
"Hangul Jamo Extended A": "Хангыль",
|
||||
"Javanese": "Яванская письменность",
|
||||
"Myanmar Extended B": "Расширенный бирманский-B",
|
||||
"Cham": "Чамское письмо",
|
||||
"Myanmar Extended A": "Мьянманская письменность. Расширение A",
|
||||
"Tai Viet": "Письменность Тай Вьет",
|
||||
"Meetei Mayek Extensions": "Мейтей расширенная",
|
||||
"Ethiopic Extended A": "Набор расширенных символов эфиопского письма-А",
|
||||
"Latin Extended E": "Расширенная латиница-E",
|
||||
"Cherokee Supplement": "Письменность чероки (дополнение)",
|
||||
"Meetei Mayek": "Мейтей (Манипури)",
|
||||
"Hangul Syllables": "Слоги Хангыля",
|
||||
"Hangul Jamo Extended B": "Расширенные хангыль чамо B",
|
||||
"High Surrogates": "Верхняя часть суррогатных пар",
|
||||
"High Private Use Surrogates": "Верхняя часть суррогатных пар для частного использования",
|
||||
"Low Surrogates": "Нижняя часть суррогатных пар",
|
||||
"Private Use Area": "Область для частного использования",
|
||||
"CJK Compatibility Ideographs": "Совместимые иероглифы ККЯ",
|
||||
"Alphabetic Presentation Forms": "Алфавитные формы представления",
|
||||
"Arabic Presentation Forms A": "Формы представления арабских букв-A",
|
||||
"Variation Selectors": "Селекторы вариантов начертания",
|
||||
"Vertical Forms": "Вертикальные формы",
|
||||
"Combining Half Marks": "Комбинируемые половинки символов",
|
||||
"CJK Compatibility Forms": "Формы совместимости ККЯ",
|
||||
"Small Form Variants": "Варианты малого размера",
|
||||
"Arabic Presentation Forms B": "Формы представления арабских букв-B",
|
||||
"Halfwidth and Fullwidth Forms": "Полуширинные и полноширинные формы",
|
||||
"Specials": "Специальные символы",
|
||||
"Linear B Syllabary": "Слоги линейного письма Б",
|
||||
"Linear B Ideograms": "Идеограммы линейного письма Б",
|
||||
"Aegean Numbers": "Эгейские цифры",
|
||||
"Ancient Greek Numbers": "Древнегреческие единицы измерения",
|
||||
"Ancient Symbols": "Древние символы",
|
||||
"Phaistos Disc": "Символы фестского диска",
|
||||
"Lycian": "Ликийский алфавит",
|
||||
"Carian": "Алфавит карийского языка",
|
||||
"Coptic Epact Numbers": "Коптские числа епакты",
|
||||
"Old Italic": "Этрусский (староитальянский) алфавит",
|
||||
"Gothic": "Готский алфавит",
|
||||
"Old Permic": "Древнепермское письмо",
|
||||
"Ugaritic": "Угаритский алфавит",
|
||||
"Old Persian": "Древнеперсидский клинописный алфавит",
|
||||
"Deseret": "Дезеретский алфавит",
|
||||
"Shavian": "Алфавит Бернарда Шоу",
|
||||
"Osmanya": "Османья (сомалийский алфавит)",
|
||||
"Osage": "Оседж",
|
||||
"Elbasan": "Эльбасанское письмо",
|
||||
"Caucasian Albanian": "Агванское письмо (Кавказская Албания)",
|
||||
"Linear A": "Линейное письмо А",
|
||||
"Cypriot Syllabary": "Слоговая письменность острова Кипр",
|
||||
"Imperial Aramaic": "Имперское арамейское письмо",
|
||||
"Palmyrene": "Пальмирский алфавит",
|
||||
"Nabataean": "Набатейское письмо",
|
||||
"Hatran": "Хатран",
|
||||
"Phoenician": "Финикийское письмо",
|
||||
"Lydian": "Лидийский алфавит",
|
||||
"Meroitic Hieroglyphs": "Лидийский алфавит",
|
||||
"Meroitic Cursive": "Курсивное мероитское письмо",
|
||||
"Kharoshthi": "Кхароштхи",
|
||||
"Old South Arabian": "Старый южноаравийский алфавит",
|
||||
"Old North Arabian": "Старый североаравийский алфавит",
|
||||
"Manichaean": "Манихейское письмо",
|
||||
"Avestan": "Авестийский алфавит",
|
||||
"Inscriptional Parthian": "Пехлевийское письмо для парфянского языка",
|
||||
"Inscriptional Pahlavi": "Эпиграфическое пехлевийское письмо",
|
||||
"Psalter Pahlavi": "Псалтырь пехлеви",
|
||||
"Old Turkic": "Древнетюркское руническое письмо",
|
||||
"Old Hungarian": "Венгерские руны",
|
||||
"Rumi Numeral Symbols": "Цифры системы руми",
|
||||
"Brahmi": "Брахмическая письменность",
|
||||
"Kaithi": "Кайтхи",
|
||||
"Sora Sompeng": "Соранг сомпенг",
|
||||
"Chakma": "Чакма",
|
||||
"Mahajani": "Махаяни",
|
||||
"Sharada": "Шарада",
|
||||
"Sinhala Archaic Numbers": "Сингальские архаические цифры",
|
||||
"Khojki": "Кходжики",
|
||||
"Multani": "Мултани",
|
||||
"Khudawadi": "Кхудабади",
|
||||
"Grantha": "Грантха",
|
||||
"Newa": "Нева",
|
||||
"Tirhuta": "Тирхута",
|
||||
"Siddham": "Сиддхаматрика",
|
||||
"Modi": "Моди",
|
||||
"Mongolian Supplement": "Монгольский (дополнение)",
|
||||
"Takri": "Такри",
|
||||
"Ahom": "Письмо ахом",
|
||||
"Warang Citi": "Варанг-кшити",
|
||||
"Pau Cin Hau": "Пау Цин Хау",
|
||||
"Bhaiksuki": "Байсаки",
|
||||
"Marchen": "Марчен",
|
||||
"Cuneiform": "Клинопись",
|
||||
"Cuneiform Numbers and Punctuation": "Клинописные цифры и знаки препинания",
|
||||
"Early Dynastic Cuneiform": "Ранняя династическая клинопись",
|
||||
"Egyptian Hieroglyphs": "Египетские иероглифы",
|
||||
"Anatolian Hieroglyphs": "Анатолийские иероглифы",
|
||||
"Bamum Supplement": "Письмо бамум (дополнение)",
|
||||
"Mro": "Мру",
|
||||
"Bassa Vah": "Письмо басса",
|
||||
"Pahawh Hmong": "Пахау хмонг",
|
||||
"Miao": "Письмо Полларда (миао)",
|
||||
"Ideographic Symbols and Punctuation": "Идеографические символы и знаки препинания",
|
||||
"Tangut": "Тангутское письмо",
|
||||
"Tangut Components": "Компоненты тангутского письма",
|
||||
"Kana Supplement": "Кана (дополнение)",
|
||||
"Duployan": "Дюплойе",
|
||||
"Shorthand Format Controls": "Форматирующие символы стенографии",
|
||||
"Byzantine Musical Symbols": "Византийские музыкальные символы",
|
||||
"Musical Symbols": "Музыкальные символы",
|
||||
"Ancient Greek Musical Notation": "Древнегреческие музыкальные символы",
|
||||
"Tai Xuan Jing Symbols": "Символы Тай Сюань Цзин",
|
||||
"Counting Rod Numerals": "Счётные палочки",
|
||||
"Mathematical Alphanumeric Symbols": "Математические буквенно-цифровые символы",
|
||||
"Sutton SignWriting": "Жестовая письменность Саттон",
|
||||
"Glagolitic Supplement": "Глаголица (расширение)",
|
||||
"Mende Kikakui": "Письмо кикакуи для языка менде",
|
||||
"Adlam": "Адлам",
|
||||
"Arabic Mathematical Alphabetic Symbols": "Арабские математические буквенно-цифровые символы",
|
||||
"Mahjong Tiles": "Кости для маджонга",
|
||||
"Domino Tiles": "Кости для домино",
|
||||
"Playing Cards": "Игральные карты",
|
||||
"Enclosed Alphanumeric Supplement": "Вложенные буквенно-цифровые символы (дополнение)",
|
||||
"Enclosed Ideographic Supplement": "Вложенные идеографические символы (дополнение)",
|
||||
"Miscellaneous Symbols and Pictographs": "Различные символы и пиктограммы",
|
||||
"Emoticons": "Эмотикон (эмоджи)",
|
||||
"Ornamental Dingbats": "Элементы орнамента",
|
||||
"Transport and Map Symbols": "Транспортные и картографические символы",
|
||||
"Alchemical Symbols": "Алхимические символы",
|
||||
"Geometric Shapes Extended": "Геометрические фигуры (расширение)",
|
||||
"Supplemental Arrows C": "Дополнительные стрелки-С",
|
||||
"Supplemental Symbols and Pictographs": "Символы и пиктограммы (дополнение)",
|
||||
"CJK Unified Ideographs Extension B": "Унифицированные иероглифы ККЯ. Расширение B",
|
||||
"CJK Unified Ideographs Extension C": "Унифицированные иероглифы ККЯ. Расширение C",
|
||||
"CJK Unified Ideographs Extension D": "Унифицированные иероглифы ККЯ. Расширение D",
|
||||
"CJK Unified Ideographs Extension E": "Унифицированные иероглифы ККЯ. Расширение E",
|
||||
"CJK Compatibility Ideographs Supplement": "Унифицированные иероглифы ККЯ (дополнение)",
|
||||
"Tags": "Теги",
|
||||
"Variation Selectors Supplement": "Селекторы вариантов начертания (дополнение)",
|
||||
"Supplementary Private Use Area A": "Дополнительная область для частного использования — A",
|
||||
"Supplementary Private Use Area B": "Дополнительная область для частного использования — B"
|
||||
}
|
||||
|
|
@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){
|
|||
message = me.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
message = me.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
message = me.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){
|
|||
waitText: 'Please, wait...',
|
||||
textLoadingDocument: 'Loading document',
|
||||
txtClose: 'Close',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})();
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
"DE.ApplicationController.unknownErrorText": "Unknown error.",
|
||||
"DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
|
||||
"DE.ApplicationController.waitText": "Please, wait...",
|
||||
"DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"DE.ApplicationView.txtDownload": "Download",
|
||||
"DE.ApplicationView.txtEmbed": "Embed",
|
||||
"DE.ApplicationView.txtFullScreen": "Full Screen",
|
||||
|
|
|
|||
|
|
@ -366,6 +366,7 @@ define([
|
|||
|
||||
if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
|
||||
(this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
|
||||
$('#editor-container').css('overflow', 'hidden');
|
||||
$('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
|
||||
}
|
||||
|
||||
|
|
@ -1055,6 +1056,7 @@ define([
|
|||
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
|
||||
Common.Gateway.documentReady();
|
||||
|
||||
$('#editor-container').css('overflow', '');
|
||||
$('.doc-placeholder').remove();
|
||||
},
|
||||
|
||||
|
|
@ -1497,6 +1499,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -2473,7 +2479,8 @@ define([
|
|||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
txtMainDocOnly: 'Error! Main Document Only.',
|
||||
txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.',
|
||||
txtNoText: 'Error! No text of specified style in document.'
|
||||
txtNoText: 'Error! No text of specified style in document.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), DE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
@ -47,6 +47,7 @@ define([
|
|||
'common/main/lib/view/ImageFromUrlDialog',
|
||||
'common/main/lib/view/InsertTableDialog',
|
||||
'common/main/lib/view/SelectFileDlg',
|
||||
'common/main/lib/view/SymbolTableDialog',
|
||||
'common/main/lib/util/define',
|
||||
'documenteditor/main/app/view/Toolbar',
|
||||
'documenteditor/main/app/view/DropcapSettingsAdvanced',
|
||||
|
|
@ -324,6 +325,7 @@ define([
|
|||
toolbar.listStyles.on('contextmenu', _.bind(this.onListStyleContextMenu, this));
|
||||
toolbar.styleMenu.on('hide:before', _.bind(this.onListStyleBeforeHide, this));
|
||||
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
|
||||
toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this));
|
||||
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this));
|
||||
toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this));
|
||||
Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
|
||||
|
|
@ -822,6 +824,8 @@ define([
|
|||
need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain;
|
||||
toolbar.btnInsertEquation.setDisabled(need_disable);
|
||||
|
||||
toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked);
|
||||
|
||||
need_disable = paragraph_locked || header_locked || in_equation;
|
||||
toolbar.btnSuperscript.setDisabled(need_disable);
|
||||
toolbar.btnSubscript.setDisabled(need_disable);
|
||||
|
|
@ -2483,6 +2487,29 @@ define([
|
|||
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
|
||||
},
|
||||
|
||||
onInsertSymbolClick: function() {
|
||||
if (this.api) {
|
||||
var me = this,
|
||||
win = new Common.Views.SymbolTableDialog({
|
||||
api: me.api,
|
||||
lang: me.mode.lang,
|
||||
modal: false,
|
||||
type: 1,
|
||||
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
|
||||
handler: function(dlg, result, settings) {
|
||||
if (result == 'ok') {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
} else
|
||||
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||
}
|
||||
});
|
||||
win.show();
|
||||
win.on('symbol:dblclick', function(cmp, settings) {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
onApiMathTypes: function(equation) {
|
||||
this._equationTemp = equation;
|
||||
var me = this;
|
||||
|
|
@ -3285,7 +3312,8 @@ define([
|
|||
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 device fonts, the saved font will be used when it is available.<br>Do you want to continue?',
|
||||
notcriticalErrorTitle: 'Warning',
|
||||
txtMarginsW: 'Left and right margins are too high for a given page wight',
|
||||
txtMarginsH: 'Top and bottom margins are too high for a given page height'
|
||||
txtMarginsH: 'Top and bottom margins are too high for a given page height',
|
||||
textInsert: 'Insert'
|
||||
|
||||
}, DE.Controllers.Toolbar || {}));
|
||||
});
|
||||
|
|
@ -108,6 +108,7 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group">
|
||||
<span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
|
||||
<span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
|
||||
</div>
|
||||
<div class="separator long"></div>
|
||||
<div class="group">
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ define([
|
|||
'</div></div>',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'<div class="footer right">',
|
||||
'<div class="footer center">',
|
||||
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
|
||||
'</div>'
|
||||
].join('')
|
||||
|
|
|
|||
|
|
@ -3982,7 +3982,7 @@ define([
|
|||
mergeCellsText : 'Merge Cells',
|
||||
splitCellsText : 'Split Cell...',
|
||||
splitCellTitleText : 'Split Cell',
|
||||
originalSizeText : 'Default Size',
|
||||
originalSizeText : 'Actual Size',
|
||||
advancedText : 'Advanced Settings',
|
||||
breakBeforeText : 'Page break before',
|
||||
keepLinesText : 'Keep lines together',
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ define([
|
|||
textWrap: 'Wraping Style',
|
||||
textWidth: 'Width',
|
||||
textHeight: 'Height',
|
||||
textOriginalSize: 'Default Size',
|
||||
textOriginalSize: 'Actual Size',
|
||||
textInsert: 'Replace Image',
|
||||
textFromUrl: 'From URL',
|
||||
textFromFile: 'From File',
|
||||
|
|
|
|||
|
|
@ -2013,7 +2013,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
|
|||
textLeft: 'Left',
|
||||
textBottom: 'Bottom',
|
||||
textRight: 'Right',
|
||||
textOriginalSize: 'Default Size',
|
||||
textOriginalSize: 'Actual Size',
|
||||
textPosition: 'Position',
|
||||
textDistance: 'Distance From Text',
|
||||
textSize: 'Size',
|
||||
|
|
|
|||
|
|
@ -583,6 +583,14 @@ define([
|
|||
});
|
||||
this.paragraphControls.push(this.btnInsertEquation);
|
||||
|
||||
this.btnInsertSymbol = new Common.UI.Button({
|
||||
id: 'tlbtn-insertsymbol',
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
iconCls: 'btn-symbol',
|
||||
caption: me.capBtnInsSymbol
|
||||
});
|
||||
this.paragraphControls.push(this.btnInsertSymbol);
|
||||
|
||||
this.btnDropCap = new Common.UI.Button({
|
||||
id: 'tlbtn-dropcap',
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
|
|
@ -1334,6 +1342,7 @@ define([
|
|||
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
|
||||
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
|
||||
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
|
||||
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
|
||||
_injectComponent('#slot-btn-pageorient', this.btnPageOrient);
|
||||
_injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
|
||||
_injectComponent('#slot-btn-pagesize', this.btnPageSize);
|
||||
|
|
@ -1604,6 +1613,7 @@ define([
|
|||
this.btnBlankPage.updateHint(this.tipBlankPage);
|
||||
this.btnInsertShape.updateHint(this.tipInsertShape);
|
||||
this.btnInsertEquation.updateHint(this.tipInsertEquation);
|
||||
this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
|
||||
this.btnDropCap.updateHint(this.tipDropCap);
|
||||
this.btnContentControls.updateHint(this.tipControls);
|
||||
this.btnColumns.updateHint(this.tipColumns);
|
||||
|
|
@ -2354,7 +2364,9 @@ define([
|
|||
textComboboxControl: 'Combo box',
|
||||
textCheckboxControl: 'Check box',
|
||||
textDropdownControl: 'Drop-down list',
|
||||
textDateControl: 'Date'
|
||||
textDateControl: 'Date',
|
||||
capBtnInsSymbol: 'Symbol',
|
||||
tipInsertSymbol: 'Insert symbol'
|
||||
}
|
||||
})(), DE.Views.Toolbar || {}));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -299,6 +299,11 @@
|
|||
"Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
|
||||
"Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
|
||||
"Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
|
||||
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
|
||||
"Common.Views.SymbolTableDialog.textFont": "Font",
|
||||
"Common.Views.SymbolTableDialog.textRange": "Range",
|
||||
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
|
||||
"Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
|
||||
"DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
|
||||
"DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
|
||||
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
|
||||
|
|
@ -650,6 +655,7 @@
|
|||
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
|
||||
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
|
||||
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
|
||||
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
|
||||
|
|
@ -991,6 +997,7 @@
|
|||
"DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
|
||||
"DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
|
||||
"DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
|
||||
"DE.Controllers.Toolbar.textInsert": "Insert",
|
||||
"DE.Controllers.Viewport.textFitPage": "Fit to Page",
|
||||
"DE.Controllers.Viewport.textFitWidth": "Fit to Width",
|
||||
"DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
|
||||
|
|
@ -1049,7 +1056,7 @@
|
|||
"DE.Views.ChartSettings.textEditData": "Edit Data",
|
||||
"DE.Views.ChartSettings.textHeight": "Height",
|
||||
"DE.Views.ChartSettings.textLine": "Line",
|
||||
"DE.Views.ChartSettings.textOriginalSize": "Default Size",
|
||||
"DE.Views.ChartSettings.textOriginalSize": "Actual Size",
|
||||
"DE.Views.ChartSettings.textPie": "Pie",
|
||||
"DE.Views.ChartSettings.textPoint": "XY (Scatter)",
|
||||
"DE.Views.ChartSettings.textSize": "Size",
|
||||
|
|
@ -1131,7 +1138,7 @@
|
|||
"DE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
|
||||
"DE.Views.DocumentHolder.moreText": "More variants...",
|
||||
"DE.Views.DocumentHolder.noSpellVariantsText": "No variants",
|
||||
"DE.Views.DocumentHolder.originalSizeText": "Default Size",
|
||||
"DE.Views.DocumentHolder.originalSizeText": "Actual Size",
|
||||
"DE.Views.DocumentHolder.paragraphText": "Paragraph",
|
||||
"DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
|
||||
"DE.Views.DocumentHolder.rightText": "Right",
|
||||
|
|
@ -1491,7 +1498,7 @@
|
|||
"DE.Views.ImageSettings.textHintFlipH": "Flip Horizontally",
|
||||
"DE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
|
||||
"DE.Views.ImageSettings.textInsert": "Replace Image",
|
||||
"DE.Views.ImageSettings.textOriginalSize": "Default Size",
|
||||
"DE.Views.ImageSettings.textOriginalSize": "Actual Size",
|
||||
"DE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||
"DE.Views.ImageSettings.textRotation": "Rotation",
|
||||
"DE.Views.ImageSettings.textSize": "Size",
|
||||
|
|
@ -1543,7 +1550,7 @@
|
|||
"DE.Views.ImageSettingsAdvanced.textMiter": "Miter",
|
||||
"DE.Views.ImageSettingsAdvanced.textMove": "Move object with text",
|
||||
"DE.Views.ImageSettingsAdvanced.textOptions": "Options",
|
||||
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size",
|
||||
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
|
||||
"DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap",
|
||||
"DE.Views.ImageSettingsAdvanced.textPage": "Page",
|
||||
"DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph",
|
||||
|
|
@ -2238,6 +2245,8 @@
|
|||
"DE.Views.Toolbar.txtScheme7": "Equity",
|
||||
"DE.Views.Toolbar.txtScheme8": "Flow",
|
||||
"DE.Views.Toolbar.txtScheme9": "Foundry",
|
||||
"DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
|
||||
"DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
|
||||
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
|
||||
"DE.Views.WatermarkSettingsDialog.textBold": "Bold",
|
||||
"DE.Views.WatermarkSettingsDialog.textColor": "Text color",
|
||||
|
|
|
|||
|
|
@ -299,6 +299,11 @@
|
|||
"Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
|
||||
"Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
|
||||
"Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
|
||||
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
|
||||
"Common.Views.SymbolTableDialog.textFont": "Шрифт",
|
||||
"Common.Views.SymbolTableDialog.textRange": "Набор",
|
||||
"Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы",
|
||||
"Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)",
|
||||
"DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.<br> Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.",
|
||||
"DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени",
|
||||
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание",
|
||||
|
|
@ -1049,7 +1054,7 @@
|
|||
"DE.Views.ChartSettings.textEditData": "Изменить данные",
|
||||
"DE.Views.ChartSettings.textHeight": "Высота",
|
||||
"DE.Views.ChartSettings.textLine": "График",
|
||||
"DE.Views.ChartSettings.textOriginalSize": "По умолчанию",
|
||||
"DE.Views.ChartSettings.textOriginalSize": "Реальный размер",
|
||||
"DE.Views.ChartSettings.textPie": "Круговая",
|
||||
"DE.Views.ChartSettings.textPoint": "Точечная",
|
||||
"DE.Views.ChartSettings.textSize": "Размер",
|
||||
|
|
@ -1131,7 +1136,7 @@
|
|||
"DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
|
||||
"DE.Views.DocumentHolder.moreText": "Больше вариантов...",
|
||||
"DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
|
||||
"DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
|
||||
"DE.Views.DocumentHolder.originalSizeText": "Реальный размер",
|
||||
"DE.Views.DocumentHolder.paragraphText": "Абзац",
|
||||
"DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
|
||||
"DE.Views.DocumentHolder.rightText": "По правому краю",
|
||||
|
|
@ -1491,7 +1496,7 @@
|
|||
"DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
|
||||
"DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
|
||||
"DE.Views.ImageSettings.textInsert": "Заменить изображение",
|
||||
"DE.Views.ImageSettings.textOriginalSize": "По умолчанию",
|
||||
"DE.Views.ImageSettings.textOriginalSize": "Реальный размер",
|
||||
"DE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
|
||||
"DE.Views.ImageSettings.textRotation": "Поворот",
|
||||
"DE.Views.ImageSettings.textSize": "Размер",
|
||||
|
|
@ -1543,7 +1548,7 @@
|
|||
"DE.Views.ImageSettingsAdvanced.textMiter": "Прямой",
|
||||
"DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом",
|
||||
"DE.Views.ImageSettingsAdvanced.textOptions": "Параметры",
|
||||
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
|
||||
"DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
|
||||
"DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие",
|
||||
"DE.Views.ImageSettingsAdvanced.textPage": "Страницы",
|
||||
"DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца",
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@
|
|||
@import "../../../../common/main/resources/less/toolbar.less";
|
||||
@import "../../../../common/main/resources/less/language-dialog.less";
|
||||
@import "../../../../common/main/resources/less/winxp_fix.less";
|
||||
@import "../../../../common/main/resources/less/symboltable.less";
|
||||
|
||||
// App
|
||||
// --------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -971,6 +971,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -1456,7 +1460,8 @@ define([
|
|||
textPaidFeature: 'Paid feature',
|
||||
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
|
||||
waitText: 'Please, wait...',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), DE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
@ -159,7 +159,7 @@ define([
|
|||
textWrap: 'Wrap',
|
||||
textReplace: 'Replace',
|
||||
textReorder: 'Reorder',
|
||||
textDefault: 'Default Size',
|
||||
textDefault: 'Actual Size',
|
||||
textRemove: 'Remove Image',
|
||||
textBack: 'Back',
|
||||
textToForeground: 'Bring to Foreground',
|
||||
|
|
|
|||
|
|
@ -249,6 +249,7 @@
|
|||
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"DE.Controllers.Search.textNoTextFound": "Text not Found",
|
||||
"DE.Controllers.Search.textReplaceAll": "Replace All",
|
||||
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
|
||||
|
|
@ -337,7 +338,7 @@
|
|||
"DE.Views.EditImage.textBack": "Back",
|
||||
"DE.Views.EditImage.textBackward": "Move Backward",
|
||||
"DE.Views.EditImage.textBehind": "Behind",
|
||||
"DE.Views.EditImage.textDefault": "Default Size",
|
||||
"DE.Views.EditImage.textDefault": "Actual Size",
|
||||
"DE.Views.EditImage.textDistanceText": "Distance from Text",
|
||||
"DE.Views.EditImage.textForward": "Move Forward",
|
||||
"DE.Views.EditImage.textFromLibrary": "Picture from Library",
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@
|
|||
"DE.Views.EditImage.textBack": "Назад",
|
||||
"DE.Views.EditImage.textBackward": "Перенести назад",
|
||||
"DE.Views.EditImage.textBehind": "За текстом",
|
||||
"DE.Views.EditImage.textDefault": "Размер по умолчанию",
|
||||
"DE.Views.EditImage.textDefault": "Реальный размер",
|
||||
"DE.Views.EditImage.textDistanceText": "Расстояние до текста",
|
||||
"DE.Views.EditImage.textForward": "Перенести вперед",
|
||||
"DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ var sdk_dev_scrpipts = [
|
|||
"../../../../sdkjs/word/Editor/Footnotes.js",
|
||||
"../../../../sdkjs/word/Editor/FootnotesChanges.js",
|
||||
"../../../../sdkjs/word/Editor/FootEndNote.js",
|
||||
"../../../../sdkjs/word/Drawing/buttons.js",
|
||||
"../../../../sdkjs/word/Drawing/Graphics.js",
|
||||
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
|
||||
"../../../../sdkjs/word/Drawing/DrawingDocument.js",
|
||||
|
|
|
|||
|
|
@ -502,6 +502,10 @@ PE.ApplicationController = new(function(){
|
|||
message = me.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
message = me.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
message = me.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -629,6 +633,7 @@ PE.ApplicationController = new(function(){
|
|||
waitText: 'Please, wait...',
|
||||
textLoadingDocument: 'Loading presentation',
|
||||
txtClose: 'Close',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
"PE.ApplicationController.unknownErrorText": "Unknown error.",
|
||||
"PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
|
||||
"PE.ApplicationController.waitText": "Please, wait...",
|
||||
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"PE.ApplicationView.txtDownload": "Download",
|
||||
"PE.ApplicationView.txtEmbed": "Embed",
|
||||
"PE.ApplicationView.txtFullScreen": "Full Screen",
|
||||
|
|
|
|||
|
|
@ -1204,6 +1204,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -2189,7 +2193,8 @@ define([
|
|||
errorEmailClient: 'No email client could be found',
|
||||
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
|
||||
waitText: 'Please, wait...',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), PE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ define([
|
|||
'common/main/lib/view/ImageFromUrlDialog',
|
||||
'common/main/lib/view/InsertTableDialog',
|
||||
'common/main/lib/view/SelectFileDlg',
|
||||
'common/main/lib/view/ListSettingsDialog',
|
||||
'common/main/lib/view/SymbolTableDialog',
|
||||
'common/main/lib/util/define',
|
||||
'presentationeditor/main/app/collection/SlideThemes',
|
||||
'presentationeditor/main/app/view/Toolbar',
|
||||
|
|
@ -55,8 +57,7 @@ define([
|
|||
'presentationeditor/main/app/view/HeaderFooterDialog',
|
||||
'presentationeditor/main/app/view/HyperlinkSettingsDialog',
|
||||
'presentationeditor/main/app/view/SlideSizeSettings',
|
||||
'presentationeditor/main/app/view/SlideshowSettings',
|
||||
'presentationeditor/main/app/view/ListSettingsDialog'
|
||||
'presentationeditor/main/app/view/SlideshowSettings'
|
||||
], function () { 'use strict';
|
||||
|
||||
PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({
|
||||
|
|
@ -310,6 +311,7 @@ define([
|
|||
toolbar.btnSlideSize.menu.on('item:click', _.bind(this.onSlideSize, this));
|
||||
toolbar.listTheme.on('click', _.bind(this.onListThemeSelect, this));
|
||||
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
|
||||
toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this));
|
||||
toolbar.btnEditHeader.on('click', _.bind(this.onEditHeaderClick, this, 'header'));
|
||||
toolbar.btnInsDateTime.on('click', _.bind(this.onEditHeaderClick, this, 'datetime'));
|
||||
toolbar.btnInsSlideNum.on('click', _.bind(this.onEditHeaderClick, this, 'slidenum'));
|
||||
|
|
@ -473,7 +475,7 @@ define([
|
|||
case 0:
|
||||
this.toolbar.btnMarkers.toggle(true, true);
|
||||
this.toolbar.mnuMarkersPicker.selectByIndex(this._state.bullets.subtype, true);
|
||||
this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
|
||||
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
|
||||
break;
|
||||
case 1:
|
||||
var idx = 0;
|
||||
|
|
@ -502,7 +504,7 @@ define([
|
|||
}
|
||||
this.toolbar.btnNumbers.toggle(true, true);
|
||||
this.toolbar.mnuNumbersPicker.selectByIndex(idx, true);
|
||||
this.toolbar.mnuNumberSettings.setDisabled(idx==0);
|
||||
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1111,7 +1113,7 @@ define([
|
|||
}
|
||||
}
|
||||
if (props) {
|
||||
(new PE.Views.ListSettingsDialog({
|
||||
(new Common.Views.ListSettingsDialog({
|
||||
props: props,
|
||||
type: type,
|
||||
handler: function(result, value) {
|
||||
|
|
@ -1668,8 +1670,8 @@ define([
|
|||
|
||||
this.toolbar.mnuMarkersPicker.selectByIndex(0, true);
|
||||
this.toolbar.mnuNumbersPicker.selectByIndex(0, true);
|
||||
this.toolbar.mnuMarkerSettings.setDisabled(true);
|
||||
this.toolbar.mnuNumberSettings.setDisabled(true);
|
||||
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(true);
|
||||
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(true);
|
||||
},
|
||||
|
||||
_getApiTextSize: function () {
|
||||
|
|
@ -1825,6 +1827,28 @@ define([
|
|||
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
|
||||
},
|
||||
|
||||
onInsertSymbolClick: function() {
|
||||
if (this.api) {
|
||||
var me = this,
|
||||
win = new Common.Views.SymbolTableDialog({
|
||||
api: me.api,
|
||||
lang: me.toolbar.mode.lang,
|
||||
type: 1,
|
||||
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
|
||||
handler: function(dlg, result, settings) {
|
||||
if (result == 'ok') {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
} else
|
||||
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||
}
|
||||
});
|
||||
win.show();
|
||||
win.on('symbol:dblclick', function(cmp, settings) {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
onApiMathTypes: function(equation) {
|
||||
this._equationTemp = equation;
|
||||
var me = this;
|
||||
|
|
@ -2528,7 +2552,8 @@ define([
|
|||
txtMatrix_2_2_LineBracket : 'Empty Matrix with Brackets',
|
||||
txtMatrix_2_2_DLineBracket : 'Empty Matrix with Brackets',
|
||||
txtMatrix_Flat_Round : 'Sparse Matrix',
|
||||
txtMatrix_Flat_Square : 'Sparse Matrix'
|
||||
txtMatrix_Flat_Square : 'Sparse Matrix',
|
||||
textInsert: 'Insert'
|
||||
|
||||
}, PE.Controllers.Toolbar || {}));
|
||||
});
|
||||
|
|
@ -17,6 +17,11 @@
|
|||
<button type="button" class="btn btn-text-default" id="image-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="padding-small" colspan=2>
|
||||
<button type="button" class="btn btn-text-default" id="image-button-fit-slide" style="width:100px;"><%= scope.textFitSlide %></button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="padding-small" colspan=2>
|
||||
<div id="image-button-crop" style="width: 100px;"></div>
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group">
|
||||
<span class="btn-slot text x-huge" id="slot-btn-insertequation"></span>
|
||||
<span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -3443,7 +3443,7 @@ define([
|
|||
mergeCellsText : 'Merge Cells',
|
||||
splitCellsText : 'Split Cell...',
|
||||
splitCellTitleText : 'Split Cell',
|
||||
originalSizeText : 'Default Size',
|
||||
originalSizeText : 'Actual Size',
|
||||
advancedImageText : 'Image Advanced Settings',
|
||||
hyperlinkText : 'Hyperlink',
|
||||
editHyperlinkText : 'Edit Hyperlink',
|
||||
|
|
|
|||
|
|
@ -176,6 +176,12 @@ define([
|
|||
this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this));
|
||||
this.lockedControls.push(this.btnCrop);
|
||||
|
||||
this.btnFitSlide = new Common.UI.Button({
|
||||
el: $('#image-button-fit-slide')
|
||||
});
|
||||
this.lockedControls.push(this.btnFitSlide);
|
||||
this.btnFitSlide.on('click', _.bind(this.setFitSlide, this));
|
||||
|
||||
this.btnRotate270 = new Common.UI.Button({
|
||||
cls: 'btn-toolbar',
|
||||
iconCls: 'rotate-270',
|
||||
|
|
@ -378,6 +384,11 @@ define([
|
|||
this.fireEvent('editcomplete', this);
|
||||
},
|
||||
|
||||
setFitSlide: function() {
|
||||
this.api && this.api.asc_FitImagesToSlide();
|
||||
this.fireEvent('editcomplete', this);
|
||||
},
|
||||
|
||||
onBtnRotateClick: function(btn) {
|
||||
var properties = new Asc.asc_CImgProperty();
|
||||
properties.asc_putRotAdd((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
|
||||
|
|
@ -415,7 +426,7 @@ define([
|
|||
textSize: 'Size',
|
||||
textWidth: 'Width',
|
||||
textHeight: 'Height',
|
||||
textOriginalSize: 'Default Size',
|
||||
textOriginalSize: 'Actual Size',
|
||||
textInsert: 'Replace Image',
|
||||
textFromUrl: 'From URL',
|
||||
textFromFile: 'From File',
|
||||
|
|
@ -431,7 +442,8 @@ define([
|
|||
textHintFlipH: 'Flip Horizontally',
|
||||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit'
|
||||
textCropFit: 'Fit',
|
||||
textFitSlide: 'Fit to Slide'
|
||||
|
||||
}, PE.Views.ImageSettings || {}));
|
||||
});
|
||||
|
|
@ -316,7 +316,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
|
|||
};
|
||||
},
|
||||
|
||||
textOriginalSize: 'Default Size',
|
||||
textOriginalSize: 'Actual Size',
|
||||
textPosition: 'Position',
|
||||
textSize: 'Size',
|
||||
textWidth: 'Width',
|
||||
|
|
|
|||
|
|
@ -543,6 +543,15 @@ define([
|
|||
});
|
||||
me.slideOnlyControls.push(this.btnInsertEquation);
|
||||
|
||||
me.btnInsertSymbol = new Common.UI.Button({
|
||||
id: 'tlbtn-insertsymbol',
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
iconCls: 'btn-symbol',
|
||||
caption: me.capBtnInsSymbol,
|
||||
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected]
|
||||
});
|
||||
me.paragraphControls.push(me.btnInsertSymbol);
|
||||
|
||||
me.btnInsertHyperlink = new Common.UI.Button({
|
||||
id: 'tlbtn-insertlink',
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
|
|
@ -815,7 +824,7 @@ define([
|
|||
this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers,
|
||||
this.btnNumbers, this.btnDecLeftOffset, this.btnIncLeftOffset, this.btnLineSpace, this.btnHorizontalAlign,
|
||||
this.btnVerticalAlign, this.btnShapeArrange, this.btnShapeAlign, this.btnInsertTable, this.btnInsertChart,
|
||||
this.btnInsertEquation, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings
|
||||
this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings
|
||||
];
|
||||
|
||||
// Disable all components before load document
|
||||
|
|
@ -933,6 +942,7 @@ define([
|
|||
_injectComponent('#slot-btn-arrange-shape', this.btnShapeArrange);
|
||||
_injectComponent('#slot-btn-align-shape', this.btnShapeAlign);
|
||||
_injectComponent('#slot-btn-insertequation', this.btnInsertEquation);
|
||||
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
|
||||
_injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink);
|
||||
_injectComponent('#slot-btn-inserttable', this.btnInsertTable);
|
||||
_injectComponent('#slot-btn-insertchart', this.btnInsertChart);
|
||||
|
|
@ -1044,6 +1054,7 @@ define([
|
|||
this.btnInsertTable.updateHint(this.tipInsertTable);
|
||||
this.btnInsertChart.updateHint(this.tipInsertChart);
|
||||
this.btnInsertEquation.updateHint(this.tipInsertEquation);
|
||||
this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
|
||||
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
|
||||
this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
|
||||
this.btnColorSchemas.updateHint(this.tipColorSchemas);
|
||||
|
|
@ -1676,7 +1687,9 @@ define([
|
|||
capBtnInsHeader: 'Header/Footer',
|
||||
capBtnSlideNum: 'Slide Number',
|
||||
capBtnDateTime: 'Date & Time',
|
||||
textListSettings: 'List Settings'
|
||||
textListSettings: 'List Settings',
|
||||
capBtnInsSymbol: 'Symbol',
|
||||
tipInsertSymbol: 'Insert symbol'
|
||||
}
|
||||
}()), PE.Views.Toolbar || {}));
|
||||
});
|
||||
|
|
@ -108,6 +108,12 @@
|
|||
"Common.Views.InsertTableDialog.txtTitle": "Table Size",
|
||||
"Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
|
||||
"Common.Views.LanguageDialog.labelSelect": "Select document language",
|
||||
"Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
|
||||
"Common.Views.ListSettingsDialog.txtColor": "Color",
|
||||
"Common.Views.ListSettingsDialog.txtOfText": "% of text",
|
||||
"Common.Views.ListSettingsDialog.txtSize": "Size",
|
||||
"Common.Views.ListSettingsDialog.txtStart": "Start at",
|
||||
"Common.Views.ListSettingsDialog.txtTitle": "List Settings",
|
||||
"Common.Views.OpenDialog.closeButtonText": "Close File",
|
||||
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
|
||||
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
|
||||
|
|
@ -214,6 +220,11 @@
|
|||
"Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
|
||||
"Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
|
||||
"Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
|
||||
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
|
||||
"Common.Views.SymbolTableDialog.textFont": "Font",
|
||||
"Common.Views.SymbolTableDialog.textRange": "Range",
|
||||
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
|
||||
"Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
|
||||
"PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
|
||||
"PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
|
||||
"PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
|
||||
|
|
@ -568,6 +579,7 @@
|
|||
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
|
||||
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
|
||||
"PE.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?",
|
||||
"PE.Controllers.Toolbar.textAccent": "Accents",
|
||||
|
|
@ -901,6 +913,7 @@
|
|||
"PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
|
||||
"PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
|
||||
"PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
|
||||
"PE.Controllers.Toolbar.textInsert": "Insert",
|
||||
"PE.Controllers.Viewport.textFitPage": "Fit to Slide",
|
||||
"PE.Controllers.Viewport.textFitWidth": "Fit to Width",
|
||||
"PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
|
||||
|
|
@ -969,7 +982,7 @@
|
|||
"PE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
|
||||
"PE.Views.DocumentHolder.moreText": "More variants...",
|
||||
"PE.Views.DocumentHolder.noSpellVariantsText": "No variants",
|
||||
"PE.Views.DocumentHolder.originalSizeText": "Default Size",
|
||||
"PE.Views.DocumentHolder.originalSizeText": "Actual Size",
|
||||
"PE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
|
||||
"PE.Views.DocumentHolder.rightText": "Right",
|
||||
"PE.Views.DocumentHolder.rowText": "Row",
|
||||
|
|
@ -1244,6 +1257,7 @@
|
|||
"PE.Views.ImageSettings.textCropFit": "Fit",
|
||||
"PE.Views.ImageSettings.textEdit": "Edit",
|
||||
"PE.Views.ImageSettings.textEditObject": "Edit Object",
|
||||
"PE.Views.ImageSettings.textFitSlide": "Fit to Slide",
|
||||
"PE.Views.ImageSettings.textFlip": "Flip",
|
||||
"PE.Views.ImageSettings.textFromFile": "From File",
|
||||
"PE.Views.ImageSettings.textFromUrl": "From URL",
|
||||
|
|
@ -1253,7 +1267,7 @@
|
|||
"PE.Views.ImageSettings.textHintFlipH": "Flip Horizontally",
|
||||
"PE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
|
||||
"PE.Views.ImageSettings.textInsert": "Replace Image",
|
||||
"PE.Views.ImageSettings.textOriginalSize": "Default Size",
|
||||
"PE.Views.ImageSettings.textOriginalSize": "Actual Size",
|
||||
"PE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||
"PE.Views.ImageSettings.textRotation": "Rotation",
|
||||
"PE.Views.ImageSettings.textSize": "Size",
|
||||
|
|
@ -1267,7 +1281,7 @@
|
|||
"PE.Views.ImageSettingsAdvanced.textHeight": "Height",
|
||||
"PE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally",
|
||||
"PE.Views.ImageSettingsAdvanced.textKeepRatio": "Constant proportions",
|
||||
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size",
|
||||
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
|
||||
"PE.Views.ImageSettingsAdvanced.textPlacement": "Placement",
|
||||
"PE.Views.ImageSettingsAdvanced.textPosition": "Position",
|
||||
"PE.Views.ImageSettingsAdvanced.textRotation": "Rotation",
|
||||
|
|
@ -1285,12 +1299,6 @@
|
|||
"PE.Views.LeftMenu.tipTitles": "Titles",
|
||||
"PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
|
||||
"PE.Views.LeftMenu.txtTrial": "TRIAL MODE",
|
||||
"PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
|
||||
"PE.Views.ListSettingsDialog.txtColor": "Color",
|
||||
"PE.Views.ListSettingsDialog.txtOfText": "% of text",
|
||||
"PE.Views.ListSettingsDialog.txtSize": "Size",
|
||||
"PE.Views.ListSettingsDialog.txtStart": "Start at",
|
||||
"PE.Views.ListSettingsDialog.txtTitle": "List Settings",
|
||||
"PE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
|
||||
"PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
|
||||
"PE.Views.ParagraphSettings.strSpacingAfter": "After",
|
||||
|
|
@ -1796,5 +1804,7 @@
|
|||
"PE.Views.Toolbar.txtScheme8": "Flow",
|
||||
"PE.Views.Toolbar.txtScheme9": "Foundry",
|
||||
"PE.Views.Toolbar.txtSlideAlign": "Align to Slide",
|
||||
"PE.Views.Toolbar.txtUngroup": "Ungroup"
|
||||
"PE.Views.Toolbar.txtUngroup": "Ungroup",
|
||||
"PE.Views.Toolbar.capBtnInsSymbol": "Symbol",
|
||||
"PE.Views.Toolbar.tipInsertSymbol": "Insert symbol"
|
||||
}
|
||||
|
|
@ -969,7 +969,7 @@
|
|||
"PE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
|
||||
"PE.Views.DocumentHolder.moreText": "Больше вариантов...",
|
||||
"PE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
|
||||
"PE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
|
||||
"PE.Views.DocumentHolder.originalSizeText": "Реальный размер",
|
||||
"PE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
|
||||
"PE.Views.DocumentHolder.rightText": "По правому краю",
|
||||
"PE.Views.DocumentHolder.rowText": "Строку",
|
||||
|
|
@ -1253,7 +1253,7 @@
|
|||
"PE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
|
||||
"PE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
|
||||
"PE.Views.ImageSettings.textInsert": "Заменить изображение",
|
||||
"PE.Views.ImageSettings.textOriginalSize": "По умолчанию",
|
||||
"PE.Views.ImageSettings.textOriginalSize": "Реальный размер",
|
||||
"PE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
|
||||
"PE.Views.ImageSettings.textRotation": "Поворот",
|
||||
"PE.Views.ImageSettings.textSize": "Размер",
|
||||
|
|
@ -1267,7 +1267,7 @@
|
|||
"PE.Views.ImageSettingsAdvanced.textHeight": "Высота",
|
||||
"PE.Views.ImageSettingsAdvanced.textHorizontally": "По горизонтали",
|
||||
"PE.Views.ImageSettingsAdvanced.textKeepRatio": "Сохранять пропорции",
|
||||
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
|
||||
"PE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
|
||||
"PE.Views.ImageSettingsAdvanced.textPlacement": "Положение",
|
||||
"PE.Views.ImageSettingsAdvanced.textPosition": "Положение",
|
||||
"PE.Views.ImageSettingsAdvanced.textRotation": "Поворот",
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@
|
|||
@import "../../../../common/main/resources/less/toolbar.less";
|
||||
@import "../../../../common/main/resources/less/language-dialog.less";
|
||||
@import "../../../../common/main/resources/less/winxp_fix.less";
|
||||
@import "../../../../common/main/resources/less/symboltable.less";
|
||||
|
||||
// App
|
||||
// --------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -890,6 +890,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -1397,7 +1401,8 @@ define([
|
|||
textPaidFeature: 'Paid feature',
|
||||
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
|
||||
waitText: 'Please, wait...',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), PE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
@ -157,7 +157,7 @@ define([
|
|||
|
||||
textReplace: 'Replace',
|
||||
textReorder: 'Reorder',
|
||||
textDefault: 'Default Size',
|
||||
textDefault: 'Actual Size',
|
||||
textRemove: 'Remove Image',
|
||||
textBack: 'Back',
|
||||
textToForeground: 'Bring to Foreground',
|
||||
|
|
|
|||
|
|
@ -225,6 +225,7 @@
|
|||
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"PE.Controllers.Search.textNoTextFound": "Text not Found",
|
||||
"PE.Controllers.Search.textReplaceAll": "Replace All",
|
||||
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
|
||||
|
|
@ -288,7 +289,7 @@
|
|||
"PE.Views.EditImage.textAlignTop": "Align Top",
|
||||
"PE.Views.EditImage.textBack": "Back",
|
||||
"PE.Views.EditImage.textBackward": "Move Backward",
|
||||
"PE.Views.EditImage.textDefault": "Default Size",
|
||||
"PE.Views.EditImage.textDefault": "Actual Size",
|
||||
"PE.Views.EditImage.textForward": "Move Forward",
|
||||
"PE.Views.EditImage.textFromLibrary": "Picture from Library",
|
||||
"PE.Views.EditImage.textFromURL": "Picture from URL",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.",
|
||||
"Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati",
|
||||
"Common.UI.ThemeColorPalette.textStandartColors": "Colori standard",
|
||||
"Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema",
|
||||
"Common.Utils.Metric.txtCm": "cm",
|
||||
|
|
@ -253,6 +254,7 @@
|
|||
"PE.Views.AddLink.textNumber": "Numero Diapositiva",
|
||||
"PE.Views.AddLink.textPrev": "Diapositiva precedente",
|
||||
"PE.Views.AddLink.textTip": "Suggerimento ",
|
||||
"PE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"PE.Views.EditChart.textAlign": "Allinea",
|
||||
"PE.Views.EditChart.textAlignBottom": "Allinea in basso",
|
||||
"PE.Views.EditChart.textAlignCenter": "Allinea al centro",
|
||||
|
|
@ -264,6 +266,7 @@
|
|||
"PE.Views.EditChart.textBackward": "Sposta indietro",
|
||||
"PE.Views.EditChart.textBorder": "Bordo",
|
||||
"PE.Views.EditChart.textColor": "Colore",
|
||||
"PE.Views.EditChart.textCustomColor": "Colore personalizzato",
|
||||
"PE.Views.EditChart.textFill": "Riempimento",
|
||||
"PE.Views.EditChart.textForward": "Sposta avanti",
|
||||
"PE.Views.EditChart.textRemoveChart": "Elimina Grafico",
|
||||
|
|
@ -285,7 +288,7 @@
|
|||
"PE.Views.EditImage.textAlignTop": "Allinea in alto",
|
||||
"PE.Views.EditImage.textBack": "Indietro",
|
||||
"PE.Views.EditImage.textBackward": "Sposta indietro",
|
||||
"PE.Views.EditImage.textDefault": "Dimensione predefinita",
|
||||
"PE.Views.EditImage.textDefault": "Dimensione reale",
|
||||
"PE.Views.EditImage.textForward": "Sposta avanti",
|
||||
"PE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta",
|
||||
"PE.Views.EditImage.textFromURL": "Immagine da URL",
|
||||
|
|
@ -314,6 +317,7 @@
|
|||
"PE.Views.EditLink.textPrev": "Diapositiva precedente",
|
||||
"PE.Views.EditLink.textRemove": "Elimina Collegamento",
|
||||
"PE.Views.EditLink.textTip": "Suggerimento ",
|
||||
"PE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"PE.Views.EditShape.textAlign": "Allinea",
|
||||
"PE.Views.EditShape.textAlignBottom": "Allinea in basso",
|
||||
"PE.Views.EditShape.textAlignCenter": "Allinea al centro",
|
||||
|
|
@ -325,6 +329,7 @@
|
|||
"PE.Views.EditShape.textBackward": "Sposta indietro",
|
||||
"PE.Views.EditShape.textBorder": "Bordo",
|
||||
"PE.Views.EditShape.textColor": "Colore",
|
||||
"PE.Views.EditShape.textCustomColor": "Colore personalizzato",
|
||||
"PE.Views.EditShape.textEffects": "Effetti",
|
||||
"PE.Views.EditShape.textFill": "Riempimento",
|
||||
"PE.Views.EditShape.textForward": "Sposta avanti",
|
||||
|
|
@ -338,6 +343,7 @@
|
|||
"PE.Views.EditShape.textToForeground": "Porta in primo piano",
|
||||
"PE.Views.EditShape.txtDistribHor": "Distribuisci orizzontalmente",
|
||||
"PE.Views.EditShape.txtDistribVert": "Distribuisci verticalmente",
|
||||
"PE.Views.EditSlide.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"PE.Views.EditSlide.textApplyAll": "Applica a tutte le diapositive",
|
||||
"PE.Views.EditSlide.textBack": "Indietro",
|
||||
"PE.Views.EditSlide.textBlack": "Attraverso il nero",
|
||||
|
|
@ -349,6 +355,7 @@
|
|||
"PE.Views.EditSlide.textColor": "Colore",
|
||||
"PE.Views.EditSlide.textCounterclockwise": "In senso antiorario",
|
||||
"PE.Views.EditSlide.textCover": "Copertina",
|
||||
"PE.Views.EditSlide.textCustomColor": "Colore personalizzato",
|
||||
"PE.Views.EditSlide.textDelay": "Ritardo",
|
||||
"PE.Views.EditSlide.textDuplicateSlide": "Duplica diapositiva",
|
||||
"PE.Views.EditSlide.textDuration": "Durata",
|
||||
|
|
@ -383,6 +390,7 @@
|
|||
"PE.Views.EditSlide.textZoomIn": "Ingrandisci",
|
||||
"PE.Views.EditSlide.textZoomOut": "Rimpicciolisci",
|
||||
"PE.Views.EditSlide.textZoomRotate": "Zoom e rotazione",
|
||||
"PE.Views.EditTable.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"PE.Views.EditTable.textAlign": "Allinea",
|
||||
"PE.Views.EditTable.textAlignBottom": "Allinea in basso",
|
||||
"PE.Views.EditTable.textAlignCenter": "Allinea al centro",
|
||||
|
|
@ -397,6 +405,7 @@
|
|||
"PE.Views.EditTable.textBorder": "Bordo",
|
||||
"PE.Views.EditTable.textCellMargins": "Margini cella",
|
||||
"PE.Views.EditTable.textColor": "Colore",
|
||||
"PE.Views.EditTable.textCustomColor": "Colore personalizzato",
|
||||
"PE.Views.EditTable.textFill": "Riempimento",
|
||||
"PE.Views.EditTable.textFirstColumn": "Prima colonna",
|
||||
"PE.Views.EditTable.textForward": "Sposta avanti",
|
||||
|
|
@ -414,6 +423,7 @@
|
|||
"PE.Views.EditTable.textTotalRow": "Riga del Totale",
|
||||
"PE.Views.EditTable.txtDistribHor": "Distribuisci orizzontalmente",
|
||||
"PE.Views.EditTable.txtDistribVert": "Distribuisci verticalmente",
|
||||
"PE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"PE.Views.EditText.textAdditional": "Più...",
|
||||
"PE.Views.EditText.textAdditionalFormat": "Formattazione aggiuntiva",
|
||||
"PE.Views.EditText.textAfter": "dopo",
|
||||
|
|
@ -426,6 +436,7 @@
|
|||
"PE.Views.EditText.textCharacterItalic": "I",
|
||||
"PE.Views.EditText.textCharacterStrikethrough": "S",
|
||||
"PE.Views.EditText.textCharacterUnderline": "U",
|
||||
"PE.Views.EditText.textCustomColor": "Colore personalizzato",
|
||||
"PE.Views.EditText.textDblStrikethrough": "Barrato doppio",
|
||||
"PE.Views.EditText.textDblSuperscript": "Apice",
|
||||
"PE.Views.EditText.textFontColor": "Colore del carattere",
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@
|
|||
"PE.Views.EditImage.textAlignTop": "По верхнему краю",
|
||||
"PE.Views.EditImage.textBack": "Назад",
|
||||
"PE.Views.EditImage.textBackward": "Перенести назад",
|
||||
"PE.Views.EditImage.textDefault": "Размер по умолчанию",
|
||||
"PE.Views.EditImage.textDefault": "Реальный размер",
|
||||
"PE.Views.EditImage.textForward": "Перенести вперед",
|
||||
"PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
|
||||
"PE.Views.EditImage.textFromURL": "Изображение по URL",
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [
|
|||
"../../../../sdkjs/word/Editor/StylesChanges.js",
|
||||
"../../../../sdkjs/word/Editor/RevisionsChange.js",
|
||||
"../../../../sdkjs/slide/Editor/Format/StylesPrototype.js",
|
||||
"../../../../sdkjs/word/Drawing/buttons.js",
|
||||
"../../../../sdkjs/word/Drawing/Graphics.js",
|
||||
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
|
||||
"../../../../sdkjs/slide/Drawing/Transitions.js",
|
||||
|
|
|
|||
|
|
@ -410,6 +410,10 @@ SSE.ApplicationController = new(function(){
|
|||
message = me.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
message = me.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
message = me.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -576,6 +580,7 @@ SSE.ApplicationController = new(function(){
|
|||
waitText: 'Please, wait...',
|
||||
textLoadingDocument: 'Loading spreadsheet',
|
||||
txtClose: 'Close',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})();
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
"SSE.ApplicationController.unknownErrorText": "Unknown error.",
|
||||
"SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
|
||||
"SSE.ApplicationController.waitText": "Please, wait...",
|
||||
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"SSE.ApplicationView.txtDownload": "Download",
|
||||
"SSE.ApplicationView.txtEmbed": "Embed",
|
||||
"SSE.ApplicationView.txtFullScreen": "Full Screen",
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ define([
|
|||
'common/main/lib/util/Shortcuts',
|
||||
'common/main/lib/view/CopyWarningDialog',
|
||||
'common/main/lib/view/OpenDialog',
|
||||
'common/main/lib/view/ListSettingsDialog',
|
||||
'spreadsheeteditor/main/app/view/DocumentHolder',
|
||||
'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog',
|
||||
'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced',
|
||||
|
|
@ -213,7 +214,7 @@ define([
|
|||
view.menuImageAlign.menu.on('item:click', _.bind(me.onImgMenuAlign, me));
|
||||
view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me));
|
||||
view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me));
|
||||
view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectNoneBullet, me));
|
||||
view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectBulletMenu, me));
|
||||
view.menuAddHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
|
||||
view.menuEditHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
|
||||
view.menuRemoveHyperlinkShape.on('click', _.bind(me.onRemoveHyperlinkShape, me));
|
||||
|
|
@ -744,11 +745,37 @@ define([
|
|||
}
|
||||
},
|
||||
|
||||
onSelectNoneBullet: function(menu, item) {
|
||||
if (this.api && item.options.value == -1) {
|
||||
this.api.asc_setListType(item.options.value);
|
||||
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
|
||||
Common.component.Analytics.trackEvent('DocumentHolder', 'List Type');
|
||||
onSelectBulletMenu: function(menu, item) {
|
||||
if (this.api) {
|
||||
if (item.options.value == -1) {
|
||||
this.api.asc_setListType(item.options.value);
|
||||
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
|
||||
Common.component.Analytics.trackEvent('DocumentHolder', 'List Type');
|
||||
} else if (item.options.value == 'settings') {
|
||||
var me = this,
|
||||
props;
|
||||
var selectedObjects = me.api.asc_getGraphicObjectProps();
|
||||
for (var i = 0; i < selectedObjects.length; i++) {
|
||||
if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) {
|
||||
props = selectedObjects[i].asc_getObjectValue();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (props) {
|
||||
(new Common.Views.ListSettingsDialog({
|
||||
props: props,
|
||||
type: this.api.asc_getCurrentListType().get_ListType(),
|
||||
handler: function(result, value) {
|
||||
if (result == 'ok') {
|
||||
if (me.api) {
|
||||
me.api.asc_setGraphicObjectProps(value);
|
||||
}
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
|
||||
}
|
||||
})).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1645,6 +1672,7 @@ define([
|
|||
documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270);
|
||||
|
||||
documentHolder.menuParagraphBulletNone.setChecked(listtype.get_ListType() == -1);
|
||||
documentHolder.mnuListSettings.setDisabled(listtype.get_ListType() == -1);
|
||||
var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype.get_ListType(), subtype: listtype.get_ListSubType() });
|
||||
documentHolder.paraBulletsPicker.selectRecord(rec, true);
|
||||
} else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) {
|
||||
|
|
|
|||
|
|
@ -1406,6 +1406,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -2435,7 +2439,8 @@ define([
|
|||
txtTime: 'Time',
|
||||
txtTab: 'Tab',
|
||||
txtFile: 'File',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), SSE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ define([
|
|||
'common/main/lib/view/CopyWarningDialog',
|
||||
'common/main/lib/view/ImageFromUrlDialog',
|
||||
'common/main/lib/view/SelectFileDlg',
|
||||
'common/main/lib/view/SymbolTableDialog',
|
||||
'common/main/lib/util/define',
|
||||
'spreadsheeteditor/main/app/view/Toolbar',
|
||||
'spreadsheeteditor/main/app/collection/TableTemplates',
|
||||
|
|
@ -323,6 +324,7 @@ define([
|
|||
toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this));
|
||||
toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this));
|
||||
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
|
||||
toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this));
|
||||
toolbar.btnTableTemplate.menu.on('show:after', _.bind(this.onTableTplMenuOpen, this));
|
||||
toolbar.btnPercentStyle.on('click', _.bind(this.onNumberFormat, this));
|
||||
toolbar.btnCurrencyStyle.on('click', _.bind(this.onNumberFormat, this));
|
||||
|
|
@ -2763,6 +2765,28 @@ define([
|
|||
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
|
||||
},
|
||||
|
||||
onInsertSymbolClick: function() {
|
||||
if (this.api) {
|
||||
var me = this,
|
||||
win = new Common.Views.SymbolTableDialog({
|
||||
api: me.api,
|
||||
lang: me.toolbar.mode.lang,
|
||||
type: 1,
|
||||
buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
|
||||
handler: function(dlg, result, settings) {
|
||||
if (result == 'ok') {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
} else
|
||||
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||
}
|
||||
});
|
||||
win.show();
|
||||
win.on('symbol:dblclick', function(cmp, settings) {
|
||||
me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
onApiMathTypes: function(equation) {
|
||||
this._equationTemp = equation;
|
||||
var me = this;
|
||||
|
|
@ -3811,7 +3835,8 @@ define([
|
|||
textPivot: 'Pivot Table',
|
||||
txtTable_TableStyleMedium: 'Table Style Medium',
|
||||
txtTable_TableStyleDark: 'Table Style Dark',
|
||||
txtTable_TableStyleLight: 'Table Style Light'
|
||||
txtTable_TableStyleLight: 'Table Style Light',
|
||||
textInsert: 'Insert'
|
||||
|
||||
}, SSE.Controllers.Toolbar || {}));
|
||||
});
|
||||
|
|
@ -142,6 +142,7 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group">
|
||||
<span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
|
||||
<span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
|
||||
</div>
|
||||
</section>
|
||||
<section class="panel" data-tab="layout">
|
||||
|
|
|
|||
|
|
@ -401,261 +401,320 @@ define([
|
|||
|
||||
this.disableControls(this._locked);
|
||||
|
||||
if (props )
|
||||
{
|
||||
if (props ) {
|
||||
this._noApply = true;
|
||||
|
||||
var value = props.asc_getAngle();
|
||||
if ( Math.abs(this._state.CellAngle-value)>0.1 || (this._state.CellAngle===undefined)&&(this._state.CellAngle!==value)) {
|
||||
if (Math.abs(this._state.CellAngle - value) > 0.1 || (this._state.CellAngle === undefined) && (this._state.CellAngle !== value)) {
|
||||
this.spnAngle.setValue((value !== null) ? value : '', true);
|
||||
this._state.CellAngle=value;
|
||||
this._state.CellAngle = value;
|
||||
}
|
||||
this.fill = props.asc_getFill2();
|
||||
this.pattern = this.fill.asc_getPatternFill();
|
||||
this.gradient = this.fill.asc_getGradientFill();
|
||||
if (this.pattern === null && this.gradient === null) {
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
|
||||
this.CellColor = {Value: 0, Color: 'transparent'};
|
||||
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0};
|
||||
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
|
||||
} else if (this.pattern !== null) {
|
||||
if(this.pattern.asc_getType() === -1) {
|
||||
var color = this.pattern.asc_getFgColor();
|
||||
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
|
||||
} else {
|
||||
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
|
||||
}
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
|
||||
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)};
|
||||
if (this.fill) {
|
||||
this.pattern = this.fill.asc_getPatternFill();
|
||||
this.gradient = this.fill.asc_getGradientFill();
|
||||
if (this.pattern === null && this.gradient === null) {
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
|
||||
this.CellColor = {Value: 0, Color: 'transparent'};
|
||||
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), Position: 0};
|
||||
this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0};
|
||||
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
|
||||
} else {
|
||||
this.PatternFillType = this.pattern.asc_getType();
|
||||
if (this._state.PatternFillType !== this.PatternFillType) {
|
||||
this.cmbPattern.suspendEvents();
|
||||
var rec = this.cmbPattern.menuPicker.store.findWhere({
|
||||
type: this.PatternFillType
|
||||
});
|
||||
this.cmbPattern.menuPicker.selectRecord(rec);
|
||||
this.cmbPattern.resumeEvents();
|
||||
this._state.PatternFillType = this.PatternFillType;
|
||||
}
|
||||
var color = this.pattern.asc_getFgColor();
|
||||
if (color) {
|
||||
} else if (this.pattern !== null) {
|
||||
if (this.pattern.asc_getType() === -1) {
|
||||
var color = this.pattern.asc_getFgColor();
|
||||
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
|
||||
this.CellColor = {
|
||||
Value: 1,
|
||||
Color: {
|
||||
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
|
||||
effectValue: color.asc_getValue()
|
||||
}
|
||||
};
|
||||
} else {
|
||||
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
|
||||
this.CellColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
|
||||
};
|
||||
}
|
||||
} else
|
||||
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
|
||||
color = this.pattern.asc_getBgColor();
|
||||
if (color) {
|
||||
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }};
|
||||
} else {
|
||||
this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())};
|
||||
}
|
||||
} else
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
|
||||
this.FGColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)
|
||||
};
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)};
|
||||
this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), Position: 0};
|
||||
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT;
|
||||
}
|
||||
} else if (this.gradient !== null) {
|
||||
var gradFillType = this.gradient.asc_getType();
|
||||
if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) {
|
||||
this.GradFillType = gradFillType;
|
||||
rec = undefined;
|
||||
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
|
||||
this.cmbGradType.setValue(this.GradFillType);
|
||||
rec = this.cmbGradType.store.findWhere({value: this.GradFillType});
|
||||
this.onGradTypeSelect(this.cmbGradType, rec.attributes);
|
||||
this.GradColors[0] = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color),
|
||||
Position: 0
|
||||
};
|
||||
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
|
||||
} else {
|
||||
this.cmbGradType.setValue('');
|
||||
this.btnDirection.setIconCls('');
|
||||
this.PatternFillType = this.pattern.asc_getType();
|
||||
if (this._state.PatternFillType !== this.PatternFillType) {
|
||||
this.cmbPattern.suspendEvents();
|
||||
var rec = this.cmbPattern.menuPicker.store.findWhere({
|
||||
type: this.PatternFillType
|
||||
});
|
||||
this.cmbPattern.menuPicker.selectRecord(rec);
|
||||
this.cmbPattern.resumeEvents();
|
||||
this._state.PatternFillType = this.PatternFillType;
|
||||
}
|
||||
var color = this.pattern.asc_getFgColor();
|
||||
if (color) {
|
||||
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
this.FGColor = {
|
||||
Value: 1,
|
||||
Color: {
|
||||
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
|
||||
effectValue: color.asc_getValue()
|
||||
}
|
||||
};
|
||||
} else {
|
||||
this.FGColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
|
||||
};
|
||||
}
|
||||
} else
|
||||
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
|
||||
color = this.pattern.asc_getBgColor();
|
||||
if (color) {
|
||||
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
this.BGColor = {
|
||||
Value: 1,
|
||||
Color: {
|
||||
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
|
||||
effectValue: color.asc_getValue()
|
||||
}
|
||||
};
|
||||
} else {
|
||||
this.BGColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
|
||||
};
|
||||
}
|
||||
} else
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.CellColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)
|
||||
};
|
||||
this.GradColors[0] = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color),
|
||||
Position: 0
|
||||
};
|
||||
this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT;
|
||||
}
|
||||
this._state.GradFillType = this.GradFillType;
|
||||
}
|
||||
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
|
||||
var value = this.gradient.asc_getDegree();
|
||||
if (Math.abs(this.GradLinearDirectionType-value)>0.001) {
|
||||
this.GradLinearDirectionType=value;
|
||||
var record = this.mnuDirectionPicker.store.findWhere({type: value});
|
||||
this.mnuDirectionPicker.selectRecord(record, true);
|
||||
if (record)
|
||||
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
|
||||
else
|
||||
} else if (this.gradient !== null) {
|
||||
var gradFillType = this.gradient.asc_getType();
|
||||
if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) {
|
||||
this.GradFillType = gradFillType;
|
||||
rec = undefined;
|
||||
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
|
||||
this.cmbGradType.setValue(this.GradFillType);
|
||||
rec = this.cmbGradType.store.findWhere({value: this.GradFillType});
|
||||
this.onGradTypeSelect(this.cmbGradType, rec.attributes);
|
||||
} else {
|
||||
this.cmbGradType.setValue('');
|
||||
this.btnDirection.setIconCls('');
|
||||
}
|
||||
this._state.GradFillType = this.GradFillType;
|
||||
}
|
||||
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
|
||||
var value = this.gradient.asc_getDegree();
|
||||
if (Math.abs(this.GradLinearDirectionType - value) > 0.001) {
|
||||
this.GradLinearDirectionType = value;
|
||||
var record = this.mnuDirectionPicker.store.findWhere({type: value});
|
||||
this.mnuDirectionPicker.selectRecord(record, true);
|
||||
if (record)
|
||||
this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
|
||||
else
|
||||
this.btnDirection.setIconCls('');
|
||||
}
|
||||
}
|
||||
|
||||
var gradientStops;
|
||||
this.GradColors.length = 0;
|
||||
gradientStops = this.gradient.asc_getGradientStops();
|
||||
gradientStops.forEach(function (color) {
|
||||
var clr = color.asc_getColor(),
|
||||
position = color.asc_getPosition(),
|
||||
itemColor;
|
||||
if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
itemColor = {
|
||||
Value: 1,
|
||||
Color: {
|
||||
color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
|
||||
effectValue: clr.asc_getValue()
|
||||
},
|
||||
Position: position
|
||||
};
|
||||
} else {
|
||||
itemColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
|
||||
Position: position
|
||||
};
|
||||
}
|
||||
me.GradColors.push(itemColor);
|
||||
});
|
||||
this.GradColors = _.sortBy(this.GradColors, 'Position');
|
||||
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
|
||||
this.FGColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
|
||||
};
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.CellColor = {
|
||||
Value: 1,
|
||||
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
|
||||
};
|
||||
}
|
||||
|
||||
var gradientStops;
|
||||
this.GradColors.length = 0;
|
||||
gradientStops = this.gradient.asc_getGradientStops();
|
||||
gradientStops.forEach(function (color) {
|
||||
var clr = color.asc_getColor(),
|
||||
position = color.asc_getPosition(),
|
||||
itemColor;
|
||||
if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
|
||||
itemColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), effectValue: clr.asc_getValue()}, Position: position};
|
||||
if (this._state.FillType !== this.OriginalFillType) {
|
||||
this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType);
|
||||
this._state.FillType = this.OriginalFillType;
|
||||
this.ShowHideElem(this.OriginalFillType);
|
||||
}
|
||||
|
||||
// Color Back
|
||||
|
||||
var type1 = typeof (this.CellColor.Color),
|
||||
type2 = typeof (this._state.CellColor);
|
||||
if ((type1 !== type2) || (type1 == 'object' &&
|
||||
(this.CellColor.Color.effectValue !== this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color) < 0)) ||
|
||||
(type1 != 'object' && this._state.CellColor !== undefined && this._state.CellColor.indexOf(this.CellColor.Color) < 0)) {
|
||||
|
||||
this.btnBackColor.setColor(this.CellColor.Color);
|
||||
if (_.isObject(this.CellColor.Color)) {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) {
|
||||
this.colorsBack.select(this.CellColor.Color, true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsBack.clearSelection();
|
||||
} else {
|
||||
itemColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), Position: position};
|
||||
this.colorsBack.select(this.CellColor.Color, true);
|
||||
}
|
||||
me.GradColors.push(itemColor);
|
||||
});
|
||||
this.GradColors = _.sortBy(this.GradColors, 'Position');
|
||||
|
||||
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
|
||||
this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)};
|
||||
this.BGColor = {Value: 1, Color: 'ffffff'};
|
||||
this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)};
|
||||
}
|
||||
|
||||
if ( this._state.FillType !== this.OriginalFillType ) {
|
||||
this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType);
|
||||
this._state.FillType = this.OriginalFillType;
|
||||
this.ShowHideElem(this.OriginalFillType);
|
||||
}
|
||||
|
||||
// Color Back
|
||||
|
||||
var type1 = typeof(this.CellColor.Color),
|
||||
type2 = typeof(this._state.CellColor);
|
||||
if ( (type1 !== type2) || (type1=='object' &&
|
||||
(this.CellColor.Color.effectValue!==this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color)<0)) ||
|
||||
(type1!='object' && this._state.CellColor!==undefined && this._state.CellColor.indexOf(this.CellColor.Color)<0 )) {
|
||||
|
||||
this.btnBackColor.setColor(this.CellColor.Color);
|
||||
if (_.isObject(this.CellColor.Color)) {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) {
|
||||
this.colorsBack.select(this.CellColor.Color,true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsBack.clearSelection();
|
||||
} else {
|
||||
this.colorsBack.select(this.CellColor.Color, true);
|
||||
this._state.CellColor = this.CellColor.Color;
|
||||
}
|
||||
this._state.CellColor = this.CellColor.Color;
|
||||
}
|
||||
|
||||
// Pattern colors
|
||||
type1 = typeof(this.FGColor.Color);
|
||||
type2 = typeof(this._state.FGColor);
|
||||
// Pattern colors
|
||||
type1 = typeof (this.FGColor.Color);
|
||||
type2 = typeof (this._state.FGColor);
|
||||
|
||||
if ( (type1 !== type2) || (type1=='object' &&
|
||||
(this.FGColor.Color.effectValue!==this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color)<0)) ||
|
||||
(type1!='object' && this._state.FGColor.indexOf(this.FGColor.Color)<0 )) {
|
||||
if ((type1 !== type2) || (type1 == 'object' &&
|
||||
(this.FGColor.Color.effectValue !== this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color) < 0)) ||
|
||||
(type1 != 'object' && this._state.FGColor.indexOf(this.FGColor.Color) < 0)) {
|
||||
|
||||
this.btnFGColor.setColor(this.FGColor.Color);
|
||||
if ( typeof(this.FGColor.Color) == 'object' ) {
|
||||
var isselected = false;
|
||||
for (var i=0; i<10; i++) {
|
||||
if ( Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue ) {
|
||||
this.colorsFG.select(this.FGColor.Color,true);
|
||||
isselected = true;
|
||||
break;
|
||||
this.btnFGColor.setColor(this.FGColor.Color);
|
||||
if (typeof (this.FGColor.Color) == 'object') {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue) {
|
||||
this.colorsFG.select(this.FGColor.Color, true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsFG.clearSelection();
|
||||
} else
|
||||
this.colorsFG.select(this.FGColor.Color,true);
|
||||
if (!isselected) this.colorsFG.clearSelection();
|
||||
} else
|
||||
this.colorsFG.select(this.FGColor.Color, true);
|
||||
|
||||
this._state.FGColor = this.FGColor.Color;
|
||||
}
|
||||
this._state.FGColor = this.FGColor.Color;
|
||||
}
|
||||
|
||||
type1 = typeof(this.BGColor.Color);
|
||||
type2 = typeof(this._state.BGColor);
|
||||
type1 = typeof (this.BGColor.Color);
|
||||
type2 = typeof (this._state.BGColor);
|
||||
|
||||
if ( (type1 !== type2) || (type1=='object' &&
|
||||
(this.BGColor.Color.effectValue!==this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color)<0)) ||
|
||||
(type1!='object' && this._state.BGColor.indexOf(this.BGColor.Color)<0 )) {
|
||||
if ((type1 !== type2) || (type1 == 'object' &&
|
||||
(this.BGColor.Color.effectValue !== this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color) < 0)) ||
|
||||
(type1 != 'object' && this._state.BGColor.indexOf(this.BGColor.Color) < 0)) {
|
||||
|
||||
this.btnBGColor.setColor(this.BGColor.Color);
|
||||
if ( typeof(this.BGColor.Color) == 'object' ) {
|
||||
var isselected = false;
|
||||
for (var i=0; i<10; i++) {
|
||||
if ( Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue ) {
|
||||
this.colorsBG.select(this.BGColor.Color,true);
|
||||
isselected = true;
|
||||
break;
|
||||
this.btnBGColor.setColor(this.BGColor.Color);
|
||||
if (typeof (this.BGColor.Color) == 'object') {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue) {
|
||||
this.colorsBG.select(this.BGColor.Color, true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsBG.clearSelection();
|
||||
} else
|
||||
this.colorsBG.select(this.BGColor.Color,true);
|
||||
if (!isselected) this.colorsBG.clearSelection();
|
||||
} else
|
||||
this.colorsBG.select(this.BGColor.Color, true);
|
||||
|
||||
this._state.BGColor = this.BGColor.Color;
|
||||
}
|
||||
this._state.BGColor = this.BGColor.Color;
|
||||
}
|
||||
|
||||
// Gradient colors
|
||||
var gradColor1 = this.GradColors[0];
|
||||
if (!gradColor1) {
|
||||
gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
}
|
||||
type1 = typeof(gradColor1.Color);
|
||||
type2 = typeof(this._state.GradColor1);
|
||||
// Gradient colors
|
||||
var gradColor1 = this.GradColors[0];
|
||||
if (!gradColor1) {
|
||||
gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
|
||||
}
|
||||
type1 = typeof (gradColor1.Color);
|
||||
type2 = typeof (this._state.GradColor1);
|
||||
|
||||
if ( (type1 !== type2) || (type1=='object' &&
|
||||
(gradColor1.Color.effectValue!==this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color)<0)) ||
|
||||
(type1!='object' && this._state.GradColor1.indexOf(gradColor1.Color)<0 )) {
|
||||
if ((type1 !== type2) || (type1 == 'object' &&
|
||||
(gradColor1.Color.effectValue !== this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color) < 0)) ||
|
||||
(type1 != 'object' && this._state.GradColor1.indexOf(gradColor1.Color) < 0)) {
|
||||
|
||||
this.btnGradColor1.setColor(gradColor1.Color);
|
||||
if ( typeof(gradColor1.Color) == 'object' ) {
|
||||
var isselected = false;
|
||||
for (var i=0; i<10; i++) {
|
||||
if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue ) {
|
||||
this.colorsGrad1.select(gradColor1.Color,true);
|
||||
isselected = true;
|
||||
break;
|
||||
this.btnGradColor1.setColor(gradColor1.Color);
|
||||
if (typeof (gradColor1.Color) == 'object') {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue) {
|
||||
this.colorsGrad1.select(gradColor1.Color, true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsGrad1.clearSelection();
|
||||
} else
|
||||
this.colorsGrad1.select(gradColor1.Color,true);
|
||||
if (!isselected) this.colorsGrad1.clearSelection();
|
||||
} else
|
||||
this.colorsGrad1.select(gradColor1.Color, true);
|
||||
|
||||
this._state.GradColor1 = gradColor1.Color;
|
||||
}
|
||||
this._state.GradColor1 = gradColor1.Color;
|
||||
}
|
||||
|
||||
var gradColor2 = this.GradColors[1];
|
||||
if (!gradColor2) {
|
||||
gradColor2 = {Value: 1, Color: 'ffffff'};
|
||||
}
|
||||
type1 = typeof(gradColor2.Color);
|
||||
type2 = typeof(this._state.GradColor2);
|
||||
var gradColor2 = this.GradColors[1];
|
||||
if (!gradColor2) {
|
||||
gradColor2 = {Value: 1, Color: 'ffffff'};
|
||||
}
|
||||
type1 = typeof (gradColor2.Color);
|
||||
type2 = typeof (this._state.GradColor2);
|
||||
|
||||
if ( (type1 !== type2) || (type1=='object' &&
|
||||
(gradColor2.Color.effectValue!==this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color)<0)) ||
|
||||
(type1!='object' && this._state.GradColor2.indexOf(gradColor2.Color)<0 )) {
|
||||
if ((type1 !== type2) || (type1 == 'object' &&
|
||||
(gradColor2.Color.effectValue !== this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color) < 0)) ||
|
||||
(type1 != 'object' && this._state.GradColor2.indexOf(gradColor2.Color) < 0)) {
|
||||
|
||||
this.btnGradColor2.setColor(gradColor2.Color);
|
||||
if ( typeof(gradColor2.Color) == 'object' ) {
|
||||
var isselected = false;
|
||||
for (var i=0; i<10; i++) {
|
||||
if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue ) {
|
||||
this.colorsGrad2.select(gradColor2.Color,true);
|
||||
isselected = true;
|
||||
break;
|
||||
this.btnGradColor2.setColor(gradColor2.Color);
|
||||
if (typeof (gradColor2.Color) == 'object') {
|
||||
var isselected = false;
|
||||
for (var i = 0; i < 10; i++) {
|
||||
if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue) {
|
||||
this.colorsGrad2.select(gradColor2.Color, true);
|
||||
isselected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isselected) this.colorsGrad2.clearSelection();
|
||||
} else
|
||||
this.colorsGrad2.select(gradColor2.Color,true);
|
||||
if (!isselected) this.colorsGrad2.clearSelection();
|
||||
} else
|
||||
this.colorsGrad2.select(gradColor2.Color, true);
|
||||
|
||||
this._state.GradColor2 = gradColor2.Color;
|
||||
this._state.GradColor2 = gradColor2.Color;
|
||||
}
|
||||
|
||||
this._noApply = false;
|
||||
}
|
||||
|
||||
this._noApply = false;
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -836,6 +836,10 @@ define([
|
|||
checkable : true,
|
||||
checked : false,
|
||||
value : -1
|
||||
}),
|
||||
me.mnuListSettings = new Common.UI.MenuItem({
|
||||
caption: me.textListSettings,
|
||||
value: 'settings'
|
||||
})
|
||||
]
|
||||
})
|
||||
|
|
@ -1057,7 +1061,7 @@ define([
|
|||
strDetails: 'Signature Details',
|
||||
strSetup: 'Signature Setup',
|
||||
strDelete: 'Remove Signature',
|
||||
originalSizeText: 'Default Size',
|
||||
originalSizeText: 'Actual Size',
|
||||
textReplace: 'Replace image',
|
||||
textFromUrl: 'From URL',
|
||||
textFromFile: 'From File',
|
||||
|
|
@ -1090,7 +1094,8 @@ define([
|
|||
textAlign: 'Align',
|
||||
textCrop: 'Crop',
|
||||
textCropFill: 'Fill',
|
||||
textCropFit: 'Fit'
|
||||
textCropFit: 'Fit',
|
||||
textListSettings: 'List Settings'
|
||||
|
||||
}, SSE.Views.DocumentHolder || {}));
|
||||
});
|
||||
|
|
@ -514,7 +514,7 @@ define([
|
|||
textSize: 'Size',
|
||||
textWidth: 'Width',
|
||||
textHeight: 'Height',
|
||||
textOriginalSize: 'Default Size',
|
||||
textOriginalSize: 'Actual Size',
|
||||
textInsert: 'Replace Image',
|
||||
textFromUrl: 'From URL',
|
||||
textFromFile: 'From File',
|
||||
|
|
|
|||
|
|
@ -571,11 +571,11 @@ define([
|
|||
textNoColor : 'No Color',
|
||||
textNewColor : 'Add New Custom Color',
|
||||
zoomText : 'Zoom {0}%',
|
||||
textSum : 'SUM',
|
||||
textCount : 'COUNT',
|
||||
textAverage : 'AVERAGE',
|
||||
textMin : 'MIN',
|
||||
textMax : 'MAX',
|
||||
textSum : 'Sum',
|
||||
textCount : 'Count',
|
||||
textAverage : 'Average',
|
||||
textMin : 'Min',
|
||||
textMax : 'Max',
|
||||
filteredRecordsText : '{0} of {1} records filtered',
|
||||
filteredText : 'Filter mode',
|
||||
selectAllSheets : 'Select All Sheets',
|
||||
|
|
|
|||
|
|
@ -714,6 +714,14 @@ define([
|
|||
menu : new Common.UI.Menu({cls: 'menu-shapes'})
|
||||
});
|
||||
|
||||
me.btnInsertSymbol = new Common.UI.Button({
|
||||
id: 'tlbtn-insertsymbol',
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
iconCls: 'btn-symbol',
|
||||
caption: me.capBtnInsSymbol,
|
||||
lock: [_set.selImage, _set.selChart, _set.selShape, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect]
|
||||
});
|
||||
|
||||
me.btnTableTemplate = new Common.UI.Button({
|
||||
id : 'id-toolbar-btn-ttempl',
|
||||
cls : 'btn-toolbar',
|
||||
|
|
@ -1459,7 +1467,7 @@ define([
|
|||
me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft,
|
||||
me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop,
|
||||
me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable,
|
||||
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.btnInsertSymbol,
|
||||
me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter,
|
||||
me.btnTableTemplate, me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell,
|
||||
me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink,
|
||||
|
|
@ -1635,6 +1643,7 @@ define([
|
|||
_injectComponent('#slot-btn-instext', this.btnInsertText);
|
||||
_injectComponent('#slot-btn-instextart', this.btnInsertTextArt);
|
||||
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
|
||||
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
|
||||
_injectComponent('#slot-btn-sortdesc', this.btnSortDown);
|
||||
_injectComponent('#slot-btn-sortasc', this.btnSortUp);
|
||||
_injectComponent('#slot-btn-setfilter', this.btnSetAutofilter);
|
||||
|
|
@ -1717,6 +1726,7 @@ define([
|
|||
_updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
|
||||
_updateHint(this.btnInsertShape, this.tipInsertShape);
|
||||
_updateHint(this.btnInsertEquation, this.tipInsertEquation);
|
||||
_updateHint(this.btnInsertSymbol, this.tipInsertSymbol);
|
||||
_updateHint(this.btnSortDown, this.txtSortAZ);
|
||||
_updateHint(this.btnSortUp, this.txtSortZA);
|
||||
_updateHint(this.btnSetAutofilter, this.txtFilter + ' (Ctrl+Shift+L)');
|
||||
|
|
@ -2520,6 +2530,8 @@ define([
|
|||
textManyPages: 'pages',
|
||||
textHeight: 'Height',
|
||||
textWidth: 'Width',
|
||||
textMorePages: 'More pages'
|
||||
textMorePages: 'More pages',
|
||||
capBtnInsSymbol: 'Symbol',
|
||||
tipInsertSymbol: 'Insert symbol'
|
||||
}, SSE.Views.Toolbar || {}));
|
||||
});
|
||||
|
|
@ -94,6 +94,12 @@
|
|||
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
|
||||
"Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
|
||||
"Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
|
||||
"Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
|
||||
"Common.Views.ListSettingsDialog.txtColor": "Color",
|
||||
"Common.Views.ListSettingsDialog.txtOfText": "% of text",
|
||||
"Common.Views.ListSettingsDialog.txtSize": "Size",
|
||||
"Common.Views.ListSettingsDialog.txtStart": "Start at",
|
||||
"Common.Views.ListSettingsDialog.txtTitle": "List Settings",
|
||||
"Common.Views.OpenDialog.closeButtonText": "Close File",
|
||||
"Common.Views.OpenDialog.txtColon": "Colon",
|
||||
"Common.Views.OpenDialog.txtComma": "Comma",
|
||||
|
|
@ -208,6 +214,11 @@
|
|||
"Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
|
||||
"Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
|
||||
"Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
|
||||
"Common.Views.SymbolTableDialog.textTitle": "Symbol",
|
||||
"Common.Views.SymbolTableDialog.textFont": "Font",
|
||||
"Common.Views.SymbolTableDialog.textRange": "Range",
|
||||
"Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
|
||||
"Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
|
||||
"SSE.Controllers.DataTab.textWizard": "Text to Columns",
|
||||
"SSE.Controllers.DocumentHolder.alignmentText": "Alignment",
|
||||
"SSE.Controllers.DocumentHolder.centerText": "Center",
|
||||
|
|
@ -737,6 +748,7 @@
|
|||
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
|
||||
"SSE.Controllers.Print.strAllSheets": "All Sheets",
|
||||
"SSE.Controllers.Print.textWarning": "Warning",
|
||||
"SSE.Controllers.Print.txtCustom": "Custom",
|
||||
|
|
@ -1091,6 +1103,7 @@
|
|||
"SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium",
|
||||
"SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
|
||||
"SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
|
||||
"SSE.Controllers.Toolbar.textInsert": "Insert",
|
||||
"SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes",
|
||||
"SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar",
|
||||
"SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines",
|
||||
|
|
@ -1391,7 +1404,7 @@
|
|||
"SSE.Views.DocumentHolder.insertColumnRightText": "Column Right",
|
||||
"SSE.Views.DocumentHolder.insertRowAboveText": "Row Above",
|
||||
"SSE.Views.DocumentHolder.insertRowBelowText": "Row Below",
|
||||
"SSE.Views.DocumentHolder.originalSizeText": "Default Size",
|
||||
"SSE.Views.DocumentHolder.originalSizeText": "Actual Size",
|
||||
"SSE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
|
||||
"SSE.Views.DocumentHolder.selectColumnText": "Entire Column",
|
||||
"SSE.Views.DocumentHolder.selectDataText": "Column Data",
|
||||
|
|
@ -1495,6 +1508,7 @@
|
|||
"SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
|
||||
"SSE.Views.DocumentHolder.txtWidth": "Width",
|
||||
"SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
||||
"SSE.Views.DocumentHolder.textListSettings": "List Settings",
|
||||
"SSE.Views.FileMenu.btnBackCaption": "Open file location",
|
||||
"SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
|
||||
"SSE.Views.FileMenu.btnCreateNewCaption": "Create New",
|
||||
|
|
@ -1702,7 +1716,7 @@
|
|||
"SSE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
|
||||
"SSE.Views.ImageSettings.textInsert": "Replace Image",
|
||||
"SSE.Views.ImageSettings.textKeepRatio": "Constant proportions",
|
||||
"SSE.Views.ImageSettings.textOriginalSize": "Default Size",
|
||||
"SSE.Views.ImageSettings.textOriginalSize": "Actual Size",
|
||||
"SSE.Views.ImageSettings.textRotate90": "Rotate 90°",
|
||||
"SSE.Views.ImageSettings.textRotation": "Rotation",
|
||||
"SSE.Views.ImageSettings.textSize": "Size",
|
||||
|
|
@ -2086,13 +2100,13 @@
|
|||
"SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "A sheet name cannot contain the following characters: \\/*?[]:",
|
||||
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name",
|
||||
"SSE.Views.Statusbar.selectAllSheets": "Select All Sheets",
|
||||
"SSE.Views.Statusbar.textAverage": "AVERAGE",
|
||||
"SSE.Views.Statusbar.textCount": "COUNT",
|
||||
"SSE.Views.Statusbar.textMax": "MAX",
|
||||
"SSE.Views.Statusbar.textMin": "MIN",
|
||||
"SSE.Views.Statusbar.textAverage": "Average",
|
||||
"SSE.Views.Statusbar.textCount": "Count",
|
||||
"SSE.Views.Statusbar.textMax": "Max",
|
||||
"SSE.Views.Statusbar.textMin": "Min",
|
||||
"SSE.Views.Statusbar.textNewColor": "Add New Custom Color",
|
||||
"SSE.Views.Statusbar.textNoColor": "No Color",
|
||||
"SSE.Views.Statusbar.textSum": "SUM",
|
||||
"SSE.Views.Statusbar.textSum": "Sum",
|
||||
"SSE.Views.Statusbar.tipAddTab": "Add worksheet",
|
||||
"SSE.Views.Statusbar.tipFirst": "Scroll to first sheet",
|
||||
"SSE.Views.Statusbar.tipLast": "Scroll to last sheet",
|
||||
|
|
@ -2429,6 +2443,8 @@
|
|||
"SSE.Views.Toolbar.txtTime": "Time",
|
||||
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
|
||||
"SSE.Views.Toolbar.txtYen": "¥ Yen",
|
||||
"SSE.Views.Toolbar.capBtnInsSymbol": "Symbol",
|
||||
"SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
|
||||
"SSE.Views.Top10FilterDialog.textType": "Show",
|
||||
"SSE.Views.Top10FilterDialog.txtBottom": "Bottom",
|
||||
"SSE.Views.Top10FilterDialog.txtItems": "Item",
|
||||
|
|
|
|||
|
|
@ -1391,7 +1391,7 @@
|
|||
"SSE.Views.DocumentHolder.insertColumnRightText": "Столбец справа",
|
||||
"SSE.Views.DocumentHolder.insertRowAboveText": "Строку выше",
|
||||
"SSE.Views.DocumentHolder.insertRowBelowText": "Строку ниже",
|
||||
"SSE.Views.DocumentHolder.originalSizeText": "По умолчанию",
|
||||
"SSE.Views.DocumentHolder.originalSizeText": "Реальный размер",
|
||||
"SSE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
|
||||
"SSE.Views.DocumentHolder.selectColumnText": "Весь столбец",
|
||||
"SSE.Views.DocumentHolder.selectDataText": "Данные столбцов",
|
||||
|
|
@ -1702,7 +1702,7 @@
|
|||
"SSE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
|
||||
"SSE.Views.ImageSettings.textInsert": "Заменить изображение",
|
||||
"SSE.Views.ImageSettings.textKeepRatio": "Сохранять пропорции",
|
||||
"SSE.Views.ImageSettings.textOriginalSize": "По умолчанию",
|
||||
"SSE.Views.ImageSettings.textOriginalSize": "Реальный размер",
|
||||
"SSE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
|
||||
"SSE.Views.ImageSettings.textRotation": "Поворот",
|
||||
"SSE.Views.ImageSettings.textSize": "Размер",
|
||||
|
|
@ -2086,13 +2086,13 @@
|
|||
"SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Имя листа не может содержать следующие символы: \\/*?[]:",
|
||||
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Имя листа",
|
||||
"SSE.Views.Statusbar.selectAllSheets": "Выбрать все листы",
|
||||
"SSE.Views.Statusbar.textAverage": "СРЕДНЕЕ",
|
||||
"SSE.Views.Statusbar.textCount": "КОЛИЧЕСТВО",
|
||||
"SSE.Views.Statusbar.textMax": "МАКС",
|
||||
"SSE.Views.Statusbar.textMin": "МИН",
|
||||
"SSE.Views.Statusbar.textAverage": "Среднее",
|
||||
"SSE.Views.Statusbar.textCount": "Количество",
|
||||
"SSE.Views.Statusbar.textMax": "Макс",
|
||||
"SSE.Views.Statusbar.textMin": "Мин",
|
||||
"SSE.Views.Statusbar.textNewColor": "Пользовательский цвет",
|
||||
"SSE.Views.Statusbar.textNoColor": "Без цвета",
|
||||
"SSE.Views.Statusbar.textSum": "СУММА",
|
||||
"SSE.Views.Statusbar.textSum": "Сумма",
|
||||
"SSE.Views.Statusbar.tipAddTab": "Добавить лист",
|
||||
"SSE.Views.Statusbar.tipFirst": "Прокрутить до первого листа",
|
||||
"SSE.Views.Statusbar.tipLast": "Прокрутить до последнего листа",
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@
|
|||
@import "../../../../common/main/resources/less/toolbar.less";
|
||||
@import "../../../../common/main/resources/less/language-dialog.less";
|
||||
@import "../../../../common/main/resources/less/winxp_fix.less";
|
||||
@import "../../../../common/main/resources/less/symboltable.less";
|
||||
|
||||
// App
|
||||
// --------------------------------------------------
|
||||
|
|
@ -164,7 +165,7 @@
|
|||
height: 100%;
|
||||
display: inline-block;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
|
||||
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background-size: 80px 20px;
|
||||
|
||||
|
|
|
|||
|
|
@ -1044,6 +1044,10 @@ define([
|
|||
config.msg = this.errorFileSizeExceed;
|
||||
break;
|
||||
|
||||
case Asc.c_oAscError.ID.UpdateVersion:
|
||||
config.msg = this.errorUpdateVersionOnDisconnect;
|
||||
break;
|
||||
|
||||
default:
|
||||
config.msg = this.errorDefaultMessage.replace('%1', id);
|
||||
break;
|
||||
|
|
@ -1625,7 +1629,8 @@ define([
|
|||
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
|
||||
errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&)',
|
||||
waitText: 'Please, wait...',
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
|
||||
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
|
||||
errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
|
||||
}
|
||||
})(), SSE.Controllers.Main || {}))
|
||||
});
|
||||
|
|
@ -148,7 +148,7 @@ define([
|
|||
|
||||
textReplace: 'Replace',
|
||||
textReorder: 'Reorder',
|
||||
textDefault: 'Default Size',
|
||||
textDefault: 'Actual Size',
|
||||
textRemove: 'Remove Image',
|
||||
textBack: 'Back',
|
||||
textToForeground: 'Bring to Foreground',
|
||||
|
|
|
|||
|
|
@ -286,6 +286,7 @@
|
|||
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
|
||||
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
|
||||
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
|
||||
"SSE.Controllers.Search.textNoTextFound": "Text not found",
|
||||
"SSE.Controllers.Search.textReplaceAll": "Replace All",
|
||||
"SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",
|
||||
|
|
@ -466,7 +467,7 @@
|
|||
"SSE.Views.EditImage.textAddress": "Address",
|
||||
"SSE.Views.EditImage.textBack": "Back",
|
||||
"SSE.Views.EditImage.textBackward": "Move Backward",
|
||||
"SSE.Views.EditImage.textDefault": "Default Size",
|
||||
"SSE.Views.EditImage.textDefault": "Actual Size",
|
||||
"SSE.Views.EditImage.textForward": "Move Forward",
|
||||
"SSE.Views.EditImage.textFromLibrary": "Picture from Library",
|
||||
"SSE.Views.EditImage.textFromURL": "Picture from URL",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.",
|
||||
"Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati",
|
||||
"Common.UI.ThemeColorPalette.textStandartColors": "Colori standard",
|
||||
"Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema",
|
||||
"Common.Utils.Metric.txtCm": "cm",
|
||||
|
|
@ -346,6 +347,7 @@
|
|||
"SSE.Views.AddOther.textLink": "Collegamento",
|
||||
"SSE.Views.AddOther.textSort": "Ordina e filtra",
|
||||
"SSE.Views.EditCell.textAccounting": "Contabilità",
|
||||
"SSE.Views.EditCell.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"SSE.Views.EditCell.textAlignBottom": "Allinea in basso",
|
||||
"SSE.Views.EditCell.textAlignCenter": "Allinea al centro",
|
||||
"SSE.Views.EditCell.textAlignLeft": "Allinea a sinistra",
|
||||
|
|
@ -362,6 +364,7 @@
|
|||
"SSE.Views.EditCell.textCharacterUnderline": "U",
|
||||
"SSE.Views.EditCell.textColor": "Colore",
|
||||
"SSE.Views.EditCell.textCurrency": "Valuta",
|
||||
"SSE.Views.EditCell.textCustomColor": "Colore personalizzato",
|
||||
"SSE.Views.EditCell.textDate": "Data",
|
||||
"SSE.Views.EditCell.textDiagDownBorder": "Bordo diagonale inferiore",
|
||||
"SSE.Views.EditCell.textDiagUpBorder": "Bordo diagonale superiore",
|
||||
|
|
@ -395,6 +398,7 @@
|
|||
"SSE.Views.EditCell.textTopBorder": "Bordo superiore",
|
||||
"SSE.Views.EditCell.textWrapText": "Disponi testo",
|
||||
"SSE.Views.EditCell.textYen": "Yen",
|
||||
"SSE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"SSE.Views.EditChart.textAuto": "Auto",
|
||||
"SSE.Views.EditChart.textAxisCrosses": "Intersezione asse",
|
||||
"SSE.Views.EditChart.textAxisOptions": "Opzioni assi",
|
||||
|
|
@ -408,6 +412,7 @@
|
|||
"SSE.Views.EditChart.textChartTitle": "Titolo del grafico",
|
||||
"SSE.Views.EditChart.textColor": "Colore",
|
||||
"SSE.Views.EditChart.textCrossesValue": "Incrocia valore",
|
||||
"SSE.Views.EditChart.textCustomColor": "Colore personalizzato",
|
||||
"SSE.Views.EditChart.textDataLabels": "Etichette dati",
|
||||
"SSE.Views.EditChart.textDesign": "Design",
|
||||
"SSE.Views.EditChart.textDisplayUnits": "Mostra unità",
|
||||
|
|
@ -461,7 +466,7 @@
|
|||
"SSE.Views.EditImage.textAddress": "Indirizzo",
|
||||
"SSE.Views.EditImage.textBack": "Indietro",
|
||||
"SSE.Views.EditImage.textBackward": "Sposta indietro",
|
||||
"SSE.Views.EditImage.textDefault": "Dimensione predefinita",
|
||||
"SSE.Views.EditImage.textDefault": "Dimensione reale",
|
||||
"SSE.Views.EditImage.textForward": "Sposta avanti",
|
||||
"SSE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta",
|
||||
"SSE.Views.EditImage.textFromURL": "Immagine da URL",
|
||||
|
|
@ -473,10 +478,12 @@
|
|||
"SSE.Views.EditImage.textReplaceImg": "Sostituisci immagine",
|
||||
"SSE.Views.EditImage.textToBackground": "Porta in secondo piano",
|
||||
"SSE.Views.EditImage.textToForeground": "Porta in primo piano",
|
||||
"SSE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"SSE.Views.EditShape.textBack": "Indietro",
|
||||
"SSE.Views.EditShape.textBackward": "Sposta indietro",
|
||||
"SSE.Views.EditShape.textBorder": "Bordo",
|
||||
"SSE.Views.EditShape.textColor": "Colore",
|
||||
"SSE.Views.EditShape.textCustomColor": "Colore personalizzato",
|
||||
"SSE.Views.EditShape.textEffects": "Effetti",
|
||||
"SSE.Views.EditShape.textFill": "Riempimento",
|
||||
"SSE.Views.EditShape.textForward": "Sposta avanti",
|
||||
|
|
@ -488,10 +495,12 @@
|
|||
"SSE.Views.EditShape.textStyle": "Stile",
|
||||
"SSE.Views.EditShape.textToBackground": "Porta in secondo piano",
|
||||
"SSE.Views.EditShape.textToForeground": "Porta in primo piano",
|
||||
"SSE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato",
|
||||
"SSE.Views.EditText.textBack": "Indietro",
|
||||
"SSE.Views.EditText.textCharacterBold": "B",
|
||||
"SSE.Views.EditText.textCharacterItalic": "I",
|
||||
"SSE.Views.EditText.textCharacterUnderline": "U",
|
||||
"SSE.Views.EditText.textCustomColor": "Colore personalizzato",
|
||||
"SSE.Views.EditText.textFillColor": "Colore di riempimento",
|
||||
"SSE.Views.EditText.textFonts": "Caratteri",
|
||||
"SSE.Views.EditText.textSize": "Dimensione",
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@
|
|||
"SSE.Views.EditImage.textAddress": "Адрес",
|
||||
"SSE.Views.EditImage.textBack": "Назад",
|
||||
"SSE.Views.EditImage.textBackward": "Перенести назад",
|
||||
"SSE.Views.EditImage.textDefault": "Размер по умолчанию",
|
||||
"SSE.Views.EditImage.textDefault": "Реальный размер",
|
||||
"SSE.Views.EditImage.textForward": "Перенести вперед",
|
||||
"SSE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
|
||||
"SSE.Views.EditImage.textFromURL": "Изображение по URL",
|
||||
|
|
|
|||
|
|
@ -7723,7 +7723,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
display: inline-block;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background-size: 80px 20px;
|
||||
-webkit-animation: flickerAnimation 2s infinite ease-in-out;
|
||||
-moz-animation: flickerAnimation 2s infinite ease-in-out;
|
||||
|
|
|
|||
|
|
@ -7585,7 +7585,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
display: inline-block;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background-size: 80px 20px;
|
||||
-webkit-animation: flickerAnimation 2s infinite ease-in-out;
|
||||
-moz-animation: flickerAnimation 2s infinite ease-in-out;
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ input, textarea {
|
|||
height: 100%;
|
||||
display: inline-block;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
|
||||
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background-size: 80px 20px;
|
||||
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ input, textarea {
|
|||
height: 100%;
|
||||
display: inline-block;
|
||||
background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0,
|
||||
linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0,
|
||||
linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x;
|
||||
background-size: 80px 20px;
|
||||
|
||||
|
|
|
|||
|
|
@ -151,6 +151,12 @@
|
|||
"cwd": "../apps/documenteditor/main/resources/watermark",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/watermark"
|
||||
},
|
||||
{
|
||||
"expand": true,
|
||||
"cwd": "../apps/common/main/resources/symboltable",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/symboltable"
|
||||
}
|
||||
],
|
||||
"help": [
|
||||
|
|
|
|||
|
|
@ -145,6 +145,12 @@
|
|||
"cwd": "../apps/presentationeditor/main/locale/",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/presentationeditor/main/locale/"
|
||||
},
|
||||
{
|
||||
"expand": true,
|
||||
"cwd": "../apps/common/main/resources/symboltable",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/symboltable"
|
||||
}
|
||||
],
|
||||
"help": [
|
||||
|
|
|
|||
|
|
@ -159,6 +159,12 @@
|
|||
"cwd": "../apps/spreadsheeteditor/main/resources/formula-lang",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang"
|
||||
},
|
||||
{
|
||||
"expand": true,
|
||||
"cwd": "../apps/common/main/resources/symboltable",
|
||||
"src": "*",
|
||||
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/symboltable"
|
||||
}
|
||||
],
|
||||
"help": [
|
||||
|
|
|
|||
Loading…
Reference in a new issue