napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Adjust names of URLs to be consistent

Browse Source 
- having show*Url and donateUrl seems inconsistent, although
   the show*Url settings were originally boolean-only.
 - add "show" to the Donate button setting, to make them
   all consistent (putting a boolean there will generate a
   warning and hide the button, that's all).
This commit is contained in:
Adriaan de Groot 2019-08-13 23:08:33 +02:00
parent 706cc73925
commit c36f963954
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/welcome/WelcomeViewStep.cpp
View File

@ -148,7 +148,7 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) ); jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) );
m_widget->setupButton( WelcomePage::Button::ReleaseNotes, m_widget->setupButton( WelcomePage::Button::ReleaseNotes,
jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) );
m_widget->setupButton( WelcomePage::Button::Donate, CalamaresUtils::getString( configurationMap, "donateUrl" ) ); m_widget->setupButton( WelcomePage::Button::Donate, CalamaresUtils::getString( configurationMap, "showDonateUrl" ) );
if ( configurationMap.contains( "requirements" ) if ( configurationMap.contains( "requirements" )
&& configurationMap.value( "requirements" ).type() == QVariant::Map ) && configurationMap.value( "requirements" ).type() == QVariant::Map )

5
src/modules/welcome/welcome.conf
View File

@ -19,9 +19,10 @@ showReleaseNotesUrl: true
# If this Url is set to something non-empty, a "donate" # If this Url is set to something non-empty, a "donate"
# button is added to the welcome page alongside the # button is added to the welcome page alongside the
# others (see settings, above). Clicking the button opens # others (see settings, above). Clicking the button opens
# the corresponding link. # the corresponding link. (This button has no corresponding
# branding.desc string)
# #
# donateUrl: https://kde.org/community/donations/ # showDonateUrl: https://kde.org/community/donations/
# Requirements checking. These are general, generic, things # Requirements checking. These are general, generic, things
# that are checked. They may not match with the actual requirements # that are checked. They may not match with the actual requirements