diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index 38957d4aa..16a83128f 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -144,6 +144,7 @@ define([ setApi: function(api) { this.api = api; this.api.asc_registerCallback('asc_onCloseChartEditor', _.bind(this.onDiagrammEditingDisabled, this)); + this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this)); return this; }, @@ -187,7 +188,7 @@ define([ iconCls: 'warn', buttons: ['ok'], callback: _.bind(function(btn){ - this.setControlsDisabled(false); + this.diagramEditorView.setControlsDisabled(false); this.diagramEditorView.hide(); }, this) }); @@ -242,6 +243,9 @@ define([ h = eventData.data.height; if (w>0 && h>0) this.diagramEditorView.setInnerSize(w, h); + } else + if (eventData.type == "frameToGeneralData") { + this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data); } else this.diagramEditorView.fireEvent('internalmessage', this.diagramEditorView, eventData); } @@ -253,6 +257,10 @@ define([ } }, + onSendFromGeneralToFrameEditor: function(data) { + externalEditor && externalEditor.serviceCommand('generalToFrameData', data); + }, + warningTitle: 'Warning', warningText: 'The object is disabled because of editing by another user.', textClose: 'Close', diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js index bcc29c803..a7d61f7c2 100644 --- a/apps/common/main/lib/controller/ExternalMergeEditor.js +++ b/apps/common/main/lib/controller/ExternalMergeEditor.js @@ -142,6 +142,7 @@ define([ setApi: function(api) { this.api = api; this.api.asc_registerCallback('asc_onCloseMergeEditor', _.bind(this.onMergeEditingDisabled, this)); + this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this)); return this; }, @@ -186,7 +187,7 @@ define([ iconCls: 'warn', buttons: ['ok'], callback: _.bind(function(btn){ - this.setControlsDisabled(false); + this.mergeEditorView.setControlsDisabled(false); this.mergeEditorView.hide(); }, this) }); @@ -242,6 +243,9 @@ define([ h = eventData.data.height; if (w>0 && h>0) this.mergeEditorView.setInnerSize(w, h); + } else + if (eventData.type == "frameToGeneralData") { + this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data); } else this.mergeEditorView.fireEvent('internalmessage', this.mergeEditorView, eventData); } @@ -253,6 +257,10 @@ define([ } }, + onSendFromGeneralToFrameEditor: function(data) { + externalEditor && externalEditor.serviceCommand('generalToFrameData', data); + }, + warningTitle: 'Warning', warningText: 'The object is disabled because of editing by another user.', textClose: 'Close', diff --git a/apps/common/main/lib/controller/ExternalOleEditor.js b/apps/common/main/lib/controller/ExternalOleEditor.js index 931eb5e6b..c21055b95 100644 --- a/apps/common/main/lib/controller/ExternalOleEditor.js +++ b/apps/common/main/lib/controller/ExternalOleEditor.js @@ -142,6 +142,7 @@ define([ setApi: function(api) { this.api = api; this.api.asc_registerCallback('asc_onCloseOleEditor', _.bind(this.onOleEditingDisabled, this)); + this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this)); return this; }, @@ -185,7 +186,7 @@ define([ iconCls: 'warn', buttons: ['ok'], callback: _.bind(function(btn){ - this.setControlsDisabled(false); + this.oleEditorView.setControlsDisabled(false); this.oleEditorView.hide(); }, this) }); @@ -241,6 +242,9 @@ define([ h = eventData.data.height; if (w>0 && h>0) this.oleEditorView.setInnerSize(w, h); + } else + if (eventData.type == "frameToGeneralData") { + this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data); } else this.oleEditorView.fireEvent('internalmessage', this.oleEditorView, eventData); } @@ -252,6 +256,10 @@ define([ } }, + onSendFromGeneralToFrameEditor: function(data) { + externalEditor && externalEditor.serviceCommand('generalToFrameData', data); + }, + warningTitle: 'Warning', warningText: 'The object is disabled because of editing by another user.', textClose: 'Close', diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index ecb631631..d5d4f87c3 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -622,10 +622,10 @@ Common.UI.HintManager = new(function() { } } - _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT && + _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 && !(window.PE && $('#pe-preview').is(':visible'))); - if (e.altKey && e.keyCode !== 115) { + if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && e.altKey && e.keyCode !== 115) { e.preventDefault(); } }); diff --git a/apps/common/main/resources/help/de/images/find_small.png b/apps/common/main/resources/help/de/images/find_small.png new file mode 100644 index 000000000..9d309a55e Binary files /dev/null and b/apps/common/main/resources/help/de/images/find_small.png differ diff --git a/apps/common/main/resources/help/de/images/ole_table.png b/apps/common/main/resources/help/de/images/ole_table.png new file mode 100644 index 000000000..78ab08b5a Binary files /dev/null and b/apps/common/main/resources/help/de/images/ole_table.png differ diff --git a/apps/common/main/resources/help/en/images/find_small.png b/apps/common/main/resources/help/en/images/find_small.png new file mode 100644 index 000000000..28ee507de Binary files /dev/null and b/apps/common/main/resources/help/en/images/find_small.png differ diff --git a/apps/common/main/resources/help/en/images/ole_table.png b/apps/common/main/resources/help/en/images/ole_table.png new file mode 100644 index 000000000..440ea9ac1 Binary files /dev/null and b/apps/common/main/resources/help/en/images/ole_table.png differ diff --git a/apps/common/main/resources/help/fr/images/find_small.png b/apps/common/main/resources/help/fr/images/find_small.png new file mode 100644 index 000000000..28ee507de Binary files /dev/null and b/apps/common/main/resources/help/fr/images/find_small.png differ diff --git a/apps/common/main/resources/help/fr/images/ole_table.png b/apps/common/main/resources/help/fr/images/ole_table.png new file mode 100644 index 000000000..ce8914b05 Binary files /dev/null and b/apps/common/main/resources/help/fr/images/ole_table.png differ diff --git a/apps/common/main/resources/help/ru/images/find_small.png b/apps/common/main/resources/help/ru/images/find_small.png new file mode 100644 index 000000000..0bfb8855c Binary files /dev/null and b/apps/common/main/resources/help/ru/images/find_small.png differ diff --git a/apps/common/main/resources/help/ru/images/ole_table.png b/apps/common/main/resources/help/ru/images/ole_table.png new file mode 100644 index 000000000..1774b6645 Binary files /dev/null and b/apps/common/main/resources/help/ru/images/ole_table.png differ diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index e7b192fe7..4d1d7180a 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -131,7 +131,7 @@ --component-hover-icon-opacity: .8; --component-active-icon-opacity: 1; --component-active-hover-icon-opacity: 1; - --component-disabled-opacity: .6; + --component-disabled-opacity: .4; --header-component-normal-icon-opacity: .8; --header-component-hover-icon-opacity: .8; diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 736f2cece..7166cb578 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -40,6 +40,8 @@ .extra { background-color: @header-background-color-ie; background-color: @header-background-color; + + box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top; } //&::after { @@ -62,6 +64,8 @@ display: flex; flex-shrink: 1; + box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top; + > ul { padding: 4px 0 0; margin: 0; @@ -75,14 +79,19 @@ display: inline-flex; align-items: center; height: 100%; + position: relative; &:hover { background-color: @highlight-header-button-hover-ie; background-color: @highlight-header-button-hover; + + box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top; } &.active { background-color: @background-toolbar-ie; background-color: @background-toolbar; + + box-shadow: inset @minus-px 0px 0 0 @border-toolbar-active-panel-top, inset @scaled-one-px-value @scaled-one-px-value 0 0 @border-toolbar-active-panel-top; } @@ -111,6 +120,29 @@ } } + &:not(.style-off-tabs *) { + &.short { + li { + &:after { + content: ''; + position: absolute; + background: @border-toolbar-active-panel-top; + height: @scaled-one-px-value; + bottom: 0; + left: 1px; + right: 1px; + z-index: 2; + } + + &.active { + &:after { + background: @background-toolbar; + } + } + } + } + } + .scroll { line-height: @height-tabs; min-width: 20px; @@ -132,7 +164,7 @@ &.left{ box-shadow: 5px 0 20px 5px @header-background-color-ie; - box-shadow: 5px 0 20px 5px @header-background-color; + box-shadow: 18px calc(38px - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, 5px 0 20px 5px @header-background-color; &:after { transform: rotate(135deg); @@ -141,7 +173,7 @@ } &.right{ box-shadow: -5px 0 20px 5px @header-background-color-ie; - box-shadow: -5px 0 20px 5px @header-background-color; + box-shadow: -10px calc(38px - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, -5px 0 20px 5px @header-background-color; &:after { transform: rotate(-45deg); @@ -403,6 +435,7 @@ li { position: relative; + &:after { //transition: opacity .1s; //transition: bottom .1s; @@ -417,6 +450,7 @@ &.active { background-color: transparent; + box-shadow: none; //> a { // padding: 0 12px; //} @@ -428,6 +462,7 @@ &:hover:not(.active) { background-color: rgba(0, 0, 0, .05); + box-shadow: none; .theme-type-dark & { background-color: rgba(255, 255, 255, .05); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 956af1bed..40597ffd5 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -293,7 +293,7 @@ define([ } })).show(); break; - case 'help': + case 'external-help': close_menu = !!isopts; break; default: close_menu = false; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 9af86ff56..531895fce 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1227,8 +1227,8 @@ define([ Common.Utils.InternalSettings.set("de-settings-inputmode", value); me.api.SetTextBoxInputMode(value); - value = Common.localStorage.getBool("de-settings-use-alt-key", true); - Common.Utils.InternalSettings.set("de-settings-use-alt-key", value); + value = Common.localStorage.getBool("de-settings-show-alt-hints", Common.Utils.isMac ? false : true); + Common.Utils.InternalSettings.set("de-settings-show-alt-hints", value); /** coauthoring begin **/ me._state.fastCoauth = Common.Utils.InternalSettings.get("de-settings-coauthmode"); diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index 8d1f840f5..8a92b0750 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -68,7 +68,7 @@ define([ var panel = this.panels[item.options.action]; if (item.options.action === 'help') { if ( panel.usedHelpCenter === true && navigator.onLine ) { - this.fireEvent('item:click', [this, item.options.action, true]); + this.fireEvent('item:click', [this, 'external-help', true]); window.open(panel.urlHelpCenter, '_blank'); return; } diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index eba89f8cf..2b9ed4169 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -791,7 +791,7 @@ define([ updateSettings: function() { this.chInputMode.setValue(Common.Utils.InternalSettings.get("de-settings-inputmode")); - this.chUseAltKey.setValue(Common.Utils.InternalSettings.get("de-settings-use-alt-key")); + this.chUseAltKey.setValue(Common.Utils.InternalSettings.get("de-settings-show-alt-hints")); var value = Common.Utils.InternalSettings.get("de-settings-zoom"); value = (value!==null) ? parseInt(value) : (this.mode.customization && this.mode.customization.zoom ? parseInt(this.mode.customization.zoom) : 100); @@ -875,8 +875,8 @@ define([ if (!this.chDarkMode.isDisabled() && (this.chDarkMode.isChecked() !== Common.UI.Themes.isContentThemeDark())) Common.UI.Themes.toggleContentTheme(); Common.localStorage.setItem("de-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0); - Common.localStorage.setItem("de-settings-use-alt-key", this.chUseAltKey.isChecked() ? 1 : 0); - Common.Utils.InternalSettings.set("de-settings-use-alt-key", Common.localStorage.getBool("de-settings-use-alt-key")); + Common.localStorage.setItem("de-settings-show-alt-hints", this.chUseAltKey.isChecked() ? 1 : 0); + Common.Utils.InternalSettings.set("de-settings-show-alt-hints", Common.localStorage.getBool("de-settings-show-alt-hints")); Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue()); Common.Utils.InternalSettings.set("de-settings-zoom", Common.localStorage.getItem("de-settings-zoom")); diff --git a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm index 9760ab54c..a75dbde7f 100644 --- a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm +++ b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm @@ -15,9 +15,11 @@
Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente direkt in Ihrem Browser betrachten und bearbeiten können.
-Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF-, HTML-, FB2, oder HTML-Dateien speichern.
-Wenn Sie in der Online-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol in der linken Seitenleiste. Wenn Sie in der Desktop-Version für Windows mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, wählen Sie das Menü Über in der linken Seitenleiste des Hauptfensters. Öffnen Sie in der Desktop-Version für Mac OS das Menü ONLYOFFICE oben auf dem Bildschirm und wählen Sie den Menüpunkt Über ONLYOFFICE.
+Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente + direkt in Ihrem Browser betrachten und bearbeiten können.
+Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, + editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF-, HTML-, FB2, oder HTML-Dateien speichern.
+Wenn Sie in der Online-Version mehr über die aktuelle Softwareversion, das Build und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol in der linken Seitenleiste. Wenn Sie in der Desktop-Version für Windows mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, wählen Sie das Menü Über in der linken Seitenleiste des Hauptfensters. Öffnen Sie in der Desktop-Version für Mac OS das Menü ONLYOFFICE oben auf dem Bildschirm und wählen Sie den Menüpunkt Über ONLYOFFICE.