Kaydet (Commit) 36245c84 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#48723 add a (hidden) CancelButton so ESC closes about dialog

üst f73d2688
...@@ -77,6 +77,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : ...@@ -77,6 +77,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ), aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ), aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ),
aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ),
aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())), aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())), m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())), m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
...@@ -110,6 +111,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : ...@@ -110,6 +111,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
aCancelButton.Hide();
FreeResource(); FreeResource();
// explicit Help-Id // explicit Help-Id
......
...@@ -45,3 +45,4 @@ ...@@ -45,3 +45,4 @@
#define ABOUT_BTN_LICENSE 16 #define ABOUT_BTN_LICENSE 16
#define ABOUT_VERSION_TEXT 17 #define ABOUT_VERSION_TEXT 17
#define ABOUT_STR_DESCRIPTION 18 #define ABOUT_STR_DESCRIPTION 18
#define ABOUT_BTN_CANCEL 19
...@@ -122,6 +122,13 @@ ModalDialog RID_DEFAULTABOUT ...@@ -122,6 +122,13 @@ ModalDialog RID_DEFAULTABOUT
Text [ en-US ] = "libreoffice.org"; Text [ en-US ] = "libreoffice.org";
DefButton = TRUE ; DefButton = TRUE ;
}; };
CancelButton ABOUT_BTN_CANCEL
{
DefButton = TRUE ;
Pos = MAP_APPFONT ( 174 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Close";
};
FixedImage ABOUT_IMAGE_LOGO FixedImage ABOUT_IMAGE_LOGO
{ {
}; };
......
...@@ -56,6 +56,7 @@ private: ...@@ -56,6 +56,7 @@ private:
PushButton aCreditsButton; PushButton aCreditsButton;
PushButton aWebsiteButton; PushButton aWebsiteButton;
PushButton aLicenseButton; PushButton aLicenseButton;
CancelButton aCancelButton;
String aVersionData; String aVersionData;
String aVersionTextStr; String aVersionTextStr;
......
AboutDialog::LinkStubCancelHdl(void*, void*)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharAttribList::Clear() CharAttribList::Clear()
Dialog::Dialog(Window*, ResId const&) Dialog::Dialog(Window*, ResId const&)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment