diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-02-07 22:57:04 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-02-08 14:47:45 +0100 |
| commit | 97d66828b6a2fcf495c89211a3d0cd648516e72a (patch) | |
| tree | 1c0b37a5df921f680b0d77601aa15b984c8fa592 /sfx2 | |
| parent | 1f8f63fd52c7522342a8e5cec0a4f9a92d5e89c8 (diff) | |
add EULA button to Help - License Information... dialog
Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99
Reviewed-on: https://gerrit.libreoffice.org/49398
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 8 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/licensedialog.ui | 37 |
2 files changed, 43 insertions, 2 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index de9b8af352f0..aad7dcdec3a6 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -281,6 +281,7 @@ namespace { private: DECL_LINK(ShowHdl, Button*, void); + DECL_LINK(EulaHdl, Button*, void); public: explicit LicenseDialog(); }; @@ -289,6 +290,7 @@ namespace : ModalDialog(nullptr, "LicenseDialog", "sfx/ui/licensedialog.ui") { get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); + get<PushButton>("eula")->SetClickHdl(LINK(this, LicenseDialog, EulaHdl)); } IMPL_LINK_NOARG(LicenseDialog, ShowHdl, Button*, void) @@ -297,6 +299,12 @@ namespace showDocument("LICENSE"); } + IMPL_LINK_NOARG(LicenseDialog, EulaHdl, Button*, void) + { + EndDialog(RET_OK); + showDocument("EULA.odt"); + } + class SafeModeQueryDialog : public ModalDialog { private: diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui index 1f9c30919faf..8d0fe33d522b 100644 --- a/sfx2/uiconfig/ui/licensedialog.ui +++ b/sfx2/uiconfig/ui/licensedialog.ui @@ -35,6 +35,23 @@ </packing> </child> <child> + <object class="GtkButton" id="eula"> + <property name="label" translatable="yes">_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> <property name="visible">True</property> @@ -45,7 +62,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> @@ -57,6 +74,22 @@ </packing> </child> <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">%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="wrap">True</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">1</property> + </packing> + </child> + <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -77,7 +110,7 @@ This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyri <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> |