core.git: Branch 'distro/collabora/co-24.04' - 6 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo officecfg/registry postprocess/signing
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 8 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 8 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt| 8 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4 ++-- officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 1 - postprocess/signing/signing.pl | 1 + 7 files changed, 16 insertions(+), 16 deletions(-) New commits: commit bbfa2264e58fcba76ec7929855b81347ed2201e6 Author: Thais Vieira AuthorDate: Fri Sep 4 08:21:28 2020 -0300 Commit: Andras Timar CommitDate: Sat Jan 13 20:46:34 2024 +0100 Loleaflet:fix menu entry replacing the 'Select...' to 'Select Table' to it be consistent with the pattern. Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044 Reviewed-by: Tor Lillqvist Tested-by: Jenkins CollaboraOffice diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 6de8e0058a52..af2e7cb9fbd5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2076,7 +2076,7 @@ Select Table - ~Select... + ~Select Table Select Table commit 8bdcda095ae39718945def78929a659b4bce0e69 Author: Andras Timar AuthorDate: Fri Apr 18 02:36:57 2014 -0700 Commit: Andras Timar CommitDate: Sat Jan 13 20:45:12 2024 +0100 [cp] Collabora Office ARP data Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index ca9abc8110e1..c051543688fd 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -7,10 +7,10 @@ AgreeToLicenseNo ApplicationUsers AllUsers ALLUSERS 1 ARPCOMMENTSARPCOMMENTSTEMPLATE -ARPCONTACT OOO_ARPCONTACTTEMPLATE -ARPHELPLINKOOO_ARPHELPLINKTEMPLATE -ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE -ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE +ARPCONTACT Collabora Productivity Ltd. +ARPHELPLINKhttps://CollaboraOffice.com +ARPURLINFOABOUThttps://CollaboraOffice.com +ARPURLUPDATEINFO https://CollaboraOffice.com DefaultUIFont DialogDefault DialogCaption Windows Installer DiskPrompt [1] diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index e528cac384ec..5a5b6e6ae2db 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -7,10 +7,10 @@ AgreeToLicenseNo ApplicationUsers AllUsers ALLUSERS 1 ARPCOMMENTSARPCOMMENTSTEMPLATE -ARPCONTACT OOO_ARPCONTACTTEMPLATE -ARPHELPLINKOOO_ARPHELPLINKTEMPLATE -ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE -ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE +ARPCONTACT Collabora Productivity Ltd. +ARPHELPLINKhttps://CollaboraOffice.com +ARPURLINFOABOUThttps://CollaboraOffice.com +ARPURLUPDATEINFO https://CollaboraOffice.com DefaultUIFont DialogDefault DialogCaption Windows Installer DiskPrompt [1] diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt index bd9065fd92b5..9883f9bdf146 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt @@ -6,10 +6,10 @@ _IsSetupTypeMin Typical AgreeToLicense No ApplicationUsers AllUsers ARPCOMMENTSARPCOMMENTSTEMPLATE -ARPCONTACT OOO_ARPCONTACTTEMPLATE -ARPHELPLINKOOO_ARPHELPLINKTEMPLATE -ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE -ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE +ARPCONTACT Collabora Productivity Ltd. +ARPHELPLINKhttps://CollaboraOffice.com +ARPURLINFOABOUThttps://CollaboraOffice.com +ARPURLUPDATEINFO https://CollaboraOffice.com ARPNOREPAIR1 ARPNOMODIFY1 DefaultUIFont Tahoma8 commit dce0227150c21117849abd873ecc1cc921d06fe8 Author: Andras Timar AuthorDate: Wed Apr 18 07:19:00 2018 -0700 Commit: Andras Timar CommitDate: Sat Jan 13 20:44:57 2024 +0100 [cp] HACK: sleep before sign On Windows, with 16x parallel
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1d64b7696453ef09150f39662c9beda09b6f964e Author: Thais Vieira AuthorDate: Fri Sep 4 08:21:28 2020 -0300 Commit: Andras Timar CommitDate: Wed Mar 31 10:47:25 2021 +0200 Loleaflet:fix menu entry replacing the 'Select...' to 'Select Table' to it be consistent with the pattern. Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044 Reviewed-by: Tor Lillqvist Tested-by: Jenkins CollaboraOffice diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 97970ec450a9..c27c39288cfe 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2055,7 +2055,7 @@ Select Table - ~Select... + ~Select Table Select Table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/html loleaflet/src
loleaflet/html/loleaflet.html.m4 |2 +-
loleaflet/src/control/Control.DocumentNameInput.js |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 221e3a59b73db56441f6a6fc8cf89eb322c1f6cf
Author: Thais Vieira
AuthorDate: Mon Sep 14 10:37:35 2020 -0300
Commit: Pedro Silva
CommitDate: Wed Sep 16 13:00:42 2020 +0200
Loleaflet: fix pencil icon
- to be displayed after the toolbar appears
- only when it's possible to edit the name of the document
- only when not in presence of android app and hidden (display: none) by
default so it does show up before input field
Change-Id: I5c78593b1229da1682832a46e6fc8f1b09b31e12
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102760
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 96d02c53e..826ec6aea 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -161,7 +161,7 @@ m4_ifelse(MOBILEAPP,[true],
-
+
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 0a79ff736..8dc67928c 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -12,7 +12,6 @@ L.Control.DocumentNameInput = L.Control.extend({
map.on('doclayerinit', this.onDocLayerInit, this);
map.on('wopiprops', this.onWopiProps, this);
map.on('resize', this.onResize, this);
- $('#document-title-pencil').addClass('editable');
},
documentNameConfirm: function() {
@@ -76,6 +75,7 @@ L.Control.DocumentNameInput = L.Control.extend({
$('#document-name-input').hide();
} else {
$('#document-name-input').show();
+ $('#document-title-pencil').show();
}
if (window.ThisIsAMobileApp) {
@@ -101,6 +101,7 @@ L.Control.DocumentNameInput = L.Control.extend({
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
$('#document-name-input').prop('disabled', false);
+ $('#document-title-pencil').addClass('editable');
$('#document-name-input').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus', this.onDocumentNameFocus.bind(this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/html loleaflet/src
loleaflet/html/loleaflet.html.m4 |4 ++--
loleaflet/src/control/Control.DocumentNameInput.js |3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 54cad07c4ee0f9283c6cdf8e71c4ad46798add73
Author: Thais Vieira
AuthorDate: Mon Sep 14 10:37:35 2020 -0300
Commit: Pedro Silva
CommitDate: Wed Sep 16 12:38:35 2020 +0200
Loleaflet: fix pencil icon
- to be displayed after the toolbar appears
- only when it's possible to edit the name of the document
- only when not in presence of android app and hidden (display: none) by
default so it does show up before input field
Change-Id: I5c78593b1229da1682832a46e6fc8f1b09b31e12
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102675
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 31820d1bd..7abe51f18 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -160,7 +160,7 @@ m4_ifelse(MOBILEAPP,[true],
-
+
@@ -280,7 +280,7 @@ m4_ifelse(MOBILEAPP,[true],
window.tileSize = 256;])
m4_syscmd([cat ]GLOBAL_JS)m4_dnl
-// Dynamically load the appropriate *-mobile.css, *-tablet.css or
*-desktop.css
+// Dynamically load the appropriate *-mobile.css, *-tablet.css or *-desktop.css
var link = document.createElement('link');
link.setAttribute("rel", "stylesheet");
link.setAttribute("type", "text/css");
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 4683dd35f..1b5697f27 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -12,7 +12,6 @@ L.Control.DocumentNameInput = L.Control.extend({
map.on('doclayerinit', this.onDocLayerInit, this);
map.on('wopiprops', this.onWopiProps, this);
map.on('resize', this.onResize, this);
- $('#document-title-pencil').addClass('editable');
},
documentNameConfirm: function() {
@@ -76,6 +75,7 @@ L.Control.DocumentNameInput = L.Control.extend({
$('#document-name-input').hide();
} else {
$('#document-name-input').show();
+ $('#document-title-pencil').show();
}
if (window.ThisIsAMobileApp) {
@@ -101,6 +101,7 @@ L.Control.DocumentNameInput = L.Control.extend({
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
$('#document-name-input').prop('disabled', false);
+ $('#document-title-pencil').addClass('editable');
$('#document-name-input').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus', this.onDocumentNameFocus.bind(this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/unocommands.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 185b3573291cb5bf7b96a3ca3868620242055050
Author: Thais Vieira
AuthorDate: Fri Sep 4 07:50:28 2020 -0300
Commit: Tor Lillqvist
CommitDate: Mon Sep 7 15:21:22 2020 +0200
Loleaflet: fix menu entry
replacing 'Select...' to 'Select Table'
to it be consistent with the pattern.
Change-Id: I2724db65242588aa5d7aa6d375690ac3f478f209
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102048
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index b23b92e16..655424700 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -269,7 +269,7 @@ var unoCommandsArray = {
SearchDialog:{global:{menu:_('Find & Rep~lace...'),},},
SelectAll:{global:{menu:_('Select ~All'),},},
SelectBackground:{presentation:{menu:_('Set Background Image...'),},},
-
SelectTable:{presentation:{menu:_('~Select...'),},text:{menu:_('~Table'),},},
+ SelectTable:{presentation:{menu:_('~Select
Table'),},text:{menu:_('~Table'),},},
SendToBack:{global:{menu:_('~Send to Back'),},},
SetAnchorAtChar:{text:{menu:_('To ~Character'),},},
SetAnchorToCell:{spreadsheet:{menu:_('To ~Cell'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5504f14e95bfb57c3d2d4bd47010f0ec433631b7 Author: Thais Vieira AuthorDate: Fri Sep 4 08:21:28 2020 -0300 Commit: Tor Lillqvist CommitDate: Mon Sep 7 15:13:26 2020 +0200 Loleaflet:fix menu entry replacing the 'Select...' to 'Select Table' to it be consistent with the pattern. Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044 Reviewed-by: Tor Lillqvist Tested-by: Jenkins CollaboraOffice diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 542b1208f00e..c8ca15e3f650 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2055,7 +2055,7 @@ Select Table - ~Select... + ~Select Table Select Table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
