Skip to content

Commit 533d1a7

Browse files
committed
Fix windows toasts, add windows CI, improve file picker
1 parent fae8dc1 commit 533d1a7

31 files changed

Lines changed: 548 additions & 605 deletions
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
on:
22
push:
3-
branches: [main]
3+
branches:
4+
- main
5+
paths:
6+
- 'src/**'
7+
- 'data/**'
8+
- 'flatpak/**'
9+
- 'meson.build'
410
pull_request:
5-
name: CI
11+
12+
name: Flatpak
613
jobs:
714
flatpak:
8-
name: "Flatpak"
915
runs-on: ubuntu-latest
1016
container:
1117
image: bilelmoussaoui/flatpak-github-actions:gnome-44
@@ -15,5 +21,5 @@ jobs:
1521
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.1
1622
with:
1723
bundle: Reminders.flatpak
18-
manifest-path: flatpak/io.github.remindersdevs.Reminders.yml
24+
manifest-path: flatpak/io.github.remindersdevs.Reminders.Devel.yml
1925
cache-key: flatpak-builder-${{ github.sha }}

.github/workflows/release.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on:
2+
push:
3+
tags:
4+
- '*'
5+
6+
name: Release
7+
jobs:
8+
windows:
9+
name: Windows
10+
runs-on: windows-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: msys2/setup-msys2@v2
14+
with:
15+
update: true
16+
- uses: actions/setup-dotnet@v3
17+
with:
18+
dotnet-version:
19+
7.x
20+
- name: Build
21+
run: |
22+
dotnet tool install --global wix --version 4.0.0
23+
windows/build_windows.ps1 -arches x86, x64 -msi -release
24+
- uses: actions/upload-artifact@v3
25+
with:
26+
name: Reminders Installer
27+
path: |
28+
out/x64/Release/en-us/Reminders Installer x64.msi
29+
out/x86/Release/en-us/Reminders Installer x86.msi

.github/workflows/windows.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
on:
2+
push:
3+
branches:
4+
- main
5+
paths:
6+
- 'src/**'
7+
- 'data/**'
8+
- 'windows/**'
9+
- 'meson.build'
10+
pull_request:
11+
12+
name: Windows
13+
jobs:
14+
windows:
15+
runs-on: windows-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
- uses: msys2/setup-msys2@v2
19+
with:
20+
update: true
21+
- uses: actions/setup-dotnet@v3
22+
with:
23+
dotnet-version:
24+
7.x
25+
- name: Build
26+
run: |
27+
dotnet tool install --global wix --version 4.0.0
28+
windows/build_windows.ps1 -msi

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
build
22
build-dir
33
.flatpak-builder
4+
bin
45
out
56
obj
7+
.vs

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You will also need `flatpak-builder`
4040

4141
### Building (Flatpak):
4242
```
43-
flatpak-builder --user --install --force-clean build-dir flatpak/io.github.remindersdevs.Reminders.yml
43+
flatpak-builder --user --install --force-clean build-dir flatpak/io.github.remindersdevs.Reminders.Devel.yml
4444
```
4545
```
4646
flatpak run io.github.remindersdevs.Reminders.Devel --restart-service
@@ -66,7 +66,7 @@ MSYS2 will be used to build the app in a unix environment (Arch based), and all
6666
```
6767
Usage: build_windows.ps1 [options...]
6868
Options:
69-
-arches <arcn...> Can be x86, x64, or arm64. Comma separated list, default is amd64.
69+
-arches <arcn...> Can be x86, x64, or arm64. Comma separated list, default is x64.
7070
-root <path> MSYS2 root path, default is 'C:\msys64'.
7171
-msi Build an msi installer
7272
-help Display this message.

REMINDERS_SERVICE.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,22 +330,21 @@ Log out of a remote account, once logged out the reminders will be refreshed
330330
- Type: s
331331

332332
### ExportLists
333-
Export lists to ical/ics file
333+
Export lists to ical/ics file, you shouldn't use this because of flatpak sandboxing limitations
334334
- Parameters (as)
335+
- folder
336+
- Type: s
337+
- The folder you want to export to
335338
- list-ids
336339
- Type: as
337340
- An array of list ids that represent the lists to export
338341

339-
- Returns (s)
340-
- folder
341-
- Type: s
342-
343342
### ImportLists
344-
Import lists from an ical/ics file
343+
Import lists from an ical/ics file, you shouldn't use this because of flatpak sandboxing limitations
345344
- Parameters (ass)
346345
- ical-files
347346
- Type: as
348-
- An array of files ids to import
347+
- An array of files to import
349348
- list-id
350349
- Type: s
351350
- The list to import the files to, or 'auto' if you want to create new lists

data/io.github.remindersdevs.Reminders.metainfo.xml.in.in

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<developer_name translatable="yes">Reminders Developers</developer_name>
77
<update_contact>dgsasha04_at_gmail.com</update_contact>
88

9-
<name>Reminders</name>
10-
<summary>Set reminders and manage tasks</summary>
9+
<name translatable="yes">Reminders</name>
10+
<summary translatable="yes">Set reminders and manage tasks</summary>
1111

12-
<description>
12+
<description translatable="yes">
1313
<p>What you can do with Reminders:</p>
1414
<ul>
1515
<li>Set recurring reminders</li>
@@ -80,10 +80,11 @@
8080
<url type="translate">https://hosted.weblate.org/engage/reminders</url>
8181
<url type="homepage">https://github.com/dgsasha/remembrance</url>
8282
<url type="bugtracker">https://github.com/dgsasha/remembrance/issues</url>
83-
<releases>
83+
<releases translatable="no">
8484
<release version="5.0" date="2023-05-03">
8585
<description>
8686
<ul>
87+
<li>Windows port</li>
8788
<li>UI improvements</li>
8889
<li>Added support for making the week start on sunday</li>
8990
<li>Added indicators that show how many incomplete reminders are in each list/group</li>

data/service/io.github.remindersdevs.Reminders.Service.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
<arg name="user-id" type="s"/>
119119
</method>
120120
<method name="ExportLists">
121+
<arg name="folder" type="s"/>
121122
<arg name="list-ids" type="as"/>
122-
<arg name="folder" direction="out" type="s"/>
123123
</method>
124124
<method name="ImportLists">
125125
<arg name="ical-files" type="as"/>
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
app-id: io.github.remindersdevs.Reminders.Devel
2+
runtime: org.gnome.Platform
3+
runtime-version: '44'
4+
sdk: org.gnome.Sdk
5+
command: reminders
6+
7+
finish-args:
8+
- --share=network
9+
- --share=ipc
10+
- --device=dri
11+
- --socket=wayland
12+
- --socket=fallback-x11
13+
- --system-talk-name=org.freedesktop.login1
14+
- --talk-name=org.freedesktop.secrets
15+
- --socket=pulseaudio
16+
- --filesystem=xdg-download
17+
18+
modules:
19+
- shared-modules/intltool/intltool-0.51.json
20+
- shared-modules/libcanberra/libcanberra.json
21+
- python3-modules.json
22+
23+
- name: libportal
24+
buildsystem: meson
25+
config-opts:
26+
- -Ddocs=false
27+
- -Dbackends=gtk4
28+
sources:
29+
- type: archive
30+
url: https://github.com/flatpak/libportal/archive/refs/tags/0.6.tar.gz
31+
sha256: 8ad326c4f53b7433645dc86d994fef0292bee8adda0fe67db9288ace19250a9c
32+
33+
- name: gsound
34+
buildsystem: meson
35+
config-opts:
36+
- -Denable_vala=false
37+
sources:
38+
- type: archive
39+
url: https://gitlab.gnome.org/GNOME/gsound/-/archive/1.0.3/gsound-1.0.3.tar.gz
40+
sha256: ebee33c77f43bcae87406c20e051acaff08e86f8960c35b92911e243fddc7a0b
41+
42+
- name: sound-theme-freedesktop
43+
sources:
44+
- type: archive
45+
url: http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2
46+
sha256: cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14
47+
48+
- name: reminders
49+
builddir: true
50+
buildsystem: meson
51+
config-opts:
52+
- -Denable-portals=true
53+
- -Drelease-type=devel
54+
sources:
55+
- type: dir
56+
path: '../'
57+

flatpak/io.github.remindersdevs.Reminders.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
app-id: io.github.remindersdevs.Reminders.Devel
1+
app-id: io.github.remindersdevs.Reminders
22
runtime: org.gnome.Platform
33
runtime-version: '44'
44
sdk: org.gnome.Sdk
@@ -13,7 +13,6 @@ finish-args:
1313
- --system-talk-name=org.freedesktop.login1
1414
- --talk-name=org.freedesktop.secrets
1515
- --socket=pulseaudio
16-
- --filesystem=xdg-download
1716

1817
modules:
1918
- shared-modules/intltool/intltool-0.51.json
@@ -50,7 +49,7 @@ modules:
5049
buildsystem: meson
5150
config-opts:
5251
- -Denable-portals=true
53-
- -Drelease-type=devel
52+
- -Drelease-type=stable
5453
sources:
5554
- type: dir
5655
path: '../'

0 commit comments

Comments
 (0)