{props.onRejectAll();}}>
diff --git a/apps/common/mobile/utils/htmlutils.js b/apps/common/mobile/utils/htmlutils.js
index 18c9bac047..bf65aa9634 100644
--- a/apps/common/mobile/utils/htmlutils.js
+++ b/apps/common/mobile/utils/htmlutils.js
@@ -21,8 +21,15 @@ if ( localStorage && localStorage.getItem('mobile-mode-direction') === 'rtl' ) {
let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("mobile-ui-theme"));
if ( !obj ) {
- obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
- {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
+ if ( window.native && window.native.theme ) {
+ if ( window.native.theme.type == 'dark' ) obj = {id: 'theme-dark', type: 'dark'};
+ else if ( window.native.theme.type == 'light' ) obj = {id: 'theme-light', type: 'light'};
+ }
+
+ if ( !obj )
+ obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
+ {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
+
localStorage && localStorage.setItem("mobile-ui-theme", JSON.stringify(obj));
}
diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
index f966805ceb..887c4393f0 100644
--- a/apps/documenteditor/forms/app/controller/ApplicationController.js
+++ b/apps/documenteditor/forms/app/controller/ApplicationController.js
@@ -1440,6 +1440,7 @@ define([
Common.Gateway.documentReady();
Common.Analytics.trackEvent('Load', 'Complete');
+ Common.NotificationCenter.trigger('document:ready');
},
onOptionsClick: function(menu, item, e) {
@@ -1602,16 +1603,24 @@ define([
}
if (Common.UI.Themes.available()) {
- var current = Common.UI.Themes.currentThemeId();
- for (var t in Common.UI.Themes.map()) {
- this.view.mnuThemes.addItem(new Common.UI.MenuItem({
- caption : Common.UI.Themes.get(t).text,
- value : t,
- toggleGroup : 'themes',
- checkable : true,
- checked : t===current
- }));
+ const _fill_themes = function () {
+ const _menu = this.view.mnuThemes;
+ _menu.removeAll();
+
+ const _current = Common.UI.Themes.currentThemeId();
+ for (const t in Common.UI.Themes.map()) {
+ _menu.addItem(new Common.UI.MenuItem({
+ caption : Common.UI.Themes.get(t).text,
+ value : t,
+ toggleGroup : 'themes',
+ checkable : true,
+ checked : t === _current
+ }));
+ }
}
+
+ Common.NotificationCenter.on('uitheme:countchanged', _fill_themes.bind(this));
+ _fill_themes.call(this);
}
if (this.view.mnuThemes.items.length<1) {
menuItems[7].setVisible(false);
diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js
index aa8b710cb5..c453eb3298 100644
--- a/apps/documenteditor/forms/app/view/ApplicationView.js
+++ b/apps/documenteditor/forms/app/view/ApplicationView.js
@@ -46,6 +46,7 @@ define([
this.btnOptions = new Common.UI.Button({
cls: 'btn-toolbar no-caret',
iconCls: 'svg-icon more-vertical',
+ scaling: false,
menu: new Common.UI.Menu({
cls: 'shifted-right',
items: [
@@ -103,34 +104,39 @@ define([
this.btnClear = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'svg-icon clear-style',
- caption: this.textClear
+ caption: this.textClear,
+ scaling: false
});
this.btnClear.render($('#id-btn-clear-fields'));
this.btnNext = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'svg-icon arrow-down',
- caption: this.textNext
+ caption: this.textNext,
+ scaling: false
});
this.btnNext.render($('#id-btn-next-field'));
this.btnPrev = new Common.UI.Button({
cls: 'btn-toolbar',
- iconCls: 'svg-icon arrow-up'
+ iconCls: 'svg-icon arrow-up',
+ scaling: false
});
this.btnPrev.render($('#id-btn-prev-field'));
this.btnUndo = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'svg-icon undo',
- hint: this.tipUndo + Common.Utils.String.platformKey('Ctrl+Z')
+ hint: this.tipUndo + Common.Utils.String.platformKey('Ctrl+Z'),
+ scaling: false
});
this.btnUndo.render($('#id-btn-undo'));
this.btnRedo = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'svg-icon redo',
- hint: this.tipRedo + Common.Utils.String.platformKey('Ctrl+Y')
+ hint: this.tipRedo + Common.Utils.String.platformKey('Ctrl+Y'),
+ scaling: false
});
this.btnRedo.render($('#id-btn-redo'));
diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html
index a9ba39ce0a..bfd92a8a13 100644
--- a/apps/documenteditor/forms/index.html
+++ b/apps/documenteditor/forms/index.html
@@ -151,6 +151,8 @@
+
+
+
.
+ The Combine feature may seem the same but with one major difference, i.e., the Tracked Changes in both versions are merged into one version and the rest of the texts is compared.
+ After merging two documents, the result will be stored on the portal as a new version of the original file.
If you do not need to merge documents which are being compared, you can reject all the changes so that the original document remains unchanged.
Choose a document for comparison
To compare two documents, open the original document that you need to compare and select the second document for comparison:
- - switch to the Collaboration tab on the top toolbar and press the Compare button,
+ - switch to the Collaboration tab on the top toolbar and press the Compare button,
-
select one of the following options to load the document:
When the second document for comparison is selected, the comparison process will start and the document will look as if it was opened in the Review mode. All the changes are highlighted with a color, and you can view the changes, navigate between them, accept or reject them one by one or all the changes at once. It's also possible to change the display mode and see how the document looks before comparison, in the process of comparison, or how it will look after comparison if you accept all changes.
+ Choose a document for combining
+ To combine two documents, open the original document and select the second document for combining:
+
+ - switch to the Collaboration tab on the top toolbar and press the Combine button,
+ -
+ select one of the following options to load the document:
+
+ - the Document from File option will open the standard dialog window for file selection. Browse your computer hard disk drive for the necessary .docx file and click the Open button.
+ -
+ the Document from URL option will open the window where you can enter a link to the file stored in a third-party web storage (for example, Nextcloud) if you have corresponding access rights to it. The link must be a direct link for downloading the file. When the link is specified, click the OK button.
+
Note: The direct link allows downloading the file directly without opening it in a web browser. For example, to get a direct link in Nextcloud, find the necessary document in the file list, select the Details option from the file menu. Click the Copy direct link (only works for users who have access to this file/folder) icon on the right of the file name on the details panel. To find out how to get a direct link for downloading the file in a different third-party web storage, please refer to the corresponding third-party service documentation.
+
+
+
+
+ When the second document for combining is selected, the combining process will start and the document will look as if it was opened in the Review mode. All the changes are highlighted with a color, and you can view the changes, navigate between them, accept or reject them one by one or all the changes at once. It's also possible to change the display mode and see how the document looks before combining, in the process of combining, or how it will look after combining if you accept all changes.
+
Choose the changes display mode
- Click the Display Mode button on the top toolbar and select one of the available modes from the list:
+ Click the Display Mode button on the top toolbar and select one of the available modes from the list:
-
- Markup - this option is selected by default. It is used to display the document in the process of comparison. This mode allows both viewing the changes and editing the document.
+ Markup - this option is selected by default. It is used to display the document in the process of comparison/combining. This mode allows both viewing the changes and editing the document.
-
- Final - this mode is used to display the document after comparison as if all the changes were accepted. This option does not actually accept all changes, it only allows you to see how the document will look like after you accept all the changes. In this mode, you cannot edit the document.
+ Final - this mode is used to display the document after comparison/combining as if all the changes were accepted. This option does not actually accept all changes, it only allows you to see how the document will look like after you accept all the changes. In this mode, you cannot edit the document.
-
- Original - this mode is used to display the document before comparison as if all the changes were rejected. This option does not actually reject all changes, it only allows you to view the document without changes. In this mode, you cannot edit the document.
+ Original - this mode is used to display the document before comparison/combining as if all the changes were rejected. This option does not actually reject all changes, it only allows you to view the document without changes. In this mode, you cannot edit the document.
Accept or reject changes
- Use the Previous and the Next buttons on the top toolbar to navigate through the changes.
+ Use the Previous and the Next buttons on the top toolbar to navigate through the changes.
To accept the currently selected change, you can:
- - click the Accept button on the top toolbar, or
+ - click the Accept button on the top toolbar, or
- click the downward arrow below the Accept button and select the Accept Current Change option (in this case, the change will be accepted and you will proceed to the next change), or
- - click the Accept button of the change pop-up window.
+ - click the Accept button of the change pop-up window.
- To quickly accept all the changes, click the downward arrow below the Accept button and select the Accept All Changes option.
+ To quickly accept all the changes, click the downward arrow below the Accept button and select the Accept All Changes option.
To reject the current change you can:
- - click the Reject button on the top toolbar, or
+ - click the Reject button on the top toolbar, or
- click the downward arrow below the Reject button and select the Reject Current Change option (in this case, the change will be rejected and you will move on to the next available change), or
- - click the Reject button of the change pop-up window.
+ - click the Reject button of the change pop-up window.
- To quickly reject all the changes, click the downward arrow below the Reject button and select the Reject All Changes option.
+ To quickly reject all the changes, click the downward arrow below the Reject button and select the Reject All Changes option.
- Additional info on the comparison feature
+ Additional info on the comparison and combining feature
Method of comparison
Documents are compared by words. If a word contains a change of at least one character (e.g. if a character was removed or replaced), in the result, the difference will be displayed as the change of the entire word, not the character.
The image below illustrates the case when the original file contains the word 'Characters' and the document for comparison contains the word 'Character'.
@@ -88,8 +106,9 @@
If the authors of two files are different users, then the author of the second file loaded for comparison is the author of the added/removed changes.
Presence of the tracked changes in the compared document
- If the original document contains some changes made in the review mode, they will be accepted in the comparison process. When you choose the second file for comparison, you'll see the corresponding warning message.
+ If the original document contains some changes made in the review mode, they will be accepted in the comparison process. When you choose the second file for comparison, you'll see the corresponding warning message.
In this case, when you choose the Original display mode, the document will not contain any changes.
+ If both documents contain some changes made in the review mode, they will be merged into one version in the combining process.