From 2a4727c52223d65de10fabb238fe1ab2f0da8935 Mon Sep 17 00:00:00 2001
From: kateleet <kate@cutefishos.com>
Date: Tue, 28 Dec 2021 15:41:45 +0800
Subject: [PATCH] fix: path history

---
 images/drive-harddisk-root.svg       |  2 +-
 images/drive-harddisk.svg            |  2 +-
 images/drive-optical.svg             | 12 +++++-------
 images/drive-removable-media-usb.svg |  2 +-
 images/folder-desktop.svg            |  2 +-
 images/folder-document.svg           |  2 +-
 images/folder-download.svg           |  2 +-
 images/folder-home.svg               |  2 +-
 images/folder-music.svg              |  4 ++--
 images/folder-picture.svg            |  2 +-
 images/folder-video.svg              |  2 +-
 images/media-optical-data.svg        |  2 +-
 images/media-optical-mixed-cd.svg    | 10 ++++------
 images/media-optical.svg             |  4 ++--
 images/user-trash.svg                | 14 ++------------
 model/foldermodel.cpp                |  3 ++-
 qml/SideBar.qml                      |  5 ++---
 17 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/images/drive-harddisk-root.svg b/images/drive-harddisk-root.svg
index de7840d..2489006 100755
--- a/images/drive-harddisk-root.svg
+++ b/images/drive-harddisk-root.svg
@@ -12,7 +12,7 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <g class="ColorScheme-Text" transform="translate(2.9999 2.5)" fill="#363636" fill-opacity=".5">
+ <g class="ColorScheme-Text" transform="translate(2.9999 2.5)" fill="#363636">
   <path d="m6 2c-1.4995 0-2.5425 1.0366-2.9316 2.0332l-2.8691 7.4844c-0.003232 0.0076-0.004654 0.01581-0.007813 0.02344l-0.058594 0.15039h0.011719c-0.08705 0.25475-0.14453 0.52362-0.14453 0.80859 0 1.385 1.115 2.5 2.5 2.5h11c1.385 0 2.5-1.115 2.5-2.5 0-0.28498-0.05748-0.55384-0.14453-0.80859h0.01172l-0.05859-0.15039-0.0039-0.01563c-0.0011-0.0027-0.0028-0.0051-0.0039-0.0078l-2.8692-7.4844c-0.38916-0.99659-1.4322-2.0332-2.9316-2.0332h-2zm0 1h4c1.108 0 1.7085 0.6499 2 1.3965l2.1875 5.7109c-0.21961-0.062705-0.44722-0.10742-0.6875-0.10742h-11c-0.24028 0-0.46789 0.04472-0.6875 0.10742l2.1875-5.7109c0.29153-0.74658 0.892-1.3965 2-1.3965zm-3.5 8h11c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-11c-0.831 0-1.5-0.669-1.5-1.5s0.669-1.5 1.5-1.5z"/>
   <circle cx="12.5" cy="12.5" r=".5"/>
   <circle cx="10.5" cy="12.5" r=".5"/>
diff --git a/images/drive-harddisk.svg b/images/drive-harddisk.svg
index de7840d..2489006 100755
--- a/images/drive-harddisk.svg
+++ b/images/drive-harddisk.svg
@@ -12,7 +12,7 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <g class="ColorScheme-Text" transform="translate(2.9999 2.5)" fill="#363636" fill-opacity=".5">
+ <g class="ColorScheme-Text" transform="translate(2.9999 2.5)" fill="#363636">
   <path d="m6 2c-1.4995 0-2.5425 1.0366-2.9316 2.0332l-2.8691 7.4844c-0.003232 0.0076-0.004654 0.01581-0.007813 0.02344l-0.058594 0.15039h0.011719c-0.08705 0.25475-0.14453 0.52362-0.14453 0.80859 0 1.385 1.115 2.5 2.5 2.5h11c1.385 0 2.5-1.115 2.5-2.5 0-0.28498-0.05748-0.55384-0.14453-0.80859h0.01172l-0.05859-0.15039-0.0039-0.01563c-0.0011-0.0027-0.0028-0.0051-0.0039-0.0078l-2.8692-7.4844c-0.38916-0.99659-1.4322-2.0332-2.9316-2.0332h-2zm0 1h4c1.108 0 1.7085 0.6499 2 1.3965l2.1875 5.7109c-0.21961-0.062705-0.44722-0.10742-0.6875-0.10742h-11c-0.24028 0-0.46789 0.04472-0.6875 0.10742l2.1875-5.7109c0.29153-0.74658 0.892-1.3965 2-1.3965zm-3.5 8h11c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-11c-0.831 0-1.5-0.669-1.5-1.5s0.669-1.5 1.5-1.5z"/>
   <circle cx="12.5" cy="12.5" r=".5"/>
   <circle cx="10.5" cy="12.5" r=".5"/>
diff --git a/images/drive-optical.svg b/images/drive-optical.svg
index 650781b..0a31fff 100755
--- a/images/drive-optical.svg
+++ b/images/drive-optical.svg
@@ -9,12 +9,10 @@
    </cc:Work>
   </rdf:RDF>
  </metadata>
- <g transform="matrix(.99984 0 0 .99984 -1129.8 -118.55)" color="#000000" fill="#999" font-family="sans-serif" font-weight="400">
-  <path d="m1135 131.14v0.86c0 2.831 2.695 5.14 6 5.14s6-2.309 6-5.14v-0.86h-8zm1 0.857h3v3e-3c0 0.941 0.902 1.713 2 1.713 1.099 0 2-0.772 2-1.713v-3e-3h3v3e-3c0 2.37-2.232 4.283-5 4.283-2.767 0-5-1.912-5-4.283zm4 0h2v3e-3c0 0.478-0.442 0.857-1 0.857s-1-0.379-1-0.857z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-  <g fill-rule="evenodd">
-   <path d="m1135.5 122s-0.34 9e-3 -0.69 0.197a1.564 1.564 0 0 0-0.788 1.27v-0.03l-1 8a0.5 0.5 0 0 0 0 0.145l0.25 1.5c0.036 0.22 0.123 0.433 0.29 0.611a0.987 0.987 0 0 0 0.702 0.307h1.25a0.5 0.5 0 1 0 0-1h-1.224c-0.01-0.01-0.023-0.035-0.031-0.082l-0.239-1.428 0.99-7.927a0.5 0.5 0 0 0 0-0.03c0.023-0.322 0.13-0.382 0.262-0.453 0.132-0.07 0.258-0.08 0.258-0.08h10.99a0.5 0.5 0 0 0 0.035-2e-3s0.11-2e-3 0.223 0.053c0.112 0.054 0.22 0.094 0.244 0.48a0.5 0.5 0 0 0 0 0.031l0.99 7.928-0.236 1.428c-0.01 0.047-0.027 0.072-0.033 0.082h-1.223a0.5 0.5 0 1 0 0 1h1.25a0.987 0.987 0 0 0 0.703-0.307c0.166-0.178 0.255-0.392 0.291-0.611l0.25-1.5a0.5 0.5 0 0 0 0-0.145l-0.994-7.968c-0.042-0.678-0.435-1.139-0.807-1.319-0.371-0.18-0.726-0.148-0.726-0.148l0.033-2e-3h-11a0.5 0.5 0 0 0-0.02 0z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-   <path d="m1133.5 131v2h2v-2zm13 0v2h2v-2z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-   <path d="m1135 131v1h12v-1z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-  </g>
+ <path d="m5.0184 12.569v0.85986c0 2.8305 2.6946 5.1392 5.999 5.1392 3.3045 0 5.999-2.3086 5.999-5.1392v-0.85986h-7.9987zm0.99984 0.85686h2.9995v3e-3c0 0.94085 0.90186 1.7127 1.9997 1.7127 1.0988 0 1.9997-0.77188 1.9997-1.7127v-3e-3h2.9995v3e-3c0 2.3696-2.2316 4.2823-4.9992 4.2823-2.7666 0-4.9992-1.9117-4.9992-4.2823zm3.9994 0h1.9997v3e-3c0 0.47792-0.44193 0.85686-0.99984 0.85686s-0.99984-0.37894-0.99984-0.85686z" color="#000000" fill="#363636" overflow="visible" stroke-width=".99984" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+ <g transform="matrix(.99984 0 0 .99984 -1129.8 -118.55)" color="#000000" fill="#363636" fill-rule="evenodd">
+  <path d="m1135.5 122s-0.34 9e-3 -0.69 0.197a1.564 1.564 0 0 0-0.788 1.27v-0.03l-1 8a0.5 0.5 0 0 0 0 0.145l0.25 1.5c0.036 0.22 0.123 0.433 0.29 0.611a0.987 0.987 0 0 0 0.702 0.307h1.25a0.5 0.5 0 1 0 0-1h-1.224c-0.01-0.01-0.023-0.035-0.031-0.082l-0.239-1.428 0.99-7.927a0.5 0.5 0 0 0 0-0.03c0.023-0.322 0.13-0.382 0.262-0.453 0.132-0.07 0.258-0.08 0.258-0.08h10.99a0.5 0.5 0 0 0 0.035-2e-3s0.11-2e-3 0.223 0.053c0.112 0.054 0.22 0.094 0.244 0.48a0.5 0.5 0 0 0 0 0.031l0.99 7.928-0.236 1.428c-0.01 0.047-0.027 0.072-0.033 0.082h-1.223a0.5 0.5 0 1 0 0 1h1.25a0.987 0.987 0 0 0 0.703-0.307c0.166-0.178 0.255-0.392 0.291-0.611l0.25-1.5a0.5 0.5 0 0 0 0-0.145l-0.994-7.968c-0.042-0.678-0.435-1.139-0.807-1.319-0.371-0.18-0.726-0.148-0.726-0.148l0.033-2e-3h-11a0.5 0.5 0 0 0-0.02 0z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+  <path d="m1133.5 131v2h2v-2zm13 0v2h2v-2z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+  <path d="m1135 131v1h12v-1z" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
  </g>
 </svg>
diff --git a/images/drive-removable-media-usb.svg b/images/drive-removable-media-usb.svg
index 70af504..c5cc0ef 100755
--- a/images/drive-removable-media-usb.svg
+++ b/images/drive-removable-media-usb.svg
@@ -9,7 +9,7 @@
    </cc:Work>
   </rdf:RDF>
  </metadata>
- <g transform="translate(3,3)" fill="#999">
+ <g transform="translate(3,3)" fill="#363636">
   <g transform="matrix(1,0,0,-1,0,16)">
    <path d="m4 11v5h8v-5h-1v4h-6v-4z"/>
    <rect x="6" y="13" width="1" height="1" rx="0" ry="0"/>
diff --git a/images/folder-desktop.svg b/images/folder-desktop.svg
index 7eb3329..0009563 100755
--- a/images/folder-desktop.svg
+++ b/images/folder-desktop.svg
@@ -12,5 +12,5 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path d="m5.2857 4.5714c-0.98622 0-1.7857 0.79949-1.7857 1.7857v7.1429c0 0.98621 0.79949 1.7857 1.7857 1.7857h4.4221l-0.7143 1.4286h-1.565c-0.19725 0-0.35715 0.15992-0.35715 0.35715 0 0.19721 0.1599 0.35715 0.35715 0.35715h1.778c0.00497 7e-5 0.00995 7e-5 0.014906 0h3.5571c5e-3 7e-5 0.0099 7e-5 0.01491 0h1.778c0.19721 0 0.35715-0.15992 0.35715-0.35715 0-0.19721-0.15993-0.35715-0.35715-0.35715h-1.565l-0.71429-1.4286h4.4221c0.98621 0 1.7857-0.7995 1.7857-1.7857v-7.1429c0-0.98622-0.7995-1.7857-1.7857-1.7857zm6.9221 12.143-0.71428-1.4286h-0.98714l-0.71429 1.4286zm-0.50136-2.1429c5e-3 -7e-5 0.01-7e-5 0.01503 0h4.9928c0.59172 0 1.0714-0.47971 1.0714-1.0714v-7.1429c0-0.59173-0.47971-1.0714-1.0714-1.0714h-11.429c-0.59173 0-1.0714 0.47969-1.0714 1.0714v7.1429c0 0.59172 0.4797 1.0714 1.0714 1.0714h4.9928c5e-3 -7.1e-5 0.01-7.1e-5 0.01491 0z" clip-rule="evenodd" fill="#363636" fill-opacity=".5" fill-rule="evenodd" stroke-width=".71428"/>
+ <path d="m5.2857 4.5714c-0.98622 0-1.7857 0.79949-1.7857 1.7857v7.1429c0 0.98621 0.79949 1.7857 1.7857 1.7857h4.4221l-0.7143 1.4286h-1.565c-0.19725 0-0.35715 0.15992-0.35715 0.35715 0 0.19721 0.1599 0.35715 0.35715 0.35715h1.778c0.00497 7e-5 0.00995 7e-5 0.014906 0h3.5571c5e-3 7e-5 0.0099 7e-5 0.01491 0h1.778c0.19721 0 0.35715-0.15992 0.35715-0.35715 0-0.19721-0.15993-0.35715-0.35715-0.35715h-1.565l-0.71429-1.4286h4.4221c0.98621 0 1.7857-0.7995 1.7857-1.7857v-7.1429c0-0.98622-0.7995-1.7857-1.7857-1.7857zm6.9221 12.143-0.71428-1.4286h-0.98714l-0.71429 1.4286zm-0.50136-2.1429c5e-3 -7e-5 0.01-7e-5 0.01503 0h4.9928c0.59172 0 1.0714-0.47971 1.0714-1.0714v-7.1429c0-0.59173-0.47971-1.0714-1.0714-1.0714h-11.429c-0.59173 0-1.0714 0.47969-1.0714 1.0714v7.1429c0 0.59172 0.4797 1.0714 1.0714 1.0714h4.9928c5e-3 -7.1e-5 0.01-7.1e-5 0.01491 0z" clip-rule="evenodd" fill="#363636" fill-rule="evenodd" stroke-width=".71428"/>
 </svg>
diff --git a/images/folder-document.svg b/images/folder-document.svg
index 768b0a3..809cf9c 100755
--- a/images/folder-document.svg
+++ b/images/folder-document.svg
@@ -12,7 +12,7 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <g transform="matrix(.030769 0 0 .030769 3.1231 3.1231)" fill="#363636" fill-opacity=".5">
+ <g transform="matrix(.030769 0 0 .030769 3.1231 3.1231)" fill="#363636">
   <path d="m446.6 124.39-120-120c-2.801-2.802-6.624-4.395-10.608-4.395h-210c-24.813 0-45 20.187-45 45v422c0 24.813 20.187 45 45 45h300c24.813 0 45-20.187 45-45v-332c0-4.09-1.717-7.931-4.395-10.608zm-115.6-73.179 68.787 68.787h-53.787c-8.271 0-15-6.729-15-15zm75 430.79h-300c-8.271 0-15-6.729-15-15v-422c0-8.271 6.729-15 15-15h195v75c0 24.813 20.187 45 45 45h75v317c0 8.271-6.729 15-15 15z"/>
   <path d="m346 272h-180c-8.284 0-15 6.716-15 15s6.716 15 15 15h180c8.284 0 15-6.716 15-15s-6.716-15-15-15z"/>
   <path d="m346 332h-180c-8.284 0-15 6.716-15 15s6.716 15 15 15h180c8.284 0 15-6.716 15-15s-6.716-15-15-15z"/>
diff --git a/images/folder-download.svg b/images/folder-download.svg
index 3244bd1..b7c8ae5 100755
--- a/images/folder-download.svg
+++ b/images/folder-download.svg
@@ -12,5 +12,5 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m11 3a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1.0667a6.9333 6.9333 0 0 1 6.9333 6.9333 6.9333 6.9333 0 0 1-6.9333 6.9333 6.9333 6.9333 0 0 1-6.9333-6.9333 6.9333 6.9333 0 0 1 6.9333-6.9333zm0 3.2c-0.29547 0-0.53333 0.23787-0.53333 0.53333v5.1125l-1.3521-1.3521c-0.20893-0.20893-0.54524-0.20893-0.75417 0s-0.20893 0.54524 0 0.75416l2.2625 2.2625c0.05014 0.05014 0.11012 0.08968 0.17709 0.11667 0.12836 0.05223 0.27164 0.05223 0.4 0 0.06697-0.02699 0.12693-0.06652 0.17709-0.11667l2.2625-2.2625c0.20893-0.20893 0.20893-0.54524 0-0.75416s-0.54524-0.20893-0.75416 0l-1.3521 1.3521v-5.1125c0-0.29547-0.23787-0.53333-0.53333-0.53333z" fill="#363636" fill-opacity=".5" stroke-width="1.0667"/>
+ <path class="ColorScheme-Text" d="m11 3a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1.0667a6.9333 6.9333 0 0 1 6.9333 6.9333 6.9333 6.9333 0 0 1-6.9333 6.9333 6.9333 6.9333 0 0 1-6.9333-6.9333 6.9333 6.9333 0 0 1 6.9333-6.9333zm0 3.2c-0.29547 0-0.53333 0.23787-0.53333 0.53333v5.1125l-1.3521-1.3521c-0.20893-0.20893-0.54524-0.20893-0.75417 0s-0.20893 0.54524 0 0.75416l2.2625 2.2625c0.05014 0.05014 0.11012 0.08968 0.17709 0.11667 0.12836 0.05223 0.27164 0.05223 0.4 0 0.06697-0.02699 0.12693-0.06652 0.17709-0.11667l2.2625-2.2625c0.20893-0.20893 0.20893-0.54524 0-0.75416s-0.54524-0.20893-0.75416 0l-1.3521 1.3521v-5.1125c0-0.29547-0.23787-0.53333-0.53333-0.53333z" fill="#363636" stroke-width="1.0667"/>
 </svg>
diff --git a/images/folder-home.svg b/images/folder-home.svg
index 36b7b8a..88a7042 100755
--- a/images/folder-home.svg
+++ b/images/folder-home.svg
@@ -12,5 +12,5 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m11 3.0778c-0.13506 0-0.27007 0.051303-0.37356 0.15479l-7.4712 7.4733c-0.20698 0.20698-0.20698 0.54014 0 0.74712s0.54014 0.20698 0.74712 0l0.75744-0.75744v6.1132c0 1.1708 0.94258 2.1134 2.1134 2.1134h8.4536c1.1708 0 2.1134-0.94258 2.1134-2.1134v-6.1132l0.75744 0.75744c0.20698 0.20698 0.54014 0.20698 0.74712 0 0.20698-0.20698 0.20698-0.54014 0-0.74712l-7.4712-7.4733c-0.10348-0.10349-0.23851-0.15479-0.37356-0.15479zm0 1.2776 5.2835 5.2835v7.1699c0 0.58541-0.47129 1.0567-1.0567 1.0567h-2.1134v-3.1701c0-1.1708-0.94258-2.1134-2.1134-2.1134-1.1708 0-2.1134 0.94258-2.1134 2.1134v3.1701h-2.1134c-0.58541 0-1.0567-0.47129-1.0567-1.0567v-7.1699z" fill="#363636" fill-opacity=".5" stroke-width="1.0567"/>
+ <path class="ColorScheme-Text" d="m11 3.0778c-0.13506 0-0.27007 0.051303-0.37356 0.15479l-7.4712 7.4733c-0.20698 0.20698-0.20698 0.54014 0 0.74712s0.54014 0.20698 0.74712 0l0.75744-0.75744v6.1132c0 1.1708 0.94258 2.1134 2.1134 2.1134h8.4536c1.1708 0 2.1134-0.94258 2.1134-2.1134v-6.1132l0.75744 0.75744c0.20698 0.20698 0.54014 0.20698 0.74712 0 0.20698-0.20698 0.20698-0.54014 0-0.74712l-7.4712-7.4733c-0.10348-0.10349-0.23851-0.15479-0.37356-0.15479zm0 1.2776 5.2835 5.2835v7.1699c0 0.58541-0.47129 1.0567-1.0567 1.0567h-2.1134v-3.1701c0-1.1708-0.94258-2.1134-2.1134-2.1134-1.1708 0-2.1134 0.94258-2.1134 2.1134v3.1701h-2.1134c-0.58541 0-1.0567-0.47129-1.0567-1.0567v-7.1699z" fill="#363636" stroke-width="1.0567"/>
 </svg>
diff --git a/images/folder-music.svg b/images/folder-music.svg
index 37de584..f2d0256 100755
--- a/images/folder-music.svg
+++ b/images/folder-music.svg
@@ -10,7 +10,7 @@
   </rdf:RDF>
  </metadata>
  <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m16.375 3-7.3774 1.9053c-0.55422 0.14836-1.0009 0.73837-1.0009 1.3116v9.0892c-0.562-0.294-1.2839-0.41299-2.0322-0.21874-1.3503 0.35052-2.1966 1.4838-1.9071 2.5303 0.28945 1.0465 1.6203 1.6309 2.9706 1.2804 1.0773-0.27964 1.82-1.071 1.9384-1.9053l0.031278-8.5892 7.0021-1.8741v6.7776c-0.562-0.294-1.2831-0.41299-2.0314-0.21874-1.3503 0.35052-2.1966 1.4838-1.9071 2.5303 0.28945 1.0465 1.6194 1.6309 2.9697 1.2804 1.0773-0.27964 1.82-1.071 1.9384-1.9053l0.03128-11.181c0-0.42993-0.26627-0.752-0.62557-0.81248z" fill="#363636" fill-opacity=".5"/>
+ <path class="ColorScheme-Text" d="m16.375 3-7.3774 1.9053c-0.55422 0.14836-1.0009 0.73837-1.0009 1.3116v9.0892c-0.562-0.294-1.2839-0.41299-2.0322-0.21874-1.3503 0.35052-2.1966 1.4838-1.9071 2.5303 0.28945 1.0465 1.6203 1.6309 2.9706 1.2804 1.0773-0.27964 1.82-1.071 1.9384-1.9053l0.031278-8.5892 7.0021-1.8741v6.7776c-0.562-0.294-1.2831-0.41299-2.0314-0.21874-1.3503 0.35052-2.1966 1.4838-1.9071 2.5303 0.28945 1.0465 1.6194 1.6309 2.9697 1.2804 1.0773-0.27964 1.82-1.071 1.9384-1.9053l0.03128-11.181c0-0.42993-0.26627-0.752-0.62557-0.81248z" fill="#363636"/>
 </svg>
diff --git a/images/folder-picture.svg b/images/folder-picture.svg
index a77bf34..9488b22 100755
--- a/images/folder-picture.svg
+++ b/images/folder-picture.svg
@@ -12,5 +12,5 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m5 5c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v9l-5-5-3.4794 4-2.5206-2-3 3v-9c0-0.554 0.446-1 1-1zm2.5 2c-0.82843 0-1.5 0.67157-1.5 1.5s0.67157 1.5 1.5 1.5 1.5-0.67157 1.5-1.5-0.67157-1.5-1.5-1.5z" fill="#363636" fill-opacity=".5"/>
+ <path class="ColorScheme-Text" d="m5 5c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v9l-5-5-3.4794 4-2.5206-2-3 3v-9c0-0.554 0.446-1 1-1zm2.5 2c-0.82843 0-1.5 0.67157-1.5 1.5s0.67157 1.5 1.5 1.5 1.5-0.67157 1.5-1.5-0.67157-1.5-1.5-1.5z" fill="#363636"/>
 </svg>
diff --git a/images/folder-video.svg b/images/folder-video.svg
index ff6046f..283795c 100755
--- a/images/folder-video.svg
+++ b/images/folder-video.svg
@@ -12,5 +12,5 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m5 5c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h1v1h-2c0-0.554 0.446-1 1-1zm2 0h8v5h-8zm9 0h1c0.554 0 1 0.446 1 1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-2zm3 0h8v5h-8zm9 0h2v1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-1c-0.554 0-1-0.446-1-1zm12 0h2c0 0.554-0.446 1-1 1h-1z" fill="#363636" fill-opacity=".5"/>
+ <path class="ColorScheme-Text" d="m5 5c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h1v1h-2c0-0.554 0.446-1 1-1zm2 0h8v5h-8zm9 0h1c0.554 0 1 0.446 1 1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-2zm3 0h8v5h-8zm9 0h2v1h-2zm-12 2h2v1h-2zm12 0h2v1h-2zm-12 2h2v1h-1c-0.554 0-1-0.446-1-1zm12 0h2c0 0.554-0.446 1-1 1h-1z" fill="#363636"/>
 </svg>
diff --git a/images/media-optical-data.svg b/images/media-optical-data.svg
index 55a16bd..f983c9b 100755
--- a/images/media-optical-data.svg
+++ b/images/media-optical-data.svg
@@ -4,7 +4,7 @@
   <defs>
     <style
        type="text/css"
-       id="current-color-scheme"> .ColorScheme-Text { color:#9A9A9A; } </style>
+       id="current-color-scheme"> .ColorScheme-Text { color:#363636; } </style>
   </defs>
   <path
      class="ColorScheme-Text" fill="currentColor"  d="M 10.990234 2 A 9 9 0 0 0 2 11 A 9 9 0 0 0 11 20 A 9 9 0 0 0 14 19.484375 L 14 18.414062 A 7.9999999 8 0 0 1 11 19 A 7.9999999 8 0 0 1 3 11 A 7.9999999 8 0 0 1 11 3 A 7.9999999 8 0 0 1 19 11 A 7.9999999 8 0 0 1 18.9375 12 L 19.943359 12 A 9 9 0 0 0 20 11 A 9 9 0 0 0 11 2 A 9 9 0 0 0 10.990234 2 z M 11 8 C 9.32 8 8 9.32 8 11 C 8 12.68 9.32 14 11 14 C 12.68 14 14 12.68 14 11 C 14 9.32 12.68 8 11 8 z M 11.005859 9.0058594 A 2.002 2.002 0 0 1 13.001953 11.001953 A 2.002 2.002 0 0 1 11.005859 12.998047 C 9.9078594 12.998047 8.9921875 12.100963 8.9921875 11.001953 C 8.9921875 9.9039531 9.9078294 9.0058594 11.005859 9.0058594 z M 15 13 L 15 20 L 18 20 L 20 18 L 20 13 L 15 13 z M 16 14 L 19 14 L 19 18 L 18 18 L 18 19 L 16 19 L 16 14 z "/>
diff --git a/images/media-optical-mixed-cd.svg b/images/media-optical-mixed-cd.svg
index b822bc0..a3978bf 100755
--- a/images/media-optical-mixed-cd.svg
+++ b/images/media-optical-mixed-cd.svg
@@ -14,11 +14,9 @@
         color:#363636;
       }</style>
  </defs>
- <g fill="currentColor">
-  <path class="ColorScheme-Text" d="m18.479 15.009c0.27841-0.03418 0.5698 0.02395 0.7782 0.18677 0.41679 0.32563 0.50691 1.0682 0.18127 1.485l-0.21606 0.27832-1.7377 2.2229c-0.43418 0.55573-1.4236 0.67771-1.9794 0.24353-0.55572-0.43418-0.67771-1.4236-0.24353-1.9794l1.7377-2.2229 0.27649 0.21606-1.7358 2.2229c-0.32564 0.41679-0.23552 1.1593 0.18127 1.485 0.4168 0.32563 1.1594 0.23552 1.485-0.18127l1.7377-2.2229 0.21606-0.27832c0.21709-0.27786 0.15701-0.77351-0.12085-0.9906s-0.77351-0.15518-0.9906 0.12268l-0.21606 0.27649-1.3037 1.6681-0.21606 0.27832c-0.10855 0.13893-0.07851 0.38584 0.06042 0.49438s0.38584 0.07851 0.49438-0.06042l1.5198-1.9464 0.27832 0.2179-1.5198 1.9446c-0.21709 0.27787-0.71091 0.33977-0.98877 0.12268s-0.33977-0.71274-0.12268-0.9906l0.21789-0.27832 1.5198-1.9446c0.16282-0.2084 0.42838-0.33569 0.70679-0.36988z" opacity=".5"/>
-  <g class="ColorScheme-Text" transform="translate(-1230,-58)" opacity=".5">
-   <path class="ColorScheme-Text" transform="translate(1233,61)" d="m8 5c-1.68 0-3 1.32-3 3s1.32 3 3 3 3-1.32 3-3-1.32-3-3-3zm0.00586 1.0059a2.002 2.002 0 0 1 1.9961 1.9961 2.002 2.002 0 0 1-1.9961 1.9961c-1.098 0-2.0137-0.89709-2.0137-1.9961 0-1.098 0.91567-1.9961 2.0137-1.9961z" fill="currentColor"/>
-  </g>
-  <path class="ColorScheme-Text" d="m10.99 2a9 9 0 0 0-8.9902 9 9 9 0 0 0 9 9 9 9 0 0 0 3-0.51562v-1.0703a8 8 0 0 1-3 0.58594 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8 8 8 0 0 1-0.58398 3h1.0684a9 9 0 0 0 0.51562-3 9 9 0 0 0-9-9 9 9 0 0 0-0.009766 0z" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m18.479 15.009c0.27841-0.03418 0.5698 0.02395 0.7782 0.18677 0.41679 0.32563 0.50691 1.0682 0.18127 1.485l-0.21606 0.27832-1.7377 2.2229c-0.43418 0.55573-1.4236 0.67771-1.9794 0.24353-0.55572-0.43418-0.67771-1.4236-0.24353-1.9794l1.7377-2.2229 0.27649 0.21606-1.7358 2.2229c-0.32564 0.41679-0.23552 1.1593 0.18127 1.485 0.4168 0.32563 1.1594 0.23552 1.485-0.18127l1.7377-2.2229 0.21606-0.27832c0.21709-0.27786 0.15701-0.77351-0.12085-0.9906s-0.77351-0.15518-0.9906 0.12268l-0.21606 0.27649-1.3037 1.6681-0.21606 0.27832c-0.10855 0.13893-0.07851 0.38584 0.06042 0.49438s0.38584 0.07851 0.49438-0.06042l1.5198-1.9464 0.27832 0.2179-1.5198 1.9446c-0.21709 0.27787-0.71091 0.33977-0.98877 0.12268s-0.33977-0.71274-0.12268-0.9906l0.21789-0.27832 1.5198-1.9446c0.16282-0.2084 0.42838-0.33569 0.70679-0.36988z" fill="#363636"/>
+ <g class="ColorScheme-Text" transform="translate(-1230,-58)" fill="#363636">
+  <path class="ColorScheme-Text" transform="translate(1233,61)" d="m8 5c-1.68 0-3 1.32-3 3s1.32 3 3 3 3-1.32 3-3-1.32-3-3-3zm0.00586 1.0059a2.002 2.002 0 0 1 1.9961 1.9961 2.002 2.002 0 0 1-1.9961 1.9961c-1.098 0-2.0137-0.89709-2.0137-1.9961 0-1.098 0.91567-1.9961 2.0137-1.9961z" fill="#363636"/>
  </g>
+ <path class="ColorScheme-Text" d="m10.99 2a9 9 0 0 0-8.9902 9 9 9 0 0 0 9 9 9 9 0 0 0 3-0.51562v-1.0703a8 8 0 0 1-3 0.58594 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8 8 8 0 0 1-0.58398 3h1.0684a9 9 0 0 0 0.51562-3 9 9 0 0 0-9-9 9 9 0 0 0-0.0098 0z"/>
 </svg>
diff --git a/images/media-optical.svg b/images/media-optical.svg
index 391bf67..68ce9f0 100755
--- a/images/media-optical.svg
+++ b/images/media-optical.svg
@@ -12,6 +12,6 @@
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m11 8c-1.68 0-3 1.32-3 3s1.32 3 3 3 3-1.32 3-3-1.32-3-3-3zm0.0059 1.0059a2.002 2.002 0 0 1 1.9961 1.9961 2.002 2.002 0 0 1-1.9961 1.9961c-1.098 0-2.0137-0.89709-2.0137-1.9961 0-1.098 0.91567-1.9961 2.0137-1.9961z" fill="currentColor" opacity=".5"/>
- <path class="ColorScheme-Text" d="m10.99 2a9 9 0 0 0-8.9902 9 9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9 9 9 0 0 0-0.009766 0zm0.009766 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m11 8c-1.68 0-3 1.32-3 3s1.32 3 3 3 3-1.32 3-3-1.32-3-3-3zm0.0059 1.0059a2.002 2.002 0 0 1 1.9961 1.9961 2.002 2.002 0 0 1-1.9961 1.9961c-1.098 0-2.0137-0.89709-2.0137-1.9961 0-1.098 0.91567-1.9961 2.0137-1.9961z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m10.99 2a9 9 0 0 0-8.9902 9 9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9 9 9 0 0 0-0.009766 0zm0.009766 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor"/>
 </svg>
diff --git a/images/user-trash.svg b/images/user-trash.svg
index 0ca84a8..7b0c00a 100755
--- a/images/user-trash.svg
+++ b/images/user-trash.svg
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
  </defs>
- <path class="ColorScheme-Text" d="m9 2.9998c-0.554 0-1 0.446-1 1v1h-4.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h0.49805l0.54688 11.061c0.0612 1.0155 0.90615 1.9395 1.998 1.9395h7.9141c1.0919 0 1.9368-0.92391 1.998-1.9395l0.54688-11.061h0.49805c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-4.5v-1c0-0.554-0.446-1-1-1h-3zm0 1h3v1h-3zm-4 2h11l-0.54297 11c-0.03333 0.553-0.446 1-1 1h-7.9141c-0.554 0-0.96667-0.447-1-1l-0.54297-11zm2.5 2c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5z" fill="#363636" fill-opacity=".5"/>
+ <path class="ColorScheme-Text" d="m10 3.9998c-0.554 0-1 0.446-1 1v1h-4.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h0.49805l0.54688 11.061c0.0612 1.0155 0.90615 1.9395 1.998 1.9395h7.9141c1.0919 0 1.9368-0.92391 1.998-1.9395l0.54688-11.061h0.49805c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-4.5v-1c0-0.554-0.446-1-1-1h-3zm0 1h3v1h-3zm-4 2h11l-0.54297 11c-0.03333 0.553-0.446 1-1 1h-7.9141c-0.554 0-0.96667-0.447-1-1l-0.54297-11zm2.5 2c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
 </svg>
diff --git a/model/foldermodel.cpp b/model/foldermodel.cpp
index 61b7218..d7187cc 100644
--- a/model/foldermodel.cpp
+++ b/model/foldermodel.cpp
@@ -414,7 +414,8 @@ void FolderModel::setUrl(const QString &url)
 
     setStatus(Status::Listing);
 
-    m_pathHistory.append(resolvedNewUrl);
+    if (m_pathHistory.isEmpty() || m_pathHistory.last() != resolvedNewUrl)
+        m_pathHistory.append(resolvedNewUrl);
 
     beginResetModel();
     m_url = resolvedNewUrl.toString(QUrl::PreferLocalFile);
diff --git a/qml/SideBar.qml b/qml/SideBar.qml
index 0164413..c2c574d 100644
--- a/qml/SideBar.qml
+++ b/qml/SideBar.qml
@@ -204,9 +204,8 @@ ListView {
                 smooth: false
                 antialiasing: true
 
-                ColorOverlay {
-                    anchors.fill: parent
-                    source: parent
+                layer.enabled: true
+                layer.effect: ColorOverlay {
                     color: checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor
                 }
             }