strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Caolán McNamara 2012-04-16 16:43:39 +01:00
parent f73d268896
commit 36245c84ba
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cui/source/dialogs/about.cxx
View file

@ -77,6 +77,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *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())),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
@ -110,6 +111,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
aCancelButton.Hide();
FreeResource();
// explicit Help-Id

1
cui/source/dialogs/about.hrc
View file

@ -45,3 +45,4 @@
#define ABOUT_BTN_LICENSE 16
#define ABOUT_VERSION_TEXT 17
#define ABOUT_STR_DESCRIPTION 18
#define ABOUT_BTN_CANCEL 19

7
cui/source/dialogs/about.src
View file

@ -122,6 +122,13 @@ ModalDialog RID_DEFAULTABOUT
Text [ en-US ] = "libreoffice.org";
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
{
};

1
cui/source/inc/about.hxx
View file

@ -56,6 +56,7 @@ private:
PushButton aCreditsButton;
PushButton aWebsiteButton;
PushButton aLicenseButton;
CancelButton aCancelButton;
String aVersionData;
String aVersionTextStr;

1
unusedcode.easy
View file

@ -1,4 +1,3 @@
AboutDialog::LinkStubCancelHdl(void*, void*)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharAttribList::Clear()
Dialog::Dialog(Window*, ResId const&)