adding in a video model and editor
This commit is contained in:
parent
fab9f86b41
commit
c35c0f6550
22 changed files with 972 additions and 160 deletions
|
@ -20,6 +20,8 @@ Controls.Page {
|
|||
property string songVorder: ""
|
||||
property int blurRadius: 0
|
||||
|
||||
/* property var video */
|
||||
|
||||
property string dragSongTitle: ""
|
||||
|
||||
property bool editing: true
|
||||
|
@ -78,6 +80,20 @@ Controls.Page {
|
|||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: videoEditorComp
|
||||
Presenter.VideoEditor {
|
||||
id: videoEditor
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: imageEditorComp
|
||||
Presenter.ImageEditor {
|
||||
id: imageEditor
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
id: presentLoader
|
||||
active: presenting
|
||||
|
@ -152,6 +168,19 @@ Controls.Page {
|
|||
id: songsqlmodel
|
||||
}
|
||||
|
||||
VideoSqlModel {
|
||||
id: videosqlmodel
|
||||
}
|
||||
|
||||
function changeSlideType(type) {
|
||||
/* showPassiveNotification("used to be: " + presentation.text); */
|
||||
presentation.itemType = type;
|
||||
/* showPassiveNotification("next"); */
|
||||
if (slideItem)
|
||||
slideItem.itemType = type;
|
||||
/* showPassiveNotification("last"); */
|
||||
}
|
||||
|
||||
function changeSlideText(text) {
|
||||
/* showPassiveNotification("used to be: " + presentation.text); */
|
||||
presentation.text = text;
|
||||
|
@ -193,11 +222,24 @@ Controls.Page {
|
|||
showPassiveNotification("previous slide please")
|
||||
}
|
||||
|
||||
function editSwitch(edit) {
|
||||
if (edit)
|
||||
mainPageArea.push(songEditorComp, Controls.StackView.Immediate)
|
||||
else
|
||||
mainPageArea.pop(Controls.StackView.Immediate)
|
||||
function editSwitch(editType, item) {
|
||||
if (editMode) {
|
||||
switch (editType) {
|
||||
case "song" :
|
||||
mainPageArea.push(songEditorComp, Controls.StackView.Immediate);
|
||||
break;
|
||||
case "video" :
|
||||
mainPageArea.push(videoEditorComp, {"video": item}, Controls.StackView.Immediate);
|
||||
break;
|
||||
case "image" :
|
||||
mainPageArea.push(imageEditorComp, Controls.StackView.Immediate);
|
||||
break;
|
||||
default:
|
||||
mainPageArea.pop(Controls.StackView.Immediate);
|
||||
editMode = false;
|
||||
}
|
||||
} else
|
||||
mainPageArea.pop(Controls.StackView.Immediate);
|
||||
}
|
||||
|
||||
function present(present) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue