← Back to branch summary

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

« back to all changes in this revision

Viewing changes to shell/app/dashdbus.cpp

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-03-05 09:52:30 UTC
  • mfrom: (1.1.28)
  • Revision ID: package-import@ubuntu.com-20120305095230-alpmktmmfnjs2t4b
Tags: 5.6.0-0ubuntu1
https://launchpad.net/bugs/944724
https://launchpad.net/bugs/812104
https://launchpad.net/bugs/932092
https://launchpad.net/bugs/942045
https://launchpad.net/bugs/942031
https://launchpad.net/bugs/841902
https://launchpad.net/bugs/932291
https://launchpad.net/bugs/936881
https://launchpad.net/bugs/939586
https://launchpad.net/bugs/934059
* New upstream release
  - [dash] [hud] If no active window, shell processes crashes (LP: #944724)
  - Long delay on session logout (LP: #812104)
  - apps/docs are not launched when performing a search on the home lens
    (LP: #932092)
  - [unity-2d] FF exception to add HUD to Unity2d (LP: #942045)
  - There's a gap between the launcher and the upper panel (LP: #942031)
  - Dash - Genre filter category in the Music Lens should use a 3 column
    layout (LP: #841902)
  - selected lens arrow should be on top instead of bottom (LP: #932291)
  - [launcher] pixel-perfection fixes, new assets, tile & pip position,
    border line & context menu position (LP: #936881)
  - Workspace switcher icon should not generate background from icon
    (LP: #939586)
  - No glow assets still needed X Y Z (LP: #934059)
* Revert an upstream commit to ensure that there is not regression with
  libunity-core 5.4 (change will be introduced again when unity 5.6 released)

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/app/dashdbus.cpp
25
25
 
26
26
// Qt
27
27
#include <QtDBus/QDBusConnection>
 
28
#include <QGraphicsObject>
28
29
 
29
30
static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
30
31
static const char* DASH_DBUS_OBJECT_PATH = "/Dash";
34
35
, m_view(view)
35
36
{
36
37
    connect(m_view, SIGNAL(dashActiveChanged(bool)), SIGNAL(activeChanged(bool)));
 
38
    connect(m_view, SIGNAL(dashAlwaysFullScreenChanged(bool)), SIGNAL(alwaysFullScreenChanged(bool)));
37
39
    connect(m_view, SIGNAL(activeLensChanged(QString)), SIGNAL(activeLensChanged(QString)));
 
40
 
 
41
    /* QML's propertyChanged signals are simple, they don't pass the property value */
 
42
    connect(m_view->rootObject(), SIGNAL(hudActiveChanged()), SLOT(onHudActiveChanged()));
38
43
}
39
44
 
40
45
DashDBus::~DashDBus()
79
84
    m_view->setDashActive(active);
80
85
}
81
86
 
 
87
bool
 
88
DashDBus::alwaysFullScreen() const
 
89
{
 
90
    return m_view->dashAlwaysFullScreen();
 
91
}
 
92
 
82
93
QString
83
94
DashDBus::activeLens() const
84
95
{
90
101
{
91
102
    m_view->setActiveLens(activeLens);
92
103
}
 
104
 
 
105
bool
 
106
DashDBus::hudActive() const
 
107
{
 
108
    return m_view->rootObject()->property("hudActive").toBool();
 
109
}
 
110
 
 
111
void
 
112
DashDBus::onHudActiveChanged()
 
113
{
 
114
    Q_EMIT hudActiveChanged(hudActive());
 
115
}
 
116
 
 
117
void
 
118
DashDBus::setHudActive(bool active)
 
119
{
 
120
    if (active != hudActive()) {
 
121
        m_view->rootObject()->setProperty("hudActive", active);
 
122
        Q_EMIT hudActiveChanged(active);
 
123
    }
 
124
}