mirror of https://github.com/cutefishos/calamares
Merge pull request #207 from calamares/debugwindow
New debug window for Calamares testing, adaptation and deploymentmain
Teo Mrnjavac
11 years ago
commit
a25c0cf490
@ -0,0 +1,107 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 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 "DebugWindow.h"
|
||||
#include "utils/Retranslator.h"
|
||||
#include "utils/qjsonmodel.h"
|
||||
#include "JobQueue.h"
|
||||
#include "Job.h"
|
||||
#include "GlobalStorage.h"
|
||||
#include "modulesystem/ModuleManager.h"
|
||||
#include "modulesystem/Module.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QSplitter>
|
||||
#include <QStringListModel>
|
||||
#include <QTreeView>
|
||||
|
||||
namespace Calamares {
|
||||
|
||||
DebugWindow::DebugWindow()
|
||||
: QWidget( nullptr )
|
||||
{
|
||||
setupUi( this );
|
||||
|
||||
// GlobalStorage page
|
||||
QJsonModel* jsonModel = new QJsonModel( this );
|
||||
|
||||
globalStorageView->setModel( jsonModel );
|
||||
GlobalStorage* gs = JobQueue::instance()->globalStorage();
|
||||
|
||||
connect( gs, &GlobalStorage::changed, [ = ]
|
||||
{
|
||||
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
|
||||
globalStorageView->expandAll();
|
||||
} );
|
||||
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
|
||||
globalStorageView->expandAll();
|
||||
|
||||
// JobQueue page
|
||||
jobQueueText->setReadOnly( true );
|
||||
connect( JobQueue::instance(), &JobQueue::queueChanged,
|
||||
[ this ]( const QList< Calamares::job_ptr >& jobs )
|
||||
{
|
||||
QStringList text;
|
||||
foreach( auto job, jobs )
|
||||
{
|
||||
text.append( job->prettyName() );
|
||||
}
|
||||
|
||||
jobQueueText->setText( text.join( '\n' ) );
|
||||
} );
|
||||
|
||||
// Modules page
|
||||
QSplitter* splitter = new QSplitter( modulesTab );
|
||||
modulesTab->layout()->addWidget( splitter );
|
||||
splitter->addWidget( modulesListView );
|
||||
splitter->addWidget( moduleConfigView );
|
||||
|
||||
QStringListModel* modulesModel = new QStringListModel( ModuleManager::instance()->availableModules() );
|
||||
modulesListView->setModel( modulesModel );
|
||||
modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );
|
||||
|
||||
QJsonModel* moduleConfigModel = new QJsonModel( this );
|
||||
moduleConfigView->setModel( moduleConfigModel );
|
||||
|
||||
connect( modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
|
||||
[ this, moduleConfigModel ]
|
||||
{
|
||||
QString moduleName = modulesListView->currentIndex().data().toString();
|
||||
Module* module = ModuleManager::instance()->module( moduleName );
|
||||
if ( module )
|
||||
{
|
||||
moduleConfigModel->loadJson( QJsonDocument::fromVariant( module->configurationMap() ).toJson() );
|
||||
moduleConfigView->expandAll();
|
||||
}
|
||||
} );
|
||||
|
||||
CALAMARES_RETRANSLATE(
|
||||
retranslateUi( this );
|
||||
setWindowTitle( tr( "Debug information" ) );
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
DebugWindow::closeEvent( QCloseEvent* e )
|
||||
{
|
||||
Q_UNUSED( e )
|
||||
emit closed();
|
||||
}
|
||||
|
||||
} // namespace Calamares
|
||||
@ -0,0 +1,45 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 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 CALAMARES_DEBUGWINDOW_H
|
||||
#define CALAMARES_DEBUGWINDOW_H
|
||||
|
||||
#include "ui_DebugWindow.h"
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
namespace Calamares {
|
||||
|
||||
class DebugWindow : public QWidget, private Ui::DebugWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DebugWindow();
|
||||
|
||||
signals:
|
||||
void closed();
|
||||
|
||||
protected:
|
||||
void closeEvent( QCloseEvent* e ) override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
} // namespace Calamares
|
||||
#endif // CALAMARES_DEBUGWINDOW_H
|
||||
@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Calamares::DebugWindow</class>
|
||||
<widget class="QWidget" name="Calamares::DebugWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>632</width>
|
||||
<height>497</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="globalStorageTab">
|
||||
<attribute name="title">
|
||||
<string>GlobalStorage</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QTreeView" name="globalStorageView"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="jobQueueTab">
|
||||
<attribute name="title">
|
||||
<string>JobQueue</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QTextEdit" name="jobQueueText"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="modulesTab">
|
||||
<attribute name="title">
|
||||
<string>Modules</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QListView" name="modulesListView"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTreeView" name="moduleConfigView"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@ -0,0 +1,138 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Originally from QJsonModel <https://github.com/dridk/QJsonmodel>
|
||||
* Copyright 2015, Sacha Schutz <sacha@labsquare.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 "qjsonitem.h"
|
||||
|
||||
QJsonTreeItem::QJsonTreeItem(QJsonTreeItem *parent)
|
||||
{
|
||||
|
||||
mParent = parent;
|
||||
|
||||
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Originally from QJsonModel <https://github.com/dridk/QJsonmodel>
|
||||
* Copyright 2015, Sacha Schutz <sacha@labsquare.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 JSONITEM_H
|
||||
#define JSONITEM_H
|
||||
#include <QtCore>
|
||||
#include <QJsonValue>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
class QJsonTreeItem
|
||||
{
|
||||
public:
|
||||
QJsonTreeItem(QJsonTreeItem * parent = 0);
|
||||
~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 = 0);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
private:
|
||||
QString mKey;
|
||||
QString mValue;
|
||||
QJsonValue::Type mType;
|
||||
|
||||
QList<QJsonTreeItem*> mChilds;
|
||||
QJsonTreeItem * mParent;
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // JSONITEM_H
|
||||
@ -0,0 +1,172 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Originally from QJsonModel <https://github.com/dridk/QJsonmodel>
|
||||
* Copyright 2015, Sacha Schutz <sacha@labsquare.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 "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");
|
||||
|
||||
|
||||
}
|
||||
|
||||
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();
|
||||
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);
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Originally from QJsonModel <https://github.com/dridk/QJsonmodel>
|
||||
* Copyright 2015, Sacha Schutz <sacha@labsquare.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 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 = 0);
|
||||
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
|
||||
Loading…
Reference in New Issue