[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - readlicense_oo/license sfx2/source sfx2/uiconfig
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 6 20:52:54 UTC 2020
readlicense_oo/license/EULA.odt |binary
readlicense_oo/license/EULA_en-US.rtf | 2 -
sfx2/source/appl/appserv.cxx | 26 ++++++++++++++++--
sfx2/uiconfig/ui/licensedialog.ui | 49 +++++++++++++++++++++++++++++-----
4 files changed, 67 insertions(+), 10 deletions(-)
New commits:
commit 05b274423a2564780bb87b23bd532ef139f7cd4f
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 26 15:53:00 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 6 22:51:54 2020 +0200
[cp] Update company's address in EULA
Change-Id: I6b7e53882fc36c96928b93bc1cf42d63dd77556a
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
index 6f888e981b3a..56ff3b330517 100644
Binary files a/readlicense_oo/license/EULA.odt and b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf b/readlicense_oo/license/EULA_en-US.rtf
index 505a644fb905..ee850441a6c0 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -10,7 +10,7 @@
\cf0\f1\fs22\par
\cf1\f0\fs20 IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \par
\cf0\f1\fs22\par
-\pard\qj\cf1\b\f0\fs20 PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at Kett House, Station Road, Cambridge, CB1 2JH, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \par
+\pard\qj\cf1\b\f0\fs20 PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at The Platinum Building, St John’s Innovation Park, Cambridge, CB4 0DS, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \par
\cf0\f1\fs22\par
\cf1\b\f0\fs20 SOFTWARE\b0 . The Software and each of its components are owned by Collabora or other licensors and are protected as copyrighted works of authorship, and are also protected under applicable database and other applicable laws. To the extent that they are not accompanied by a separate Collabora software licence agreement, any modification, update or upgrade to the Software that You may download or receive, whether as Subscription Services detailed below or otherwise, is included as Software and governed by the \ldblquote Licenses\rdblquote heading below and generally by this Agreement.\par
\cf0\f1\fs22\par
commit 69d8dd00eeda129749ff0a13b1f1cd6a06487bc0
Author: Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Sep 18 23:07:09 2019 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 6 22:49:21 2020 +0200
[cp] add EULA button to Help - License Information... dialog
Forward port of acd8acfa89d9 from distro/collabora/cp-6.0
Rewritten for weld API
Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99
28a21f5831e0b2e99eb11f1c1ac2b8845c462669
Reviewed-on: https://gerrit.libreoffice.org/79110
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c73d8d9d39c9..06828d918fdc 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -315,21 +315,43 @@ namespace
class LicenseDialog : public weld::GenericDialogController
{
+ private:
+ std::unique_ptr<weld::Button> m_xBtnLicense;
+ std::unique_ptr<weld::Button> m_xBtnEula;
+
+ DECL_LINK(EulaHdl, weld::Button&, void);
+ DECL_LINK(LicenseHdl, weld::Button&, void);
+
public:
LicenseDialog(weld::Window* pParent)
: GenericDialogController(pParent, "sfx/ui/licensedialog.ui", "LicenseDialog")
+ , m_xBtnLicense(m_xBuilder->weld_button("license"))
+ , m_xBtnEula(m_xBuilder->weld_button("eula"))
{
+ m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog, LicenseHdl) );
+ m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) );
}
virtual short run() override
{
short nRet = GenericDialogController::run();
- if (nRet == RET_OK)
- showDocument("LICENSE");
return nRet;
}
};
+ IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void)
+ {
+ response(RET_OK);
+ showDocument("EULA.odt");
+ }
+
+ IMPL_LINK_NOARG(LicenseDialog, LicenseHdl, weld::Button&, void)
+ {
+ response(RET_OK);
+ showDocument("LICENSE");
+ }
+
+
class SafeModeQueryDialog : public weld::MessageDialogController
{
public:
diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui
index c8c3394de0a9..601747d7044d 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="LicenseDialog">
@@ -11,6 +11,9 @@
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -21,7 +24,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
+ <object class="GtkButton" id="license">
<property name="label" translatable="yes" context="licensedialog|show">_Show License</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -36,6 +39,23 @@
<property name="secondary">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="eula">
+ <property name="label" translatable="yes" context="licensedialog|eula">_EULA</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
<child>
<object class="GtkButton" id="close">
<property name="label">gtk-close</property>
@@ -50,7 +70,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -61,6 +81,24 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="licensedialog|label2">%PRODUCTNAME binary package is made available subject to the terms of the End User License and Subscription Agreement; choose EULA to see exact details in English.</property>
+ <property name="use_underline">True</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">eula</property>
+ <property name="max_width_chars">80</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
@@ -88,11 +126,8 @@ This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyri
</object>
</child>
<action-widgets>
- <action-widget response="-5">ok</action-widget>
+ <action-widget response="-5">license</action-widget>
<action-widget response="-7">close</action-widget>
</action-widgets>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
More information about the Libreoffice-commits
mailing list