working loading and saving of files with dialog from rust

This means we are loading and saving files with the rfd crate which
utilizes platform appropriate dialogs for saving and loading files. We
can start to use this in all other file dialog locations to make sure
we are getting the right files.

It uses xdg-desktop-portals on linux so we will always use the
appropriate file dialog for each desktop environment.
This commit is contained in:
Chris Cochrun 2023-09-21 17:37:14 -05:00
parent 08cc744a31
commit cd8801af51
6 changed files with 58 additions and 12 deletions

View file

@ -186,6 +186,10 @@ int main(int argc, char *argv[])
&ServiceItemMod::itemRemoved, &ServiceItemMod::itemRemoved,
slideMod.get(), slideMod.get(),
&SlideyMod::removeItemFromService); &SlideyMod::removeItemFromService);
QObject::connect(serviceItemModel.get(),
&ServiceItemMod::cleared,
slideMod.get(),
&SlideyMod::clear);
// QObject::connect(serviceItemModel.get(), // QObject::connect(serviceItemModel.get(),
// SIGNAL(allRemoved()), // SIGNAL(allRemoved()),
// slideMod.get(), // slideMod.get(),

View file

@ -39,14 +39,17 @@ Kirigami.ApplicationWindow {
Controls.Menu { Controls.Menu {
title: qsTr("File") title: qsTr("File")
Controls.MenuItem { text: qsTr("New...") } Controls.MenuItem { text: qsTr("New...") }
Controls.MenuItem { text: qsTr("Open...") } Controls.MenuItem {
text: qsTr("Open...")
onTriggered: load()
}
Controls.MenuItem { Controls.MenuItem {
text: qsTr("Save") text: qsTr("Save")
onTriggered: saveFileDialog.open() onTriggered: save()
} }
Controls.MenuItem { Controls.MenuItem {
text: qsTr("Save As...") text: qsTr("Save As...")
onTriggered: save() onTriggered: saveAs()
} }
Controls.MenuSeparator { } Controls.MenuSeparator { }
Controls.MenuItem { text: qsTr("Quit") } Controls.MenuItem { text: qsTr("Quit") }
@ -130,7 +133,7 @@ Kirigami.ApplicationWindow {
Loader { Loader {
id: menuLoader id: menuLoader
active: Kirigami.Settings.hasPlatformMenuBar active: true
sourceComponent: globalMenuComponent sourceComponent: globalMenuComponent
onLoaded: console.log("Loaded global menu") onLoaded: console.log("Loaded global menu")
} }
@ -145,17 +148,17 @@ Kirigami.ApplicationWindow {
Labs.MenuItem { Labs.MenuItem {
text: qsTr("Open...") text: qsTr("Open...")
shortcut: "Ctrl+O" shortcut: "Ctrl+O"
onTriggered: loadFileDialog.open() onTriggered: load()
} }
Labs.MenuItem { Labs.MenuItem {
text: qsTr("Save") text: qsTr("Save")
shortcut: "Ctrl+S" shortcut: "Ctrl+S"
onTriggered: fileHelper.saveFile() onTriggered: save()
} }
Labs.MenuItem { Labs.MenuItem {
text: qsTr("Save As...") text: qsTr("Save As...")
shortcut: "Ctrl+Shift+S" shortcut: "Ctrl+Shift+S"
onTriggered: fileHelper.saveFile() onTriggered: saveAs()
} }
Labs.MenuSeparator { } Labs.MenuSeparator { }
Labs.MenuItem { Labs.MenuItem {
@ -254,6 +257,7 @@ Kirigami.ApplicationWindow {
} }
function save() { function save() {
const saveFile = RSettings.lastSaveFile;
const file = fileHelper.saveFile(); const file = fileHelper.saveFile();
const saved = mainPage.serviceItems.save(file); const saved = mainPage.serviceItems.save(file);
saved ? RSettings.setSaveFile(file) saved ? RSettings.setSaveFile(file)
@ -263,15 +267,22 @@ Kirigami.ApplicationWindow {
} }
function saveAs() { function saveAs() {
const file = fileHelper.saveFile();
const saved = mainPage.serviceItems.save(file);
saved ? RSettings.setSaveFile(file)
: console.log("File: " + file + " wasn't saved");
saved ? showPassiveNotification("SAVED! " + file)
: showPassiveNotification("FAILED!");
} }
function load(file) { function load() {
const file = fileHelper.loadFile();
const loaded = mainPage.serviceItems.load(file); const loaded = mainPage.serviceItems.load(file);
loaded ? showPassiveNotification("Loaded: " + file) loaded ? showPassiveNotification("Loaded: " + file)
: showPassiveNotification("FAILED!"); : showPassiveNotification("FAILED!");
/* console.log("Number of items: " + loaded.length); */ loaded ? RSettings.loadFile = file
/* console.log(loaded[0].audio); */ : showPassiveNotification("Didn't set loadfile!");
showPassiveNotification(RSettings.loadFile);
} }
Component.onCompleted: { Component.onCompleted: {

View file

@ -91,5 +91,25 @@ mod file_helper {
QUrl::default() QUrl::default()
} }
} }
#[qinvokable]
pub fn load_file(self: Pin<&mut Self>) -> QUrl {
let file = FileDialog::new()
.set_title("Load Presentation")
.pick_file();
if let Some(file) = file {
println!("loading-file: {:?}", file);
let mut string =
String::from(file.to_str().unwrap_or(""));
if string.is_empty() {
QUrl::default()
} else {
string.insert_str(0, "file://");
QUrl::from(string.as_str())
}
} else {
QUrl::default()
}
}
} }
} }

View file

@ -114,6 +114,7 @@ mod service_item_model {
// index: &'a i32, // index: &'a i32,
item: &'a QMap_QString_QVariant, item: &'a QMap_QString_QVariant,
}, },
Cleared {},
} }
enum Role { enum Role {
@ -147,11 +148,13 @@ mod service_item_model {
impl qobject::ServiceItemMod { impl qobject::ServiceItemMod {
#[qinvokable] #[qinvokable]
pub fn clear(mut self: Pin<&mut Self>) { pub fn clear(mut self: Pin<&mut Self>) {
println!("CLEARING ALL ITEMS");
unsafe { unsafe {
self.as_mut().begin_reset_model(); self.as_mut().begin_reset_model();
self.as_mut().service_items_mut().clear(); self.as_mut().service_items_mut().clear();
self.as_mut().end_reset_model(); self.as_mut().end_reset_model();
} }
self.emit(Signals::Cleared {});
} }
#[qinvokable] #[qinvokable]
@ -734,6 +737,7 @@ mod service_item_model {
#[qinvokable] #[qinvokable]
pub fn load(mut self: Pin<&mut Self>, file: QUrl) -> bool { pub fn load(mut self: Pin<&mut Self>, file: QUrl) -> bool {
self.as_mut().clear();
println!("file is: {file}"); println!("file is: {file}");
let lfr = fs::File::open( let lfr = fs::File::open(
file.to_local_file().unwrap_or_default().to_string(), file.to_local_file().unwrap_or_default().to_string(),

View file

@ -24,6 +24,8 @@ mod settings {
sound_effect: QString, sound_effect: QString,
#[qproperty] #[qproperty]
last_save_file: QUrl, last_save_file: QUrl,
#[qproperty]
loaded_file: QUrl,
} }
impl Default for Settings { impl Default for Settings {
@ -33,6 +35,7 @@ mod settings {
screen: QString::from(""), screen: QString::from(""),
sound_effect: QString::from(""), sound_effect: QString::from(""),
last_save_file: QUrl::from(""), last_save_file: QUrl::from(""),
loaded_file: QUrl::from(""),
} }
} }
} }
@ -62,7 +65,10 @@ mod settings {
.get("General", "lastSaveFile"); .get("General", "lastSaveFile");
println!("{:?}", sf); println!("{:?}", sf);
if let Some(s) = sf { if let Some(s) = sf {
self.set_last_save_file(QUrl::from(&s)); self.as_mut()
.set_last_save_file(QUrl::from(&s));
self.as_mut()
.set_loaded_file(QUrl::from(&s));
println!("{s}"); println!("{s}");
} else { } else {
println!("error loading last save file"); println!("error loading last save file");

View file

@ -146,6 +146,7 @@ mod slide_model {
#[qinvokable] #[qinvokable]
pub fn clear(mut self: Pin<&mut Self>) { pub fn clear(mut self: Pin<&mut Self>) {
println!("CLEARING ALL SLIDES");
unsafe { unsafe {
self.as_mut().begin_reset_model(); self.as_mut().begin_reset_model();
self.as_mut().slides_mut().clear(); self.as_mut().slides_mut().clear();