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

welcomeq buttons connecting

Browse Source 
minor spelling corrections
This commit is contained in:
demmm 2020-04-02 20:16:05 +02:00
parent e2fee79957
commit 34292618d8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/welcomeq/WelcomeQmlViewStep.cpp
View File

@ -139,10 +139,10 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
m_config->setReleaseNotesUrl( jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); m_config->setReleaseNotesUrl( jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) );
m_config->setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) ); m_config->setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) );
// TODO: expand Config class and set the remaining fields // with the configurationMap all those properties can be accesed withouth having to declare a property, get and setter for each // TODO: expand Config class and set the remaining fields // with the configurationMap all those properties can be accessed without having to declare a property, get and setter for each
// TODO: figure out how the requirements (held by ModuleManager) should be accessible // TODO: figure out how the requirements (held by ModuleManager) should be accessible
// to QML as a odel. //will be model as a qvariantmap containing a alert level and the message string // to QML as a model. //will be model as a qvariantmap containing a alert level and the message string
if ( configurationMap.contains( "requirements" ) if ( configurationMap.contains( "requirements" )
&& configurationMap.value( "requirements" ).type() == QVariant::Map ) && configurationMap.value( "requirements" ).type() == QVariant::Map )
{ {

14
src/modules/welcomeq/welcomeq.qml
View File

@ -91,8 +91,8 @@ Page
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: config.helpUrl.isValid visible: config.supportUrl !== ""
onClicked: Qt.openUrlExternally(config.helpUrl) onClicked: Qt.openUrlExternally(config.supportUrl)
} }
Button Button
{ {
@ -102,8 +102,8 @@ Page
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: config.issuesUrl.isValid visible: config.knownIssuesUrl !== ""
onClicked: Qt.openUrlExternally(config.issuesUrl) onClicked: Qt.openUrlExternally(config.knownIssuesUrl)
} }
Button Button
{ {
@ -113,8 +113,8 @@ Page
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: config.notesUrl.isValid visible: config.releaseNotesUrl !== ""
onClicked: Qt.openUrlExternally(config.notesUrl) onClicked: Qt.openUrlExternally(config.releaseNotesUrl)
} }
Button Button
{ {
@ -124,7 +124,7 @@ Page
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: config.donateUrl.isValid visible: config.donateUrl !== ""
onClicked: Qt.openUrlExternally(config.donateUrl) onClicked: Qt.openUrlExternally(config.donateUrl)
} }
} }