Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement support for XDG Desktop Portal #4406

Merged
merged 20 commits into from
Dec 22, 2023
Merged

Implement support for XDG Desktop Portal #4406

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eba8c46
Initial support for notifications through xdg-desktop-portal
Jacalz Nov 18, 2023
1bd9c07
Update OpenURL to use portal if possible
Jacalz Nov 18, 2023
fb32438
Don't use deprecated .Read call
Jacalz Nov 19, 2023
349c6cb
Simplify code by using rymdport/portal package
Jacalz Nov 19, 2023
03bc57b
Update portal to get parentWindow inputs
Jacalz Nov 19, 2023
475db66
Wire up initial support for file and folder dialogs
Jacalz Nov 19, 2023
54e960b
Use the correct name for the folder portal
Jacalz Nov 19, 2023
b59b458
Handle cancelled dialogs
Jacalz Nov 19, 2023
6531028
Pull new portal with license
Jacalz Nov 19, 2023
4dd8904
Implement more file/folder dialog options
Jacalz Nov 19, 2023
828eb30
Set up starting location for dialog
Jacalz Nov 19, 2023
53a7273
Make the code compile again
Jacalz Nov 19, 2023
626ab0a
Attach the file chooser dialogs to the current window
Jacalz Nov 19, 2023
31b1f20
Only use the new portal implementation with -tags flatpak
Jacalz Nov 21, 2023
b385ca2
Make sure that we can compile outside of X11
Jacalz Nov 21, 2023
b8aebdd
Remove leftover file
Jacalz Nov 21, 2023
d8433d6
Fix an incorrect comment
Jacalz Nov 21, 2023
73b5953
Try to get the buildtags working
Jacalz Nov 21, 2023
a34f95b
Try to fix weird web compile error
Jacalz Nov 21, 2023
212042d
Minor improvements to portal code
Jacalz Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Minor improvements to portal code
  • Loading branch information
@Jacalz
Jacalz committed Nov 27, 2023
commit 212042dfdfce3d7d930f1da7a54babe65984c3c3
1 change: 0 additions & 1 deletion dialog/file_xdg_flatpak.go
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@ func fileOpenOSOverride(d *FileDialog) bool {
}

parentWindowHandle := d.parent.(interface{ GetWindowHandle() string }).GetWindowHandle()
fmt.Println(parentWindowHandle)

if folder {
uris, err := filechooser.OpenFile(parentWindowHandle, "Open Folder", options)
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ require (
github.com/lucor/goinfo v0.9.0
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/rymdport/portal v0.0.0-20231119195719-fb11153c815d
github.com/rymdport/portal v0.0.0-20231123202536-da45518a87bb
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef
github.com/stretchr/testify v1.8.4
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -266,10 +266,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/rymdport/portal v0.0.0-20231119194321-d452ead565fd h1:nHVuLKAtBcunYBBiuclbtYllz+gW9TB3uHR8e1uMoM0=
github.com/rymdport/portal v0.0.0-20231119194321-d452ead565fd/go.mod h1:RYYAnv4sssTQ7ceErKl7UD8auER/0yFV7CgmfS/uAD8=
github.com/rymdport/portal v0.0.0-20231119195719-fb11153c815d h1:q+VIAL+ZpA2fP/9k6dn+720s4YJGVATDTj35L2CWsIA=
github.com/rymdport/portal v0.0.0-20231119195719-fb11153c815d/go.mod h1:RYYAnv4sssTQ7ceErKl7UD8auER/0yFV7CgmfS/uAD8=
github.com/rymdport/portal v0.0.0-20231123202536-da45518a87bb h1:ejEomhJX7G4p8dFImv2zcQd2Oa0IpWIeB/FUZRnpQKg=
github.com/rymdport/portal v0.0.0-20231123202536-da45518a87bb/go.mod h1:RYYAnv4sssTQ7ceErKl7UD8auER/0yFV7CgmfS/uAD8=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=