Make the partition viewmodule compile with the new ViewStep interface.

This commit is contained in:
Teo Mrnjavac 2014-06-27 18:14:39 +02:00
parent 299d4caae5
commit c7d62300a0
2 changed files with 64 additions and 6 deletions

View File

@ -18,9 +18,12 @@
#include "PartitionViewPlugin.h"
#include "PartitionPage.h"
PartitionViewPlugin::PartitionViewPlugin( QObject* parent )
: Calamares::ViewPlugin( parent )
: Calamares::ViewStep( parent )
, m_widget( new PartitionPage() )
{
}
@ -28,5 +31,45 @@ PartitionViewPlugin::PartitionViewPlugin( QObject* parent )
QString
PartitionViewPlugin::prettyName()
{
return tr( "Welcome" );
return tr( "Partitions" );
}
QWidget*
PartitionViewPlugin::widget()
{
return m_widget;
}
void
PartitionViewPlugin::next()
{
emit done();
}
void
PartitionViewPlugin::back()
{}
bool
PartitionViewPlugin::isNextEnabled()
{
return false;
}
bool
PartitionViewPlugin::isAtBeginning()
{
return true;
}
bool
PartitionViewPlugin::isAtEnd()
{
return true;
}

View File

@ -21,19 +21,34 @@
#include <QObject>
#include "viewpages/ViewPlugin.h"
#include "viewpages/ViewStep.h"
#include "PluginDllMacro.h"
class PLUGINDLLEXPORT PartitionViewPlugin : public Calamares::ViewPlugin
class PartitionPage;
class PLUGINDLLEXPORT PartitionViewPlugin : public Calamares::ViewStep
{
Q_OBJECT
Q_PLUGIN_METADATA( IID "calamares.ViewPlugin/1.0" )
Q_INTERFACES( Calamares::ViewPlugin )
Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
Q_INTERFACES( Calamares::ViewStep )
public:
explicit PartitionViewPlugin( QObject* parent = 0 );
QString prettyName() override;
QWidget* widget() override;
void next() override;
void back() override;
bool isNextEnabled() override;
bool isAtBeginning() override;
bool isAtEnd() override;
private:
PartitionPage* m_widget;
};
#endif // PARTITIONPAGEPLUGIN_H