Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-15 02:02:08 -04:00
Code Packages Releases Activity

notepad: Fix open/save modals

Browse Source
This commit is contained in:
purian23
2026-01-17 15:23:57 -05:00
parent 27f0df07af
commit 53f5240d41
1 changed files with 240 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
quickshell/Modules/Notepad/Notepad.qml
View File

@@ -1,5 +1,6 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell
import Quickshell.Io import Quickshell.Io
import qs.Common import qs.Common
import qs.Modals.Common import qs.Modals.Common
@@ -51,7 +52,9 @@ Item {
if (tabIndex === NotepadStorageService.currentTabIndex && hasUnsavedChanges()) { if (tabIndex === NotepadStorageService.currentTabIndex && hasUnsavedChanges()) {
root.pendingAction = "close_tab_" + tabIndex; root.pendingAction = "close_tab_" + tabIndex;
root.confirmationDialogOpen = true; root.confirmationDialogOpen = true;
confirmationDialog.open(); confirmationDialogLoader.active = true;
if (confirmationDialogLoader.item)
confirmationDialogLoader.item.open();
} else { } else {
performCloseTab(tabIndex); performCloseTab(tabIndex);
} }
@@ -101,7 +104,9 @@ Item {
root.pendingFileUrl = fileUrl; root.pendingFileUrl = fileUrl;
root.pendingAction = "load_file"; root.pendingAction = "load_file";
root.confirmationDialogOpen = true; root.confirmationDialogOpen = true;
confirmationDialog.open(); confirmationDialogLoader.active = true;
if (confirmationDialogLoader.item)
confirmationDialogLoader.item.open();
} else { } else {
performLoadFromFile(fileUrl); performLoadFromFile(fileUrl);
} }
@@ -170,7 +175,9 @@ Item {
saveToFile(fileUrl); saveToFile(fileUrl);
} else { } else {
root.fileDialogOpen = true; root.fileDialogOpen = true;
saveBrowser.open(); saveBrowserLoader.active = true;
if (saveBrowserLoader.item)
saveBrowserLoader.item.open();
} }
} }
@@ -178,10 +185,14 @@ Item {
if (hasUnsavedChanges()) { if (hasUnsavedChanges()) {
root.pendingAction = "open"; root.pendingAction = "open";
root.confirmationDialogOpen = true; root.confirmationDialogOpen = true;
confirmationDialog.open(); confirmationDialogLoader.active = true;
if (confirmationDialogLoader.item)
confirmationDialogLoader.item.open();
} else { } else {
root.fileDialogOpen = true; root.fileDialogOpen = true;
loadBrowser.open(); loadBrowserLoader.active = true;
if (loadBrowserLoader.item)
loadBrowserLoader.item.open();
} }
} }
@@ -189,7 +200,9 @@ Item {
if (hasUnsavedChanges()) { if (hasUnsavedChanges()) {
root.pendingAction = "new"; root.pendingAction = "new";
root.confirmationDialogOpen = true; root.confirmationDialogOpen = true;
confirmationDialog.open(); confirmationDialogLoader.active = true;
if (confirmationDialogLoader.item)
confirmationDialogLoader.item.open();
} else { } else {
createNewTab(); createNewTab();
} }
@@ -249,6 +262,10 @@ Item {
onLoadFailed: error => {} onLoadFailed: error => {}
} }
LazyLoader {
id: saveBrowserLoader
active: false
FileBrowserModal { FileBrowserModal {
id: saveBrowser id: saveBrowser
@@ -290,7 +307,9 @@ Item {
} else if (root.pendingAction === "open") { } else if (root.pendingAction === "open") {
Qt.callLater(() => { Qt.callLater(() => {
root.fileDialogOpen = true; root.fileDialogOpen = true;
loadBrowser.open(); loadBrowserLoader.active = true;
if (loadBrowserLoader.item)
loadBrowserLoader.item.open();
}); });
} else if (root.pendingAction.startsWith("close_tab_")) { } else if (root.pendingAction.startsWith("close_tab_")) {
Qt.callLater(() => { Qt.callLater(() => {
@@ -307,6 +326,11 @@ Item {
root.fileDialogOpen = false; root.fileDialogOpen = false;
} }
} }
}
LazyLoader {
id: loadBrowserLoader
active: false
FileBrowserModal { FileBrowserModal {
id: loadBrowser id: loadBrowser
@@ -334,6 +358,11 @@ Item {
root.fileDialogOpen = false; root.fileDialogOpen = false;
} }
} }
}
LazyLoader {
id: confirmationDialogLoader
active: false
DankModal { DankModal {
id: confirmationDialog id: confirmationDialog
@@ -436,7 +465,9 @@ Item {
createNewTab(); createNewTab();
} else if (root.pendingAction === "open") { } else if (root.pendingAction === "open") {
root.fileDialogOpen = true; root.fileDialogOpen = true;
loadBrowser.open(); loadBrowserLoader.active = true;
if (loadBrowserLoader.item)
loadBrowserLoader.item.open();
} else if (root.pendingAction === "load_file") { } else if (root.pendingAction === "load_file") {
performLoadFromFile(root.pendingFileUrl); performLoadFromFile(root.pendingFileUrl);
} else if (root.pendingAction.startsWith("close_tab_")) { } else if (root.pendingAction.startsWith("close_tab_")) {
@@ -473,7 +504,9 @@ Item {
confirmationDialog.close(); confirmationDialog.close();
root.confirmationDialogOpen = false; root.confirmationDialogOpen = false;
root.fileDialogOpen = true; root.fileDialogOpen = true;
saveBrowser.open(); saveBrowserLoader.active = true;
if (saveBrowserLoader.item)
saveBrowserLoader.item.open();
} }
} }
@@ -490,4 +523,5 @@ Item {
} }
} }
} }
}
} }