moved qml to root plugin dir. moved IndicatoBase to Panel/Indicators
commit2d4caa603bf35b2cdd43c3f65940c01ea6a57a4d
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateThu 26 Jun 2014, 11:00 (12 years ago)
parent6776991
plugins/Unity/Indicators/CMakeLists.txt+1−4
@@ -51,7 +51,4 @@ target_link_libraries(IndicatorsQml
5151
5252qt5_use_modules(IndicatorsQml Core Qml Quick)
5353
54−add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators
55− SEARCH_PATH qml
56− TARGETS IndicatorsQml
57−)
54+add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
plugins/Unity/Indicators/qml/CachedUnityMenuModel.qml → plugins/Unity/Indicators/CachedUnityMenuModel.qmlrenamed
The content is the same.
plugins/Unity/Indicators/qml/qmldir → plugins/Unity/Indicators/qmldirrenamed
The content is the same.
qml/Panel/Indicators/DefaultIndicatorPage.qml+1−1
@@ -22,7 +22,7 @@ import QtQuick 2.0
2222import Ubuntu.Components 0.1 as Components
2323import Unity.Indicators 0.1 as Indicators
2424
25−Indicators.IndicatorBase {
25+IndicatorBase {
2626 id: main
2727
2828 //const
qml/Panel/Indicators/DefaultIndicatorWidget.qml+1−2
@@ -19,9 +19,8 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import Unity.Indicators 0.1 as Indicators
2322
24−Indicators.IndicatorBase {
23+IndicatorBase {
2524 id: indicatorWidget
2625
2726 property int iconSize: height
plugins/Unity/Indicators/qml/IndicatorBase.qml → qml/Panel/Indicators/IndicatorBase.qmlrenamed+1−1
@@ -36,7 +36,7 @@ Item {
3636
3737 property alias menuModel: cachedModel.model
3838
39− CachedUnityMenuModel {
39+ Indicators.CachedUnityMenuModel {
4040 id: cachedModel
4141 busName: indicatorItem.busName
4242 actionsObjectPath: indicatorItem.actionsObjectPath
qml/Panel/Indicators/IndicatorDelegate.qml+1−2
@@ -18,9 +18,8 @@
1818 */
1919
2020import QtQuick 2.0
21−import Unity.Indicators 0.1 as Indicators
2221
23−Indicators.IndicatorBase {
22+IndicatorBase {
2423 enabled: false
2524
2625 onRootActionStateChanged: {