← Back to branch summary

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

« back to all changes in this revision

Viewing changes to panel/applets/indicator/indicatorapplet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-08-25 18:16:57 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20110825181657-opb29rqsxae3i98f
Tags: 4.2.0-0ubuntu1
https://launchpad.net/bugs/825262
https://launchpad.net/bugs/825368
https://launchpad.net/bugs/827673
https://launchpad.net/bugs/706903
https://launchpad.net/bugs/767367
https://launchpad.net/bugs/817456
https://launchpad.net/bugs/827214
https://launchpad.net/bugs/831855
https://launchpad.net/bugs/831856
https://launchpad.net/bugs/831857
https://launchpad.net/bugs/831858
https://launchpad.net/bugs/832058
https://launchpad.net/bugs/832060
https://launchpad.net/bugs/832114
https://launchpad.net/bugs/825060
https://launchpad.net/bugs/825267
https://launchpad.net/bugs/832204
* New upstream release:
  - [panel] application menus do not appear on first hover after dismissal
    (lp: #825262)
  - [dash] Lens icons badly scaled (lp: #825368)
  - [panel] indicators are shifted offscreen to the right (lp: #827673)
  - [panel] scrubbing from system indicators to menubar should be possible
    (lp: #706903)
  - [launcher] Closed applications don't get their launcher counts cleared
    (lp: #767367)
  - [dash] selected item should not be underlined but use the same 
    treatment as unity (lp: #817456)
  - [dash] categories should be collapsed by default (lp: #827214)
  - [dash] Ratings filter (lp: #831855)
  - [dash] Multirange filter (lp: #831856)
  - [dash] ToggleButton filter (lp: #831857)
  - [dash] Icon size must be bigger to match the mockups (lp: #831858)
  - [dash] "Refine search" right margin should be 15 pixels (lp: #832058)
  - [dash] "Refine search" should be "Filter results" (lp: #832060)
  - [dash] Font sizes should match new design (lp: #832114)
  - [panel] Glitch: application menu appearing when pressing the BFB 
    (lp: #825060)
  - [panel] Glitch: application menus are quickly opened after a drag gesture
    (lp: #825267)
  - [dash] File thumbnails aspect ratio is not respected (lp: #832204)
* debian/control: require current the current versions of nux and unity

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel/applets/indicator/indicatorapplet.cpp
25
25
#include <debug_p.h>
26
26
#include <indicatorsmanager.h>
27
27
#include <indicatorwidget.h>
 
28
#include <unity2dpanel.h>
28
29
 
29
30
// Qt
30
31
#include <QHBoxLayout>
31
32
 
32
33
using namespace unity::indicator;
33
34
 
34
 
IndicatorApplet::IndicatorApplet(IndicatorsManager* manager)
35
 
: m_indicatorsManager(manager)
 
35
IndicatorApplet::IndicatorApplet(Unity2dPanel* panel)
 
36
: Unity2d::PanelApplet(panel)
36
37
{
37
38
    QHBoxLayout* layout = new QHBoxLayout(this);
38
39
    layout->setMargin(0);
39
40
    layout->setSpacing(0);
40
41
    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
41
42
 
 
43
    m_indicatorsManager = panel->indicatorsManager();
 
44
 
42
45
    m_indicatorsManager->indicators()->on_object_added.connect(
43
46
        sigc::mem_fun(this, &IndicatorApplet::onObjectAdded)
44
47
        );