← Back to branch summary

~ubuntu-branches/ubuntu/precise/unity-2d/precise-updates

« back to all changes in this revision

Viewing changes to libunity-2d-private/Unity2d/plugin.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-08-11 21:22:18 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20110811212218-vjwi8txoyl6g7upb
Tags: 4.0.0-0ubuntu1
https://launchpad.net/bugs/741129
https://launchpad.net/bugs/823326
https://launchpad.net/bugs/660010
https://launchpad.net/bugs/795422
https://launchpad.net/bugs/812792
https://launchpad.net/bugs/823295
https://launchpad.net/bugs/823877
https://launchpad.net/bugs/609860
https://launchpad.net/bugs/812933
https://launchpad.net/bugs/821880
* New upstream release:
  - [launcher] Impossible to keep KDE Apps in Launcher (LP: #741129)
  - [dash] Background should be blurred (LP: #823326)
  - No 'safely remove' option is present in the unity menu when a usb disk
    is inserted (LP: #660010)
  - Quicklist item "Keep In Launcher" should be "Keep in launcher" as design
    (LP: #795422)
  - [launcher] ESC doesn't dismiss launcher when activated with Alt+F1
    (LP: #812792)
  - [dash] Background wallpaper shifted when using a non compositing window
    manager (LP: #823295)
  - [launcher] Bottom gradient appears too early (LP: #823877)
  - mute/unmute sound when user clicks on sound applet using scroll button
    or middle mouse button (LP: #609860)
  - Secondary activate (i.e. middle click) support for indicators advanced
    usage (LP: #812933)
  - Unused GConfItemQmlWrapper dep found (LP: #821880)
* debian/control:
  - bump libunity-core-4.0-dev, libnux-1.0-dev
  - recommends lenses and not places anymore. Adding music lens

Show diffs side-by-side

added added

removed removed

Lines of Context:
libunity-2d-private/Unity2d/plugin.cpp
56
56
#include "autohidebehavior.h"
57
57
#include "intellihidebehavior.h"
58
58
#include "forcevisiblebehavior.h"
 
59
#include "bfb.h"
 
60
 
 
61
#include "lenses.h"
 
62
#include "lens.h"
59
63
 
60
64
#include <QtDeclarative/qdeclarative.h>
61
65
#include <QDeclarativeEngine>
101
105
 
102
106
    qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
103
107
 
 
108
    qmlRegisterType<BfbModel>(uri, 0, 1, "BfbModel");
 
109
    qmlRegisterType<BfbItem>(uri, 0, 1, "BfbItem");
 
110
 
104
111
    qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
105
112
    qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
106
113
 
126
133
    qmlRegisterType<IconUtilities>(); // Register the type as non creatable
127
134
 
128
135
    qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
 
136
 
 
137
    qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");
 
138
    qmlRegisterType<Lens>(uri, 1, 0, "Lens");
129
139
}
130
140
 
131
141
void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)