diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2019-05-13 10:59:18 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2019-05-17 10:43:57 +0200 |
commit | 5187d3ae495a07373a12fd5980c9269bc8ce3f8f (patch) | |
tree | d529b9a31620015ecab6e69c607a37de2fb8018b /cui | |
parent | 9e35b5a70844c8a0f6bc8e9dd8e0055cf5597b07 (diff) |
Resolves: tdf#69042 - Add a "What's New" infobar
Shows an infobar with a link to the respective wiki page
Adds a button to the About dialog
Replaces If6eb1542d2ad310226f76850f480f2f99070b803
Change-Id: I1eeb504994a6364feb90cfa447029875e0ec1969
Reviewed-on: https://gerrit.libreoffice.org/72218
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/about.cxx | 9 | ||||
-rw-r--r-- | cui/source/inc/about.hxx | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/aboutdialog.ui | 22 |
3 files changed, 29 insertions, 3 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0943c163b42e..7d5266682144 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -76,6 +76,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent) m_aCopyrightTextStr = m_pCopyrightText->GetText(); get(m_pWebsiteButton, "website"); get(m_pCreditsButton, "credits"); + get(m_pReleaseNotesButton, "btnReleaseNotes"); m_aCreditsLinkStr = get<FixedText>("link")->GetText(); m_sBuildStr = get<FixedText>("buildid")->GetText(); m_aVendorTextStr = get<FixedText>("vendor")->GetText(); @@ -100,6 +101,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent) // Connect all handlers m_pCreditsButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); m_pWebsiteButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); + m_pReleaseNotesButton->SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); get<PushButton>("close")->GrabFocus(); } @@ -119,6 +121,7 @@ void AboutDialog::dispose() m_pCreditsButton.clear(); m_pWebsiteButton.clear(); m_pBuildIdLink.clear(); + m_pReleaseNotesButton.clear(); SfxModalDialog::dispose(); } @@ -134,6 +137,12 @@ IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, void ) sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get(); localizeWebserviceURI(sURL); } + else if (pButton == m_pReleaseNotesButton) + { + 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() ) diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 9885cdec7d47..d191343f941a 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -43,6 +43,7 @@ private: VclPtr<FixedText> m_pLogoReplacement; VclPtr<PushButton> m_pCreditsButton; VclPtr<PushButton> m_pWebsiteButton; + VclPtr<PushButton> m_pReleaseNotesButton; OUString m_aVersionTextStr; OUString m_aVendorTextStr; diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 552fd1570185..2fc67d43913b 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -21,6 +21,21 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" 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="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + <property name="secondary">True</property> + </packing> + </child> + <child> <object class="GtkButton" id="credits"> <property name="label" translatable="yes" context="aboutdialog|credits">Cre_dits</property> <property name="visible">True</property> @@ -31,7 +46,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> <property name="secondary">True</property> </packing> </child> @@ -46,7 +61,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> <property name="secondary">True</property> </packing> </child> @@ -63,7 +78,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -311,6 +326,7 @@ </object> </child> <action-widgets> + <action-widget response="0">btnReleaseNotes</action-widget> <action-widget response="0">credits</action-widget> <action-widget response="0">website</action-widget> <action-widget response="-7">close</action-widget> |