Skip to content

Commit 6e3f205

Browse files
committed
Final changes before release v3.8
1 parent eeae617 commit 6e3f205

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

data/io.github.vikdevelop.SaveDesktop.metainfo.xml.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
<li>Fixed detection of newer versions of Budgie (#462)</li>
6767
<li>Fixed saving configuration without creating an archive in CLI (#463)</li>
6868
<li>Added support for system installations of Flatpak apps (#459)</li>
69-
<li>Translation updates</li>
69+
<li>Added notification at the start and the end of periodic saving</li>
70+
<li>Updated translations</li>
7071
</ul>
7172
</description>
7273
</release>

src/core/flatpaks_installer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@
3232
# If the Bash scripts for installing Flatpak apps to the system exist, install them
3333
if os.path.exists(f"{dest_dir}/installed_flatpaks.sh") or os.path.exists(f"{dest_dir}/installed_user_flatpaks.sh"):
3434
print("installing the Flatpak apps on the system")
35+
3536
# If the Flathub repository in user installation doesn't exist, add it
36-
os.system("flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo")
37+
if os.path.getsize(f"{dest_dir}/installed_user_flatpaks.sh") < 5:
38+
os.system("flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo")
3739
# Install Flatpak apps from list
3840
installed_flatpaks_files = [f'{dest_dir}/installed_flatpaks.sh', f'{dest_dir}/installed_user_flatpaks.sh']
3941
system_flatpak_dir = '/var/lib/flatpak/app'

src/core/synchronization_setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# Check if the cloud drive folder uses GVFS or Rclone FS or if it is a Syncthing folder
55
def check_fs(folder):
66
check_filesystem = subprocess.getoutput('df -T "%s" | awk \'NR==2 {print $2}\'' % folder)
7-
if not "gvfsd" in check_filesystem:
8-
if not "rclone" in check_filesystem:
7+
if "gvfsd" not in check_filesystem:
8+
if "rclone" not in check_filesystem:
99
if not os.path.exists(f"{folder}/.stfolder"):
1010
return "You didn't select the cloud drive folder!"
1111

@@ -22,9 +22,9 @@ def set_up_auto_mount(mount_type):
2222
elif mount_type == "cloud-receiver":
2323
cfile_subtitle = settings["file-for-syncing"]
2424
else:
25-
cfile_subtitle = "none"
25+
cfile_subtitle = None
2626

27-
if not cfile_subtitle == "none":
27+
if cfile_subtitle:
2828
if "gvfs" in cfile_subtitle:
2929
if "google-drive" in cfile_subtitle:
3030
pattern = r'.*/gvfs/([^:]*):host=([^,]*),user=([^/]*).*'

src/gui/window.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,10 +714,10 @@ def _errDialog_closed(self, w, response):
714714

715715
# a warning indicating that the user must log out
716716
def show_warn_toast(self):
717-
self.warn_toast = Adw.Toast.new(title=_("Changes will only take effect after the next login"))
718-
self.warn_toast.set_button_label(_("Log Out"))
719-
self.warn_toast.set_action_name("app.logout")
720-
self.toast_overlay.add_toast(self.warn_toast)
717+
self.toast.set_title(title=_("Changes will only take effect after the next login"))
718+
self.toast.set_button_label(_("Log Out"))
719+
self.toast.set_action_name("app.logout")
720+
self.toast_overlay.add_toast(self.toast)
721721

722722
# action after closing the main window
723723
def on_close(self, w):

0 commit comments

Comments
 (0)