← Back to branch summary

~mterry/+junk/u8.2

« back to all changes in this revision

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

  • Committer: Michael Terry
  • Date: 2014-11-17 14:56:04 UTC
  • mfrom: (1317.1.118 unity8)
  • Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/indicatorsmodel.cpp
225
225
    {
226
226
        roles[IndicatorsModelRole::Identifier] = "identifier";
227
227
        roles[IndicatorsModelRole::Position] = "position";
228
 
        roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
229
 
        roles[IndicatorsModelRole::PageSource] = "pageSource";
230
228
        roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
231
229
    }
232
230
    return roles;
271
269
                return QVariant(indicator->indicatorProperties());
272
270
            }
273
271
            break;
274
 
        case IndicatorsModelRole::WidgetSource:
275
 
            return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
276
 
        case IndicatorsModelRole::PageSource:
277
 
            return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
278
272
        default:
279
273
            break;
280
274
    }