cui/source/dialogs/about.cxx | 56 ----------------------- cui/source/inc/about.hxx | 4 - desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 - desktop/source/deployment/gui/dp_gui_dialog2.hxx | 1 desktop/uiconfig/ui/extensionmanager.ui | 16 ------ 5 files changed, 3 insertions(+), 78 deletions(-)
New commits: commit 0a150500828278ffb4677cc2ba759c3b82793098 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Jan 20 17:01:20 2022 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jan 24 10:21:51 2022 +0100 Remove external link from extension manager Change-Id: Ib86020a764b61c4fd4d42d3d7ffb6dce2a84587d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128693 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index e48bb2d0912d..cda1d3c11d77 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -449,7 +449,6 @@ ExtMgrDialog::ExtMgrDialog(weld::Window *pParent, TheExtensionManager *pManager) , m_xBundledCbx(m_xBuilder->weld_check_button("bundled")) , m_xSharedCbx(m_xBuilder->weld_check_button("shared")) , m_xUserCbx(m_xBuilder->weld_check_button("user")) - , m_xGetExtensions(m_xBuilder->weld_link_button("getextensions")) , m_xProgressText(m_xBuilder->weld_label("progressft")) , m_xProgressBar(m_xBuilder->weld_progress_bar("progressbar")) , m_xCancelBtn(m_xBuilder->weld_button("cancel")) @@ -504,9 +503,8 @@ ExtMgrDialog::~ExtMgrDialog() m_aIdle.Stop(); } -void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) +void ExtMgrDialog::setGetExtensionsURL( const OUString &/* rURL */ ) { - m_xGetExtensions->set_uri( rURL ); } void ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 84a755677843..a27db669a9f4 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -127,7 +127,6 @@ class ExtMgrDialog : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xBundledCbx; std::unique_ptr<weld::CheckButton> m_xSharedCbx; std::unique_ptr<weld::CheckButton> m_xUserCbx; - std::unique_ptr<weld::LinkButton> m_xGetExtensions; std::unique_ptr<weld::Label> m_xProgressText; std::unique_ptr<weld::ProgressBar> m_xProgressBar; std::unique_ptr<weld::Button> m_xCancelBtn; diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui index bcc1be250dd0..828c799178c3 100644 --- a/desktop/uiconfig/ui/extensionmanager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -312,22 +312,6 @@ <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkLinkButton" id="getextensions"> - <property name="label" translatable="yes" context="extensionmanager|getextensions">Get more extensions online...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> commit a922b8d9644d1aa07d40a50025931c7eda89ba7c Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Jan 20 16:54:09 2022 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jan 24 10:21:41 2022 +0100 Remove external links from about dialog Change-Id: Ib339ed4d00e04e2c89dfeb3f110ef7a9b92bdba6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128692 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 12dcb9bf9dbf..ea85f401df48 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -64,16 +64,7 @@ AboutDialog::AboutDialog(weld::Window* pParent) , m_xContentArea(m_xDialog->weld_content_area()) { m_xDialog->add_button(GetStandardText(StandardButtonType::Close), RET_CLOSE); - m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_CREDITS), 101); - m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_WEBSITE), 102); - m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_RELEASE_NOTES), 103); - - m_xCreditsButton.reset(m_xDialog->weld_widget_for_response(101)); - m_xCreditsButton->set_secondary(true); - m_xWebsiteButton.reset(m_xDialog->weld_widget_for_response(102)); - m_xWebsiteButton->set_secondary(true); - m_xReleaseNotesButton.reset(m_xDialog->weld_widget_for_response(103)); - m_xReleaseNotesButton->set_secondary(true); + m_xCloseButton.reset(m_xDialog->weld_widget_for_response(RET_CLOSE)); m_buildIdLinkString = m_xDialog->get_website_label(); @@ -88,9 +79,6 @@ AboutDialog::AboutDialog(weld::Window* pParent) m_xDialog->connect_size_allocate(LINK(this, AboutDialog, SizeAllocHdl)); // Connect all handlers - m_xCreditsButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) ); - m_xWebsiteButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) ); - m_xReleaseNotesButton->connect_clicked( LINK( this, AboutDialog, HandleClick ) ); m_xCloseButton->grab_focus(); } @@ -98,46 +86,6 @@ AboutDialog::~AboutDialog() { } -IMPL_LINK(AboutDialog, HandleClick, weld::Button&, rButton, void) -{ - OUString sURL = ""; - - // Find which button was pressed and from this, get the URL to be opened - if (&rButton == m_xCreditsButton.get()) - sURL = CuiResId(RID_SVXSTR_ABOUT_CREDITS_URL); - else if (&rButton == m_xWebsiteButton.get()) - { - sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get(); - localizeWebserviceURI(sURL); - } - else if (&rButton == m_xReleaseNotesButton.get()) - { - sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() + - "?LOvers=" + utl::ConfigManager::getProductVersion() + - "&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getLanguage(); - } - - // If the URL is empty, don't do anything - if ( sURL.isEmpty() ) - return; - try - { - Reference< css::system::XSystemShellExecute > xSystemShellExecute( - css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) ); - xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); - } - catch (const Exception&) - { - Any exc( ::cppu::getCaughtException() ); - OUString msg( ::comphelper::anyToString( exc ) ); - const SolarMutexGuard guard; - std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(getDialog(), - VclMessageType::Warning, VclButtonsType::Ok, msg)); - xErrorBox->set_title(m_xDialog->get_title()); - xErrorBox->run(); - } -} - void AboutDialog::SetBuildIdLink() { OUString sDefault; @@ -152,7 +100,7 @@ void AboutDialog::SetBuildIdLink() } m_xDialog->set_website_label(m_buildIdLinkString.replaceAll("$GITHASH", buildId)); - m_xDialog->set_website("https://hub.libreoffice.org/git-core/"; + buildId); + m_xDialog->set_website(OUString()); } else { diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index c51eb15433d8..eacd4be8f53e 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -28,9 +28,6 @@ private: std::unique_ptr<weld::Builder> m_xBuilder; std::shared_ptr<weld::AboutDialog> m_xDialog; std::unique_ptr<weld::Container> m_xContentArea; - std::unique_ptr<weld::Button> m_xCreditsButton; - std::unique_ptr<weld::Button> m_xWebsiteButton; - std::unique_ptr<weld::Button> m_xReleaseNotesButton; std::unique_ptr<weld::Button> m_xCloseButton; BitmapEx aLogoBitmap; @@ -52,7 +49,6 @@ public: virtual weld::Dialog* getDialog() override { return m_xDialog.get(); } virtual ~AboutDialog() override; - DECL_LINK(HandleClick, weld::Button&, void); DECL_LINK(SizeAllocHdl, const Size&, void); };
