',
'
',
'
',
@@ -82,6 +82,7 @@ define([
this.closable = this.options.closable;
this.textButton = this.options.textButton || '';
this.position = this.options.position; // show in the position relative to target
+ this.style = this.options.style || '';
},
render: function() {
diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js
index 784070a57..2418b501d 100644
--- a/apps/documenteditor/main/app/controller/Statusbar.js
+++ b/apps/documenteditor/main/app/controller/Statusbar.js
@@ -326,7 +326,8 @@ define([
text : this.textDisconnect,
placement: 'top',
position: this.statusbar.isVisible() ? undefined : {bottom: 0},
- showLink: false
+ showLink: false,
+ style: 'max-width: 310px;'
});
this.disconnectTip.on({
'closeclick': function() {
@@ -348,6 +349,6 @@ define([
textTrackChanges: 'The document is opened with the Track Changes mode enabled',
tipReview : 'Review',
textSetTrackChanges: 'You are in Track Changes mode',
- textDisconnect: 'Connection is lost
Please check connection settings.'
+ textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.'
}, DE.Controllers.Statusbar || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 362a058ca..852b600e1 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -887,7 +887,7 @@
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
- "DE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.",
+ "DE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
"DE.Controllers.Statusbar.textSetTrackChanges": "You are in Track Changes mode",
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index fbe678533..38e18f8c9 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -884,6 +884,7 @@
"DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений",
"DE.Controllers.Statusbar.tipReview": "Отслеживать изменения",
"DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
+ "DE.Controllers.Statusbar.textDisconnect": "Соединение потеряно
Пытаемся восстановить соединение. Проверьте параметры подключения.",
"DE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.
Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.
Вы хотите продолжить?",
"DE.Controllers.Toolbar.dataUrl": "Вставьте URL-адрес данных",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Внимание",
diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js
index 377dc978a..12281714c 100644
--- a/apps/presentationeditor/main/app/controller/Statusbar.js
+++ b/apps/presentationeditor/main/app/controller/Statusbar.js
@@ -246,7 +246,8 @@ define([
text : this.textDisconnect,
placement: 'top',
position: this.statusbar.isVisible() ? undefined : {bottom: 0},
- showLink: false
+ showLink: false,
+ style: 'max-width: 310px;'
});
this.disconnectTip.on({
'closeclick': function() {
@@ -264,7 +265,7 @@ define([
},
zoomText : 'Zoom {0}%',
- textDisconnect: 'Connection is lost
Please check connection settings.'
+ textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.'
}, PE.Controllers.Statusbar || {}));
});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index e262054ce..79f18bea6 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -947,7 +947,7 @@
"PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
- "PE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.",
+ "PE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?",
"PE.Controllers.Toolbar.textAccent": "Accents",
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png
new file mode 100644
index 000000000..517917c84
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png
index 67a7db219..49dc965f0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png
index dbc28ce00..4125f719c 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png
index b05ca5221..16f77543b 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png
new file mode 100644
index 000000000..88d647a98
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png
new file mode 100644
index 000000000..7f4467c04
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png
index ae13adf95..e087ecbec 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png
new file mode 100644
index 000000000..0335e33d2
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png
index a388ec8f3..2f5de3519 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png
new file mode 100644
index 000000000..6f512969d
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png
index 8adf7ec6d..75160ae0a 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png
index ae5889ffc..86c908475 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png
index 63d88e7c9..f6292c1a0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png
new file mode 100644
index 000000000..56f92ac8a
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png
index 0ee550615..bd2276119 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png
index 8ded80640..10376043f 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png
new file mode 100644
index 000000000..aa140ec68
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png
index 1fc639a31..9a671569d 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png
index cb2ca9f8d..fc7418ed6 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png
index 17cfd3bac..5d4f99966 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png
new file mode 100644
index 000000000..3f6e01ca5
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png
index c155164a2..a19c8a7d0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png
index dc6e8e5e9..4c5520b0d 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-multiple.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-multiple.png
index c9d615018..361ddecda 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-multiple.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-multiple.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bBold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bBold_flash.png
deleted file mode 100644
index 2f990e20e..000000000
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bBold_flash.png and /dev/null differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png
new file mode 100644
index 000000000..0d25ec681
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png
new file mode 100644
index 000000000..be1322f05
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png
index 36e981bd0..8f01e1ece 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png
index 9211ec890..ee6b34bfe 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png
index e24a97742..aeaf2fba1 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-uUnderline.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-uUnderline.png
rename to apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png
index f04f6467a..150f33a5e 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png
new file mode 100644
index 000000000..931b04d75
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png
index 86e86e82b..93332f3a8 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png
index 4518e668d..60b45b73c 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png
index d4f285a59..e4c9a21ab 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png
index a4470212a..95338b363 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png
new file mode 100644
index 000000000..1c094cb90
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png
index 80403a251..c271db9a0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png
index 50af7c16d..aa9f14e48 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png
index 796e9ea9a..5c1b21bf0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png
index 3a10a64d7..edbf2c7a0 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png
index 1e865881b..9f34192de 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png
index 9a0bb496d..a50b43199 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png
new file mode 100644
index 000000000..118a0408c
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png
new file mode 100644
index 000000000..3395d28bd
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png
new file mode 100644
index 000000000..fbf7296d3
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png
new file mode 100644
index 000000000..80f5dc6c8
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png
new file mode 100644
index 000000000..d48cbd04b
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png
new file mode 100644
index 000000000..9c2a48897
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png
new file mode 100644
index 000000000..6597eb4ef
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png
new file mode 100644
index 000000000..a87408d49
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png
new file mode 100644
index 000000000..9eb8a1a1c
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png
new file mode 100644
index 000000000..170583fac
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png
new file mode 100644
index 000000000..b680cfb1d
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png
index f96b35fa3..567312289 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png
index c1db32eb3..efcbb0653 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png
new file mode 100644
index 000000000..6983151c2
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png
index df1974e42..321a60eea 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png
index 2f6debcec..56efade1c 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png
index c0f2d34fb..2c2bc19a2 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png
index 5b5d01680..0589a8032 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png
index 58c09c0be..4f4fae04f 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png
new file mode 100644
index 000000000..5ab7170c8
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png
index 47a0e3c4b..4be198450 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png
index 52a7a22b6..0e2ee2e4e 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png
index 3e5559da9..874165655 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png
new file mode 100644
index 000000000..e99d0939a
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png
index f9f485d21..b22cd2653 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png
index 53c9e366c..5d4f9ffe4 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png
index df9562892..ed4f126de 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png
index a8c7c8eb4..c1100fd05 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png
index bc6823588..f2a2b49ed 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png
new file mode 100644
index 000000000..73a6cc316
Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png
index b4199cf9a..f330d1fb3 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png
index 0cd335358..c8488229e 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png
index b12cd9df6..24d40f76a 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png differ
diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-multiple.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-multiple.png
index 1cf0eeb06..b0c1ec76b 100644
Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-multiple.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-multiple.png differ
diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js
index 29cd68c68..398db2c65 100644
--- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js
@@ -824,7 +824,8 @@ define([
text : this.textDisconnect,
placement: 'top',
position: this.statusbar.isVisible() ? undefined : {bottom: 0},
- showLink: false
+ showLink: false,
+ style: 'max-width: 310px;'
});
this.disconnectTip.on({
'closeclick': function() {
@@ -848,6 +849,6 @@ define([
strSheet : 'Sheet',
textSheetViewTip: 'You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.',
textSheetViewTipFilters: 'You are in Sheet View mode. Filters are visible only to you and those who are still in this view.',
- textDisconnect: 'Connection is lost
Please check connection settings.'
+ textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.'
}, SSE.Controllers.Statusbar || {}));
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
index fee16cd3a..eb2e028bd 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
@@ -222,7 +222,8 @@ define([
editable: false,
data: [],
scrollAlwaysVisible: true,
- takeFocusOnClose: true
+ takeFocusOnClose: true,
+ search: true
});
this.cmbSymbols.on('selected', _.bind(this.onSymbolsSelect, this));
@@ -321,7 +322,7 @@ define([
if (this._state.hasSeparator)
this.chSeparator.setValue(props.formatInfo.asc_getSeparator());
if (this._state.hasSymbols)
- this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol());
+ this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol() || props.formatInfo.asc_getCurrencySymbol());
if (props.format) {
if (this._state.hasNegative) {
@@ -384,7 +385,7 @@ define([
info.asc_setType(this.FormatType);
info.asc_setDecimalPlaces(this.spnDecimal.getNumberValue());
info.asc_setSeparator(false);
- info.asc_setSymbol(record.value);
+ (typeof record.value === 'string') ? info.asc_setCurrencySymbol(record.value) : info.asc_setSymbol(record.value);
var format = this.api.asc_getFormatCells(info),
data = [];
@@ -406,7 +407,11 @@ define([
info.asc_setType(this.FormatType);
info.asc_setDecimalPlaces(field.getNumberValue());
info.asc_setSeparator((this.FormatType == Asc.c_oAscNumFormatType.Number) ? this.chSeparator.getValue()=='checked' : false);
- info.asc_setSymbol((this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) ? this.cmbSymbols.getValue() : false);
+ if (this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
+ var value = this.cmbSymbols.getValue();
+ (typeof value === 'string') ? info.asc_setCurrencySymbol(value) : info.asc_setSymbol(value);
+ } else
+ info.asc_setSymbol(false);
var format = this.api.asc_getFormatCells(info);
if (this.FormatType == Asc.c_oAscNumFormatType.Number || this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
@@ -479,7 +484,7 @@ define([
me = this,
valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(),
valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'),
- valSymbol = (initFormatInfo) ? initFormatInfo.asc_getSymbol() : this.langId;
+ valSymbol = (initFormatInfo) ? (initFormatInfo.asc_getSymbol() || initFormatInfo.asc_getCurrencySymbol()) : this.langId;
if (record.value !== Asc.c_oAscNumFormatType.Custom) {
var info = new Asc.asc_CFormatCellsInfo();
@@ -503,6 +508,10 @@ define([
return 0;
});
me.CurrencySymbolsData.unshift({value: null, displayValue: me.txtNone});
+ symbolssarr = this.api.asc_getAdditionalCurrencySymbols();
+ symbolssarr.forEach(function(item) {
+ me.CurrencySymbolsData.push({value: item, displayValue: item});
+ });
this.cmbSymbols.setData(this.CurrencySymbolsData);
this.cmbSymbols.setValue(valSymbol);
}
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 6f58254a6..dc154bc1e 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1072,7 +1072,7 @@
"SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.",
"SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.",
"SSE.Controllers.Statusbar.strSheet": "Sheet",
- "SSE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.",
+ "SSE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.",
"SSE.Controllers.Statusbar.textSheetViewTip": "You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.",
"SSE.Controllers.Statusbar.textSheetViewTipFilters": "You are in Sheet View mode. Filters are visible only to you and those who are still in this view.",
"SSE.Controllers.Statusbar.warnDeleteSheet": "The selected worksheets might contain data. Are you sure you want to proceed?",