← Back to branch summary

~larryprice/libertine/lxd-run-environ

« back to all changes in this revision

Viewing changes to system-settings-plugin/plugin.cpp

  • Committer: Larry Price
  • Date: 2017-03-02 21:10:36 UTC
  • mfrom: (388.2.37 devel)
  • Revision ID: larry.price@canonical.com-20170302211036-u7tqm7i00u26qbpm
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
system-settings-plugin/plugin.cpp
21
21
#include "common/ContainerAppsList.h"
22
22
#include "common/ContainerArchivesList.h"
23
23
#include "common/ContainerConfigList.h"
 
24
#include "common/ContainerOperationDetails.h"
24
25
#include "common/LibertineConfig.h"
25
 
#include "common/PackageOperationDetails.h"
26
26
#include <memory>
27
27
#include <QQmlEngine>
28
28
#include <QQmlContext>
47
47
    ContainerConfigList*            containers_;
48
48
    ContainerAppsList*              container_apps_;
49
49
    ContainerArchivesList*          container_archives_;
50
 
    PackageOperationDetails*        package_operation_details_;
 
50
    ContainerOperationDetails*      container_operation_details_;
51
51
    QFileSystemWatcher              watcher_;
52
52
 
53
53
private slots:
61
61
  , containers_(new ContainerConfigList(config_.get(), this))
62
62
  , container_apps_(new ContainerAppsList(containers_, this))
63
63
  , container_archives_(new ContainerArchivesList(containers_, this))
64
 
  , package_operation_details_(new PackageOperationDetails(this))
 
64
  , container_operation_details_(new ContainerOperationDetails(this))
65
65
  , watcher_({config_->containers_config_file_name()})
66
66
{
67
67
  qmlRegisterType<ContainerManagerWorker>("Libertine", 1, 0, "ContainerManagerWorker");
68
 
  qmlRegisterType<PackageOperationDetails>("Libertine", 1, 0, "PackageOperationDetails");
 
68
  qmlRegisterType<ContainerOperationDetails>("Libertine", 1, 0, "ContainerOperationDetails");
69
69
 
70
70
  connect(&watcher_, &QFileSystemWatcher::fileChanged, this, &LibertineItem::reload_config);
71
71
}
77
77
  ctxt->setContextProperty("containerConfigList", containers_);
78
78
  ctxt->setContextProperty("containerAppsList", container_apps_);
79
79
  ctxt->setContextProperty("containerArchivesList", container_archives_);
80
 
  ctxt->setContextProperty("packageOperationDetails", package_operation_details_);
 
80
  ctxt->setContextProperty("containerOperationDetails", container_operation_details_);
81
81
 
82
82
  auto component = new QQmlComponent(engine,
83
83
                           QUrl(LIBERTINE_PLUGIN_QML_DIR "/MainSettingsPage.qml"),