← Back to branch summary

~rpadovani/webbrowser-app/settings-page

« back to all changes in this revision

Viewing changes to src/app/browserapplication.cpp

  • Committer: Olivier Tilloy
  • Date: 2015-02-04 10:56:38 UTC
  • mto: (934.1.1 webbrowser-app)
  • mto: This revision was merged to the branch mainline in revision 937.
  • Revision ID: olivier.tilloy@canonical.com-20150204105638-esnozvbxjatpl5vb
Import DirectionalDragArea from unity8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/browserapplication.cpp
1
1
/*
2
 
 * Copyright 2013 Canonical Ltd.
 
2
 * Copyright 2013-2015 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
39
39
#include "session-storage.h"
40
40
#include "webbrowser-window.h"
41
41
 
 
42
#include "Ubuntu/Gestures/Direction.h"
 
43
#include "Ubuntu/Gestures/DirectionalDragArea.h"
 
44
 
42
45
BrowserApplication::BrowserApplication(int& argc, char** argv)
43
46
    : QApplication(argc, argv)
44
47
    , m_engine(0)
100
103
    return QString();
101
104
}
102
105
 
 
106
static QObject* Direction_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
 
107
{
 
108
    Q_UNUSED(engine);
 
109
    Q_UNUSED(scriptEngine);
 
110
    return new Direction();
 
111
}
 
112
 
103
113
bool BrowserApplication::initialize(const QString& qmlFileSubPath)
104
114
{
105
115
    Q_ASSERT(m_window == 0);
149
159
    qmlRegisterType<FaviconFetcher>(uri, 0, 1, "FaviconFetcher");
150
160
    qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
151
161
 
 
162
    const char* gesturesUri = "Ubuntu.Gestures";
 
163
    qmlRegisterSingletonType<Direction>(gesturesUri, 0, 1, "Direction", Direction_singleton_factory);
 
164
    qmlRegisterType<DirectionalDragArea>(gesturesUri, 0, 1, "DirectionalDragArea");
 
165
 
152
166
    m_engine = new QQmlEngine;
153
167
    connect(m_engine, SIGNAL(quit()), SLOT(quit()));
154
168
    if (!isRunningInstalled()) {