Skip to content

Commit

Permalink
Merge branch 'main' into refreshthumbnail-editedimage
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremypw authored Aug 30, 2024
2 parents c0a0779 + 515c507 commit 8e1ab2b
Show file tree
Hide file tree
Showing 414 changed files with 20,436 additions and 18,253 deletions.
9 changes: 9 additions & 0 deletions data/files.gresource.xml
Original file line number Diff line number Diff line change
@@ -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>
39 changes: 39 additions & 0 deletions data/icons/permission-execute-prevent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions data/icons/permission-execute.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions data/icons/permission-read-prevent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions data/icons/permission-read.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions data/icons/permission-write-prevent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions data/icons/permission-write.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions data/styles/Application.css
Original file line number Diff line number Diff line change
@@ -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;
}
1 change: 1 addition & 0 deletions libcore/Directory.vala
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,7 @@ public class Files.Directory : Object {
case FileMonitorEvent.MOVED_IN:
case FileMonitorEvent.MOVED_OUT:
break;
// Icon does not currently change for these events
case FileMonitorEvent.RENAMED:
case FileMonitorEvent.PRE_UNMOUNT:
case FileMonitorEvent.UNMOUNTED:
Expand Down
Loading

0 comments on commit 8e1ab2b

Please sign in to comment.