diff options
author | Stefan Knorr (astron) <heinzlesspam@gmail.com> | 2012-06-28 16:45:08 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-07-04 12:52:15 +0200 |
commit | f342094d35c85a882db7b6ffe3f69ea9b3f8cc74 (patch) | |
tree | 51d51394693b43e731c61ad8e0b78409d496ea64 /cui | |
parent | 01e1714d0cb613cb192c7dc8e997789ec1aa73aa (diff) |
Remove duplication of License/Credits information
A bit differently this time around:
+ remove Credits menu item from menu
+ remove License button from the About dialog
Conflicts:
cui/source/dialogs/about.cxx
Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/about.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/about.hrc | 1 | ||||
-rw-r--r-- | cui/source/dialogs/about.src | 8 | ||||
-rw-r--r-- | cui/source/inc/about.hxx | 2 |
4 files changed, 0 insertions, 25 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index db5057f02961..daa662836ef9 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -61,7 +61,6 @@ using namespace ::com::sun::star; enum AboutDialogButton { CREDITS_BUTTON, - LICENSE_BUTTON, WEBSITE_BUTTON }; @@ -73,7 +72,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ), aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr() ) ), aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ), - aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ), aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ), m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()), @@ -83,7 +81,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : m_aBasedDerivedTextStr(ResId(ABOUT_STR_BASED_DERIVED, *rId.GetResMgr())), m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())), m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())), - m_aLicenseLinkStr(ResId( ABOUT_STR_LINK_LICENSE, *rId.GetResMgr())), m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr())), m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr())) { @@ -101,12 +98,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : // Allow the button to be identifiable once they are clicked aCreditsButton.SetData( (void*)CREDITS_BUTTON ); - aLicenseButton.SetData( (void*)LICENSE_BUTTON ); aWebsiteButton.SetData( (void*)WEBSITE_BUTTON ); // Connect all handlers aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); - aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) ); aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) ); @@ -125,8 +120,6 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData(); if ( pDialogButton == (AboutDialogButton*)CREDITS_BUTTON ) sURL = m_aCreditsLinkStr; - else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON) - sURL = m_aLicenseLinkStr; else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON ) sURL = m_aWebsiteLinkStr; @@ -269,15 +262,12 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder, sal_Int32 aButtonHPadding = 4; sal_Int32 aAdjacentButtonSpacing = 15; sal_Int32 aCreditsButtonWidth = aCreditsButton.CalcMinimumSize().Width(); - sal_Int32 aLicenseButtonWidth = aLicenseButton.CalcMinimumSize().Width(); sal_Int32 aWebsiteButtonWidth = aWebsiteButton.CalcMinimumSize().Width(); sal_Int32 aCancelButtonWidth = aCancelButton.CalcMinimumSize().Width(); sal_Int32 aLargestButtonWidth = 70; if ( aLargestButtonWidth < aCreditsButtonWidth ) aLargestButtonWidth = aCreditsButtonWidth; - if ( aLargestButtonWidth < aLicenseButtonWidth ) - aLargestButtonWidth = aLicenseButtonWidth; if ( aLargestButtonWidth < aWebsiteButtonWidth ) aLargestButtonWidth = aWebsiteButtonWidth; if ( aLargestButtonWidth < aCancelButtonWidth ) @@ -287,7 +277,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder, aButtonSize.Height() = aWebsiteButton.CalcMinimumSize().Height() + ( 2 * aButtonVPadding ); aCreditsButton.SetSizePixel( aButtonSize ); - aLicenseButton.SetSizePixel( aButtonSize ); aWebsiteButton.SetSizePixel( aButtonSize ); aCancelButton.SetSizePixel( aButtonSize ); @@ -304,9 +293,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder, aCreditsButton.SetPosPixel( aButtonPos ); aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing; - aLicenseButton.SetPosPixel( aButtonPos ); - - aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing; aWebsiteButton.SetPosPixel( aButtonPos ); aButtonPos.X() += aButtonSize.Width() + aButtonSpacing; diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc index e2c8a64f36c0..7842dc9e0407 100644 --- a/cui/source/dialogs/about.hrc +++ b/cui/source/dialogs/about.hrc @@ -35,7 +35,6 @@ #define ABOUT_STR_BASED_DERIVED 6 #define ABOUT_STR_LINK_WEBSITE 7 #define ABOUT_STR_LINK_CREDITS 8 -#define ABOUT_STR_LINK_LICENSE 9 #define ABOUT_BTN_CREDITS 10 #define ABOUT_DESCRIPTION_TEXT 11 #define ABOUT_COPYRIGHT_TEXT 12 diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 3a38862889c1..63c5f2c0e930 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -105,18 +105,10 @@ ModalDialog RID_DEFAULTABOUT { Text[ en-US ] = "http://www.libreoffice.org/about-us/credits/"; }; - String ABOUT_STR_LINK_LICENSE - { - Text[ en-US ] = "http://www.libreoffice.org/download/license/"; - }; PushButton ABOUT_BTN_CREDITS { Text [ en-US ] = "Credits"; }; - PushButton ABOUT_BTN_LICENSE - { - Text [ en-US ] = "License"; - }; PushButton ABOUT_BTN_WEBSITE { Text [ en-US ] = "Website"; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 5d1af3d7bf90..639490878f26 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -52,7 +52,6 @@ private: MultiLineEdit aCopyrightTextShadow; FixedImage aLogoImage; PushButton aCreditsButton; - PushButton aLicenseButton; PushButton aWebsiteButton; CancelButton aCancelButton; @@ -64,7 +63,6 @@ private: String m_aBasedDerivedTextStr; String m_aWebsiteLinkStr; String m_aCreditsLinkStr; - String m_aLicenseLinkStr; rtl::OUString m_sBuildStr; String m_aDescriptionTextStr; |