cui/source/dialogs/about.cxx | 16 ----------- cui/source/inc/about.hxx | 3 -- cui/uiconfig/ui/aboutdialog.ui | 58 ----------------------------------------- 3 files changed, 77 deletions(-)
New commits: commit 163fa70df34a9ccbd8b7c0c15f3fec844a89ddc7 Author: Balazs Varga <balazs.varga.ext...@allotropia.de> AuthorDate: Mon Sep 4 14:31:50 2023 +0200 Commit: Balazs Varga <balazs.va...@collabora.com> CommitDate: Wed Aug 27 16:31:30 2025 +0200 Remove external links from about dialog Party cherry-picked from: a922b8d9644d1aa07d40a50025931c7eda89ba7c Change-Id: I37a655178c57b5c932cbe802b62427094155e495 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156516 Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175006 Tested-by: allotropia jenkins <jenk...@allotropia.de> Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190065 Reviewed-by: Balazs Varga <balazs.va...@collabora.com> Tested-by: Balazs Varga <balazs.va...@collabora.com> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 361458e656cf..f41f16d46e56 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -56,9 +56,6 @@ using namespace ::com::sun::star::uno; AboutDialog::AboutDialog(weld::Window *pParent) : GenericDialogController(pParent, u"cui/ui/aboutdialog.ui"_ustr, u"AboutDialog"_ustr), - m_pCreditsButton(m_xBuilder->weld_link_button(u"btnCredits"_ustr)), - m_pWebsiteButton(m_xBuilder->weld_link_button(u"btnWebsite"_ustr)), - m_pReleaseNotesButton(m_xBuilder->weld_link_button(u"btnReleaseNotes"_ustr)), m_pCloseButton(m_xBuilder->weld_button(u"btnClose"_ustr)), m_pCopyButton(m_xBuilder->weld_button(u"btnCopyVersion"_ustr)), m_pBrandImage(m_xBuilder->weld_image(u"imBrand"_ustr)), @@ -117,19 +114,6 @@ AboutDialog::AboutDialog(weld::Window *pParent) m_pAboutImage->set_image(aGraphic.GetXGraphic()); } - // Links - m_pCreditsButton->set_uri(officecfg::Office::Common::Menus::CreditsURL::get()); - - OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get()); - // localizeWebserviceURI(sURL); - m_pWebsiteButton->set_uri(sURL); - - // See also SID_WHATSNEW in sfx2/source/appl/appserv.cxx - sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() + - "?LOvers=" + utl::ConfigManager::getProductVersion() + "&LOlocale=" + - LanguageTag(utl::ConfigManager::getUILocale()).getBcp47(); - m_pReleaseNotesButton->set_uri(sURL); - // Handler m_pCopyButton->connect_clicked(LINK(this, AboutDialog, HandleClick)); m_pCloseButton->grab_focus(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 42eae5467eab..b29be776c56c 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -23,9 +23,6 @@ class AboutDialog : public weld::GenericDialogController { private: - std::unique_ptr<weld::LinkButton> m_pCreditsButton; - std::unique_ptr<weld::LinkButton> m_pWebsiteButton; - std::unique_ptr<weld::LinkButton> m_pReleaseNotesButton; std::unique_ptr<weld::Button> m_pCloseButton; std::unique_ptr<weld::Button> m_pCopyButton; diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 8759b1c5ec03..adcbded8a5fc 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -133,64 +133,6 @@ <property name="can-focus">False</property> <property name="halign">center</property> <property name="spacing">12</property> - <child> - <object class="GtkLinkButton" id="btnCredits"> - <property name="label" translatable="yes" context="aboutdialog|credits">Credits</property> - <property name="name">lbCredit</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLinkButton" id="btnWebsite"> - <property name="label" translatable="yes" context="aboutdialog|website">Website</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="uri">https://www.libreoffice.org/</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLinkButton" id="btnReleaseNotes"> - <property name="label" translatable="yes" context="aboutdialog|releasenotes">Release Notes</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> <child> <object class="GtkLabel" id="lbVersionInfo"> <property name="visible">True</property>