diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index d5d0acda6..451bc6a48 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -44,7 +44,6 @@ if( WITH_PYTHONQT ) include_directories(${PYTHONQT_INCLUDE_DIR}) list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES - PythonQtConsoleViewStep.cpp modulesystem/PythonQtViewModule.cpp viewpages/PythonQtViewStep.cpp ) diff --git a/src/libcalamaresui/PythonQtConsoleViewStep.cpp b/src/libcalamaresui/PythonQtConsoleViewStep.cpp deleted file mode 100644 index 5a5ad990f..000000000 --- a/src/libcalamaresui/PythonQtConsoleViewStep.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2016, Teo Mrnjavac - * - * 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 . - */ - -#include "PythonQtConsoleViewStep.h" - -using namespace Calamares; - -PythonQtConsoleViewStep::PythonQtConsoleViewStep( PythonQtObjectPtr cxt, - QObject* parent ) - : ViewStep( parent ) -{ - m_cxt = cxt; - qDebug() << "SMO" << PythonQtConsoleViewStep::staticMetaObject.className(); - PythonQt::self()->registerClass( &PythonQtConsoleViewStep::staticMetaObject, "Calamares" ); - m_console = new PythonQtScriptingConsole( nullptr, m_cxt ); -} - -QWidget* -PythonQtConsoleViewStep::widget() -{ - return m_console; -} - - diff --git a/src/libcalamaresui/PythonQtConsoleViewStep.h b/src/libcalamaresui/PythonQtConsoleViewStep.h deleted file mode 100644 index 0dd0ce8da..000000000 --- a/src/libcalamaresui/PythonQtConsoleViewStep.h +++ /dev/null @@ -1,56 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2016, Teo Mrnjavac - * - * 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 . - */ - -#ifndef PYTHONQTCONSOLEVIEWSTEP_H -#define PYTHONQTCONSOLEVIEWSTEP_H - - -#include "viewpages/ViewStep.h" - -#include -#include - - -class PythonQtConsoleViewStep : public Calamares::ViewStep -{ - Q_OBJECT -public: - PythonQtConsoleViewStep( PythonQtObjectPtr cxt, - QObject* parent = nullptr ); - - virtual QString prettyName() const override { return tr( "PythonQt Console" ); } - - virtual QWidget* widget() override; - - virtual void next() override {} - virtual void back() override {} - - virtual bool isNextEnabled() const override { return true; } - virtual bool isBackEnabled() const override { return true; } - - virtual bool isAtBeginning() const override { return true; } - virtual bool isAtEnd() const override { return true; } - - virtual QList< Calamares::job_ptr > jobs() const override { return QList< Calamares::job_ptr >(); } - -private: - PythonQtObjectPtr m_cxt; - PythonQtScriptingConsole* m_console; -}; - -#endif // PYTHONQTCONSOLEVIEWSTEP_H