mirror of https://github.com/cutefishos/calamares
[calamares] Remove superfluous ViewStepItem
- The model is a simple list, not a tree (it may have been in the distant past). - All the information needed comes from the ViewSteps held by the ViewManager. - The delegate and fake-step handling was never used.main
Adriaan de Groot
5 years ago
parent
5a59eb1963
commit
76144fb3dc
@ -1,85 +0,0 @@
|
|||||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
|
||||||
*
|
|
||||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
|
||||||
*
|
|
||||||
* Calamares is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Calamares is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ViewStepItem.h"
|
|
||||||
|
|
||||||
#include "ProgressTreeModel.h"
|
|
||||||
|
|
||||||
#include "Settings.h"
|
|
||||||
#include "ViewManager.h"
|
|
||||||
#include "viewpages/ViewStep.h"
|
|
||||||
|
|
||||||
|
|
||||||
ViewStepItem::ViewStepItem( std::function< QString() > prettyName,
|
|
||||||
std::function< const Calamares::ViewStep*() > accessor,
|
|
||||||
ProgressTreeItem* parent )
|
|
||||||
: ProgressTreeItem( parent )
|
|
||||||
, m_accessor( accessor )
|
|
||||||
, m_prettyName( prettyName )
|
|
||||||
, m_step( nullptr )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ViewStepItem::ViewStepItem( const Calamares::ViewStep* step, ProgressTreeItem* parent )
|
|
||||||
: ProgressTreeItem( parent )
|
|
||||||
, m_step( step )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
ViewStepItem::appendChild( ProgressTreeItem* item )
|
|
||||||
{
|
|
||||||
Q_ASSERT( false );
|
|
||||||
Q_UNUSED( item )
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
QVariant
|
|
||||||
ViewStepItem::data( int role ) const
|
|
||||||
{
|
|
||||||
if ( role == Qt::DisplayRole )
|
|
||||||
{
|
|
||||||
return m_step ? m_step->prettyName() : m_prettyName();
|
|
||||||
}
|
|
||||||
if ( Calamares::Settings::instance()->debugMode() && role == Qt::ToolTipRole )
|
|
||||||
{
|
|
||||||
QString toolTip( "<b>Debug information</b>" );
|
|
||||||
if ( m_step )
|
|
||||||
{
|
|
||||||
toolTip.append( "<br/>Type:\tViewStep" );
|
|
||||||
toolTip.append( QString( "<br/>Pretty:\t%1" ).arg( m_step->prettyName() ) );
|
|
||||||
toolTip.append( QString( "<br/>Status:\t%1" ).arg( m_step->prettyStatus() ) );
|
|
||||||
toolTip.append( QString( "<br/>Source:\t%1" )
|
|
||||||
.arg( m_step->moduleInstanceKey().isValid() ? m_step->moduleInstanceKey().toString()
|
|
||||||
: QStringLiteral( "built-in" ) ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
toolTip.append( "<br/>Type:\tDelegate" );
|
|
||||||
toolTip.append( QString( "<br/>Pretty:\t%1" ).arg( m_prettyName() ) );
|
|
||||||
}
|
|
||||||
return toolTip;
|
|
||||||
}
|
|
||||||
if ( role == ProgressTreeModel::ProgressTreeItemCurrentRole )
|
|
||||||
{
|
|
||||||
return m_step ? ( Calamares::ViewManager::instance()->currentStep() == m_step )
|
|
||||||
: ( Calamares::ViewManager::instance()->currentStep() == m_accessor() );
|
|
||||||
}
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
|
||||||
*
|
|
||||||
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
|
|
||||||
*
|
|
||||||
* Calamares is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Calamares is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef VIEWSTEPITEM_H
|
|
||||||
#define VIEWSTEPITEM_H
|
|
||||||
|
|
||||||
#include "ProgressTreeItem.h"
|
|
||||||
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
namespace Calamares
|
|
||||||
{
|
|
||||||
class ViewStep;
|
|
||||||
}
|
|
||||||
|
|
||||||
class ViewStepItem : public ProgressTreeItem
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
// We take a std::function< QString() > instead of a QString because the view asks for
|
|
||||||
// new strings on LanguageChange, and tr needs to be called again in that case.
|
|
||||||
explicit ViewStepItem( std::function< QString() > prettyName,
|
|
||||||
std::function< const Calamares::ViewStep*() > accessor,
|
|
||||||
ProgressTreeItem* parent = nullptr );
|
|
||||||
|
|
||||||
explicit ViewStepItem( const Calamares::ViewStep* step, ProgressTreeItem* parent = nullptr );
|
|
||||||
|
|
||||||
void appendChild( ProgressTreeItem* item ) override;
|
|
||||||
|
|
||||||
QVariant data( int role ) const override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
const std::function< const Calamares::ViewStep*() > m_accessor;
|
|
||||||
const std::function< QString() > m_prettyName;
|
|
||||||
const Calamares::ViewStep* const m_step;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif // VIEWSTEPITEM_H
|
|
||||||
Loading…
Reference in New Issue