Commit 0728a7ea authored by Matthieu Gallien's avatar Matthieu Gallien 🎵
Browse files

fixes after removal of context variables and update qml plugin types

parent c30efb0a
......@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
// 'qmlplugindump -nonrelocatable org.kde.elisa 1.0 .'
// 'qmlplugindump -nonrelocatable org.kde.elisa 1.0'
Module {
dependencies: ["QtQuick 2.0"]
......@@ -369,6 +369,7 @@ Module {
isSingleton: true
exportMetaObjectRevisions: [0]
Property { name: "arguments"; type: "DataTypes::EntryDataList" }
Property { name: "embeddedView"; type: "ElisaUtils::PlayListEntryType"; isReadonly: true }
Property {
name: "musicManager"
type: "MusicListenersManager"
......@@ -454,6 +455,7 @@ Module {
Property { name: "forceUsageOfFastFileSearch"; type: "bool" }
Property { name: "showProgressInTaskBar"; type: "bool" }
Property { name: "showSystemTrayIcon"; type: "bool" }
Property { name: "embeddedView"; type: "ElisaUtils::PlayListEntryType" }
Property { name: "isDirty"; type: "bool"; isReadonly: true }
Signal {
name: "rootPathChanged"
......@@ -476,6 +478,10 @@ Module {
name: "setForceUsageOfFastFileSearch"
Parameter { name: "forceUsageOfFastFileSearch"; type: "bool" }
}
Method {
name: "setEmbeddedView"
Parameter { name: "embeddedView"; type: "ElisaUtils::PlayListEntryType" }
}
}
Component {
name: "ElisaUtils"
......@@ -525,6 +531,13 @@ Module {
"FilterByPath": 8
}
}
Enum {
name: "IconUseColorOverlay"
values: {
"UseColorOverlay": 1,
"DoNotUseColorOverlay": 0
}
}
}
Component {
name: "FileBrowserModel"
......@@ -1796,6 +1809,68 @@ Module {
prototype: "QObject"
exports: ["org.kde.elisa/ViewsListData 1.0"]
exportMetaObjectRevisions: [0]
Property { name: "embeddedCategory"; type: "ElisaUtils::PlayListEntryType" }
Property { name: "manager"; type: "MusicListenersManager"; isPointer: true }
Property { name: "database"; type: "DatabaseInterface"; isPointer: true }
Signal {
name: "needData"
Parameter { name: "dataType"; type: "ElisaUtils::PlayListEntryType" }
}
Signal {
name: "dataAboutToBeAdded"
Parameter { name: "startIndex"; type: "int" }
Parameter { name: "endIndex"; type: "int" }
}
Signal { name: "dataAdded" }
Signal {
name: "dataAboutToBeRemoved"
Parameter { name: "startIndex"; type: "int" }
Parameter { name: "endIndex"; type: "int" }
}
Signal { name: "dataRemoved" }
Signal {
name: "dataModified"
Parameter { name: "index"; type: "int" }
}
Signal { name: "dataAboutToBeReset" }
Signal { name: "dataReset" }
Method {
name: "setEmbeddedCategory"
Parameter { name: "aEmbeddedView"; type: "ElisaUtils::PlayListEntryType" }
}
Method {
name: "setManager"
Parameter { name: "aManager"; type: "MusicListenersManager"; isPointer: true }
}
Method {
name: "setDatabase"
Parameter { name: "aDatabase"; type: "DatabaseInterface"; isPointer: true }
}
Method {
name: "genresAdded"
Parameter { name: "newData"; type: "DataTypes::ListGenreDataType" }
}
Method {
name: "artistsAdded"
Parameter { name: "newData"; type: "DataTypes::ListArtistDataType" }
}
Method {
name: "artistRemoved"
Parameter { name: "removedDatabaseId"; type: "qulonglong" }
}
Method {
name: "albumsAdded"
Parameter { name: "newData"; type: "DataTypes::ListAlbumDataType" }
}
Method {
name: "albumRemoved"
Parameter { name: "removedDatabaseId"; type: "qulonglong" }
}
Method {
name: "albumModified"
Parameter { name: "modifiedAlbum"; type: "DataTypes::AlbumDataType" }
}
Method { name: "cleanedDatabase" }
}
Component {
name: "ViewsModel"
......
......@@ -147,9 +147,9 @@ RowLayout {
ViewsListData {
id: viewsData
manager: elisa.musicManager
database: elisa.musicManager.viewDatabase
embeddedCategory: elisa.embeddedView
manager: ElisaApplication.musicManager
database: ElisaApplication.musicManager.viewDatabase
embeddedCategory: ElisaApplication.embeddedView
}
ViewSelector {
......
......@@ -11,8 +11,6 @@ import org.kde.kirigami 2.8 as Kirigami
import org.kde.elisa 1.0
import org.kde.elisa 1.0
ColumnLayout {
spacing: Kirigami.Units.smallSpacing
......@@ -55,42 +53,42 @@ ColumnLayout {
i18nc("Configure dialog, embed all genres in views navigation list", "Embed Genres")]
editable: false
currentIndex: (config.embeddedView === ElisaUtils.Genre ? 3 : (config.embeddedView === ElisaUtils.Album ? 1 : (config.embeddedView === ElisaUtils.Artist ? 2 : 0)))
currentIndex: (ElisaConfigurationDialog.embeddedView === ElisaUtils.Genre ? 3 : (ElisaConfigurationDialog.embeddedView === ElisaUtils.Album ? 1 : (ElisaConfigurationDialog.embeddedView === ElisaUtils.Artist ? 2 : 0)))
onCurrentIndexChanged: {
if (!isFinished) {
return
}
config.embeddedView = (currentIndex === 0 ? ElisaUtils.Unknown : (currentIndex === 1 ? ElisaUtils.Album : (currentIndex === 2 ? ElisaUtils.Artist : ElisaUtils.Genre)))
ElisaConfigurationDialog.embeddedView = (currentIndex === 0 ? ElisaUtils.Unknown : (currentIndex === 1 ? ElisaUtils.Album : (currentIndex === 2 ? ElisaUtils.Artist : ElisaUtils.Genre)))
}
}
Connections {
target: config
target: ElisaConfigurationDialog
onEmbeddedViewChanged:
{
if (config.embeddedView == ElisaUtils.Unknown) {
if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Unknown) {
embeddedCategoryCombo.currentIndex = 0
} else if (config.embeddedView == ElisaUtils.Album) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Album) {
embeddedCategoryCombo.currentIndex = 1
} else if (config.embeddedView == ElisaUtils.Artist) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Artist) {
embeddedCategoryCombo.currentIndex = 2
} else if (config.embeddedView == ElisaUtils.Genre) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Genre) {
embeddedCategoryCombo.currentIndex = 3
}
}
}
Component.onCompleted: {
if (config.embeddedView == ElisaUtils.Unknown) {
if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Unknown) {
embeddedCategoryCombo.currentIndex = 0
} else if (config.embeddedView == ElisaUtils.Album) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Album) {
embeddedCategoryCombo.currentIndex = 1
} else if (config.embeddedView == ElisaUtils.Artist) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Artist) {
embeddedCategoryCombo.currentIndex = 2
} else if (config.embeddedView == ElisaUtils.Genre) {
} else if (ElisaConfigurationDialog.embeddedView == ElisaUtils.Genre) {
embeddedCategoryCombo.currentIndex = 3
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment