← Back to branch summary

~ubuntu-branches/ubuntu/trusty/unity8/trusty-proposed

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/indicatorsmodel.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Michał Sawicz, Michael Hall, Christopher Lee, Nic, Nick Dedekind, Mirco Müller, Michael Zanetti, Daniel d'Andrada, Dimitri John Ledkov, Albert Astals, Ubuntu daily release
  • Date: 2013-12-20 03:23:08 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20131220032308-p3no0uoar5fzoead
Tags: 7.84+14.04.20131220-0ubuntu1
https://launchpad.net/bugs/1260860
https://launchpad.net/bugs/1260860
[ Michał Sawicz ]
* Clean up root project file. Introduce include/ and qml/ and move
  files around to be where they fit, also adapt everything else to
  match.

[ Michael Hall ]
* Update CODING to reflect the fact that only 14.04 is supported
  currently.

[ Christopher Lee ]
* Make use of helpers in all tests. (LP: #1260860). (LP: #1260860)

[ Nic ]
* Added kill time 30 to unity8 override. Added install path. (LP:
  #1260379)

[ Nick Dedekind ]
* Added parser for strftime in TimeFormatter. Moved TimeFormatter to
  Utils plugin.

[ Mirco Müller ]
* Support fullscreen for special-case extended snap-decision of the
  pin-unlock dialog.

[ Michael Zanetti ]
* Change the default behaviour of the Lockscreen to have a variable
  PIN length, requiring the user to confirm with OK.

[ Daniel d'Andrada ]
* Update CODING with instructions on how to run tests.

[ Dimitri John Ledkov ]
* Fix cross-compilation.

[ Albert Astals ]
* Vertical journal Comes from lp:~aacid/+junk/verticalJournal.
* Add code and tests for incremental inserting/removing from the end.

[ Ubuntu daily release ]
* Automatic snapshot from revision 603

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/indicatorsmodel.cpp
21
21
#include "indicatorsmanager.h"
22
22
#include "indicator.h"
23
23
#include "indicators.h"
24
 
#include "paths.h"
 
24
 
 
25
#include <paths.h>
25
26
 
26
27
#include <QQmlContext>
27
28
#include <QQmlEngine>
248
249
            }
249
250
            break;
250
251
        case IndicatorsModelRole::WidgetSource:
251
 
            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
 
252
            return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
252
253
        case IndicatorsModelRole::PageSource:
253
 
            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
 
254
            return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
254
255
        default:
255
256
            break;
256
257
    }