← Back to branch summary

~ubuntu-branches/ubuntu/wily/unity-2d/wily

« back to all changes in this revision

Viewing changes to panel/applets/appname/appnameapplet.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/appname/appnameapplet.cpp
26
26
#include "croppedlabel.h"
27
27
#include "menubarwidget.h"
28
28
#include "panelstyle.h"
 
29
#include "unity2dpanel.h"
29
30
#include "windowhelper.h"
30
31
 
31
32
// Unity-2d
39
40
 
40
41
// Qt
41
42
#include <QAbstractButton>
42
 
#include <QEvent>
43
43
#include <QHBoxLayout>
44
44
#include <QLabel>
45
45
#include <QLinearGradient>
50
50
 
51
51
static const int APPNAME_LABEL_LEFT_MARGIN = 6;
52
52
 
53
 
namespace Unity2d
54
 
{
55
 
 
56
53
class WindowButton : public QAbstractButton
57
54
{
58
55
public:
185
182
    }
186
183
};
187
184
 
188
 
AppNameApplet::AppNameApplet(IndicatorsManager* indicatorsManager)
189
 
: d(new AppNameAppletPrivate)
 
185
AppNameApplet::AppNameApplet(Unity2dPanel* panel)
 
186
: Unity2d::PanelApplet(panel)
 
187
, d(new AppNameAppletPrivate)
190
188
{
191
189
    d->q = this;
192
190
    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
194
192
    d->setupWindowHelper();
195
193
    d->setupLabel();
196
194
    d->setupWindowButtonWidget();
197
 
    d->setupMenuBarWidget(indicatorsManager);
 
195
    d->setupMenuBarWidget(panel->indicatorsManager());
198
196
    d->setupKeyboardModifiersMonitor();
199
197
 
200
198
    QHBoxLayout* layout = new QHBoxLayout(this);
266
264
    updateWidgets();
267
265
}
268
266
 
269
 
} // namespace
270
 
 
271
267
#include "appnameapplet.moc"