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

Merge branch 'replace-debug-models'

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-09 08:00:10 -04:00
commit 3ac7a7323c
14 changed files with 395 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
3rdparty/qjsonitem.cpp vendored
View File

@ -1,140 +0,0 @@
/*
* SPDX-License-Identifier: GPL-3.0+
* License-Filename: LICENSES/GPLv3+-QJsonModel
*/
/***********************************************
Copyright (C) 2014 Schutz Sacha
This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
QJsonModel 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.
QJsonModel 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 QJsonModel. If not, see <http://www.gnu.org/licenses/>.
**********************************************/
#include "qjsonitem.h"
QJsonTreeItem::QJsonTreeItem(QJsonTreeItem *parent)
: mParent( parent )
, mType( QJsonValue::Type::Null )
{
}
QJsonTreeItem::~QJsonTreeItem()
{
qDeleteAll(mChilds);
}
void QJsonTreeItem::appendChild(QJsonTreeItem *item)
{
mChilds.append(item);
}
QJsonTreeItem *QJsonTreeItem::child(int row)
{
return mChilds.value(row);
}
QJsonTreeItem *QJsonTreeItem::parent()
{
return mParent;
}
int QJsonTreeItem::childCount() const
{
return mChilds.count();
}
int QJsonTreeItem::row() const
{
if (mParent)
return mParent->mChilds.indexOf(const_cast<QJsonTreeItem*>(this));
return 0;
}
void QJsonTreeItem::setKey(const QString &key)
{
mKey = key;
}
void QJsonTreeItem::setValue(const QString &value)
{
mValue = value;
}
void QJsonTreeItem::setType(const QJsonValue::Type &type)
{
mType = type;
}
QString QJsonTreeItem::key() const
{
return mKey;
}
QString QJsonTreeItem::value() const
{
return mValue;
}
QJsonValue::Type QJsonTreeItem::type() const
{
return mType;
}
QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* parent)
{
QJsonTreeItem * rootItem = new QJsonTreeItem(parent);
rootItem->setKey("root");
if ( value.isObject())
{
//Get all QJsonValue childs
foreach (QString key , value.toObject().keys()){
QJsonValue v = value.toObject().value(key);
QJsonTreeItem * child = load(v,rootItem);
child->setKey(key);
child->setType(v.type());
rootItem->appendChild(child);
}
}
else if ( value.isArray())
{
//Get all QJsonValue childs
int index = 0;
foreach (QJsonValue v , value.toArray()){
QJsonTreeItem * child = load(v,rootItem);
child->setKey(QString::number(index));
child->setType(v.type());
rootItem->appendChild(child);
++index;
}
}
else
{
rootItem->setValue(value.toVariant().toString());
rootItem->setType(value.type());
}
return rootItem;
}

46
3rdparty/qjsonitem.h vendored
View File

@ -1,46 +0,0 @@
/*
* SPDX-License-Identifier: GPL-3.0+
* License-Filename: LICENSES/GPLv3+-QJsonModel
*/
#ifndef JSONITEM_H
#define JSONITEM_H
#include <QtCore>
#include <QJsonValue>
#include <QJsonArray>
#include <QJsonObject>
class QJsonTreeItem
{
public:
QJsonTreeItem(QJsonTreeItem * parent = nullptr);
~QJsonTreeItem();
void appendChild(QJsonTreeItem * item);
QJsonTreeItem *child(int row);
QJsonTreeItem *parent();
int childCount() const;
int row() const;
void setKey(const QString& key);
void setValue(const QString& value);
void setType(const QJsonValue::Type& type);
QString key() const;
QString value() const;
QJsonValue::Type type() const;
static QJsonTreeItem* load(const QJsonValue& value, QJsonTreeItem * parent = nullptr);
protected:
private:
QString mKey;
QString mValue;
QJsonValue::Type mType;
QList<QJsonTreeItem*> mChilds;
QJsonTreeItem * mParent;
};
#endif // JSONITEM_H

186
3rdparty/qjsonmodel.cpp vendored
View File

@ -1,186 +0,0 @@
/*
* SPDX-License-Identifier: GPL-3.0+
* License-Filename: LICENSES/GPLv3+-QJsonModel
*/
/***********************************************
Copyright (C) 2014 Schutz Sacha
This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
QJsonModel 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.
QJsonModel 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 QJsonModel. If not, see <http://www.gnu.org/licenses/>.
**********************************************/
#include "qjsonmodel.h"
#include <QFile>
#include <QDebug>
#include <QJsonDocument>
#include <QJsonObject>
#include <QIcon>
#include <QFont>
QJsonModel::QJsonModel(QObject *parent) :
QAbstractItemModel(parent)
, mRootItem( new QJsonTreeItem )
{
mHeaders.append("key");
mHeaders.append("value");
}
QJsonModel::~QJsonModel()
{
delete mRootItem;
}
bool QJsonModel::load(const QString &fileName)
{
QFile file(fileName);
bool success = false;
if (file.open(QIODevice::ReadOnly)) {
success = load(&file);
file.close();
}
else success = false;
return success;
}
bool QJsonModel::load(QIODevice *device)
{
return loadJson(device->readAll());
}
bool QJsonModel::loadJson(const QByteArray &json)
{
mDocument = QJsonDocument::fromJson(json);
if (!mDocument.isNull())
{
beginResetModel();
delete mRootItem;
if (mDocument.isArray()) {
mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.array()));
} else {
mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.object()));
}
endResetModel();
return true;
}
return false;
}
QVariant QJsonModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
return QVariant();
QJsonTreeItem *item = static_cast<QJsonTreeItem*>(index.internalPointer());
if ((role == Qt::DecorationRole) && (index.column() == 0)){
return mTypeIcons.value(item->type());
}
if (role == Qt::DisplayRole) {
if (index.column() == 0)
return QString("%1").arg(item->key());
if (index.column() == 1)
return QString("%1").arg(item->value());
}
return QVariant();
}
QVariant QJsonModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (role != Qt::DisplayRole)
return QVariant();
if (orientation == Qt::Horizontal) {
return mHeaders.value(section);
}
else
return QVariant();
}
QModelIndex QJsonModel::index(int row, int column, const QModelIndex &parent) const
{
if (!hasIndex(row, column, parent))
return QModelIndex();
QJsonTreeItem *parentItem;
if (!parent.isValid())
parentItem = mRootItem;
else
parentItem = static_cast<QJsonTreeItem*>(parent.internalPointer());
QJsonTreeItem *childItem = parentItem->child(row);
if (childItem)
return createIndex(row, column, childItem);
else
return QModelIndex();
}
QModelIndex QJsonModel::parent(const QModelIndex &index) const
{
if (!index.isValid())
return QModelIndex();
QJsonTreeItem *childItem = static_cast<QJsonTreeItem*>(index.internalPointer());
QJsonTreeItem *parentItem = childItem->parent();
if (parentItem == mRootItem)
return QModelIndex();
return createIndex(parentItem->row(), 0, parentItem);
}
int QJsonModel::rowCount(const QModelIndex &parent) const
{
QJsonTreeItem *parentItem;
if (parent.column() > 0)
return 0;
if (!parent.isValid())
parentItem = mRootItem;
else
parentItem = static_cast<QJsonTreeItem*>(parent.internalPointer());
return parentItem->childCount();
}
int QJsonModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
return 2;
}
void QJsonModel::setIcon(const QJsonValue::Type &type, const QIcon &icon)
{
mTypeIcons.insert(type,icon);
}

42
3rdparty/qjsonmodel.h vendored
View File

@ -1,42 +0,0 @@
/*
* SPDX-License-Identifier: GPL-3.0+
* License-Filename: LICENSES/GPLv3+-QJsonModel
*/
#ifndef QJSONMODEL_H
#define QJSONMODEL_H
#include <QAbstractItemModel>
#include "qjsonitem.h"
#include <QJsonDocument>
#include <QJsonObject>
#include <QIcon>
class QJsonModel : public QAbstractItemModel
{
Q_OBJECT
public:
explicit QJsonModel(QObject *parent = nullptr);
~QJsonModel();
bool load(const QString& fileName);
bool load(QIODevice * device);
bool loadJson(const QByteArray& json);
QVariant data(const QModelIndex &index, int role) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
QModelIndex index(int row, int column,const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &index) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
void setIcon(const QJsonValue::Type& type, const QIcon& icon);
private:
QJsonTreeItem * mRootItem;
QJsonDocument mDocument;
QStringList mHeaders;
QHash<QJsonValue::Type, QIcon> mTypeIcons;
};
#endif // QJSONMODEL_H

18
LICENSES/GPLv3+-QJsonModel
View File

@ -1,18 +0,0 @@
/***********************************************
Copyright (C) 2014 Schutz Sacha
This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
QJsonModel 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.
QJsonModel 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 QJsonModel. If not, see <http://www.gnu.org/licenses/>.
**********************************************/

4
src/calamares/CMakeLists.txt
View File

@ -5,6 +5,9 @@ set( calamaresSources
CalamaresApplication.cpp
CalamaresWindow.cpp
DebugWindow.cpp
VariantModel.cpp
progresstree/ProgressTreeDelegate.cpp
progresstree/ProgressTreeItem.cpp
progresstree/ProgressTreeModel.cpp
@ -35,6 +38,7 @@ set_target_properties(calamares_bin
RUNTIME_OUTPUT_NAME calamares
)
calamares_automoc( calamares_bin )
calamares_autouic( calamares_bin )
target_link_libraries( calamares_bin
PRIVATE

2
src/calamares/CalamaresWindow.cpp
View File

@ -26,7 +26,7 @@
#include "ViewManager.h"
#include "progresstree/ProgressTreeView.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/DebugWindow.h"
#include "DebugWindow.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"

34
src/libcalamaresui/utils/DebugWindow.cpp → src/calamares/DebugWindow.cpp
View File

@ -20,6 +20,8 @@
#include "DebugWindow.h"
#include "ui_DebugWindow.h"
#include "VariantModel.h"
#include "Branding.h"
#include "modulesystem/Module.h"
#include "modulesystem/ModuleManager.h"
@ -30,8 +32,6 @@
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "3rdparty/qjsonmodel.h"
#ifdef WITH_PYTHONQT
#include "ViewManager.h"
#include "viewpages/PythonQtViewStep.h"
@ -39,10 +39,10 @@
#include <gui/PythonQtScriptingConsole.h>
#endif
#include <QJsonDocument>
#include <QSplitter>
#include <QStringListModel>
#include <QTreeView>
#include <QWidget>
/**
* @brief crash makes Calamares crash immediately.
@ -74,23 +74,25 @@ namespace Calamares {
DebugWindow::DebugWindow()
: QWidget( nullptr )
, m_ui( new Ui::DebugWindow )
, m_globals( JobQueue::instance()->globalStorage()->data() )
, m_globals_model( std::make_unique< VariantModel >( &m_globals ) )
, m_module_model( std::make_unique< VariantModel >( &m_module ) )
{
m_ui->setupUi( this );
// GlobalStorage page
QJsonModel* jsonModel = new QJsonModel( this );
m_ui->globalStorageView->setModel( jsonModel );
GlobalStorage* gs = JobQueue::instance()->globalStorage();
m_ui->setupUi( this );
m_ui->globalStorageView->setModel( m_globals_model.get() );
m_ui->globalStorageView->expandAll();
// Do above when the GS changes, too
connect( gs, &GlobalStorage::changed,
this, [ = ]
{
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
m_globals = JobQueue::instance()->globalStorage()->data();
m_globals_model->reload();
m_ui->globalStorageView->expandAll();
} );
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
m_ui->globalStorageView->expandAll();
// JobQueue page
m_ui->jobQueueText->setReadOnly( true );
@ -111,8 +113,7 @@ DebugWindow::DebugWindow()
m_ui->modulesListView->setModel( modulesModel );
m_ui->modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );
QJsonModel* moduleConfigModel = new QJsonModel( this );
m_ui->moduleConfigView->setModel( moduleConfigModel );
m_ui->moduleConfigView->setModel( m_module_model.get() );
#ifdef WITH_PYTHONQT
QPushButton* pythonConsoleButton = new QPushButton;
@ -183,7 +184,7 @@ DebugWindow::DebugWindow()
#endif
connect( m_ui->modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, [ this, moduleConfigModel
this, [ this
#ifdef WITH_PYTHONQT
, pythonConsoleButton
#endif
@ -193,7 +194,8 @@ DebugWindow::DebugWindow()
Module* module = ModuleManager::instance()->moduleInstance( moduleName );
if ( module )
{
moduleConfigModel->loadJson( QJsonDocument::fromVariant( module->configurationMap() ).toJson() );
m_module = module->configurationMap();
m_module_model->reload();
m_ui->moduleConfigView->expandAll();
m_ui->moduleTypeLabel->setText( module->typeString() );
m_ui->moduleInterfaceLabel->setText( module->interfaceString() );

8
src/libcalamaresui/utils/DebugWindow.h → src/calamares/DebugWindow.h
View File

@ -20,8 +20,12 @@
#ifndef CALAMARES_DEBUGWINDOW_H
#define CALAMARES_DEBUGWINDOW_H
#include "VariantModel.h"
#include <QVariant>
#include <QWidget>
#include <memory>
namespace Calamares {
@ -46,6 +50,10 @@ protected:
private:
Ui::DebugWindow *m_ui;
QVariant m_globals;
QVariant m_module;
std::unique_ptr< VariantModel> m_globals_model;
std::unique_ptr< VariantModel> m_module_model;
};

0
src/libcalamaresui/utils/DebugWindow.ui → src/calamares/DebugWindow.ui
View File

270
src/calamares/VariantModel.cpp Normal file
View File

@ -0,0 +1,270 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2019, Adriaan de Groot <groot@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 "VariantModel.h"
static void
overallLength( const QVariant& item, int& c, int parent, VariantModel::IndexVector* skiplist )
{
if ( skiplist )
{
skiplist->append( parent );
}
parent = c++;
if ( item.canConvert< QVariantList >() )
{
for ( const auto& subitem : item.toList() )
{
overallLength( subitem, c, parent, skiplist );
}
}
else if ( item.canConvert< QVariantMap >() )
{
for ( const auto& subitem : item.toMap() )
{
overallLength( subitem, c, parent, skiplist );
}
}
}
static quintptr
findNth( const VariantModel::IndexVector& skiplist, quintptr value, int n )
{
if ( n < 0 )
{
return -1;
}
int index = 0;
while ( ( n >= 0 ) && ( index < skiplist.count() ) )
{
if ( skiplist[ index ] == value )
{
if ( --n < 0 )
{
return index;
}
}
index++;
}
return -1;
}
VariantModel::VariantModel( const QVariant* p )
: m_p( p )
{
reload();
}
VariantModel::~VariantModel() {}
void
VariantModel::reload()
{
int x = 0;
overallLength( *m_p, x, -1, nullptr );
m_rows.clear(); // Start over
m_rows.reserve( x ); // We'll need this much
x = 0;
overallLength( *m_p, x, -1, &m_rows );
}
int
VariantModel::columnCount( const QModelIndex& index ) const
{
return 2;
}
int
VariantModel::rowCount( const QModelIndex& index ) const
{
quintptr p = index.isValid() ? index.internalId() : 0;
return m_rows.count( p );
}
QModelIndex
VariantModel::index( int row, int column, const QModelIndex& parent ) const
{
quintptr p = 0;
if ( parent.isValid() )
{
if ( !( parent.internalId() >= m_rows.count() ) )
{
p = parent.internalId();
}
}
return createIndex( row, column, findNth( m_rows, p, row ) );
}
QModelIndex
VariantModel::parent( const QModelIndex& index ) const
{
if ( !index.isValid() || ( index.internalId() > m_rows.count() ) )
{
return QModelIndex();
}
quintptr p = m_rows[ index.internalId() ];
if ( p == 0 )
{
return QModelIndex();
}
if ( p >= m_rows.count() )
{
return QModelIndex();
}
quintptr p_pid = m_rows[ p ];
int row = 0;
for ( int i = 0; i < p; ++i )
{
if ( m_rows[ i ] == p_pid )
{
row++;
}
}
return createIndex( row, index.column(), p );
}
QVariant
VariantModel::data( const QModelIndex& index, int role ) const
{
if ( role != Qt::DisplayRole )
{
return QVariant();
}
if ( !index.isValid() )
{
return QVariant();
}
if ( ( index.column() < 0 ) || ( index.column() > 1 ) )
{
return QVariant();
}
if ( index.internalId() >= m_rows.count() )
{
return QVariant();
}
const QVariant thing = underlying( parent( index ) );
if ( !thing.isValid() )
{
return QVariant();
}
if ( thing.canConvert< QVariantMap >() )
{
QVariantMap the_map = thing.toMap();
const auto key = the_map.keys().at( index.row() );
if ( index.column() == 0 )
{
return key;
}
else
{
return the_map[ key ];
}
}
else if ( thing.canConvert< QVariantList >() )
{
if ( index.column() == 0 )
{
return index.row();
}
else
{
QVariantList the_list = thing.toList();
return the_list.at( index.row() );
}
}
else
{
if ( index.column() == 0 )
{
return QVariant();
}
else
{
return thing;
}
}
}
QVariant
VariantModel::headerData( int section, Qt::Orientation orientation, int role ) const
{
if ( role != Qt::DisplayRole )
{
return QVariant();
}
if ( orientation == Qt::Horizontal )
{
if ( section == 0 )
{
return tr( "Key" );
}
else if ( section == 1 )
{
return tr( "Value" );
}
else
{
return QVariant();
}
}
else
{
return QVariant();
}
}
const QVariant
VariantModel::underlying( const QModelIndex& index ) const
{
if ( !index.isValid() )
{
return *m_p;
}
const auto& thing = underlying( parent( index ) );
if ( thing.canConvert< QVariantMap >() )
{
const auto& the_map = thing.toMap();
return the_map[ the_map.keys()[ index.row() ] ];
}
else if ( thing.canConvert< QVariantList >() )
{
return thing.toList()[ index.row() ];
}
else
{
return thing;
}
return QVariant();
}

84
src/calamares/VariantModel.h Normal file
View File

@ -0,0 +1,84 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2019, Adriaan de Groot <groot@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 VARIANTMODEL_H
#define VARIANTMODEL_H
#include <QAbstractItemModel>
#include <QVariantMap>
#include <QVector>
/** @brief A model that operates directly on a QVariant
*
* A VariantModel operates directly on an underlying
* QVariant, treating QVariantMap and QVariantList as
* nodes with multiple children. In general, putting
* a QVariantMap into a QVariant and passing that into
* the model will get you a tree-like model of the
* VariantMap's data structure.
*
* Take care of object lifetimes and that the underlying
* QVariant does not change during use. If the QVariant
* **does** change, call reload() to re-build the internal
* representation of the tree.
*/
class VariantModel : public QAbstractItemModel
{
public:
/** @brief Auxiliary data
*
* The nodes of the tree are enumerated into a vector
* (of length equal to the number of nodes in the tree + 1)
* which are used to do index and parent calculations.
*/
using IndexVector = QVector< quintptr >;
/** @brief Constructor
*
* The QVariant's lifetime is **not** affected by the model,
* so take care that the QVariant lives at least as long as
* the model). Also, don't change the QVariant underneath the model.
*/
VariantModel( const QVariant* p );
~VariantModel() override;
/** @brief Re-build the internal tree
*
* Call this when the underlying variant is changed, which
* might impact how the tree is laid out.
*/
void reload();
int columnCount( const QModelIndex& index ) const override;
int rowCount( const QModelIndex& index ) const override;
QModelIndex index( int row, int column, const QModelIndex& parent ) const override;
QModelIndex parent( const QModelIndex& index ) const override;
QVariant data( const QModelIndex& index, int role ) const override;
QVariant headerData( int section, Qt::Orientation orientation, int role ) const override;
private:
const QVariant* const m_p;
IndexVector m_rows;
/// @brief Implementation of walking an index through the variant-tree
const QVariant underlying( const QModelIndex& index ) const;
};
#endif

12
src/libcalamares/GlobalStorage.h
View File

@ -22,6 +22,8 @@
#include "CalamaresConfig.h"
#include <QObject>
#include <QString>
#include <QVariantMap>
#ifdef WITH_PYTHON
@ -87,13 +89,19 @@ public:
/// @brief reads settings from the given filename
bool loadYaml( const QString& filename );
/** @brief Get internal mapping as a constant object
*
* Note that the VariantMap underneath may change, because
* it's not constant in itself. Connect to the changed()
* signal for notifications.
*/
const QVariantMap& data() const { return m; }
signals:
void changed();
private:
QVariantMap m;
friend DebugWindow;
};
} // namespace Calamares

9
src/libcalamaresui/CMakeLists.txt
View File

@ -14,13 +14,9 @@ set( calamaresui_SOURCES
modulesystem/ViewModule.cpp
utils/CalamaresUtilsGui.cpp
utils/DebugWindow.cpp
utils/ImageRegistry.cpp
utils/Paste.cpp
${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
viewpages/BlankViewStep.cpp
viewpages/ViewStep.cpp
@ -41,10 +37,6 @@ mark_thirdparty_code(
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
)
set( calamaresui_UI
utils/DebugWindow.ui
)
if( WITH_PYTHON )
list( APPEND calamaresui_SOURCES
modulesystem/PythonJobModule.cpp
@ -72,7 +64,6 @@ endif()
calamares_add_library( calamaresui
SOURCES ${calamaresui_SOURCES}
UI ${calamaresui_UI}
EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES
${OPTIONAL_PYTHON_LIBRARIES}