From 4d597e62e0e192b0245ae6c9ceec85ed1cd6c902 Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Sun, 26 Apr 2020 16:52:44 +0200 Subject: [PATCH] Adapt patches to new sao location (outside public_data). --- old_icons.diff | 82 ++++++++++++++++++++++---------------------- resize_modal_md.diff | 6 ++-- set_preferences.diff | 4 +-- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/old_icons.diff b/old_icons.diff index 8e7d6a6..3496f8e 100644 --- a/old_icons.diff +++ b/old_icons.diff @@ -1,6 +1,6 @@ diff -r d9cd58135f75 images/tryton-attachment-hi.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-attachment-hi.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-attachment-hi.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,245 @@ + + @@ -249,7 +249,7 @@ diff -r d9cd58135f75 images/tryton-attachment-hi.svg + diff -r d9cd58135f75 images/tryton-attachment.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-attachment.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-attachment.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,187 @@ + + @@ -440,7 +440,7 @@ diff -r d9cd58135f75 images/tryton-attachment.svg + diff -r d9cd58135f75 images/tryton-connect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-connect.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-connect.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,1044 @@ + + @@ -1488,7 +1488,7 @@ diff -r d9cd58135f75 images/tryton-connect.svg + diff -r d9cd58135f75 images/tryton-create.svg --- a/images/tryton-create.svg Mon Nov 12 23:40:22 2018 +0100 -+++ b/public_data/sao/images/tryton-create.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-create.svg Wed Nov 28 11:20:10 2018 +0100 @@ -1,4 +1,4 @@ - @@ -1497,7 +1497,7 @@ diff -r d9cd58135f75 images/tryton-create.svg diff -r d9cd58135f75 images/tryton-dialog-error.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-dialog-error.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-dialog-error.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,331 @@ + + @@ -1832,7 +1832,7 @@ diff -r d9cd58135f75 images/tryton-dialog-error.svg + diff -r d9cd58135f75 images/tryton-dialog-information.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-dialog-information.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-dialog-information.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,1160 @@ + + @@ -2996,7 +2996,7 @@ diff -r d9cd58135f75 images/tryton-dialog-information.svg + diff -r d9cd58135f75 images/tryton-dialog-warning.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-dialog-warning.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-dialog-warning.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,374 @@ + + @@ -3374,7 +3374,7 @@ diff -r d9cd58135f75 images/tryton-dialog-warning.svg + diff -r d9cd58135f75 images/tryton-disconnect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-disconnect.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-disconnect.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,1415 @@ + + @@ -4793,7 +4793,7 @@ diff -r d9cd58135f75 images/tryton-disconnect.svg + diff -r d9cd58135f75 images/tryton-executable.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-executable.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-executable.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,179 @@ + + @@ -4976,7 +4976,7 @@ diff -r d9cd58135f75 images/tryton-executable.svg + diff -r d9cd58135f75 images/tryton-find-replace.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-find-replace.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-find-replace.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,975 @@ + + @@ -5955,7 +5955,7 @@ diff -r d9cd58135f75 images/tryton-find-replace.svg + diff -r d9cd58135f75 images/tryton-find.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-find.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-find.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,751 @@ + + @@ -6710,7 +6710,7 @@ diff -r d9cd58135f75 images/tryton-find.svg + diff -r d9cd58135f75 images/tryton-folder-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-folder-new.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-folder-new.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,453 @@ + + @@ -7167,7 +7167,7 @@ diff -r d9cd58135f75 images/tryton-folder-new.svg + diff -r d9cd58135f75 images/tryton-fullscreen.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-fullscreen.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-fullscreen.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,523 @@ + + @@ -7694,7 +7694,7 @@ diff -r d9cd58135f75 images/tryton-fullscreen.svg + diff -r d9cd58135f75 images/tryton-go-home.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-go-home.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-go-home.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,446 @@ + + diff -r d9cd58135f75 images/tryton-go-jump.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-go-jump.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-go-jump.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,205 @@ + + @@ -8353,7 +8353,7 @@ diff -r d9cd58135f75 images/tryton-go-jump.svg + diff -r d9cd58135f75 images/tryton-go-next.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-go-next.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-go-next.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,193 @@ + + @@ -8550,7 +8550,7 @@ diff -r d9cd58135f75 images/tryton-go-next.svg + diff -r d9cd58135f75 images/tryton-go-previous.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-go-previous.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-go-previous.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,855 @@ + + @@ -9409,7 +9409,7 @@ diff -r d9cd58135f75 images/tryton-go-previous.svg + diff -r d9cd58135f75 images/tryton-help.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-help.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-help.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,225 @@ + + @@ -9638,7 +9638,7 @@ diff -r d9cd58135f75 images/tryton-help.svg + diff -r d9cd58135f75 images/tryton-icon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-icon.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-icon.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,96 @@ + + @@ -9738,7 +9738,7 @@ diff -r d9cd58135f75 images/tryton-icon.svg + diff -r d9cd58135f75 images/tryton-list-add.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-list-add.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-list-add.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,437 @@ + + @@ -10179,7 +10179,7 @@ diff -r d9cd58135f75 images/tryton-list-add.svg + diff -r d9cd58135f75 images/tryton-list-remove.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-list-remove.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-list-remove.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,425 @@ + + @@ -10608,7 +10608,7 @@ diff -r d9cd58135f75 images/tryton-list-remove.svg + diff -r d9cd58135f75 images/tryton-locale.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-locale.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-locale.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,879 @@ + + @@ -11491,7 +11491,7 @@ diff -r d9cd58135f75 images/tryton-locale.svg + diff -r d9cd58135f75 images/tryton-lock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-lock.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-lock.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,287 @@ + + @@ -11782,7 +11782,7 @@ diff -r d9cd58135f75 images/tryton-lock.svg + diff -r d9cd58135f75 images/tryton-log-out.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-log-out.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-log-out.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,458 @@ + + @@ -12244,7 +12244,7 @@ diff -r d9cd58135f75 images/tryton-log-out.svg + diff -r d9cd58135f75 images/tryton-mail-message-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-mail-message-new.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-mail-message-new.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,465 @@ + + @@ -12713,7 +12713,7 @@ diff -r d9cd58135f75 images/tryton-mail-message-new.svg + diff -r d9cd58135f75 images/tryton-mail-message.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-mail-message.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-mail-message.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,502 @@ + + @@ -13219,7 +13219,7 @@ diff -r d9cd58135f75 images/tryton-mail-message.svg + diff -r d9cd58135f75 images/tryton-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-new.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-new.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,449 @@ + + @@ -13674,7 +13674,7 @@ diff -r d9cd58135f75 images/tryton-noimage.png Binary file images/tryton-noimage.png has changed diff -r d9cd58135f75 images/tryton-preferences-system-session.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-preferences-system-session.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-preferences-system-session.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,511 @@ + + @@ -14189,7 +14189,7 @@ diff -r d9cd58135f75 images/tryton-preferences-system-session.svg + diff -r d9cd58135f75 images/tryton-preferences-system.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-preferences-system.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-preferences-system.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,399 @@ + + @@ -14592,7 +14592,7 @@ diff -r d9cd58135f75 images/tryton-preferences-system.svg + diff -r d9cd58135f75 images/tryton-preferences.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-preferences.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-preferences.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,778 @@ + + @@ -15374,7 +15374,7 @@ diff -r d9cd58135f75 images/tryton-preferences.svg + diff -r d9cd58135f75 images/tryton-print-email.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-print-email.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-print-email.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,883 @@ + + @@ -16261,7 +16261,7 @@ diff -r d9cd58135f75 images/tryton-print-email.svg + diff -r d9cd58135f75 images/tryton-print-open.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-print-open.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-print-open.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,869 @@ + + @@ -17134,7 +17134,7 @@ diff -r d9cd58135f75 images/tryton-print-open.svg + diff -r d9cd58135f75 images/tryton-save-as.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-save-as.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-save-as.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,664 @@ + + @@ -17802,7 +17802,7 @@ diff -r d9cd58135f75 images/tryton-save-as.svg + diff -r d9cd58135f75 images/tryton-start-here.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-start-here.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-start-here.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,493 @@ + + @@ -18299,7 +18299,7 @@ diff -r d9cd58135f75 images/tryton-start-here.svg + diff -r d9cd58135f75 images/tryton-system-file-manager.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-system-file-manager.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-system-file-manager.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,318 @@ + + @@ -18621,7 +18621,7 @@ diff -r d9cd58135f75 images/tryton-system-file-manager.svg + diff -r d9cd58135f75 images/tryton-system.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-system.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-system.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,741 @@ + + @@ -19366,7 +19366,7 @@ diff -r d9cd58135f75 images/tryton-system.svg + diff -r d9cd58135f75 images/tryton-text-background.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-text-background.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-text-background.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,548 @@ + + @@ -19918,7 +19918,7 @@ diff -r d9cd58135f75 images/tryton-text-background.svg + diff -r d9cd58135f75 images/tryton-text-foreground.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-text-foreground.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-text-foreground.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,569 @@ + + @@ -20491,7 +20491,7 @@ diff -r d9cd58135f75 images/tryton-text-foreground.svg + diff -r d9cd58135f75 images/tryton-text-markup.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-text-markup.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-text-markup.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,577 @@ + + @@ -21072,7 +21072,7 @@ diff -r d9cd58135f75 images/tryton-text-markup.svg + diff -r d9cd58135f75 images/tryton-unstar.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-unstar.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-unstar.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,139 @@ + + @@ -21215,7 +21215,7 @@ diff -r d9cd58135f75 images/tryton-unstar.svg + diff -r d9cd58135f75 images/tryton-web-browser.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/public_data/sao/images/tryton-web-browser.svg Wed Nov 28 11:20:10 2018 +0100 ++++ b/sao/images/tryton-web-browser.svg Wed Nov 28 11:20:10 2018 +0100 @@ -0,0 +1,983 @@ + + diff --git a/resize_modal_md.diff b/resize_modal_md.diff index d98823d..30b29dd 100644 --- a/resize_modal_md.diff +++ b/resize_modal_md.diff @@ -1,7 +1,7 @@ -Index: diloy/public_data/sao/src/sao.less +Index: diloy/sao/src/sao.less =================================================================== ---- diloy.orig/public_data/sao/src/sao.less -+++ diloy/public_data/sao/src/sao.less +--- diloy.orig/sao/src/sao.less ++++ diloy/sao/src/sao.less @@ -82,6 +82,10 @@ } } diff --git a/set_preferences.diff b/set_preferences.diff index dfda531..7c05ab1 100644 --- a/set_preferences.diff +++ b/set_preferences.diff @@ -1,6 +1,6 @@ diff -r 399d0255a637 src/window.js ---- a/public_data/sao/src/window.js Wed Nov 28 10:01:32 2018 +0100 -+++ b/public_data/sao/src/window.js Thu Nov 29 11:56:22 2018 +0100 +--- a/sao/src/window.js Wed Nov 28 10:01:32 2018 +0100 ++++ b/sao/src/window.js Thu Nov 29 11:56:22 2018 +0100 @@ -765,9 +765,17 @@ prm = this.screen.current_record.validate() .then(function(validate) {