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

Merge remote-tracking branch 'origin/welcomeq'

Browse Source
This commit is contained in:
Adriaan de Groot 2020-04-30 22:55:19 +02:00
commit 39ec061639
3 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/welcome/Config.cpp
View File

@ -191,12 +191,6 @@ Config::setIsNextEnabled( bool isNextEnabled )
emit isNextEnabledChanged( m_isNextEnabled );
}
QString
Config::donateUrl() const
{
return m_donateUrl;
}
void
Config::setDonateUrl( const QString& url )
{
@ -204,12 +198,6 @@ Config::setDonateUrl( const QString& url )
emit donateUrlChanged();
}
QString
Config::knownIssuesUrl() const
{
return m_knownIssuesUrl;
}
void
Config::setKnownIssuesUrl( const QString& url )
{
@ -224,18 +212,6 @@ Config::setReleaseNotesUrl( const QString& url )
emit releaseNotesUrlChanged();
}
QString
Config::releaseNotesUrl() const
{
return m_releaseNotesUrl;
}
QString
Config::supportUrl() const
{
return m_supportUrl;
}
void
Config::setSupportUrl( const QString& url )
{

10
src/modules/welcome/Config.h
View File

@ -59,19 +59,19 @@ public:
void setIsNextEnabled( bool isNextEnabled );
void setLocaleIndex( int index );
int localeIndex() const { return m_localeIndex; }
void setLocaleIndex( int index );
QString supportUrl() const;
QString supportUrl() const { return m_supportUrl; }
void setSupportUrl( const QString& url );
QString knownIssuesUrl() const;
QString knownIssuesUrl() const { return m_knownIssuesUrl; }
void setKnownIssuesUrl( const QString& url );
QString releaseNotesUrl() const;
QString releaseNotesUrl() const { return m_releaseNotesUrl; }
void setReleaseNotesUrl( const QString& url );
QString donateUrl() const;
QString donateUrl() const { return m_donateUrl; }
void setDonateUrl( const QString& url );
QString genericWelcomeMessage() const;

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

@ -72,14 +72,14 @@ Page
icon.name: "dialog-information"
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
visible: true
onClicked: {
onClicked: {
//onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml"
onClicked: load.source = "about.qml"
}
}
Button {
Layout.fillWidth: true
text: qsTr("Support")
@ -90,7 +90,7 @@ Page
visible: config.supportUrl !== ""
onClicked: Qt.openUrlExternally(config.supportUrl)
}
Button {
Layout.fillWidth: true
text: qsTr("Known issues")
@ -101,7 +101,7 @@ Page
visible: config.knownIssuesUrl !== ""
onClicked: Qt.openUrlExternally(config.knownIssuesUrl)
}
Button {
Layout.fillWidth: true
text: qsTr("Release notes")
@ -113,7 +113,7 @@ Page
onClicked: load.source = "release_notes.qml"
//onClicked: load.source = "file:/usr/share/calamares/release_notes.qml"
}
Button {
Layout.fillWidth: true
text: qsTr("Donate")
@ -125,17 +125,17 @@ Page
onClicked: Qt.openUrlExternally(config.donateUrl)
}
}
RowLayout {
id: languageBar
width: parent.width /1.2
height: 48
anchors.bottom: parent.bottom
anchors.bottomMargin: parent.height /7
anchors.horizontalCenter: parent.horizontalCenter
spacing: Kirigami.Units.largeSpacing* 4
Rectangle {
width: parent.width
Layout.fillWidth: true
@ -146,21 +146,21 @@ Page
fillMode: Image.PreserveAspectFit
source: "img/language-icon-48px.png"
}
ComboBox {
id: languages
anchors.left: image.right
width: languageBar.width /1.1
textRole: "label"
currentIndex: 4 //model.currentIndex
currentIndex: config.localeIndex
model: config.languagesModel
onCurrentIndexChanged: console.debug(currentText, currentIndex)
onCurrentIndexChanged: config.localeIndex = currentIndex
}
}
}
Loader {
id:load
Loader {
id:load
anchors.fill: parent
}
}