chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better ui for the obs list

Browse source
This commit is contained in:
Chris Cochrun 2023-11-18 06:44:03 -06:00
parent 259e7201d7
commit 9bcddfe69d
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/qml/presenter/ServiceList.qml
View file

@ -4,6 +4,7 @@ import QtQuick.Controls 2.12 as Controls
/* import QtQuick.Window 2.15 */ /* import QtQuick.Window 2.15 */
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Shapes 1.15 import QtQuick.Shapes 1.15
import QtQml.Models 2.15
/* import QtQml.Models 2.12 */ /* import QtQml.Models 2.12 */
/* import QtMultimedia 5.15 */ /* import QtMultimedia 5.15 */
/* import QtAudioEngine 1.15 */ /* import QtAudioEngine 1.15 */
@ -292,20 +293,21 @@ Item {
Controls.MenuSeparator {} Controls.MenuSeparator {}
Controls.Menu { Controls.Menu {
id: obsMenu id: obsMenu
title: "Obs Scenes" title: "Obs Scenes"
Instantiator {
ListView {
width: parent.width
height: 200
model: ObsModel.scenes model: ObsModel.scenes
delegate: Controls.ToolButton { Kirigami.Action {
width: parent.width
text: modelData text: modelData
onClicked: ObsModel.setScene(modelData) onTriggered: {
showPassiveNotification("setting: " + modelData)
} }
} }
onObjectAdded: obsMenu.insertAction(index, object)
onObjectRemoved: obsMenu.removeAction(object)
}
} }
} }
} }
@ -675,4 +677,5 @@ Item {
} }
serviceItemList.forceLayout() serviceItemList.forceLayout()
} }
} }

11
src/rust/obs.rs
View file

@ -72,13 +72,13 @@ impl Obs {
if self.client.is_some() { if self.client.is_some() {
debug!("Starting to set"); debug!("Starting to set");
let runtime = tokio::runtime::Runtime::new().unwrap(); let runtime = tokio::runtime::Runtime::new().unwrap();
tokio::spawn(async move { runtime.block_on(async move {
debug!(scene, "working in thread"); debug!(scene, "working in thread");
self.client self.client
.unwrap() .unwrap()
.scenes() .scenes()
.set_current_program_scene(scene.as_str()).await .set_current_program_scene(scene.as_str()).await
}); })?;
Ok(()) Ok(())
} else { } else {
Err("There is no client".to_owned())? Err("There is no client".to_owned())?
@ -126,7 +126,7 @@ mod obs_model {
let mut scenes_list = QList_QString::default(); let mut scenes_list = QList_QString::default();
if let Some(obs) = self.obs() { if let Some(obs) = self.obs() {
debug!("found obs"); debug!("found obs");
for scene in obs.scenes.scenes.iter() { for scene in obs.scenes.scenes.iter().rev() {
debug!(?scene); debug!(?scene);
scenes_list.append(QString::from(&scene.name)); scenes_list.append(QString::from(&scene.name));
} }
@ -151,7 +151,10 @@ mod obs_model {
self.as_mut().set_obs(Some(o)); self.as_mut().set_obs(Some(o));
self.as_mut().update_scenes(); self.as_mut().update_scenes();
}, },
Err(e) => error!(e) Err(e) => {
error!(e);
self.as_mut().set_connected(false);
},
} }
}); });