|
diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js
index 1f37fabc66..5242546eb4 100644
--- a/apps/documenteditor/main/app/view/ImageSettings.js
+++ b/apps/documenteditor/main/app/view/ImageSettings.js
@@ -310,6 +310,37 @@ define([
this.btnResetCrop.on('click', _.bind(this.onResetCrop, this));
this.lockedControls.push(this.btnResetCrop);
+ this.numTransparency = new Common.UI.MetricSpinner({
+ el: $('#image-spin-transparency'),
+ step: 1,
+ width: 62,
+ value: '100 %',
+ defaultUnit : "%",
+ maxValue: 100,
+ minValue: 0,
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big',
+ ariaLabel: this.strTransparency
+ });
+ this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
+ this.numTransparency.on('inputleave', function(){ this.fireEvent('editcomplete', this);});
+ this.lockedControls.push(this.numTransparency);
+
+ this.sldrTransparency = new Common.UI.SingleSlider({
+ el: $('#image-slider-transparency'),
+ width: 75,
+ minValue: 0,
+ maxValue: 100,
+ value: 100
+ });
+ this.sldrTransparency.on('change', _.bind(this.onTransparencyChange, this));
+ this.sldrTransparency.on('changecomplete', _.bind(this.onTransparencyChangeComplete, this));
+ this.lockedControls.push(this.sldrTransparency);
+
+ this.lblTransparencyStart = $(this.el).find('#image-lbl-transparency-start');
+ this.lblTransparencyEnd = $(this.el).find('#image-lbl-transparency-end');
+
this.btnSelectImage = new Common.UI.Button({
parentEl: $('#image-button-replace'),
cls: 'btn-text-menu-default',
@@ -448,6 +479,8 @@ define([
this.btnRotate90.setDisabled(value || this._locked);
this.btnFlipV.setDisabled(value || this._locked);
this.btnFlipH.setDisabled(value || this._locked);
+ this.numTransparency.setDisabled(value || this._locked);
+ this.sldrTransparency.setDisabled(value || this._locked);
if (this._state.isOleObject) {
var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
@@ -455,6 +488,19 @@ define([
} else {
this.btnSelectImage.setDisabled(pluginGuid===null || this._locked);
}
+
+ var transparency = props.asc_getTransparent();
+ if (Math.abs(this._state.Transparency - transparency) > 0.001 ||
+ Math.abs(this.numTransparency.getNumberValue() - transparency) > 0.001 ||
+ (this._state.Transparency === null || transparency === null) &&
+ (this._state.Transparency !== transparency || this.numTransparency.getNumberValue() !== transparency)) {
+
+ if (transparency !== undefined) {
+ this.sldrTransparency.setValue((transparency === null) ? 100 : transparency / 255 * 100, true);
+ this.numTransparency.setValue(this.sldrTransparency.getValue(), true);
+ }
+ this._state.Transparency = transparency;
+ }
}
},
@@ -692,6 +738,46 @@ define([
}
},
+ onNumTransparencyChange: function(field, newValue, oldValue, eOpts){
+ this.sldrTransparency.setValue(field.getNumberValue(), true);
+ if (this.api) {
+ var num = field.getNumberValue();
+ var properties = new Asc.asc_CImgProperty();
+ properties.asc_putTransparent(num * 2.55);
+ this.api.ImgApply(properties);
+ }
+ },
+
+ onTransparencyChange: function(field, newValue, oldValue){
+ this._sliderChanged = newValue;
+ this.numTransparency.setValue(newValue, true);
+
+ if (this._sendUndoPoint) {
+ this.api.setStartPointHistory();
+ this._sendUndoPoint = false;
+ this.updateslider = setInterval(_.bind(this._transparencyApplyFunc, this), 100);
+ }
+ },
+
+ onTransparencyChangeComplete: function(field, newValue, oldValue){
+ clearInterval(this.updateslider);
+ this._sliderChanged = newValue;
+ if (!this._sendUndoPoint) {
+ this.api.setEndPointHistory();
+ this._transparencyApplyFunc();
+ }
+ this._sendUndoPoint = true;
+ },
+
+ _transparencyApplyFunc: function() {
+ if (this._sliderChanged!==undefined) {
+ var properties = new Asc.asc_CImgProperty();
+ properties.asc_putTransparent(this._sliderChanged * 2.55);
+ this.api.ImgApply(properties);
+ this._sliderChanged = undefined;
+ }
+ },
+
setLocked: function (locked) {
this._locked = locked;
},
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 243adf2eea..1ebbc5842d 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1628,7 +1628,7 @@ define([
caption: me.capBtnPageColor,
menu: true,
eyeDropper: false,
- hideColorLine: true,
+ colorLine: false,
additionalItemsBefore: [
me.mnuPageNoFill = new Common.UI.MenuItem({
caption: me.strMenuNoFill,
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 84d73ebff8..e065d54582 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2534,6 +2534,7 @@
"DE.Views.ImageSettings.txtThrough": "Through",
"DE.Views.ImageSettings.txtTight": "Tight",
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
+ "DE.Views.ImageSettings.strTransparency": "Opacity",
"DE.Views.ImageSettingsAdvanced.strMargins": "Text padding",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignment",
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 8241fcafb8..8260663b49 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -136,6 +136,10 @@
#image-button-90, #image-button-flipv {
display: inline-block;
}
+
+ #image-spin-transparency {
+ display: inline-block;
+ }
}
&#id-header-settings {
diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js
index a79d866de6..5fbca9b3c5 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolder.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js
@@ -72,15 +72,6 @@ define([
initialize: function() {
//
- this.addListeners({
- 'DocumentHolder': {
- 'createdelayedelements': this.createDelayedElements,
- 'equation:callback': this.equationCallback
- },
- 'FileMenu': {
- 'settings:apply': _.bind(this.applySettings, this)
- },
- });
var me = this;
@@ -88,7 +79,7 @@ define([
me.usertips = [];
me.fastcoauthtips = [];
me._isDisabled = false;
- me._state = {};
+ me._state = {initEditorEvents: true};
me.mode = {};
me.mouseMoveData = null;
me.isTooltipHiding = false;
@@ -97,6 +88,7 @@ define([
me.lastTextBarBounds = [];
me.lastAnnotBarBounds = [];
me.lastAnnotBarOnTop = true;
+ me.lastAnnotSelBarOnTop = true;
me.screenTip = {
toolTip: new Common.UI.Tooltip({
@@ -121,7 +113,7 @@ define([
eyedropperColor: null,
tipInterval: null,
isTipVisible: false
- }
+ };
me.userTooltip = true;
me.wrapEvents = {
userTipMousover: _.bind(me.userTipMousover, me),
@@ -177,42 +169,6 @@ define([
this.api = o;
if (this.api) {
- this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
- this.api.asc_registerCallback('asc_onMouseMoveStart', _.bind(this.onMouseMoveStart, this));
- this.api.asc_registerCallback('asc_onMouseMoveEnd', _.bind(this.onMouseMoveEnd, this));
-
- //hyperlink
- this.api.asc_registerCallback('asc_onHyperlinkClick', _.bind(this.onHyperlinkClick, this));
- this.api.asc_registerCallback('asc_onMouseMove', _.bind(this.onMouseMove, this));
-
- if (this.mode.isEdit === true) {
- this.api.asc_registerCallback('asc_onHideEyedropper', _.bind(this.hideEyedropper, this));
- this.api.asc_registerCallback('asc_onShowPDFFormsActions', _.bind(this.onShowFormsPDFActions, this));
- this.api.asc_registerCallback('asc_onHidePdfFormsActions', _.bind(this.onHidePdfFormsActions, this));
- this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onCountPages, this));
- if (this.mode.canComments) {
- // for text
- this.api.asc_registerCallback('asc_onShowAnnotTextPrTrack', _.bind(this.onShowTextBar, this));
- this.api.asc_registerCallback('asc_onHideAnnotTextPrTrack', _.bind(this.onHideTextBar, this));
- this.api.asc_registerCallback('asc_onShowTextSelectTrack', _.bind(this.onShowAnnotBar, this));
- this.api.asc_registerCallback('asc_onHideTextSelectTrack', _.bind(this.onHideAnnotBar, this));
- }
- }
- if (this.mode.isRestrictedEdit) {
- this.api.asc_registerCallback('asc_onShowContentControlsActions', _.bind(this.onShowContentControlsActions, this));
- this.api.asc_registerCallback('asc_onHideContentControlsActions', _.bind(this.onHideContentControlsActions, this));
- Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
- Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this)); // try to load image from storage
- Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this)); // set loaded image to control
- }
- this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
- Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
-
- this.api.asc_registerCallback('asc_onShowForeignCursorLabel', _.bind(this.onShowForeignCursorLabel, this));
- this.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(this.onHideForeignCursorLabel, this));
- this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
- this.api.asc_registerCallback('onPluginContextMenu', _.bind(this.onPluginContextMenu, this));
-
this.documentHolder.setApi(this.api);
}
@@ -230,136 +186,12 @@ define([
},
createPostLoadElements: function() {
+ this.setEvents();
+ this.applyEditorMode();
this.showMathTrackOnLoad && this.onShowMathTrack(this.lastMathTrackBounds);
},
- createDelayedElements: function(view, type) {
- var me = this,
- view = me.documentHolder;
-
- if (type==='pdf') {
- view.menuPDFViewCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuAddComment.on('click', _.bind(me.addComment, me));
- view.menuRemoveComment.on('click', _.bind(me.removeComment, me));
- } else if (type==='forms') {
- view.menuPDFFormsUndo.on('click', _.bind(me.onUndo, me));
- view.menuPDFFormsRedo.on('click', _.bind(me.onRedo, me));
- view.menuPDFFormsClear.on('click', _.bind(me.onClear, me));
- view.menuPDFFormsCut.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuPDFFormsCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuPDFFormsPaste.on('click', _.bind(me.onCutCopyPaste, me));
- } else if (type==='edit') {
- view.menuPDFEditCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuEditAddComment.on('click', _.bind(me.addComment, me));
- view.menuEditRemoveComment.on('click', _.bind(me.removeComment, me));
-/*
- var diagramEditor = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
- if (diagramEditor) {
- diagramEditor.on('internalmessage', _.bind(function(cmp, message) {
- var command = message.data.command;
- var data = message.data.data;
- if (this.api) {
- ( diagramEditor.isEditMode() )
- ? this.api.asc_editChartDrawingObject(data)
- : this.api.asc_addChartDrawingObject(data, diagramEditor.getPlaceholder());
- }
- }, this));
- diagramEditor.on('hide', _.bind(function(cmp, message) {
- if (this.api) {
- this.api.asc_onCloseChartFrame();
- this.api.asc_enableKeyEvents(true);
- }
- var me = this;
- setTimeout(function(){
- me.editComplete();
- }, 10);
- }, this));
- }
-
- var oleEditor = this.getApplication().getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor');
- if (oleEditor) {
- oleEditor.on('internalmessage', _.bind(function(cmp, message) {
- var command = message.data.command;
- var data = message.data.data;
- if (this.api) {
- oleEditor.isEditMode()
- ? this.api.asc_editTableOleObject(data)
- : this.api.asc_addTableOleObject(data);
- }
- }, this));
- oleEditor.on('hide', _.bind(function(cmp, message) {
- if (this.api) {
- this.api.asc_enableKeyEvents(true);
- this.api.asc_onCloseChartFrame();
- }
- var me = this;
- setTimeout(function(){
- me.editComplete();
- }, 10);
- }, this));
- }
- */
- view.menuParaCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuParaPaste.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuParaCut.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuImgCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuImgPaste.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuImgCut.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuTableCopy.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuTablePaste.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuTableCut.on('click', _.bind(me.onCutCopyPaste, me));
- view.menuAddHyperlinkPara.on('click', _.bind(me.addHyperlink, me));
- view.menuAddHyperlinkTable.on('click', _.bind(me.addHyperlink, me));
- view.menuEditHyperlinkPara.on('click', _.bind(me.editHyperlink, me));
- view.menuEditHyperlinkTable.on('click', _.bind(me.editHyperlink, me));
- view.menuRemoveHyperlinkPara.on('click', _.bind(me.removeHyperlink, me));
- view.menuRemoveHyperlinkTable.on('click', _.bind(me.removeHyperlink, me));
- // view.menuChartEdit.on('click', _.bind(me.editChartClick, me, undefined));
- view.menuImgSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
- view.menuTableSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
- view.menuAddCommentPara.on('click', _.bind(me.addComment, me));
- view.menuAddCommentTable.on('click', _.bind(me.addComment, me));
- view.menuAddCommentImg.on('click', _.bind(me.addComment, me));
- view.mnuTableMerge.on('click', _.bind(me.onTableMerge, me));
- view.mnuTableSplit.on('click', _.bind(me.onTableSplit, me));
- view.menuTableCellAlign.menu.on('item:click', _.bind(me.tableCellsVAlign, me));
- view.menuTableDistRows.on('click', _.bind(me.onTableDistRows, me));
- view.menuTableDistCols.on('click', _.bind(me.onTableDistCols, me));
- view.menuTableAdvanced.on('click', _.bind(me.onTableAdvanced, me));
- view.menuImageAdvanced.on('click', _.bind(me.onImageAdvanced, me));
- view.menuImgOriginalSize.on('click', _.bind(me.onImgOriginalSize, me));
- view.menuImgShapeRotate.menu.items[0].on('click', _.bind(me.onImgRotate, me));
- view.menuImgShapeRotate.menu.items[1].on('click', _.bind(me.onImgRotate, me));
- view.menuImgShapeRotate.menu.items[3].on('click', _.bind(me.onImgFlip, me));
- view.menuImgShapeRotate.menu.items[4].on('click', _.bind(me.onImgFlip, me));
- view.menuImgCrop.menu.on('item:click', _.bind(me.onImgCrop, me));
- view.menuImgResetCrop.on('click', _.bind(me.onImgResetCrop, me));
- view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me));
- view.menuShapeAdvanced.on('click', _.bind(me.onShapeAdvanced, me));
- view.menuParagraphAdvanced.on('click', _.bind(me.onParagraphAdvanced, me));
- // view.menuChartAdvanced.on('click', _.bind(me.onChartAdvanced, me));
- view.mnuGroupImg.on('click', _.bind(me.onGroupImg, me));
- view.mnuUnGroupImg.on('click', _.bind(me.onUnGroupImg, me));
- view.mnuArrangeFront.on('click', _.bind(me.onArrangeFront, me));
- view.mnuArrangeBack.on('click', _.bind(me.onArrangeBack, me));
- view.mnuArrangeForward.on('click', _.bind(me.onArrangeForward, me));
- view.mnuArrangeBackward.on('click', _.bind(me.onArrangeBackward, me));
- view.menuImgShapeAlign.menu.on('item:click', _.bind(me.onImgShapeAlign, me));
- view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me));
- view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me));
- view.menuTableSelectText.menu.on('item:click', _.bind(me.tableSelectText, me));
- view.menuTableInsertText.menu.on('item:click', _.bind(me.tableInsertText, me));
- view.menuTableDeleteText.menu.on('item:click', _.bind(me.tableDeleteText, me));
- view.menuTableEquationSettings.menu.on('item:click', _.bind(me.convertEquation, me));
- view.menuParagraphEquation.menu.on('item:click', _.bind(me.convertEquation, me));
- view.mnuNewPageBefore.on('click', _.bind(me.onNewPage, me));
- view.mnuNewPageAfter.on('click', _.bind(me.onNewPage, me));
- view.mnuDeletePage.on('click', _.bind(me.onDeletePage, me));
- view.mnuRotatePageRight.on('click', _.bind(me.onRotatePage, me, 90));
- view.mnuRotatePageLeft.on('click', _.bind(me.onRotatePage, me, -90));
- view.menuImgReplace.menu.on('item:click', _.bind(me.onImgReplace, me));
- }
- },
+ createDelayedElements: function(view, type) {},
getView: function (name) {
return !name ?
@@ -405,141 +237,13 @@ define([
}
},
- fillViewMenuProps: function(selectedElements) {
- // if (!selectedElements || !_.isArray(selectedElements)) return;
-
- var documentHolder = this.documentHolder;
- if (!documentHolder.viewPDFModeMenu)
- documentHolder.createDelayedElementsPDFViewer();
-
- var menu_props = {};
- selectedElements && _.each(selectedElements, function(element, index) {
- if (Asc.c_oAscTypeSelectElement.Annot == element.get_ObjectType()) {
- menu_props.annotProps = {};
- menu_props.annotProps.value = element.get_ObjectValue();
- }
- });
-
- return {menu_to_show: documentHolder.viewPDFModeMenu, menu_props: menu_props};
- },
-
- fillPDFEditMenuProps: function(selectedElements) {
- var documentHolder = this.documentHolder;
- if (!documentHolder.editPDFModeMenu)
- documentHolder.createDelayedElementsPDFEditor();
-
- if (!selectedElements || !_.isArray(selectedElements) || selectedElements.length<1)
- return {menu_to_show: documentHolder.editPDFModeMenu, menu_props: {}}
-
- var me = this,
- menu_props = {},
- menu_to_show = null;
- _.each(selectedElements, function(element, index) {
- var elType = element.get_ObjectType(),
- elValue = element.get_ObjectValue();
-
- if (Asc.c_oAscTypeSelectElement.Image == elType) {
- menu_to_show = documentHolder.pictureMenu;
- menu_props.imgProps = {};
- menu_props.imgProps.value = elValue;
- menu_props.imgProps.locked = (elValue) ? elValue.get_Locked() : false;
- } else if (Asc.c_oAscTypeSelectElement.Table == elType) {
- menu_to_show = documentHolder.tableMenu;
- menu_props.tableProps = {};
- menu_props.tableProps.value = elValue;
- menu_props.tableProps.locked = (elValue) ? elValue.get_Locked() : false;
- } else if (Asc.c_oAscTypeSelectElement.Hyperlink == elType) {
- menu_props.hyperProps = {};
- menu_props.hyperProps.value = elValue;
- } else if (Asc.c_oAscTypeSelectElement.Shape == elType) { // shape
- menu_props.shapeProps = {};
- menu_props.shapeProps.value = elValue;
- menu_props.shapeProps.locked = (elValue) ? elValue.get_Locked() : false;
- if (elValue.get_FromChart())
- menu_props.shapeProps.isChart = true;
- if (menu_props.paraProps && menu_props.paraProps.value && elValue.asc_getCanEditText()) // text in shape, need to show paragraph menu with vertical align
- menu_to_show = documentHolder.textMenu;
- else
- menu_to_show = documentHolder.pictureMenu;
- }
- // else if (Asc.c_oAscTypeSelectElement.Chart == elType) {
- // menu_to_show = documentHolder.pictureMenu;
- // menu_props.chartProps = {};
- // menu_props.chartProps.value = elValue;
- // menu_props.chartProps.locked = (elValue) ? elValue.get_Locked() : false;
- // }
- else if (Asc.c_oAscTypeSelectElement.Paragraph == elType) {
- menu_props.paraProps = {};
- menu_props.paraProps.value = elValue;
- menu_props.paraProps.locked = (elValue) ? elValue.get_Locked() : false;
- if (menu_props.shapeProps && menu_props.shapeProps.value && menu_props.shapeProps.value.asc_getCanEditText()) // text in shape, need to show paragraph menu with vertical align
- menu_to_show = documentHolder.textMenu;
- } else if (Asc.c_oAscTypeSelectElement.Math == elType) {
- menu_props.mathProps = {};
- menu_props.mathProps.value = elValue;
- documentHolder._currentMathObj = elValue;
- } else if (Asc.c_oAscTypeSelectElement.Annot == elType) {
- menu_to_show = documentHolder.editPDFModeMenu;
- menu_props.annotProps = {};
- menu_props.annotProps.value = elValue;
- }
- });
- if (menu_to_show === null) {
- if (!_.isUndefined(menu_props.paraProps))
- menu_to_show = documentHolder.textMenu;
- }
-
- return {menu_to_show: menu_to_show, menu_props: menu_props};
- },
+ fillViewMenuProps: function(selectedElements) {},
- applyEditorMode: function() {
- if (this.mode && this.mode.isPDFEdit && !this.documentHolder.editPDFModeMenu) {
- this.documentHolder.createDelayedElementsPDFEditor();
- this.api.asc_registerCallback('asc_onShowMathTrack', _.bind(this.onShowMathTrack, this));
- this.api.asc_registerCallback('asc_onHideMathTrack', _.bind(this.onHideMathTrack, this));
- this.api.asc_registerCallback('asc_onDialogAddHyperlink', _.bind(this.onDialogAddHyperlink, this));
- this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this.onChangeCropState, this));
- }
- if (this.mode)
- this.mode.isPDFEdit ? this.onHideTextBar() : this.onHideMathTrack();
- },
+ fillPDFEditMenuProps: function(selectedElements) {},
- fillFormsMenuProps: function(selectedElements) {
- if (!selectedElements || !_.isArray(selectedElements)) return;
-
- var documentHolder = this.documentHolder;
- if (!documentHolder.formsPDFMenu)
- documentHolder.createDelayedElementsPDFForms();
-
- var menu_props = {},
- noobject = true;
- for (var i = 0; i 256)
- ToolTip = ToolTip.substr(0, 256) + '...';
- } else if (type==Asc.c_oAscMouseMoveDataTypes.Form) {
- ToolTip = moveData.get_FormHelpText();
- if (ToolTip.length>1000)
- ToolTip = ToolTip.substr(0, 1000) + '...';
- } else if (type==Asc.c_oAscMouseMoveDataTypes.Eyedropper) {
- if (me.eyedropperTip.isTipVisible) {
- me.eyedropperTip.isTipVisible = false;
- me.eyedropperTip.toolTip.hide();
- }
-
- var color = moveData.get_EyedropperColor().asc_getColor(),
- r = color.get_r(),
- g = color.get_g(),
- b = color.get_b(),
- hex = Common.Utils.ThemeColor.getHexColor(r,g,b);
- if (!me.eyedropperTip.eyedropperColor) {
- var colorEl = $(document.createElement("div"));
- colorEl.addClass('eyedropper-color');
- colorEl.appendTo(document.body);
- me.eyedropperTip.eyedropperColor = colorEl;
- $('#id_main_view').on('mouseleave', _.bind(me.hideEyedropper, me));
- }
- me.eyedropperTip.eyedropperColor.css({
- backgroundColor: '#' + hex,
- left: (moveData.get_X() + me._XY[0] + 23) + 'px',
- top: (moveData.get_Y() + me._XY[1] - 53) + 'px'
- });
- me.eyedropperTip.isVisible = true;
-
- if (me.eyedropperTip.tipInterval) {
- clearInterval(me.eyedropperTip.tipInterval);
- }
- me.eyedropperTip.tipInterval = setInterval(function () {
- clearInterval(me.eyedropperTip.tipInterval);
- if (me.eyedropperTip.isVisible) {
- ToolTip = ' RGB(' + r + ',' + g + ',' + b + ') ' +
- '' + moveData.get_EyedropperColor().asc_getName() + ' ';
- me.eyedropperTip.toolTip.setTitle(ToolTip);
- me.eyedropperTip.isTipVisible = true;
- me.eyedropperTip.toolTip.show([-10000, -10000]);
- me.eyedropperTip.tipWidth = me.eyedropperTip.toolTip.getBSTip().$tip.width();
- showPoint = [moveData.get_X(), moveData.get_Y()];
- showPoint[1] += (me._XY[1] - 57);
- showPoint[0] += (me._XY[0] + 58);
- if (showPoint[0] + me.eyedropperTip.tipWidth > me._BodyWidth ) {
- showPoint[0] = showPoint[0] - me.eyedropperTip.tipWidth - 40;
- }
- me.eyedropperTip.toolTip.getBSTip().$tip.css({
- top: showPoint[1] + 'px',
- left: showPoint[0] + 'px'
- });
- }
- }, 800);
- me.eyedropperTip.isHidden = false;
- return;
- }
-
- var recalc = false;
- screenTip.isHidden = false;
-
- ToolTip = Common.Utils.String.htmlEncode(ToolTip);
-
- if (screenTip.tipType !== type || screenTip.tipLength !== ToolTip.length || screenTip.strTip.indexOf(ToolTip)<0 ) {
- screenTip.toolTip.setTitle((type==Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? (ToolTip + '
' + Common.Utils.String.platformKey('Ctrl', me.documentHolder.txtPressLink) + '') : ToolTip);
- screenTip.tipLength = ToolTip.length;
- screenTip.strTip = ToolTip;
- screenTip.tipType = type;
- recalc = true;
- }
-
- showPoint = [moveData.get_X(), moveData.get_Y()];
- showPoint[1] += (me._XY[1]-15);
- showPoint[0] += (me._XY[0]+5);
-
- if (!screenTip.isVisible || recalc) {
- screenTip.isVisible = true;
- screenTip.toolTip.show([-10000, -10000]);
- }
-
- if ( recalc ) {
- screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height();
- screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width();
- }
-
- recalc = false;
- if (showPoint[0] + screenTip.tipWidth > me._BodyWidth ) {
- showPoint[0] = me._BodyWidth - screenTip.tipWidth;
- recalc = true;
- }
- if (showPoint[1] - screenTip.tipHeight < 0) {
- showPoint[1] = (recalc) ? showPoint[1]+30 : 0;
- } else
- showPoint[1] -= screenTip.tipHeight;
-
- screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'});
- }
- /** coauthoring begin **/
- else if (moveData.get_Type()==Asc.c_oAscMouseMoveDataTypes.LockedObject && me.mode.isEdit && me.isUserVisible(moveData.get_UserId())) { // 2 - locked object
- var src;
- if (me.usertipcount >= me.usertips.length) {
- src = $(document.createElement("div"));
- src.addClass('username-tip');
- src.css({height: me._TtHeight + 'px', position: 'absolute', zIndex: '900', visibility: 'visible'});
- $(document.body).append(src);
- if (me.userTooltip) {
- src.on('mouseover', me.wrapEvents.userTipMousover);
- src.on('mouseout', me.wrapEvents.userTipMousout);
- }
-
- me.usertips.push(src);
- }
- src = me.usertips[me.usertipcount];
- me.usertipcount++;
-
- ToolTip = me.getUserName(moveData.get_UserId());
-
- showPoint = [moveData.get_X()+me._XY[0], moveData.get_Y()+me._XY[1]];
- var maxwidth = showPoint[0];
- showPoint[0] = me._BodyWidth - showPoint[0];
- showPoint[1] -= ((moveData.get_LockedObjectType()==2) ? me._TtHeight : 0);
-
- if (showPoint[1] > me._XY[1] && showPoint[1]+me._TtHeight < me._XY[1]+me._Height) {
- src.text(ToolTip);
- src.css({visibility: 'visible', top: showPoint[1] + 'px', right: showPoint[0] + 'px', 'max-width': maxwidth + 'px'});
- } else {
- src.css({visibility: 'hidden'});
- }
- }
- /** coauthoring end **/
- }
- },
+ onMouseMove: function(moveData) {},
onCoAuthoringDisconnect: function() {
this.mode.isEdit = false;
@@ -1144,1744 +561,34 @@ define([
}
},
- removeComment: function(item, e, eOpt){
- this.api && this.api.asc_remove();
- },
-
- onCutCopyPaste: function(item, e) {
- var me = this;
- if (me.api) {
- var res = (item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
- if (!res) {
- if (!Common.localStorage.getBool("pdfe-hide-copywarning")) {
- (new Common.Views.CopyWarningDialog({
- handler: function(dontshow) {
- if (dontshow) Common.localStorage.setItem("pdfe-hide-copywarning", 1);
- me.editComplete();
- }
- })).show();
- }
- }
- item.isFromBar && me.api.SetShowTextSelectPanel(false);
- }
- me.editComplete();
- },
-
- onUndo: function () {
- this.api && this.api.Undo();
- },
-
- onRedo: function () {
- this.api && this.api.Redo();
- },
-
- onClear: function () {
- if (this.api) {
- var props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null;
- if (props) {
- this.api.asc_ClearContentControl(props.get_InternalId());
- }
- }
- },
-
- onPrintSelection: function(item){
- if (this.api){
- var printopt = new Asc.asc_CAdjustPrint();
- printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection);
- var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isOpera == true use asc_onPrintUrl event
- opts.asc_setAdvancedOptions(printopt);
- this.api.asc_Print(opts);
- this.editComplete();
- Common.component.Analytics.trackEvent('DocumentHolder', 'Print Selection');
- }
- },
-
- onSignatureClick: function(item) {
- var datavalue = item.cmpEl.attr('data-value');
- switch (item.value) {
- case 0:
- Common.NotificationCenter.trigger('protect:sign', datavalue); //guid
- break;
- case 1:
- this.api.asc_ViewCertificate(datavalue); //certificate id
- break;
- case 2:
- var docProtection = this.documentHolder._docProtection;
- Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly, datavalue);//guid, can edit settings for requested signature
- break;
- case 3:
- var me = this;
- Common.UI.warning({
- title: this.documentHolder.notcriticalErrorTitle,
- msg: this.documentHolder.txtRemoveWarning,
- buttons: ['ok', 'cancel'],
- primary: 'ok',
- callback: function(btn) {
- if (btn == 'ok') {
- me.api.asc_RemoveSignature(datavalue);
- }
- }
- });
- break;
- }
- },
-
- saveAsPicture: function() {
- if(this.api) {
- this.api.asc_SaveDrawingAsPicture();
- }
- },
-
- onPluginContextMenu: function(data) {
- if (data && data.length>0 && this.documentHolder && this.documentHolder.currentMenu && this.documentHolder.currentMenu.isVisible()){
- this.documentHolder.updateCustomItems(this.documentHolder.currentMenu, data);
- }
- },
-
- onHidePdfFormsActions: function() {
- this.listControlMenuPdf && this.listControlMenuPdf.isVisible() && this.listControlMenuPdf.hide();
- var controlsContainer = this.documentHolder.cmpEl.find('#calendar-control-container-pdf');
- if (controlsContainer.is(':visible'))
- controlsContainer.hide();
- },
-
- onShowFormsPDFActions: function(obj, x, y) {
- switch (obj.type) {
- case AscPDF.FIELD_TYPES.combobox:
- this.onShowListActionsPDF(obj, x, y);
- break;
- case AscPDF.FIELD_TYPES.text:
- this.onShowDateActionsPDF(obj, x, y);
- break;
- }
- },
-
- onShowListActionsPDF: function(obj) {
- var isForm = true,
- cmpEl = this.documentHolder.cmpEl,
- menu = this.listControlMenuPdf,
- menuContainer = menu ? cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
- me = this;
-
- me._listObjPdf = obj;
- this._fromShowContentControls = true;
- Common.UI.Menu.Manager.hideAll();
-
- if (!menu) {
- this.listControlMenuPdf = menu = new Common.UI.Menu({
- maxHeight: 207,
- menuAlign: 'tr-bl',
- items: []
- });
- menu.on('item:click', function(menu, item) {
- setTimeout(function(){
- (item.value!==-1) && me.api.asc_SelectPDFFormListItem(item.value);
- }, 1);
- });
-
- // Prepare menu container
- if (!menuContainer || menuContainer.length < 1) {
- menuContainer = $(Common.Utils.String.format('', menu.id));
- cmpEl.append(menuContainer);
- }
-
- menu.render(menuContainer);
- menu.cmpEl.attr({tabindex: "-1"});
- menu.on('hide:after', function(){
- me.listControlMenuPdf.removeAll();
- if (!me._fromShowContentControls)
- me.api.asc_UncheckContentControlButtons();
- });
- }
-
- var options = obj.getOptions(),
- count = options.length;
- for (var i=0; i',
- '<%= Common.Utils.String.htmlEncode(caption) %>',
- ''
- ].join(''))
- }));
- }
- if (!isForm && menu.items.length<1) {
- menu.addItem(new Common.UI.MenuItem({
- caption : this.documentHolder.txtEmpty,
- value : -1
- }));
- }
-
- var pagepos = obj.getPagePos(),
- oGlobalCoords = AscPDF.GetGlobalCoordsByPageCoords(pagepos.x + pagepos.w, pagepos.y + pagepos.h, obj.getPage(), true);
-
- menuContainer.css({left: oGlobalCoords.X, top : oGlobalCoords.Y});
- menuContainer.attr('data-value', 'prevent-canvas-click');
- this._preventClick = true;
- menu.show();
-
- _.delay(function() {
- menu.cmpEl.focus();
- }, 10);
- this._fromShowContentControls = false;
- },
-
- onShowDateActionsPDF: function(obj, x, y) {
- var cmpEl = this.documentHolder.cmpEl,
- controlsContainer = cmpEl.find('#calendar-control-container-pdf'),
- me = this;
-
- this._dateObjPdf = obj;
-
- if (controlsContainer.length < 1) {
- controlsContainer = $('');
- cmpEl.append(controlsContainer);
- }
-
- Common.UI.Menu.Manager.hideAll();
-
- var pagepos = obj.getPagePos(),
- oGlobalCoords = AscPDF.GetGlobalCoordsByPageCoords(pagepos.x + pagepos.w, pagepos.y + pagepos.h, obj.getPage(), true);
-
- controlsContainer.css({left: oGlobalCoords.X, top : oGlobalCoords.Y});
- controlsContainer.show();
-
- if (!this.cmpCalendarPdf) {
- this.cmpCalendarPdf = new Common.UI.Calendar({
- el: cmpEl.find('#id-document-calendar-control-pdf'),
- enableKeyEvents: true,
- firstday: 1
- });
- this.cmpCalendarPdf.on('date:click', function (cmp, date) {
- var specProps = new AscCommon.CSdtDatePickerPr();
- specProps.put_FullDate(new Date(date));
- me.api.asc_SetTextFormDatePickerDate(specProps);
- controlsContainer.hide();
- });
- this.cmpCalendarPdf.on('calendar:keydown', function (cmp, e) {
- if (e.keyCode==Common.UI.Keys.ESC) {
- controlsContainer.hide();
- }
- });
- $(document).on('mousedown', function(e) {
- if (e.target.localName !== 'canvas' && controlsContainer.is(':visible') && controlsContainer.find(e.target).length==0) {
- controlsContainer.hide();
- }
- });
-
- }
- var val = this._dateObjPdf ? this._dateObjPdf.asc_GetValue() : undefined;
- if (val) {
- val = new Date(val);
- if (Object.prototype.toString.call(val) !== '[object Date]' || isNaN(val))
- val = undefined;
- }
- !val && (val = new Date());
- this.cmpCalendarPdf.setDate(val);
-
- // align
- var offset = Common.Utils.getOffset(controlsContainer),
- docW = Common.Utils.innerWidth(),
- docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number
- menuW = this.cmpCalendarPdf.cmpEl.outerWidth(),
- menuH = this.cmpCalendarPdf.cmpEl.outerHeight(),
- buttonOffset = 22,
- left = offset.left - menuW,
- top = offset.top;
- if (top + menuH > docH) {
- top = docH - menuH;
- left -= buttonOffset;
- }
- if (top < 0)
- top = 0;
- if (left + menuW > docW)
- left = docW - menuW;
- this.cmpCalendarPdf.cmpEl.css({left: left, top : top});
-
- this._preventClick = true;
- },
-
- onShowContentControlsActions: function(obj, x, y) {
- if (this._isDisabled) return;
-
- var me = this;
- switch (obj.type) {
- case Asc.c_oAscContentControlSpecificType.DateTime:
- this.onShowDateActions(obj, x, y);
- break;
- case Asc.c_oAscContentControlSpecificType.Picture:
- if (obj.pr && obj.pr.get_Lock) {
- var lock = obj.pr.get_Lock();
- if (lock == Asc.c_oAscSdtLockType.SdtContentLocked || lock==Asc.c_oAscSdtLockType.ContentLocked)
- return;
- }
- this.onShowImageActions(obj, x, y);
- break;
- case Asc.c_oAscContentControlSpecificType.DropDownList:
- case Asc.c_oAscContentControlSpecificType.ComboBox:
- this.onShowListActions(obj, x, y);
- break;
- }
- },
-
- onHideContentControlsActions: function() {
- this.listControlMenu && this.listControlMenu.isVisible() && this.listControlMenu.hide();
- var controlsContainer = this.documentHolder.cmpEl.find('#calendar-control-container');
- if (controlsContainer.is(':visible'))
- controlsContainer.hide();
- },
-
- onShowImageActions: function(obj, x, y) {
- var cmpEl = this.documentHolder.cmpEl,
- menu = this.imageControlMenu,
- menuContainer = menu ? cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
- me = this;
-
- this.internalFormObj = obj ? obj.pr : null;
- this._fromShowContentControls = true;
- Common.UI.Menu.Manager.hideAll();
-
- if (!menu) {
- this.imageControlMenu = menu = new Common.UI.Menu({
- maxHeight: 207,
- menuAlign: 'tl-bl',
- items: [
- {caption: this.documentHolder.mniImageFromFile, value: 'file'},
- {caption: this.documentHolder.mniImageFromUrl, value: 'url'},
- {caption: this.documentHolder.mniImageFromStorage, value: 'storage', visible: this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1}
- ]
- });
- menu.on('item:click', function(menu, item) {
- setTimeout(function(){
- me.onImageSelect(menu, item);
- }, 1);
- setTimeout(function(){
- me.api.asc_UncheckContentControlButtons();
- }, 500);
- });
-
- // Prepare menu container
- if (!menuContainer || menuContainer.length < 1) {
- menuContainer = $(Common.Utils.String.format('', menu.id));
- cmpEl.append(menuContainer);
- }
-
- menu.render(menuContainer);
- menu.cmpEl.attr({tabindex: "-1"});
- menu.on('hide:after', function(){
- if (!me._fromShowContentControls)
- me.api.asc_UncheckContentControlButtons();
- });
- }
- menuContainer.css({left: x, top : y});
- menuContainer.attr('data-value', 'prevent-canvas-click');
- this._preventClick = true;
- menu.show();
-
- _.delay(function() {
- menu.cmpEl.focus();
- }, 10);
- this._fromShowContentControls = false;
- },
-
- onImageSelect: function(menu, item) {
- if (item.value=='url') {
- var me = this;
- (new Common.Views.ImageFromUrlDialog({
- handler: function(result, value) {
- if (result == 'ok') {
- if (me.api) {
- var checkUrl = value.replace(/ /g, '');
- if (!_.isEmpty(checkUrl)) {
- me.setImageUrl(checkUrl);
- }
- }
- }
- }
- })).show();
- } else if (item.value=='storage') {
- Common.NotificationCenter.trigger('storage:image-load', 'control');
- } else {
- if (this._isFromFile) return;
- this._isFromFile = true;
- this.api.asc_addImage(this.internalFormObj);
- this._isFromFile = false;
- }
- },
-
- openImageFromStorage: function(type) {
- var me = this;
- if (this.mode.canRequestInsertImage) {
- Common.Gateway.requestInsertImage(type);
- } else {
- (new Common.Views.SelectFileDlg({
- fileChoiceUrl: this.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
- })).on('selectfile', function(obj, file){
- file && (file.c = type);
- !file.images && (file.images = [{fileType: file.fileType, url: file.url}]); // SelectFileDlg uses old format for inserting image
- file.url = null;
- me.insertImage(file);
- }).show();
- }
- },
-
- setImageUrl: function(url, token) {
- this.api.asc_SetContentControlPictureUrl(url, this.internalFormObj ? this.internalFormObj.get_InternalId() : null, token);
- },
-
- insertImage: function(data) { // gateway
- if (data && (data.url || data.images)) {
- data.url && console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead.");
+ onDialogAddHyperlink: function() {},
- var arr = [];
- if (data.images && data.images.length>0) {
- for (var i=0; i |
+
diff --git a/apps/pdfeditor/main/app/view/DocumentHolder.js b/apps/pdfeditor/main/app/view/DocumentHolder.js
index 8cb3a8ea03..bc89efa808 100644
--- a/apps/pdfeditor/main/app/view/DocumentHolder.js
+++ b/apps/pdfeditor/main/app/view/DocumentHolder.js
@@ -147,269 +147,9 @@ define([
});
},
- createTextBar: function(textBarBtns) {
- var container = $('' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ '' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ ' ' +
+ '' +
+ ' ' +
+ ' ' +
+ '
Are you sure you want to continue?",
"PDFE.Views.DocumentHolder.unicodeText": "Unicode",
"PDFE.Views.DocumentHolder.vertAlignText": "Vertical alignment",
+ "PDFE.Views.DocumentHolder.textColor": "Color",
"PDFE.Views.FileMenu.ariaFileMenu": "File menu",
"PDFE.Views.FileMenu.btnBackCaption": "Open File Location",
"PDFE.Views.FileMenu.btnCloseEditor": "Close File",
@@ -1411,6 +1412,7 @@
"PDFE.Views.ImageSettings.textRotation": "Rotation",
"PDFE.Views.ImageSettings.textSize": "Size",
"PDFE.Views.ImageSettings.textWidth": "Width",
+ "PDFE.Views.ImageSettings.strTransparency": "Opacity",
"PDFE.Views.ImageSettingsAdvanced.textAlt": "Alternative text",
"PDFE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
"PDFE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, shape, chart, or table.",
diff --git a/apps/pdfeditor/main/locale/es.json b/apps/pdfeditor/main/locale/es.json
index 599905a792..be4940265b 100644
--- a/apps/pdfeditor/main/locale/es.json
+++ b/apps/pdfeditor/main/locale/es.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Ajustar a la página",
"PDFE.Views.ViewTab.tipFitToWidth": "Ajustar al ancho",
"PDFE.Views.ViewTab.tipHeadings": "Encabezados",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de la interfaz"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de la interfaz",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/eu.json b/apps/pdfeditor/main/locale/eu.json
index 785de7d97f..ac71b288a3 100644
--- a/apps/pdfeditor/main/locale/eu.json
+++ b/apps/pdfeditor/main/locale/eu.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Doitu orrira",
"PDFE.Views.ViewTab.tipFitToWidth": "Doitu zabalerara",
"PDFE.Views.ViewTab.tipHeadings": "Izenburuak",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfazearen gaia"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfazearen gaia",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/fi.json b/apps/pdfeditor/main/locale/fi.json
index a926c797a7..40437a39ce 100644
--- a/apps/pdfeditor/main/locale/fi.json
+++ b/apps/pdfeditor/main/locale/fi.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Sovita sivulle",
"PDFE.Views.ViewTab.tipFitToWidth": "Sovita leveyden mukaan",
"PDFE.Views.ViewTab.tipHeadings": "Headings",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Käyttöliittymän teema"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Käyttöliittymän teema",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/fr.json b/apps/pdfeditor/main/locale/fr.json
index 7bf4dcabfa..d439f9b509 100644
--- a/apps/pdfeditor/main/locale/fr.json
+++ b/apps/pdfeditor/main/locale/fr.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Ajuster à la page",
"PDFE.Views.ViewTab.tipFitToWidth": "Ajuster à la largeur",
"PDFE.Views.ViewTab.tipHeadings": "Titres",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Thème d’interface"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Thème d’interface",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/gl.json b/apps/pdfeditor/main/locale/gl.json
index 91f0f579ba..1676cb50d9 100644
--- a/apps/pdfeditor/main/locale/gl.json
+++ b/apps/pdfeditor/main/locale/gl.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Axustar á páxina",
"PDFE.Views.ViewTab.tipFitToWidth": "Axustar á anchura",
"PDFE.Views.ViewTab.tipHeadings": "Títulos",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/he.json b/apps/pdfeditor/main/locale/he.json
index 6f22a5c607..e1fea5dc37 100644
--- a/apps/pdfeditor/main/locale/he.json
+++ b/apps/pdfeditor/main/locale/he.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "מתאים לדף",
"PDFE.Views.ViewTab.tipFitToWidth": "מתאים לרוחב",
"PDFE.Views.ViewTab.tipHeadings": "כותרות",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "ערכת נושא"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "ערכת נושא",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/hu.json b/apps/pdfeditor/main/locale/hu.json
index 5126555ac4..ca11f4398b 100644
--- a/apps/pdfeditor/main/locale/hu.json
+++ b/apps/pdfeditor/main/locale/hu.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Oldalhoz igazít",
"PDFE.Views.ViewTab.tipFitToWidth": "Szélességhez igazít",
"PDFE.Views.ViewTab.tipHeadings": "Címsorok",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Felhasználói felület témája"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Felhasználói felület témája",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/hy.json b/apps/pdfeditor/main/locale/hy.json
index b5e60d3e20..3884740a44 100644
--- a/apps/pdfeditor/main/locale/hy.json
+++ b/apps/pdfeditor/main/locale/hy.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Հարմարեցնել էջին",
"PDFE.Views.ViewTab.tipFitToWidth": "Հարմարեցնել լայնությանը",
"PDFE.Views.ViewTab.tipHeadings": "Գլխագրեր",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Ինտերֆեյսի թեմա"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Ինտերֆեյսի թեմա",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/id.json b/apps/pdfeditor/main/locale/id.json
index e7009c1c25..b88d728696 100644
--- a/apps/pdfeditor/main/locale/id.json
+++ b/apps/pdfeditor/main/locale/id.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Sesuaikan Halaman",
"PDFE.Views.ViewTab.tipFitToWidth": "Sesuaikan Lebar",
"PDFE.Views.ViewTab.tipHeadings": "Tajuk",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antarmuka"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antarmuka",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/it.json b/apps/pdfeditor/main/locale/it.json
index d0d28de709..e2cf23c27a 100644
--- a/apps/pdfeditor/main/locale/it.json
+++ b/apps/pdfeditor/main/locale/it.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Adatta alla pagina",
"PDFE.Views.ViewTab.tipFitToWidth": "Adatta alla larghezza",
"PDFE.Views.ViewTab.tipHeadings": "Intestazioni",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema dell'interfaccia"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema dell'interfaccia",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/ja.json b/apps/pdfeditor/main/locale/ja.json
index 1336b329d1..4771c631ee 100644
--- a/apps/pdfeditor/main/locale/ja.json
+++ b/apps/pdfeditor/main/locale/ja.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "ページに合わせる",
"PDFE.Views.ViewTab.tipFitToWidth": "幅に合わせる",
"PDFE.Views.ViewTab.tipHeadings": "見出し",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "インターフェイスのテーマ"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "インターフェイスのテーマ",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/ko.json b/apps/pdfeditor/main/locale/ko.json
index 3905238640..368da89458 100644
--- a/apps/pdfeditor/main/locale/ko.json
+++ b/apps/pdfeditor/main/locale/ko.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "페이지에 맞춤",
"PDFE.Views.ViewTab.tipFitToWidth": "너비에 맞춤",
"PDFE.Views.ViewTab.tipHeadings": "제목",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "인터페이스 테마"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "인터페이스 테마",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/lo.json b/apps/pdfeditor/main/locale/lo.json
index 2f4bd54ae8..be2af42246 100644
--- a/apps/pdfeditor/main/locale/lo.json
+++ b/apps/pdfeditor/main/locale/lo.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "ພໍດີຂອບ",
"PDFE.Views.ViewTab.tipFitToWidth": "ຄວາມກວ້າງພໍດີ",
"PDFE.Views.ViewTab.tipHeadings": "ຫົວເລື່ອງ",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "ຮູບແບບການສະແດງຜົນ"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "ຮູບແບບການສະແດງຜົນ",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/lv.json b/apps/pdfeditor/main/locale/lv.json
index aad3020ae4..0eea496429 100644
--- a/apps/pdfeditor/main/locale/lv.json
+++ b/apps/pdfeditor/main/locale/lv.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Saskaņot ar lapu",
"PDFE.Views.ViewTab.tipFitToWidth": "Saskaņot ar platumu",
"PDFE.Views.ViewTab.tipHeadings": "Virsraksti",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfeisa tēma"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfeisa tēma",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/ms.json b/apps/pdfeditor/main/locale/ms.json
index 1b644f66eb..760a692704 100644
--- a/apps/pdfeditor/main/locale/ms.json
+++ b/apps/pdfeditor/main/locale/ms.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Muat kepada Halaman",
"PDFE.Views.ViewTab.tipFitToWidth": "Muat kepada Kelebaran",
"PDFE.Views.ViewTab.tipHeadings": "Pengepala",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antara muka"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antara muka",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/nl.json b/apps/pdfeditor/main/locale/nl.json
index d8bcd8eedd..2145bd0e91 100644
--- a/apps/pdfeditor/main/locale/nl.json
+++ b/apps/pdfeditor/main/locale/nl.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Aan pagina aanpassen",
"PDFE.Views.ViewTab.tipFitToWidth": "Aan breedte aanpassen",
"PDFE.Views.ViewTab.tipHeadings": "Koppen",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfacethema"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfacethema",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/pl.json b/apps/pdfeditor/main/locale/pl.json
index 9810dba4af..114c840605 100644
--- a/apps/pdfeditor/main/locale/pl.json
+++ b/apps/pdfeditor/main/locale/pl.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Dopasuj do strony",
"PDFE.Views.ViewTab.tipFitToWidth": "Dopasuj do szerokości",
"PDFE.Views.ViewTab.tipHeadings": "Nagłówki",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Motyw interfejsu"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Motyw interfejsu",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/pt-pt.json b/apps/pdfeditor/main/locale/pt-pt.json
index edcc9fe04b..8415640809 100644
--- a/apps/pdfeditor/main/locale/pt-pt.json
+++ b/apps/pdfeditor/main/locale/pt-pt.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Ajustar à página",
"PDFE.Views.ViewTab.tipFitToWidth": "Ajustar à largura",
"PDFE.Views.ViewTab.tipHeadings": "Títulos",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/pt.json b/apps/pdfeditor/main/locale/pt.json
index 56ff3177cb..a5c7be94ef 100644
--- a/apps/pdfeditor/main/locale/pt.json
+++ b/apps/pdfeditor/main/locale/pt.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Ajustar a página",
"PDFE.Views.ViewTab.tipFitToWidth": "Ajustar à Largura",
"PDFE.Views.ViewTab.tipHeadings": "Títulos",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interface"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interface",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/ro.json b/apps/pdfeditor/main/locale/ro.json
index dddd0afe98..3e71ce85d5 100644
--- a/apps/pdfeditor/main/locale/ro.json
+++ b/apps/pdfeditor/main/locale/ro.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Portivire la pagina",
"PDFE.Views.ViewTab.tipFitToWidth": "Potrivire lățime",
"PDFE.Views.ViewTab.tipHeadings": "Titluri",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interfață"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interfață",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/ru.json b/apps/pdfeditor/main/locale/ru.json
index e7071bcfbc..4faf850f86 100644
--- a/apps/pdfeditor/main/locale/ru.json
+++ b/apps/pdfeditor/main/locale/ru.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "По размеру страницы",
"PDFE.Views.ViewTab.tipFitToWidth": "По ширине",
"PDFE.Views.ViewTab.tipHeadings": "Заголовки",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфейса"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфейса",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/si.json b/apps/pdfeditor/main/locale/si.json
index 48f01a61c4..d36cc780f3 100644
--- a/apps/pdfeditor/main/locale/si.json
+++ b/apps/pdfeditor/main/locale/si.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "පිටුවට ගළපන්න",
"PDFE.Views.ViewTab.tipFitToWidth": "පළලට ගළපන්න",
"PDFE.Views.ViewTab.tipHeadings": "ශ්රීර්ෂනාම",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "අතුරුමුහුණතේ තේමාව"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "අතුරුමුහුණතේ තේමාව",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/sk.json b/apps/pdfeditor/main/locale/sk.json
index 19ff57c278..6e79c72bd7 100644
--- a/apps/pdfeditor/main/locale/sk.json
+++ b/apps/pdfeditor/main/locale/sk.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Prispôsobiť na stranu",
"PDFE.Views.ViewTab.tipFitToWidth": "Prispôsobiť na šírku",
"PDFE.Views.ViewTab.tipHeadings": "Nadpisy",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Vzhľad prostredia"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Vzhľad prostredia",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/sl.json b/apps/pdfeditor/main/locale/sl.json
index b17397e229..5b5a2a3842 100644
--- a/apps/pdfeditor/main/locale/sl.json
+++ b/apps/pdfeditor/main/locale/sl.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Prilagodi stran",
"PDFE.Views.ViewTab.tipFitToWidth": "Prilagodi širino",
"PDFE.Views.ViewTab.tipHeadings": "Naslovi",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Interface theme"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/sr-cyrl.json b/apps/pdfeditor/main/locale/sr-cyrl.json
index c5a98bff0e..8d3da2d00f 100644
--- a/apps/pdfeditor/main/locale/sr-cyrl.json
+++ b/apps/pdfeditor/main/locale/sr-cyrl.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Прилагоди страници",
"PDFE.Views.ViewTab.tipFitToWidth": "Прилагоди ширини",
"PDFE.Views.ViewTab.tipHeadings": "Наслови",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфејса"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфејса",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/sr.json b/apps/pdfeditor/main/locale/sr.json
index 17b4b8da62..fce308cb86 100644
--- a/apps/pdfeditor/main/locale/sr.json
+++ b/apps/pdfeditor/main/locale/sr.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Prilagodi strani",
"PDFE.Views.ViewTab.tipFitToWidth": "Prilagodi Širinu ",
"PDFE.Views.ViewTab.tipHeadings": "Naslovi",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema interfejsa"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema interfejsa",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/sv.json b/apps/pdfeditor/main/locale/sv.json
index 45cd41b643..a86363ade4 100644
--- a/apps/pdfeditor/main/locale/sv.json
+++ b/apps/pdfeditor/main/locale/sv.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Anpassa till sida",
"PDFE.Views.ViewTab.tipFitToWidth": "Anpassa till bredd",
"PDFE.Views.ViewTab.tipHeadings": "Rubriker",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Gränssnittstema"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Gränssnittstema",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/tr.json b/apps/pdfeditor/main/locale/tr.json
index f232bd72c7..1496351a64 100644
--- a/apps/pdfeditor/main/locale/tr.json
+++ b/apps/pdfeditor/main/locale/tr.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "Sayfaya Sığdır",
"PDFE.Views.ViewTab.tipFitToWidth": "Genişliğe Sığdır",
"PDFE.Views.ViewTab.tipHeadings": "Başlıklar",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Arayüz teması"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Arayüz teması",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/uk.json b/apps/pdfeditor/main/locale/uk.json
index 8e5647ced4..976e649ba7 100644
--- a/apps/pdfeditor/main/locale/uk.json
+++ b/apps/pdfeditor/main/locale/uk.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "За розміром сторінки",
"PDFE.Views.ViewTab.tipFitToWidth": "По ширині",
"PDFE.Views.ViewTab.tipHeadings": "Заголовки",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема інтерфейсу"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема інтерфейсу",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/zh-tw.json b/apps/pdfeditor/main/locale/zh-tw.json
index 9827161454..62f672e7f5 100644
--- a/apps/pdfeditor/main/locale/zh-tw.json
+++ b/apps/pdfeditor/main/locale/zh-tw.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "調整至頁面",
"PDFE.Views.ViewTab.tipFitToWidth": "調整至寬度",
"PDFE.Views.ViewTab.tipHeadings": "頁首",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "介面主題"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "介面主題",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/locale/zh.json b/apps/pdfeditor/main/locale/zh.json
index 839389fc7d..2180859e49 100644
--- a/apps/pdfeditor/main/locale/zh.json
+++ b/apps/pdfeditor/main/locale/zh.json
@@ -2025,5 +2025,6 @@
"PDFE.Views.ViewTab.tipFitToPage": "适合页面",
"PDFE.Views.ViewTab.tipFitToWidth": "适合宽度",
"PDFE.Views.ViewTab.tipHeadings": "标题",
- "PDFE.Views.ViewTab.tipInterfaceTheme": "界面主题"
+ "PDFE.Views.ViewTab.tipInterfaceTheme": "界面主题",
+ "PDFE.Views.DocumentHolder.textColor": "Color"
}
\ No newline at end of file
diff --git a/apps/pdfeditor/main/resources/less/rightmenu.less b/apps/pdfeditor/main/resources/less/rightmenu.less
index ece76084c6..9378cbc38e 100644
--- a/apps/pdfeditor/main/resources/less/rightmenu.less
+++ b/apps/pdfeditor/main/resources/less/rightmenu.less
@@ -51,6 +51,10 @@
#image-button-90, #image-button-flipv {
display: inline-block;
}
+
+ #image-spin-transparency {
+ display: inline-block;
+ }
}
&#id-table-settings {
diff --git a/apps/pdfeditor/main/resources/less/toolbar.less b/apps/pdfeditor/main/resources/less/toolbar.less
index 874d25b2b9..a06361f219 100644
--- a/apps/pdfeditor/main/resources/less/toolbar.less
+++ b/apps/pdfeditor/main/resources/less/toolbar.less
@@ -121,7 +121,8 @@
#equation-container,
#text-bar-container,
-#annot-bar-container {
+#annot-bar-container,
+#annot-sel-bar-container {
position: absolute;
z-index: @zindex-dropdown - 20;
background-color: @background-toolbar-ie;
@@ -157,10 +158,11 @@
}
#text-bar-container,
-#annot-bar-container {
+#annot-bar-container,
+#annot-sel-bar-container {
padding: 4px 6px;
- :not(.btn-group.split) .btn-toolbar,
- .btn-group.split {
+ .btn-toolbar,
+ .btn-group {
display: flex;
justify-content: center;
align-items: center;
diff --git a/apps/presentationeditor/main/app/template/ImageSettings.template b/apps/presentationeditor/main/app/template/ImageSettings.template
index 6d0b795e6d..c89fdaeff9 100644
--- a/apps/presentationeditor/main/app/template/ImageSettings.template
+++ b/apps/presentationeditor/main/app/template/ImageSettings.template
@@ -37,6 +37,24 @@
|
+