Merge branch 'main' into filemanager1-scroll-to-item

data/files.gresource.xml

@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/files/">
+    <file alias="Application.css" compressed="true">styles/Application.css</file>
     <file alias="ColorButton.css" compressed="true">styles/ColorButton.css</file>
     <file alias="DiskRenderer.css" compressed="true">styles/DiskRenderer.css</file>
     <file alias="SidebarExpander.css" compressed="true">styles/SidebarExpander.css</file>
   </gresource>
+  <gresource prefix="/io/elementary/files/icons">
+    <file alias="scalable/status/permission-execute-prevent-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-execute-prevent.svg</file>
+    <file alias="scalable/status/permission-execute-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-execute.svg</file>
+    <file alias="scalable/status/permission-read-prevent-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-read-prevent.svg</file>
+    <file alias="scalable/status/permission-read-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-read.svg</file>
+    <file alias="scalable/status/permission-write-prevent-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-write-prevent.svg</file>
+    <file alias="scalable/status/permission-write-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/permission-write.svg</file>
+  </gresource>
 </gresources>

data/files.metainfo.xml.in.in

@@ -16,15 +16,15 @@
   <screenshots>
     <screenshot type="default">
       <caption>Quick access to settings like zoom levels and hidden files</caption>
-      <image>https://raw.githubusercontent.com/elementary/files/6.5.3/data/screenshot-grid.png</image>
+      <image>https://raw.githubusercontent.com/elementary/files/7.0.0/data/screenshot-grid.png</image>
     </screenshot>
     <screenshot>
       <caption>See more metadata at a glance in List view</caption>
-      <image>https://raw.githubusercontent.com/elementary/files/6.5.3/data/screenshot-list.png</image>
+      <image>https://raw.githubusercontent.com/elementary/files/7.0.0/data/screenshot-list.png</image>
     </screenshot>
     <screenshot>
       <caption>Browse complex trees faster with Column view</caption>
-      <image>https://raw.githubusercontent.com/elementary/files/6.5.3/data/screenshot-column.png</image>
+      <image>https://raw.githubusercontent.com/elementary/files/7.0.0/data/screenshot-column.png</image>
     </screenshot>
   </screenshots>
 
@@ -62,7 +62,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="8.0.0" date="2024-05-13" urgency="medium">
+    <release version="7.0.0" date="2024-08-02" urgency="medium">
       <description>
         <p>Minor updates:</p>
         <ul>

data/styles/Application.css

@@ -0,0 +1,34 @@
+/*FIXME: Remove list styles in Gtk4*/
+list.rich-list > row {
+    padding: 6px;
+    min-height: 32px;
+}
+
+list.rich-list label {
+    margin: 0 6px;
+}
+
+list.rich-list button.toggle {
+    margin: 3px 0;
+}
+
+list:not(.horizontal) row.separator,
+list.separators:not(.horizontal) > row:not(.separator) + row:not(.separator) {
+    border-top: 1px solid @menu_separator;
+}
+
+list.boxed-list {
+    border-radius: 6px;
+    box-shadow: 0 1px 3px alpha(black, 0.1);
+}
+
+list.boxed-list > row:first-child {
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+list.boxed-list > row:last-child {
+    border-bottom-left-radius: 6px;
+    border-bottom-right-radius: 6px;
+    border-bottom-width: 0;
+}

filechooser-portal/Main.vala

@@ -478,6 +478,7 @@ public class Files.FileChooserPortal : Object {
             connection.register_object ("/org/freedesktop/portal/desktop", new FileChooserPortal (connection));
         } catch (Error e) {
             critical ("Unable to register the object: %s", e.message);
+            // Should we quit main loop if this happens?
         }
     }
 
@@ -510,22 +511,16 @@ public class Files.FileChooserPortal : Object {
         }
 
         var loop = new MainLoop (null, false);
-        try {
-            var session_bus = Bus.get_sync (BusType.SESSION);
-            var owner_id = Bus.own_name (
-                BusType.SESSION,
-                "org.freedesktop.impl.portal.desktop.elementary.files",
-                BusNameOwnerFlags.ALLOW_REPLACEMENT | (opt_replace ? BusNameOwnerFlags.REPLACE : 0),
-                on_bus_acquired,
-                () => debug ("org.freedesktop.impl.portal.desktop.elementary.files acquired"),
-                () => loop.quit ()
-            );
-            loop.run ();
-            Bus.unown_name (owner_id);
-        } catch (Error e) {
-            printerr ("No session bus: %s\n", e.message);
-            return 2;
-        }
+        var owner_id = Bus.own_name (
+            BusType.SESSION,
+            "org.freedesktop.impl.portal.desktop.elementary.files",
+            BusNameOwnerFlags.ALLOW_REPLACEMENT | (opt_replace ? BusNameOwnerFlags.REPLACE : 0),
+            on_bus_acquired,
+            () => debug ("org.freedesktop.impl.portal.desktop.elementary.files acquired"),
+            () => loop.quit ()
+        );
+        loop.run ();
+        Bus.unown_name (owner_id);
 
         return 0;
     }

libcore/Directory.vala

@@ -989,26 +989,37 @@ public class Files.Directory : Object {
     }
 
     private void real_directory_changed (GLib.File _file, GLib.File? other_file, FileMonitorEvent event) {
+        // Ignore events from transient streams
+        if (_file.get_basename ().has_prefix (".goutputstream")) {
+            return;
+        }
+
         switch (event) {
             case FileMonitorEvent.CREATED:
                 Files.FileChanges.queue_file_added (_file, false);
                 break;
             case FileMonitorEvent.DELETED:
                 Files.FileChanges.queue_file_removed (_file);
                 break;
-            case FileMonitorEvent.CHANGED:
-                // e.g. When data streamed into file
-            case FileMonitorEvent.ATTRIBUTE_CHANGED: /* test  last to avoid unnecessary action when file renamed */
+            case FileMonitorEvent.ATTRIBUTE_CHANGED:
                 // e.g. changed permissions
                 Files.FileChanges.queue_file_changed (_file);
                 break;
             case FileMonitorEvent.CHANGES_DONE_HINT:
                 // TODO Check for unexpected regressions caused by not refreshing file info here. It should already
-                // have been done if requried by one of the set of changes so doing it again is inefficient.
+                // have been done if required by one of the set of changes so doing it again is inefficient.
+                Files.FileChanges.queue_file_changed (_file);
                 break;
+            // Move events should not be received as relevant flag is not set
             case FileMonitorEvent.MOVED:
+            case FileMonitorEvent.MOVED_IN:
+            case FileMonitorEvent.MOVED_OUT:
                 break;
-            default:
+            // Icon does not currently change for these events
+            case FileMonitorEvent.RENAMED:
+            case FileMonitorEvent.PRE_UNMOUNT:
+            case FileMonitorEvent.UNMOUNTED:
+            case FileMonitorEvent.CHANGED:
                 break;
         }
 

libcore/Enums.vala

@@ -34,14 +34,6 @@ namespace Files {
                     return "Marlin.WindowState.INVALID";
             }
         }
-
-        public static Files.WindowState from_gdk_window_state (Gdk.WindowState state) {
-            if (Gdk.WindowState.MAXIMIZED in state || Gdk.WindowState.FULLSCREEN in state) {
-                return Files.WindowState.MAXIMIZED;
-            } else {
-                return Files.WindowState.NORMAL;
-            }
-        }
     }
 
     public enum ViewMode {