Refactored calamares_bin into calamares_bin and libcalamaresui.

Now linking with -Wl,--no-undefined!
Moved find_package KF5 from the root CMakeLists.txt to the partitioning
module where it belongs. KF5 deps should be limited to plugins.
Lots of random fixage to make stuff link.
Removed CalamaresApplication reference from Settings.
Removed the use of AbstractPage, we don't need it right now.
This commit is contained in:
Teo Mrnjavac 2014-07-03 18:00:40 +02:00
parent 1efb4f1101
commit 4ec72f4afb
32 changed files with 81 additions and 45 deletions

View file

@ -0,0 +1,110 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, 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 "ViewModule.h"
#include "utils/Logger.h"
#include "viewpages/ViewStep.h"
#include "ViewManager.h"
#include <yaml-cpp/yaml.h>
#include <QDir>
#include <QPluginLoader>
namespace Calamares {
Module::Type
ViewModule::type()
{
return View;
}
Module::Interface
ViewModule::interface()
{
return QtPlugin;
}
void
ViewModule::loadSelf()
{
cDebug() << Q_FUNC_INFO << "for module" << name();
if ( m_loader )
{
ViewStep *vs = qobject_cast< ViewStep* >( m_loader->instance() );
if ( vs )
{
ViewManager::instance()->addViewStep( vs );
m_loaded = true;
}
else
{
cDebug() << Q_FUNC_INFO << m_loader->errorString();
}
}
}
void
ViewModule::initFrom( const YAML::Node& node )
{
Module::initFrom( node );
QDir directory( location() );
QString load;
if ( node[ "load" ] )
{
load = QString::fromStdString( node[ "load" ].as<std::string>() );
load = directory.absoluteFilePath( load );
}
// If a load path is not specified, we look for a plugin to load in the directory.
if ( load.isEmpty() || !QLibrary::isLibrary( load ) )
{
QStringList ls = directory.entryList( QStringList() = { "*.so" } );
if ( !ls.isEmpty() )
{
foreach ( QString entry, ls )
{
entry = directory.absoluteFilePath( entry );
if ( QLibrary::isLibrary( entry ) )
{
load = entry;
break;
}
}
}
}
m_loader = new QPluginLoader( load );
}
ViewModule::ViewModule()
: Module()
, m_loader( nullptr )
{
}
ViewModule::~ViewModule()
{
delete m_loader;
}
} // namespace Calamares