~ci-train-bot/libertine/libertine-ubuntu-zesty-2086

Viewing changes to libertine/libertine.cpp

Committer: Chris Townsend
Date: 2016-07-15 18:39:58 UTC
mto: This revision was merged to the branch mainline in revision 272.
Revision ID: christopher.townsend@canonical.com-20160715183958-l95grj44p272lfz4

Rework the whole way we handle updating the necessary system files for unprivileged LXC's:
- Add new script that does the updates.
- Add sudoers file for this script.
- Remove the password dialog in the UI.

Show diffs side-by-side

added added

removed removed

libertine/libertine.cpp

#include "libertine/ContainerConfigList.h"

#include "libertine/libertine.h"

#include "libertine/LibertineConfig.h"

#include "libertine/PasswordHelper.h"

#include <QtCore/QDebug>

#include <QtCore/QDir>

#include <QtCore/QFile>

config_.reset(new LibertineConfig(*this));

qmlRegisterType<ContainerConfig>("Libertine", 1, 0, "ContainerConfig");

qmlRegisterType<ContainerManagerWorker>("Libertine", 1, 0, "ContainerManagerWorker");

qmlRegisterType<PasswordHelper>("Libertine", 1, 0, "PasswordHelper");

watcher_.addPath(config_.data()->containers_config_file_name());

100

connect(&watcher_, SIGNAL(fileChanged(QString)), SLOT(reload_config(QString)));

107

105

containers_ = new ContainerConfigList(config_.data(), this);

108

106

container_apps_ = new ContainerAppsList(containers_, this);

109

107

container_archives_ = new ContainerArchivesList(containers_, this);

110

password_helper_ = new PasswordHelper();

111

108

112

109

initialize_view();

113

110

view_.show();

134

131

ctxt->setContextProperty("containerConfigList", containers_);

135

132

ctxt->setContextProperty("containerAppsList", container_apps_);

136

133

ctxt->setContextProperty("containerArchivesList", container_archives_);

137

ctxt->setContextProperty("passwordHelper", password_helper_);

138

134

139

135

view_.setSource(QUrl::fromLocalFile(main_qml_source_file_));

140

136

connect(view_.engine(), SIGNAL(quit()), SLOT(quit()));

Older »