mirror of https://github.com/cutefishos/calamares
[welcomeq] initial work for welcomeview in qml
Camilo Higuita
5 years ago
committed by
Adriaan de Groot
parent
d7f7c16958
commit
d26fa63ccd
@ -1,44 +1,51 @@
|
||||
# This is a re-write of the welcome module using QML view steps
|
||||
# instead of widgets.
|
||||
|
||||
#set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome )
|
||||
set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome )
|
||||
|
||||
#include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ${_welcome} )
|
||||
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ${CMAKE_CURRENT_SOURCE_DIR}/../../libcalamares ${_welcome} )
|
||||
|
||||
## DUPLICATED WITH WELCOME MODULE
|
||||
#find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
|
||||
# DUPLICATED WITH WELCOME MODULE
|
||||
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
|
||||
|
||||
#find_package( LIBPARTED )
|
||||
#if ( LIBPARTED_FOUND )
|
||||
# set( PARTMAN_SRC ${_welcome}/checker/partman_devices.c )
|
||||
# set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} )
|
||||
#else()
|
||||
# set( PARTMAN_SRC )
|
||||
# set( CHECKER_LINK_LIBRARIES )
|
||||
# add_definitions( -DWITHOUT_LIBPARTED )
|
||||
#endif()
|
||||
find_package( LIBPARTED )
|
||||
if ( LIBPARTED_FOUND )
|
||||
set( PARTMAN_SRC ${_welcome}/checker/partman_devices.c )
|
||||
set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} )
|
||||
else()
|
||||
set( PARTMAN_SRC )
|
||||
set( CHECKER_LINK_LIBRARIES )
|
||||
add_definitions( -DWITHOUT_LIBPARTED )
|
||||
endif()
|
||||
|
||||
#set( CHECKER_SOURCES
|
||||
# ${_welcome}/checker/CheckerContainer.cpp
|
||||
# ${_welcome}/checker/GeneralRequirements.cpp
|
||||
# ${_welcome}/checker/ResultWidget.cpp
|
||||
# ${_welcome}/checker/ResultsListWidget.cpp
|
||||
# ${PARTMAN_SRC}
|
||||
#)
|
||||
set( CHECKER_SOURCES
|
||||
${_welcome}/checker/GeneralRequirements.cpp
|
||||
${PARTMAN_SRC}
|
||||
)
|
||||
|
||||
#calamares_add_plugin( welcomeq
|
||||
# TYPE viewmodule
|
||||
# EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
||||
# SOURCES
|
||||
# ${CHECKER_SOURCES}
|
||||
# WelcomeQmlViewStep.cpp
|
||||
# Config.cpp
|
||||
# RESOURCES
|
||||
# welcomeq.qrc
|
||||
# LINK_PRIVATE_LIBRARIES
|
||||
# calamaresui
|
||||
# ${CHECKER_LINK_LIBRARIES}
|
||||
# Qt5::DBus
|
||||
# Qt5::Network
|
||||
# SHARED_LIB
|
||||
#)
|
||||
calamares_add_plugin( welcomeq
|
||||
TYPE viewmodule
|
||||
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
||||
SOURCES
|
||||
${CHECKER_SOURCES}
|
||||
WelcomeQmlViewStep.cpp
|
||||
${_welcome}/Config.cpp
|
||||
RESOURCES
|
||||
welcomeq.qrc
|
||||
LINK_PRIVATE_LIBRARIES
|
||||
calamaresui
|
||||
${CHECKER_LINK_LIBRARIES}
|
||||
Qt5::DBus
|
||||
Qt5::Network
|
||||
SHARED_LIB
|
||||
)
|
||||
|
||||
# add_executable( welcomeqmltest qmlmain.cpp Config.cpp WelcomeQmlViewStep.cpp ${CHECKER_SOURCES} )
|
||||
# target_link_libraries( welcomeqmltest PRIVATE calamaresui Qt5::Core Qt5::Network Qt5::DBus ${CHECKER_LINK_LIBRARIES})
|
||||
# set_target_properties( welcomeqmltest
|
||||
# PROPERTIES
|
||||
# ENABLE_EXPORTS TRUE
|
||||
# RUNTIME_OUTPUT_NAME welcomeqmltest
|
||||
# )
|
||||
# calamares_automoc( welcomeqmltest )
|
||||
# calamares_autouic( welcomeqmltest )
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2019-2020, 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 "Config.h"
|
||||
|
||||
Config::Config() {}
|
||||
|
||||
Config::~Config() {}
|
||||
@ -1,51 +0,0 @@
|
||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2019-2020, 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 WELCOMEQ_CONFIG_H
|
||||
#define WELCOMEQ_CONFIG_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QUrl>
|
||||
|
||||
class Config : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY( QUrl helpUrl READ helpUrl CONSTANT FINAL )
|
||||
Q_PROPERTY( QUrl issuesUrl READ issuesUrl CONSTANT FINAL )
|
||||
Q_PROPERTY( QUrl notesUrl READ notesUrl CONSTANT FINAL )
|
||||
Q_PROPERTY( QUrl donateUrl READ donateUrl CONSTANT FINAL )
|
||||
public:
|
||||
Config();
|
||||
virtual ~Config();
|
||||
|
||||
void setHelpUrl( const QUrl& url ) { m_helpUrl = url; }
|
||||
void setIssuesUrl( const QUrl& url ) { m_issuesUrl = url; }
|
||||
void setNotesUrl( const QUrl& url ) { m_notesUrl = url; }
|
||||
void setDonateUrl( const QUrl& url ) { m_donateUrl = url; }
|
||||
|
||||
public slots:
|
||||
QUrl helpUrl() const { return m_helpUrl; }
|
||||
QUrl issuesUrl() const { return m_issuesUrl; }
|
||||
QUrl notesUrl() const { return m_notesUrl; }
|
||||
QUrl donateUrl() const { return m_donateUrl; }
|
||||
|
||||
private:
|
||||
QUrl m_helpUrl, m_issuesUrl, m_notesUrl, m_donateUrl;
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue