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 ); emit isNextEnabledChanged( m_isNextEnabled );
} }
QString
Config::donateUrl() const
{
return m_donateUrl;
}
void void
Config::setDonateUrl( const QString& url ) Config::setDonateUrl( const QString& url )
{ {
@ -204,12 +198,6 @@ Config::setDonateUrl( const QString& url )
emit donateUrlChanged(); emit donateUrlChanged();
} }
QString
Config::knownIssuesUrl() const
{
return m_knownIssuesUrl;
}
void void
Config::setKnownIssuesUrl( const QString& url ) Config::setKnownIssuesUrl( const QString& url )
{ {
@ -224,18 +212,6 @@ Config::setReleaseNotesUrl( const QString& url )
emit releaseNotesUrlChanged(); emit releaseNotesUrlChanged();
} }
QString
Config::releaseNotesUrl() const
{
return m_releaseNotesUrl;
}
QString
Config::supportUrl() const
{
return m_supportUrl;
}
void void
Config::setSupportUrl( const QString& url ) Config::setSupportUrl( const QString& url )
{ {

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

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

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

@ -152,9 +152,9 @@ Page
anchors.left: image.right anchors.left: image.right
width: languageBar.width /1.1 width: languageBar.width /1.1
textRole: "label" textRole: "label"
currentIndex: 4 //model.currentIndex currentIndex: config.localeIndex
model: config.languagesModel model: config.languagesModel
onCurrentIndexChanged: console.debug(currentText, currentIndex) onCurrentIndexChanged: config.localeIndex = currentIndex
} }
} }
} }