applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 20:05:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up identifiers + use QComboBox instead of QListView.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-05-13 12:44:11 +02:00
parent 7bcb060967
commit 3dd1d7932f
7 changed files with 126 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/modules/welcome/WelcomeViewStep.cpp
View file

@ -16,21 +16,21 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include "GreetingViewStep.h"
#include "WelcomeViewStep.h"
#include "GreetingPage.h"
#include "WelcomePage.h"
#include <QVariant>
GreetingViewStep::GreetingViewStep( QObject* parent )
WelcomeViewStep::WelcomeViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_widget( new GreetingPage() )
, m_widget( new WelcomePage() )
{
emit nextStatusChanged( true );
}
GreetingViewStep::~GreetingViewStep()
WelcomeViewStep::~WelcomeViewStep()
{
if ( m_widget && m_widget->parent() == nullptr )
m_widget->deleteLater();
@ -38,68 +38,68 @@ GreetingViewStep::~GreetingViewStep()
QString
GreetingViewStep::prettyName() const
WelcomeViewStep::prettyName() const
{
return tr( "Welcome" );
}
QWidget*
GreetingViewStep::widget()
WelcomeViewStep::widget()
{
return m_widget;
}
void
GreetingViewStep::next()
WelcomeViewStep::next()
{
emit done();
}
void
GreetingViewStep::back()
WelcomeViewStep::back()
{}
bool
GreetingViewStep::isNextEnabled() const
WelcomeViewStep::isNextEnabled() const
{
return true;
}
bool
GreetingViewStep::isBackEnabled() const
WelcomeViewStep::isBackEnabled() const
{
return false;
}
bool
GreetingViewStep::isAtBeginning() const
WelcomeViewStep::isAtBeginning() const
{
return true;
}
bool
GreetingViewStep::isAtEnd() const
WelcomeViewStep::isAtEnd() const
{
return true;
}
QList< Calamares::job_ptr >
GreetingViewStep::jobs() const
WelcomeViewStep::jobs() const
{
return QList< Calamares::job_ptr >();
}
void
GreetingViewStep::setConfigurationMap( const QVariantMap& configurationMap )
WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
bool showSupportUrl =
configurationMap.contains( "showSupportUrl" ) &&