From 5942c636f7aeba39569d1f0752db46378fcf4520 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Thu, 2 Oct 2025 17:05:26 +0200 Subject: [PATCH 1/7] i18n: translation updates from weblate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Hugo Carvalho Co-authored-by: Mattias Eriksson Co-authored-by: Priit Jõerüüt Co-authored-by: VandaL Co-authored-by: Walter William Beckerleg Bruckman Co-authored-by: Yauhen Co-authored-by: mikenu Co-authored-by: oddib Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/be/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/es/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/es_419/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/et/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/ja/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/nb_NO/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/pl/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/pt/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/sv/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-files/zh_Hant/ Translation: Pop OS/COSMIC Files --- i18n/be/cosmic_files.ftl | 2 +- i18n/es-419/cosmic_files.ftl | 62 +++++++------- i18n/es/cosmic_files.ftl | 76 +++++++++------- i18n/et/cosmic_files.ftl | 12 +++ i18n/ja/cosmic_files.ftl | 65 ++++++++------ i18n/nb-NO/cosmic_files.ftl | 162 +++++++++++++++++++++++++++++++++++ i18n/pl/cosmic_files.ftl | 2 +- i18n/pt-BR/cosmic_files.ftl | 32 +++---- i18n/pt/cosmic_files.ftl | 36 ++++---- i18n/sv/cosmic_files.ftl | 4 +- i18n/zh-CN/cosmic_files.ftl | 10 +-- i18n/zh-TW/cosmic_files.ftl | 41 +++++++-- 12 files changed, 364 insertions(+), 140 deletions(-) diff --git a/i18n/be/cosmic_files.ftl b/i18n/be/cosmic_files.ftl index 4767ed8..fc8a3f0 100644 --- a/i18n/be/cosmic_files.ftl +++ b/i18n/be/cosmic_files.ftl @@ -210,7 +210,7 @@ username = Імя карыстальніка cancelled = Скасавана edit-history = Гісторыя рэдагавання history = Гісторыя -no-history = Няма элементаў у гісторыі +no-history = У гісторыі няма запісаў. pending = У чаканні progress = { $percent }% progress-cancelled = { $percent }%, скасавана diff --git a/i18n/es-419/cosmic_files.ftl b/i18n/es-419/cosmic_files.ftl index 42ea584..12e0fdc 100644 --- a/i18n/es-419/cosmic_files.ftl +++ b/i18n/es-419/cosmic_files.ftl @@ -149,12 +149,12 @@ compressing = *[other] elementos } de "{ $from }" a "{ $to }" ({ $progress })... compressed = - { $items } { $items -> - [one] elemento comprimido - *[other] elementos comprimidos + { $items -> + [one] Se ha comprimido un elemento + *[other] Se han comprimidos { $items } elementos } de "{ $from }" a "{ $to }" copy_noun = Copiar -creating = Creando { $name } en { $parent } +creating = Creando "{ $name }" en "{ $parent }" created = Se ha creado "{ $name }" en "{ $parent }" copying = Copiando { $items } { $items -> @@ -162,9 +162,9 @@ copying = *[other] elementos } de "{ $from }" a "{ $to }" ({ $progress })... copied = - { $items } { $items -> - [one] elemento copiado - *[other] elementos copiados + { $items -> + [one] Se ha copiado un elemento + *[other] Se han copiado { $items } elementos } de "{ $from }" a "{ $to }" emptying-trash = Vaciando la { trash } ({ $progress })... emptied-trash = Se ha vaciado la { trash } @@ -174,9 +174,9 @@ extracting = *[other] elementos } de "{ $from }" a "{ $to }" ({ $progress })... extracted = - { $items } { $items -> - [one] elemento extraído - *[other] elementos extraídos + { $items -> + [one] Se ha extraído un elemento + *[other] Se han extraído { $items } elementos } de "{ $from }" a "{ $to }" setting-executable-and-launching = Estableciendo "{ $name }" como ejecutable y abriendo set-executable-and-launched = Se ha establecido "{ $name }" como ejecutable y se ha abierto @@ -184,12 +184,12 @@ moving = Moviendo { $items } { $items -> [one] elemento *[other] elementos - } desde "{ $from }" a "{ $to }" ({ $progress })... + } de "{ $from }" a "{ $to }" ({ $progress })... moved = - { $items } { $items -> - [one] elemento movido - *[other] elementos movidos - } desde "{ $from }" a "{ $to }" + { $items -> + [one] Se ha movido un elemento + *[other] Se han movido { $items } elementos + } de "{ $from }" a "{ $to }" renaming = Cambiando el nombre de "{ $from }" a "{ $to }" renamed = Se ha cambiado el nombre de "{ $from }" a "{ $to }" restoring = @@ -198,10 +198,10 @@ restoring = *[other] elementos } de la { trash } ({ $progress })... restored = - Se ha restaurado { $items } { $items -> - [one] elemento - *[other] elementos - } from { trash } + { $items -> + [one] Se ha restaurado un elemento + *[other] Se han restaurado { $items } elementos + } de la { trash } unknown-folder = carpeta desconocida ## Open with @@ -232,7 +232,7 @@ new-file = Archivo nuevo... new-folder = Carpeta nueva... open-in-terminal = Abrir en una terminal move-to-trash = Mover a la papelera -restore-from-trash = Restaurar desde la papelera +restore-from-trash = Restaurar de la papelera remove-from-sidebar = Quitar de la barra lateral sort-by-name = Ordenar por nombre sort-by-modified = Ordenar por modificado @@ -350,25 +350,25 @@ deleting = *[other] elementos } de la { trash } ({ $progress })... deleted = - { $items } { $items -> - [one] elemento eliminado - *[other] elementos eliminados + { $items -> + [one] Se ha eliminado un elemento + *[other] Se han eliminado { $items } elementos } de la { trash } permanently-deleted = - { $items } { $items -> - [one] elemento - *[other] elementos - } eliminados de forma permanente + { $items -> + [one] Se ha eliminado un elemento + *[other] Se han eliminado { $items } elementos + } de forma permanente removing-from-recents = Quitando { $items } { $items -> [one] elemento *[other] elementos } de { recents } removed-from-recents = - { $items } { $items -> - [one] elemento - *[other] elementos - } quitados de { recents } + { $items -> + [one] Se ha quitado elemento + *[other] Se han quitado { $items } elementos + } de { recents } reload-folder = Recargar la carpeta remove-from-recents = Quitar de recientes calculating = Calculando... diff --git a/i18n/es/cosmic_files.ftl b/i18n/es/cosmic_files.ftl index 78dca2e..a46f943 100644 --- a/i18n/es/cosmic_files.ftl +++ b/i18n/es/cosmic_files.ftl @@ -231,12 +231,12 @@ compressing = } de "{ $from }" a "{ $to }" ({ $progress })... compressed = { $items -> - [one] Comprimido un archivo - *[other] Comprimidos { $items } archivos - } de { $from } a { $to } + [one] Se ha comprimido un elemento + *[other] Se han comprimidos { $items } elementos + } de "{ $from }" a "{ $to }" copy_noun = Copia -creating = Creando { $name } en { $parent } -created = Se han creado "{ $name }" en "{ $parent }" +creating = Creando "{ $name }" en "{ $parent }" +created = Se ha creado "{ $name }" en "{ $parent }" copying = Copiando { $items -> [one] elemento @@ -244,8 +244,8 @@ copying = } de "{ $from }" a "{ $to }" ({ $progress })... copied = { $items -> - [one] elemento copiado - *[other] elementos copiados + [one] Se ha copiado un archivo + *[other] Se han copiado { $items } archivos } de "{ $from }" a "{ $to }" deleting = { $items -> @@ -253,21 +253,21 @@ deleting = *[other] Eliminando { $items } archivos } de la { trash } ({ $progress })... deleted = - { $items } { $items -> - [one] elemento eliminado - *[other] elementos eliminados + { $items -> + [one] Se ha eliminado un elemento + *[other] Se han eliminado { $items } elementos } de la { trash } emptying-trash = Vaciando la { trash } ({ $progress })... emptied-trash = Se ha vaciado la { trash } extracting = - Extrayendo{ $items -> + Extrayendo { $items } { $items -> [one] elemento *[other] elementos } de "{ $from }" a "{ $to }" ({ $progress })... extracted = - { $items } { $items -> - [one] elemento extraído - *[other] elementos extraídos + { $items -> + [one] Se ha extraído un elemento + *[other] Se han extraído { $items } elementos } de "{ $from }" a "{ $to }" setting-executable-and-launching = Estableciendo "{ $name }" como ejecutable y lanzando set-executable-and-launched = Se ha establecido "{ $name }" como ejecutable y se ha lanzado @@ -278,36 +278,36 @@ moving = } de "{ $from }" a "{ $to }" ({ $progress })... moved = { $items -> - [one] Se ha movido un archivo - *[other] Se han movido { $items } archivos - } desde { $from } a { $to } + [one] Se ha movido un elemento + *[other] Se han movido { $items } elementos + } de "{ $from }" a "{ $to }" permanently-deleting = - { $items -> - [one] Eliminando un archivo permanentemente - *[other] Eliminando permanentemente { $items } archivos - } + Eliminando { $items } { $items -> + [one] elemento + *[other] archivos + } permanentemente permanently-deleted = { $items -> [one] Se ha eliminado un archivo permanentemente *[other] Se han eliminado { $items } archivos permanentemente } -renaming = Renombrando { $from } a { $to } -renamed = Se ha renombrado { $from } a { $to } +renaming = Cambiando el nombre de "{ $from }" a "{ $to }" +renamed = Se ha cambiado el nombre de "{ $from }" a "{ $to }" restoring = - { $items -> - [one] Restaurando un archivo - *[other] Restaurando { $items } archivos - } desde la { trash } + Restaurando { $items } { $items -> + [one] elemento + *[other] elementos + } de la { trash } ({ $progress })... restored = { $items -> [one] Se ha restaurado un archivo *[other] Se han restaurado { $items } archivos - } desde la { trash } + } de la { trash } unknown-folder = carpeta desconocida ## Open with -menu-open-with = Abrir con +menu-open-with = Abrir con... default-app = { $name } (predeterminado) ## Show details @@ -345,11 +345,11 @@ compress = Comprimir delete-permanently = Eliminar permanentemente eject = Expulsar extract-here = Extraer aquí -new-file = Nuevo archivo -new-folder = Nueva carpeta +new-file = Nuevo archivo... +new-folder = Nueva carpeta... open-in-terminal = Abrir en la consola -move-to-trash = Mover a la { trash } -restore-from-trash = Restaurar desde la { trash } +move-to-trash = Mover a la papelera +restore-from-trash = Restaurar de la papelera remove-from-sidebar = Quitar de la barra lateral sort-by-name = Ordenar por nombre sort-by-modified = Ordenar por fecha de modificación @@ -407,3 +407,13 @@ sort-newest-first = Más reciente primero sort-oldest-first = Más antiguo primero sort-smallest-to-largest = De menor a mayor sort-largest-to-smallest = De mayor a menor +removing-from-recents = + Quitando { $items } { $items -> + [one] elemento + *[other] elementos + } de { recents } +removed-from-recents = + { $items -> + [one] Se ha quitado elemento + *[other] Se han quitado { $items } elementos + } de { recents } diff --git a/i18n/et/cosmic_files.ftl b/i18n/et/cosmic_files.ftl index 7a9eb09..27b87a0 100644 --- a/i18n/et/cosmic_files.ftl +++ b/i18n/et/cosmic_files.ftl @@ -88,3 +88,15 @@ pending = Ootel failed = Ebaõnnestunud complete = Tehtud dismiss = Suulge sõnum +notification-in-progress = Tegevused failidega on pooleli. +desktop-view-options = Töölauavaate valikud... +create-archive = Loo arhiivifail +extract-password-required = Salasõna on vajalik +extract-to = Paki lahti siia... +extract-to-title = Paku lahti kausta +empty-trash = Tühjenda prügikast +empty-trash-warning = Kas oled kindel, et soovid jäädavalt kustutada prügikasti sisu? +related-apps = Seotud rakendused +rename-file = Muuda faili nime +rename-folder = Muuda kausta nime +replace-title = „{ $filename }“ fail juba on selles asukohas olemas. diff --git a/i18n/ja/cosmic_files.ftl b/i18n/ja/cosmic_files.ftl index f216bf4..39dcaa3 100644 --- a/i18n/ja/cosmic_files.ftl +++ b/i18n/ja/cosmic_files.ftl @@ -9,7 +9,6 @@ notification-in-progress = ファイル操作中 trash = ゴミ箱 recents = 最近 undo = 元に戻す - # List view name = 名前 modified = 更新日 @@ -17,13 +16,15 @@ size = サイズ # Dialogs + ## Compress Dialog + create-archive = アーカイブを作成 ## Empty Trash Dialog + empty-trash = ゴミ箱を空にする empty-trash-warning = ゴミ箱のアイテムをすべて完全に削除してもよろしいですか? - # New File/Folder Dialog create-new-file = 新しいファイルを作成 create-new-folder = 新しいフォルダを作成 @@ -32,9 +33,8 @@ folder-name = フォルダ名 file-already-exists = 同じ名前のファイルがすでに存在します。 folder-already-exists = 同じ名前のフォルダがすでに存在します。 name-hidden = 「.」で始まる名前は隠られます。 -name-invalid = 「{$filename}」という名前は使用できません。 +name-invalid = 「{ $filename }」という名前は使用できません。 name-no-slashes = 「/」は名前に含められません。 - # Open/Save Dialog cancel = キャンセル create = 作る @@ -48,14 +48,12 @@ open-multiple-files = 複数ファイルを開く open-multiple-folders = 複数フォルダを開く save = 保存 save-file = ファイルを保存 - # Rename Dialog rename-file = ファイル名を変更 rename-folder = フォルダ名を変更 - # Replace Dialog replace = 置き換える -replace-title = {$filename}はすでにこの場所に存在します。 +replace-title = { $filename }はすでにこの場所に存在します。 replace-warning = 保存しているファイルで置き換えますか?置き換えると、内容を上書きます。 replace-warning-operation = 置き換えますか?置き換えると、内容を上書きます。 original-file = 元のファイル @@ -65,6 +63,7 @@ keep-both = 両方を保管 skip = スキップ ## Metadata Dialog + owner = 所有者 group = グループ other = その他 @@ -74,10 +73,13 @@ execute = 実行 # Context Pages + ## About -git-description = {$date}に{$hash}というGitコミット + +git-description = { $date }に{ $hash }というGitコミット ## Add Network Drive + add-network-drive = ネットワークドライブを追加 connect = 接続 connect-anonymously = 匿名的に接続 @@ -87,7 +89,9 @@ enter-server-address = サーバーアドレスを入力 network-drive-description = サーバーアドレスはプロトコル接頭辞とアドレスを含めます。 例: ssh://192.168.0.1, ftp://[2001:db8::1] + ### Make sure to keep the comma which separates the columns + network-drive-schemes = 利用可能なプロトコル,接頭辞 AppleTalk,afp:// @@ -103,46 +107,50 @@ try-again = 再試行 username = ユーザー名 ## Operations + edit-history = 変更の歴史 history = 歴史 no-history = 歴史にはアイテムはありません。 pending = 保留中 failed = 失敗 complete = 完了 -compressing = {$items}つのアイテムを{$from}から{$to}まで圧縮中 -compressed = {$items}つのアイテムを{$from}から{$to}まで圧縮完了 +compressing = { $items }つのアイテムを{ $from }から{ $to }まで圧縮中 +compressed = { $items }つのアイテムを{ $from }から{ $to }まで圧縮完了 copy_noun = コピー -creating = {$parent}で{$name}を作成中 -created = {$parent}で{$name}を作成完了 -copying = {$items}つのアイテムを{$from}から{$to}までコピー中 -copied = {$items}つのアイテムを{$from}から{$to}までコピー完了 -emptying-trash = {trash}を空にしています -emptied-trash = {trash}を空にした -moving = {$items}つのアイテムを{$from}から{$to}まで移動中 -moved = {$items}つのアイテムを{$from}から{$to}まで移動完了 -renaming = {$from}を{$to}に変更中 -renamed = {$from}を{$to}に変更完了 -restoring = {trash}から{$items}つのアイテムをもとに戻している -restored = {trash}から{$items}つのアイテムをもとに戻した +creating = { $parent }で{ $name }を作成中 +created = { $parent }で{ $name }を作成完了 +copying = { $items }つのアイテムを{ $from }から{ $to }までコピー中 +copied = { $items }つのアイテムを{ $from }から{ $to }までコピー完了 +emptying-trash = { trash }を空にしています +emptied-trash = { trash }を空にした +moving = { $items }つのアイテムを{ $from }から{ $to }まで移動中 +moved = { $items }つのアイテムを{ $from }から{ $to }まで移動完了 +renaming = { $from }を{ $to }に変更中 +renamed = { $from }を{ $to }に変更完了 +restoring = { trash }から{ $items }つのアイテムをもとに戻している +restored = { trash }から{ $items }つのアイテムをもとに戻した unknown-folder = 不明なフォルダー ## Open with + menu-open-with = 別のアプリケーションで開く -default-app = {$name} (デフォルト) +default-app = { $name } (デフォルト) ## Properties + properties = プロパティ ## Settings + settings = 設定 ### Appearance + appearance = 外観 theme = テーマ match-desktop = システム設定に従う dark = ダーク light = ライト - # Context menu add-to-sidebar = サイドバーに追加 compress = 圧縮 @@ -159,7 +167,9 @@ sort-by-size = サイズで並べ替え # Menu + ## File + file = ファイル new-tab = 新しいタブ new-window = 新しいウィンドウ @@ -169,6 +179,7 @@ close-tab = タブを閉じる quit = 終了 ## Edit + edit = 編集 cut = 切り取り copy = コピー @@ -176,8 +187,9 @@ paste = 貼り付け select-all = すべてを選択 ## View + zoom-in = ズームイン -default-size = デフォルトサイズ +default-size = 規定のサイズ zoom-out = ズームアウト view = 表示 grid-view = グリッドの表示 @@ -188,6 +200,7 @@ menu-settings = 設定... menu-about = COSMICファイルについて... ## Sort + sort = 並べ替え sort-a-z = A-Z sort-z-a = Z-A @@ -195,3 +208,5 @@ sort-newest-first = 新しい順 sort-oldest-first = 古い順 sort-smallest-to-largest = 最小から最大まで sort-largest-to-smallest = 最大から最小まで +repository = リポジトリ +support = サポート diff --git a/i18n/nb-NO/cosmic_files.ftl b/i18n/nb-NO/cosmic_files.ftl index dee7931..e0fb82c 100644 --- a/i18n/nb-NO/cosmic_files.ftl +++ b/i18n/nb-NO/cosmic_files.ftl @@ -140,3 +140,165 @@ zoom-out = Zoom ut cut = Klipp ut set-and-launch = Still inn og start domain = Domene +enter-server-address = Angi serveradresse +network-drive-description = + Serveradresser inkluderer ett protokollprefiks og en addresse. + Examples: ssh://192.168.0.1, ftp://[2001:db8::1] +network-drive-schemes = + Tilgjengelige protokoller, Prefiks + AppleTalk,afp:// + File Transfer Protocol,ftp:// eller ftps:// + Network File System,nfs:// + Server Message Block,smb:// + SSH File Transfer Protocol,sftp:// eller ssh:// + WebDAV,dav:// eller davs:// +network-drive-error = Kunne ikke nå nettverksdisk +remember-password = Husk passord +try-again = Prøv igjen +edit-history = Rediger hisorikk +history = Historikk +no-history = Ingenting i historikken. +progress = { $percent }% +progress-cancelled = { $percent }%, avbrutt +progress-failed = { $percent }%, mislykket +progress-paused = { $percent }%, satt på pause +compressing = + Komprimerer { $items } { $items -> + [one] objekt + *[other] objekter + } fra "{ $from }" til "{ $to }" ({ $progress })... +compressed = + Komprimerete { $items } { $items -> + [one] objekt + *[other] objekter + } fra "{ $from }" til "{ $to }" +copy_noun = Kopi +creating = Oppretter "{ $name }" i "{ $parent }" +created = Opprettet "{ $name }" i "{ $parent }" +copying = + Kopierer { $items } { $items -> + [one] objekt + *[other] objekter + } fra "{ $from }" til "{ $to }" ({ $progress })... +copied = + Kopierete { $items } { $items -> + [one] objekt + *[other] objekter + } fra "{ $from }" til "{ $to }" +deleting = + Sletter { $items } { $items -> + [one] objekt + *[other] objekt + } fra { trash } ({ $progress })... +deleted = + Slettet { $items } { $items -> + [one] objekt + *[other] objekter + } fra { trash } +emptying-trash = Tømmer { trash } ({ $progress })... +emptied-trash = Tømte { trash } +extracting = + Pakker ut { $items } { $items -> + [one] objekt + *[other] objekter + } fra «{ $from }» til «{ $to }» ({ $progress })... +extracted = + Pakka ut { $items } { $items -> + [one] objekt + *[other] objekter + } fra «{ $from }» til «{ $to }» +setting-executable-and-launching = Setter «{ $name }» som kjørbar og starter +set-executable-and-launched = Sett «{ $name }» som kjørbar og startet +setting-permissions = Setter tillatelser for «{ $name }» til { $mode } +set-permissions = Sett tillatelser for «{ $name }» til { $mode } +moving = + Flytter { $items } { $items -> + [one] objekt + *[other] objekter + } fra «{ $from }» til «{ $to }» ({ $progress })... +moved = + Flytta { $items } { $items -> + [one] objekt + *[other] objekter + } fra «{ $from }» til «{ $to }» +permanently-deleting = + Sletter { $items } { $items -> + [one] objekt + *[other] objekter + } permanent +permanently-deleted = + Sletta { $items } { $items -> + [one] objekt + *[other] objekter + } permanent +removing-from-recents = + Fjerner { $items } { $items -> + [one] objekt + *[other] objekter + } fra { recents } +removed-from-recents = + Fjerna { $items } { $items -> + [one] objekt + *[other] objekter + } fra { recents } +renaming = Bytter navn «{ $from }» til «{ $to }» +renamed = Byttet navn «{ $from }» til «{ $to }» +restoring = + Gjenopretter { $items } { $items -> + [one] objekt + *[other] objekter + } fra { trash } ({ $progress })... +restored = + Gjenopretta { $items } { $items -> + [one] objekt + *[other] objekter + } fra { trash } +unknown-folder = ukjent mappe +menu-open-with = Åpne med… +default-app = { $name } (standard) +show-details = Vis detaljer +type = Type: { $mime } +items = Objekter: { $items } +item-size = Størrelse: { $size } +item-created = Opprettet: { $created } +item-modified = Endret: { $modified } +item-accessed = Åpnet: { $accessed } +calculating = Beregner... +single-click = Ett klikk for å åpne +type-to-search = Skriv for å Søke +type-to-search-recursive = Søker i den aktuelle mappen og alle undermapper +type-to-search-enter-path = Åpner plasseringen til mappen eller filen +add-to-sidebar = Legg til sidepanelet +compress = Komprimer +delete-permanently = Slett permanent +eject = Løs ut +extract-here = Pakk ut +new-file = Ny fil… +new-folder = Ny mappe… +open-in-terminal = Åpne i terminal +move-to-trash = Flytt til papirkurven +restore-from-trash = Gjenoprett fra papirkurven +remove-from-sidebar = Fjern fra sidepanelet +sort-by-name = Sorter etter navn +sort-by-modified = Sorter etter modifisert +sort-by-size = Sorter etter størrelse +sort-by-trashed = Sorter etter slettingsdato +remove-from-recents = Fjern fra nylige +change-wallpaper = Bytt bakgrunnsbilde… +desktop-appearance = Skrivebordsutseende... +display-settings = Skjerminnstillinger… +reload-folder = Last inn mappe på nytt +rename = Gi nytt navn… +grid-view = Rutevisning +list-view = Rutenettvisning +show-hidden-files = Vis skjulte filer +list-directories-first = List mapper først +gallery-preview = Galleriforhåndsvisning +menu-about = Om COSMIC Filer... +sort = Sorter +sort-a-z = A-Å +sort-z-a = Å-A +sort-newest-first = Nyeste først +sort-oldest-first = Eldste først +sort-smallest-to-largest = Minste til største +sort-largest-to-smallest = Største til minste diff --git a/i18n/pl/cosmic_files.ftl b/i18n/pl/cosmic_files.ftl index f027fdd..25b5cd5 100644 --- a/i18n/pl/cosmic_files.ftl +++ b/i18n/pl/cosmic_files.ftl @@ -7,7 +7,7 @@ home = Katalog domowy networks = Sieci notification-in-progress = Operacje na plikach w toku. trash = Kosz -recents = Ubiegłe +recents = Poprzednie undo = Cofnij today = Dzisiaj # Desktop view options diff --git a/i18n/pt-BR/cosmic_files.ftl b/i18n/pt-BR/cosmic_files.ftl index e1b21ab..ec1f6b3 100644 --- a/i18n/pt-BR/cosmic_files.ftl +++ b/i18n/pt-BR/cosmic_files.ftl @@ -226,18 +226,18 @@ progress-paused = { $percent }%, pausado failed = Com falha complete = Concluído compressing = - Compactando { $items } { $items -> + Comprimindo { $items } { $items -> [one] item *[other] itens } de "{ $from }" para "{ $to }" ({ $progress })... compressed = - Compactado(s) { $items } { $items -> - [one] item - *[other] itens + { $items } { $items -> + [one] item comprimido + *[other] itens comprimidos } de "{ $from }" para "{ $to }" copy_noun = Copiado -creating = Criando { $name } em { $parent } -created = "{ $name }" criado em { $parent } +creating = Criando "{ $name }" em "{ $parent }" +created = "{ $name }" criado em "{ $parent }" copying = Copiando { $items } { $items -> [one] item @@ -285,15 +285,15 @@ moved = *[other] itens movidos } de "{ $from }" para "{ $to }" permanently-deleting = - Excluindo permanentemente "{ $items }" "{ $items -> - [one] item - *[other] itens - }" -permanently-deleted = - Excluído(s) permanentemente "{ $items }" "{ $items -> + Excluindo permanentemente { $items } { $items -> [one] item *[other] itens } +permanently-deleted = + { $items } { $items -> + [one] item excluído + *[other] itens excluídos + } permanentemente removing-from-recents = Removendo { $items } { $items -> [one] item @@ -301,9 +301,9 @@ removing-from-recents = } de { recents } removed-from-recents = { $items } { $items -> - [one] item - *[other] itens - } removido(s) de { recents } + [one] item removido + *[other] itens removidos + } de { recents } renaming = Renomeando "{ $from }" para "{ $to }" renamed = "{ $from }" renomeado para "{ $to }" restoring = @@ -354,7 +354,7 @@ type-to-search-recursive = Pesquisa na pasta atual e em todas as subpastas type-to-search-enter-path = Insere o caminho do diretório ou arquivo # Context menu add-to-sidebar = Adicionar à barra lateral -compress = Compactar +compress = Comprimir delete-permanently = Excluir permanentemente eject = Desmontar extract-here = Extrair diff --git a/i18n/pt/cosmic_files.ftl b/i18n/pt/cosmic_files.ftl index 9c130b3..d639907 100644 --- a/i18n/pt/cosmic_files.ftl +++ b/i18n/pt/cosmic_files.ftl @@ -3,7 +3,7 @@ empty-folder = Pasta vazia empty-folder-hidden = Pasta vazia (tem ficheiros ocultos) no-results = Nenhum resultado encontrado filesystem = Sistema de ficheiros -home = Pasta pessoal +home = Pasta Pessoal notification-in-progress = Operações em curso. trash = Lixo undo = Anular @@ -80,8 +80,8 @@ pending = Pendentes failed = Com falha complete = Concluído copy_noun = Copiado -creating = A criar { $name } em { $parent } -created = "{ $name }" criado em { $parent } +creating = A criar "{ $name }" em "{ $parent }" +created = "{ $name }" criado em "{ $parent }" copying = A copiar { $items } { $items -> [one] item @@ -211,7 +211,7 @@ trash-folder-icon = Ícone do lixo icon-size-and-spacing = Tamanho e espaçamento do ícone icon-size = Tamanho do ícone grid-spacing = Espaçamento entre ícones -trashed-on = Movido para o lixo +trashed-on = Enviado para o lixo operations-running = { $running } { $running -> [one] operação @@ -222,7 +222,7 @@ operations-running-finished = [one] operação *[other] operações } em execução ({ $percent }%), { $finished } concluídas... -pause = Pausar +pause = Pausa resume = Retomar create-archive = Criar arquivo extract-password-required = Palavra-passe necessária @@ -289,15 +289,15 @@ compressing = *[other] itens } de "{ $from }" para "{ $to }" ({ $progress })... compressed = - Comprimido(s) { $items } { $items -> - [one] item - *[other] itens + { $items } { $items -> + [one] item comprimido + *[other] itens comprimidos } de "{ $from }" para "{ $to }" deleting = A eliminar { $items } { $items -> [one] item *[other] itens - } do Lixo { trash } ({ $progress })... + } do { trash } ({ $progress })... deleted = { $items } { $items -> [one] item eliminado @@ -308,24 +308,24 @@ set-executable-and-launched = "{ $name }" definido como executável e iniciado setting-permissions = A definir permissões de "{ $name }" para { $mode } set-permissions = Definir permissões de "{ $name }" para { $mode } permanently-deleting = - A eliminar permanentemente "{ $items }" "{ $items -> - [one] item - *[other] itens - }" -permanently-deleted = - Eliminado(s) permanentemente "{ $items }" "{ $items -> + A eliminar permanentemente { $items } { $items -> [one] item *[other] itens } +permanently-deleted = + { $items } { $items -> + [one] item eliminado + *[other] itens eliminados + } permanentemente removing-from-recents = A remover { $items } { $items -> [one] item *[other] itens } de { recents } removed-from-recents = - Removido(s) { $items } { $items -> - [one] item - *[other] itens + { $items } { $items -> + [one] item removido + *[other] itens removidos } de { recents } type = Tipo: { $mime } items = Itens: { $items } diff --git a/i18n/sv/cosmic_files.ftl b/i18n/sv/cosmic_files.ftl index ef03e5b..46a9c95 100644 --- a/i18n/sv/cosmic_files.ftl +++ b/i18n/sv/cosmic_files.ftl @@ -104,7 +104,7 @@ write = Skriv execute = Exekvera # Listvy name = Namn -modified = Modifierad +modified = Ändrad trashed-on = Kastad size = Storlek # Framstegssidfot @@ -243,7 +243,7 @@ type = Typ: { $mime } items = Objekt: { $items } item-size = Storlek: { $size } item-created = Skapad: { $created } -item-modified = Modifierad: { $modified } +item-modified = Ändrad: { $modified } item-accessed = Åtkomst: { $accessed } calculating = Beräknar... diff --git a/i18n/zh-CN/cosmic_files.ftl b/i18n/zh-CN/cosmic_files.ftl index 7294a3a..b1298e5 100644 --- a/i18n/zh-CN/cosmic_files.ftl +++ b/i18n/zh-CN/cosmic_files.ftl @@ -275,17 +275,17 @@ moved = *[other] 项目 } 从 "{ $from }" 到 "{ $to }" permanently-deleting = - 正在永久删除 "{ $items }" "{ $items -> + 正在永久删除 { $items } { $items -> [one] 项目 *[other] 项目 - }" + } permanently-deleted = - 已永久删除 "{ $items }" "{ $items -> + 已永久删除 { $items } { $items -> [one] 项目 *[other] 项目 - }" + } removing-from-recents = - 正在从 { recents } 中移除 { $items } { $items -> + 正在从{ recents }中移除 { $items } { $items -> [one] 项目 *[other] 项目 } diff --git a/i18n/zh-TW/cosmic_files.ftl b/i18n/zh-TW/cosmic_files.ftl index 891f0a4..8075d79 100644 --- a/i18n/zh-TW/cosmic_files.ftl +++ b/i18n/zh-TW/cosmic_files.ftl @@ -121,20 +121,20 @@ pending = 待處理 failed = 失敗 complete = 完成 compressing = - 正在壓縮 { $items } 項目 { $items -> + 正在壓縮 { $items } { $items -> [one] 項目 *[other] 項目 } 從「{ $from }」到 「{ $to }」({ $progress })... compressed = - 已壓縮 { $items } 項目 { $items -> + 已壓縮 { $items } { $items -> [one] 項目 *[other] 項目 - } 從 { $from } 到 { $to } + }從「{ $from }」到「{ $to }」 copy_noun = 複製 -creating = 正在建立 { $name } 於 { $parent } -created = 已建立 { $name } 於 { $parent } +creating = 正在建立「{ $name }」於「{ $parent }」 +created = 已建立「{ $name }」於「{ $parent }」 copying = - 正在複製 { $items } 項目 { $items -> + 正在複製 { $items } { $items -> [one] 項目 *[other] 項目 } 從「{ $from }」到「{ $to }」({ $progress })... @@ -156,7 +156,7 @@ extracted = *[other] 項目 } 從 { $from } 到 { $to } moving = - 正在移動 { $items } 項目 { $items -> + 正在移動 { $items } { $items -> [one] 項目 *[other] 項目 } 從「{ $from }」到「{ $to }」({ $progress })... @@ -165,7 +165,7 @@ moved = [one] 項目 *[other] 項目 } 從「{ $from }」到「{ $to }」 -renaming = 正在重新命名 { $from } 為 { $to } +renaming = 正在重新命名「{ $from }」為「{ $to }」 renamed = 已重新命名 { $from } 為 { $to } restoring = 正在還原 { $items } 項目 { $items -> @@ -261,3 +261,28 @@ deleted = [one] 項目 *[other] 項目 }從{ trash } +permanently-deleting = + 正在永久刪除 { $items } { $items -> + [one] 项目 + *[other] 项目 + } +permanently-deleted = + 已永久刪除 { $items } { $items -> + [one] 项目 + *[other] 项目 + } +removing-from-recents = + 正在從{ recents }中移除 { $items } { $items -> + [one] 项目 + *[other] 项目 + } +deleting = + 正在刪除 { $items } { $items -> + [one] 项目 + *[other] 项目 + }從{ trash }({ $progress })… +removed-from-recents = + 已從{ recents }中移除 { $items } { $items -> + [one] 项目 + *[other] 项目 + } From 4a4d5c0a9ed6b4bf0e177d159d28c2fcb3406112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Fri, 3 Oct 2025 02:27:04 +0200 Subject: [PATCH 2/7] chore: update dependencies Also removes the license crate patch. --- Cargo.lock | 145 ++++++++++++++++++++++------------------------------- Cargo.toml | 9 ++-- src/app.rs | 3 +- 3 files changed, 64 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 30ecbfb..35b3fce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -833,6 +833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", + "regex-automata", "serde", ] @@ -1437,7 +1438,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1458,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "quote", "syn 2.0.106", @@ -1494,7 +1495,7 @@ dependencies = [ "libc", "libcosmic", "log", - "lzma-rust2", + "lzma-rust2 0.14.2", "md-5", "mime_guess", "notify-debouncer-full", @@ -1576,7 +1577,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#eac9b17070947d627d2450ee58a77d48377c511e" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#8616c40d235164779cd3f2ceec1fe9b2b4aceb40" dependencies = [ "cosmic-config", "ron", @@ -1597,7 +1598,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#e04bfd098f58958b09f0cf5e14a67f87e49dbaec" +source = "git+https://github.com/pop-os/cosmic-text.git#1140ce89b09433a10835d1219ea4f714329d1557" dependencies = [ "bitflags 2.9.4", "fontdb 0.23.0", @@ -1607,7 +1608,7 @@ dependencies = [ "rangemap", "rustc-hash 1.1.0", "self_cell", - "skrifa 0.36.0", + "skrifa", "smol_str", "swash", "sys-locale", @@ -1620,7 +1621,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "almost", "cosmic-config", @@ -1842,9 +1843,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "deflate64" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" [[package]] name = "deranged" @@ -2439,9 +2440,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "font-types" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7" +checksum = "511e2c18a516c666d27867d2f9821f76e7d591f762e9fc41dd6cc5c90fe54b0b" dependencies = [ "bytemuck", ] @@ -2530,10 +2531,11 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.17" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cad6ec36904c816446700d81a2a2b7968aa9f678c24821974fa9bd53b315228" +checksum = "528df05c8ed0bfd569c7018914ba1995be2a133ba9ead17628ddb0ff94b86331" dependencies = [ + "bstr", "gettext-rs", "log", "memchr", @@ -2954,9 +2956,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.11.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" +checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" [[package]] name = "guillotiere" @@ -2980,14 +2982,14 @@ dependencies = [ [[package]] name = "harfrust" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a4c970f1a00edc1626f1e3cc039492b15b73df28b9fff70f95404a571b4fae" +checksum = "1f3fd23d35c2d8bcf34a1f0e9ea8c0ad263f0c8a9a47108eee23aac76e71645a" dependencies = [ "bitflags 2.9.4", "bytemuck", "core_maths", - "read-fonts 0.34.0", + "read-fonts", "smallvec", ] @@ -3175,7 +3177,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "dnd", "iced_accessibility", @@ -3193,7 +3195,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "accesskit", "accesskit_winit", @@ -3202,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3226,7 +3228,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "futures", "iced_core", @@ -3252,7 +3254,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3274,7 +3276,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3286,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3301,7 +3303,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bytemuck", "cosmic-text", @@ -3317,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3348,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3367,7 +3369,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4452,7 +4454,7 @@ checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "apply", "ashpd 0.12.0", @@ -4481,7 +4483,6 @@ dependencies = [ "iced_winit", "image", "libc", - "license", "mime 0.3.17", "palette", "raw-window-handle", @@ -4546,16 +4547,6 @@ dependencies = [ "zlib-rs", ] -[[package]] -name = "license" -version = "3.7.0+3.27.0" -source = "git+https://github.com/evenorog/license.git#6dac4a556165c96b8e94fefe1a6ad75f45721891" -dependencies = [ - "reword", - "serde", - "serde_json", -] - [[package]] name = "linebender_resource_handle" version = "0.1.1" @@ -4704,6 +4695,16 @@ dependencies = [ "sha2", ] +[[package]] +name = "lzma-rust2" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d3176655c152883186e161a1031192759660878ac04b2f776290b4f4e770a9" +dependencies = [ + "crc", + "sha2", +] + [[package]] name = "mac-notification-sys" version = "0.6.6" @@ -6170,19 +6171,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.29.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d" -dependencies = [ - "bytemuck", - "font-types", -] - -[[package]] -name = "read-fonts" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8941f8e9d5f8ad3aebea330d01ac68c0167600eb31a86ecd86e97be4d13b51f5" +checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" dependencies = [ "bytemuck", "core_maths", @@ -6315,15 +6306,6 @@ dependencies = [ "usvg", ] -[[package]] -name = "reword" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2de73ec80cfacafa51b73b0db31d6c3a4718fc6b0d479ef445609704020c1b0" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "rfd" version = "0.15.4" @@ -6734,22 +6716,12 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skrifa" -version = "0.31.3" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607" +checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" dependencies = [ "bytemuck", - "read-fonts 0.29.3", -] - -[[package]] -name = "skrifa" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37004372610e83ee2a4c69c7d896b41f33da6a3dc1a4fe07dd9b2629a549b1dc" -dependencies = [ - "bytemuck", - "read-fonts 0.34.0", + "read-fonts", ] [[package]] @@ -6958,11 +6930,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" +checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" dependencies = [ - "skrifa 0.31.3", + "skrifa", "yazi", "zeno", ] @@ -7037,12 +7009,13 @@ dependencies = [ [[package]] name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b25026fb8cc9ab51ab9fdabe5d11706796966f6d1c78e19871ef63be2b8f0644" dependencies = [ "arrayvec", "grid", - "num-traits", + "serde", "slotmap", ] @@ -7539,9 +7512,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "uds_windows" @@ -9314,7 +9287,7 @@ dependencies = [ "getrandom 0.3.3", "hmac", "indexmap 2.11.4", - "lzma-rust2", + "lzma-rust2 0.13.0", "memchr", "pbkdf2", "ppmd-rust", diff --git a/Cargo.toml b/Cargo.toml index e1c1a2d..5f8b89b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,8 @@ xdg-mime = { git = "https://github.com/ebassi/xdg-mime-rs" } bzip2 = { version = "0.6", optional = true } #TODO: replace with pure Rust crate flate2 = "1.1" tar = "0.4.44" -lzma-rust2 = { version = "0.13", optional = true } -ordermap = { version = "0.5.10", features = ["serde"] } +lzma-rust2 = { version = "0.14", optional = true } +ordermap = { version = "0.5.12", features = ["serde"] } # Internationalization i18n-embed = { version = "0.16", features = [ "fluent-system", @@ -59,7 +59,7 @@ zip = "5.1.1" uzers = "0.12.1" md-5 = "0.10.6" png = "0.18" -jxl-oxide = { version = "0.12.4", features = ["image"] } +jxl-oxide = { version = "0.12.5", features = ["image"] } num_cpus = "1.17.0" # Completion-based IO runtime to enable io_uring / IOCP file IO support. @@ -135,6 +135,3 @@ tokio = { version = "1", features = ["rt", "macros"] } [workspace] members = ["cosmic-files-applet"] - -[patch.crates-io] -license = { git = "https://github.com/evenorog/license.git" } diff --git a/src/app.rs b/src/app.rs index 8e1420f..9d05d22 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2096,6 +2096,7 @@ impl Application for App { .version(env!("CARGO_PKG_VERSION")) .author("System76") .license("GPL-3.0-only") + .license_url("https://spdx.org/licenses/GPL-3.0-only") .developers([("Jeremy Soller", "jeremy@system76.com")]) .links([ (fl!("repository"), "https://github.com/pop-os/cosmic-files"), @@ -4695,7 +4696,7 @@ impl Application for App { Some(match &self.context_page { ContextPage::About => context_drawer::about( &self.about, - Message::LaunchUrl, + |url| Message::LaunchUrl(url.to_string()), Message::ToggleContextPage(ContextPage::About), ), ContextPage::EditHistory => context_drawer::context_drawer( From 909577b3643b2cf3d0a3e9b6db3a3172657336fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Fri, 3 Oct 2025 03:24:44 +0200 Subject: [PATCH 3/7] chore: clippy --- Cargo.lock | 49 ++++++++-------- src/app.rs | 48 +++++++-------- src/dialog.rs | 15 ++--- src/menu.rs | 12 ++-- src/mime_app.rs | 2 +- src/mime_icon.rs | 4 +- src/mounter/gvfs.rs | 5 +- src/tab.rs | 126 ++++++++++++++++++---------------------- src/thumbnail_cacher.rs | 6 +- 9 files changed, 121 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35b3fce..64a1f7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -965,9 +965,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.39" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ "find-msvc-tools", "jobserver", @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "quote", "syn 2.0.106", @@ -1621,7 +1621,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "almost", "cosmic-config", @@ -2343,9 +2343,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" [[package]] name = "fixed_decimal" @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "dnd", "iced_accessibility", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "accesskit", "accesskit_winit", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3228,7 +3228,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "futures", "iced_core", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3276,7 +3276,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3303,7 +3303,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "bytemuck", "cosmic-text", @@ -3319,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4454,7 +4454,7 @@ checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" +source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" dependencies = [ "apply", "ashpd 0.12.0", @@ -6608,9 +6608,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" +checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5" dependencies = [ "base64", "chrono", @@ -6619,8 +6619,7 @@ dependencies = [ "indexmap 2.11.4", "schemars 0.9.0", "schemars 1.0.4", - "serde", - "serde_derive", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -6628,9 +6627,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" +checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27" dependencies = [ "darling 0.21.3", "proc-macro2", diff --git a/src/app.rs b/src/app.rs index 9d05d22..dbbfff6 100644 --- a/src/app.rs +++ b/src/app.rs @@ -534,6 +534,12 @@ pub struct DialogPages { pages: VecDeque, } +impl Default for DialogPages { + fn default() -> Self { + Self::new() + } +} + impl DialogPages { pub fn new() -> Self { Self { @@ -996,7 +1002,6 @@ impl App { self.margin = overlaps; } - #[must_use] fn open_tab_entity( &mut self, location: Location, @@ -1061,7 +1066,6 @@ impl App { } // This wrapper ensures that local folders use trash and remote folders permanently delete with a dialog - #[must_use] fn delete(&mut self, paths: Vec) -> Task { let mut dialog_paths = Vec::new(); let mut trash_paths = Vec::new(); @@ -1069,10 +1073,7 @@ impl App { for path in paths { //TODO: is there a smarter way to check this? (like checking for trash folders) let can_trash = match path.metadata() { - Ok(metadata) => match tab::fs_kind(&metadata) { - tab::FsKind::Local => true, - _ => false, - }, + Ok(metadata) => matches!(tab::fs_kind(&metadata), tab::FsKind::Local), Err(err) => { log::warn!("failed to get metadata for {:?}: {}", path, err); false @@ -1097,7 +1098,6 @@ impl App { Task::batch(tasks) } - #[must_use] fn operation(&mut self, operation: Operation) -> Task { let id = self.pending_operation_id; let controller = Controller::default(); @@ -1157,7 +1157,6 @@ impl App { } } - #[must_use] fn rescan_operation_selection(&mut self, op_sel: OperationSelection) -> Task { log::info!("rescan_operation_selection {:?}", op_sel); let entity = self.tab_model.active(); @@ -2023,7 +2022,7 @@ impl App { } } - return false; + false } } @@ -2085,7 +2084,7 @@ impl Application for App { .unwrap() .block_on(async move { while let Some(task) = compio_rx.recv().await { - _ = compio::runtime::spawn(task).detach(); + compio::runtime::spawn(task).detach(); } }) }); @@ -2242,7 +2241,7 @@ impl Application for App { if location_opt .and_then(|x| x.path_opt()) - .map_or(false, |x| x.is_file()) + .is_some_and(|x| x.is_file()) { items.push(cosmic::widget::menu::Item::Button( fl!("open"), @@ -2320,14 +2319,14 @@ impl Application for App { found |= item.path().is_some_and(|p| path.starts_with(&p)) || item.name() == *name || item.uri() == *uri; - (!item.is_mounted() && found).then(|| *k) + (!item.is_mounted() && found).then_some(*k) }) }) .or(if found { None } else { // TODO do we need to choose the correct mounter? - self.mounter_items.iter().map(|(k, _)| *k).next() + self.mounter_items.keys().map(|k| *k).next() }) { if let Some(mounter) = MOUNTERS.get(&key) { @@ -3079,7 +3078,7 @@ impl Application for App { } Message::NetworkDriveSubmit => { //TODO: know which mounter to use for network drives - for (mounter_key, mounter) in MOUNTERS.iter() { + if let Some((mounter_key, mounter)) = MOUNTERS.iter().next() { self.network_drive_connecting = Some((*mounter_key, self.network_drive_input.clone())); return mounter @@ -3877,7 +3876,7 @@ impl Application for App { }; let window_id = WindowId::unique(); self.windows.insert( - window_id.clone(), + window_id, WindowKind::ContextMenu(entity, widget::Id::unique()), ); commands.push(self.update(Message::Surface( @@ -3901,7 +3900,7 @@ impl Application for App { parent: parent_id.unwrap_or( app.core .main_window_id() - .unwrap_or_else(|| WindowId::NONE), + .unwrap_or(WindowId::NONE), ), id: window_id, positioner, @@ -4062,7 +4061,7 @@ impl Application for App { .sort_names .get(&location_str) .or_else(|| SORT_OPTION_FALLBACK.get(&location_str)) - .unwrap_or_else(|| &(HeadingOptions::Name, true)); + .unwrap_or(&(HeadingOptions::Name, true)); tab.sort_name = sort.0; tab.sort_direction = sort.1; @@ -4377,7 +4376,7 @@ impl Application for App { .and_then(|x| x.path_opt()) .map(ToOwned::to_owned) { - return self.open_file(&[path]).into(); + return self.open_file(&[path]); } } NavMenuAction::OpenWith(entity) => { @@ -4635,7 +4634,7 @@ impl Application for App { if let Some(p) = paths.first() { { for (k, mounter_items) in &self.mounter_items { - if let Some(mounter) = MOUNTERS.get(&k) { + if let Some(mounter) = MOUNTERS.get(k) { if let Some(item) = mounter_items .iter() .find(|item| item.path().is_some_and(|path| path == *p)) @@ -4767,10 +4766,7 @@ impl Application for App { ); } } - - let Some(dialog_page) = self.dialog_pages.front() else { - return None; - }; + let dialog_page = self.dialog_pages.front()?; let cosmic_theme::Spacing { space_xxs, space_s, .. @@ -4855,8 +4851,7 @@ impl Application for App { archive_type: archive_types[index], password: password.clone(), }) - }) - .into(), + }), ]) .align_y(Alignment::Center) .spacing(space_xxs) @@ -5963,8 +5958,7 @@ impl Application for App { // watching the trash which is slow but also properly get events. let trash_paths = trash_bins .into_iter() - .map(|path| [path.join("files"), path]) - .flatten(); + .flat_map(|path| [path.join("files"), path]); for path in trash_paths { if let Err(e) = watcher.watch(&path, notify::RecursiveMode::NonRecursive) diff --git a/src/dialog.rs b/src/dialog.rs index 935a41a..af64b10 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -159,11 +159,9 @@ impl> From for DialogLabel { let underline = next_underline; next_underline = false; - if c == '_' { - if !underline { - next_underline = true; - continue; - } + if c == '_' && !underline { + next_underline = true; + continue; } if underline && key_bind_opt.is_none() { @@ -1041,10 +1039,7 @@ impl Application for App { ); } - let dialog_page = match self.dialog_pages.front() { - Some(some) => some, - None => return None, - }; + let dialog_page = self.dialog_pages.front()?; let dialog = match dialog_page { DialogPage::NewFolder { parent, name } => { @@ -1628,7 +1623,7 @@ impl Application for App { }; use cosmic::iced::Rectangle; let window_id = window::Id::unique(); - self.context_menu_window = Some(window_id.clone()); + self.context_menu_window = Some(window_id); let autosize_id = widget::Id::unique(); commands.push(self.update(Message::Surface( cosmic::surface::action::app_popup( diff --git a/src/menu.rs b/src/menu.rs index 548c4de..bb5f3a4 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -535,13 +535,13 @@ pub fn menu_bar<'a>( menu::Item::CheckBox( label, None, - sort_options.map_or(false, |(sort_name, sort_direction, _)| { + sort_options.is_some_and(|(sort_name, sort_direction, _)| { sort_name == sort && sort_direction == dir }), Action::SetSort(sort, dir), ) }; - let in_trash = tab_opt.map_or(false, |tab| tab.location == Location::Trash); + let in_trash = tab_opt.is_some_and(|tab| tab.location == Location::Trash); let mut selected_dir = 0; let mut selected = 0; @@ -637,26 +637,26 @@ pub fn menu_bar<'a>( menu::Item::CheckBox( fl!("grid-view"), None, - tab_opt.map_or(false, |tab| matches!(tab.config.view, tab::View::Grid)), + tab_opt.is_some_and(|tab| matches!(tab.config.view, tab::View::Grid)), Action::TabViewGrid, ), menu::Item::CheckBox( fl!("list-view"), None, - tab_opt.map_or(false, |tab| matches!(tab.config.view, tab::View::List)), + tab_opt.is_some_and(|tab| matches!(tab.config.view, tab::View::List)), Action::TabViewList, ), menu::Item::Divider, menu::Item::CheckBox( fl!("show-hidden-files"), None, - tab_opt.map_or(false, |tab| tab.config.show_hidden), + tab_opt.is_some_and(|tab| tab.config.show_hidden), Action::ToggleShowHidden, ), menu::Item::CheckBox( fl!("list-directories-first"), None, - tab_opt.map_or(false, |tab| tab.config.folders_first), + tab_opt.is_some_and(|tab| tab.config.folders_first), Action::ToggleFoldersFirst, ), menu::Item::CheckBox( diff --git a/src/mime_app.rs b/src/mime_app.rs index e8ed809..51b0beb 100644 --- a/src/mime_app.rs +++ b/src/mime_app.rs @@ -439,7 +439,7 @@ impl MimeAppCache { fn get_default_terminal(&self) -> Option { let output = process::Command::new("xdg-mime") - .args(&["query", "default", "x-scheme-handler/terminal"]) + .args(["query", "default", "x-scheme-handler/terminal"]) .output() .ok()?; diff --git a/src/mime_icon.rs b/src/mime_icon.rs index a697911..367d535 100644 --- a/src/mime_icon.rs +++ b/src/mime_icon.rs @@ -69,7 +69,7 @@ pub fn mime_for_path>( gb.file_name(file_name); } } else { - gb.path(&path); + gb.path(path); } if let Some(metadata) = metadata_opt { gb.metadata(metadata.clone()); @@ -77,7 +77,7 @@ pub fn mime_for_path>( let guess = gb.guess(); if guess.uncertain() { // If uncertain, try mime_guess. This could happen on platforms without shared-mime-info - mime_guess::from_path(&path).first_or_octet_stream() + mime_guess::from_path(path).first_or_octet_stream() } else { guess.mime_type().clone() } diff --git a/src/mounter/gvfs.rs b/src/mounter/gvfs.rs index 99490f2..3eda468 100644 --- a/src/mounter/gvfs.rs +++ b/src/mounter/gvfs.rs @@ -99,10 +99,7 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result, String> { let metadata = if !force_dir && !info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE) { let mtime = info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED); - let is_dir = match info.file_type() { - gio::FileType::Directory => true, - _ => false, - }; + let is_dir = matches!(info.file_type(), gio::FileType::Directory); let size_opt = match is_dir { true => None, false => Some(info.size() as u64), diff --git a/src/tab.rs b/src/tab.rs index 8e2a0ed..15d0cf3 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -309,24 +309,24 @@ fn tab_complete(path: &Path) -> Result, Box> { .ok_or_else(|| format!("path has no parent {:?}", path))? }; - let child_os = path.strip_prefix(&parent)?; + let child_os = path.strip_prefix(parent)?; let child = child_os .to_str() .ok_or_else(|| format!("invalid UTF-8 {:?}", child_os))?; - let pattern = format!("^{}", regex::escape(&child)); + let pattern = format!("^{}", regex::escape(child)); let regex = regex::RegexBuilder::new(&pattern) .case_insensitive(true) .build()?; let mut completions = Vec::new(); - for entry_res in fs::read_dir(&parent)? { + for entry_res in fs::read_dir(parent)? { let entry = entry_res?; let file_name_os = entry.file_name(); let Some(file_name) = file_name_os.to_str() else { continue; }; - if regex.is_match(&file_name) { + if regex.is_match(file_name) { completions.push((file_name.to_string(), entry.path())); } } @@ -610,10 +610,7 @@ pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconS let mtime = file_info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED); let mut display_name = Item::display_name(&file_info.display_name()); let remote = file_info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE); - let is_dir = match file_info.file_type() { - gio::FileType::Directory => true, - _ => false, - }; + let is_dir = matches!(file_info.file_type(), gio::FileType::Directory); let size_opt = match is_dir { true => None, @@ -881,11 +878,11 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { { if let Ok(path_meta) = fs::metadata(tab_path) { if fs_kind(&path_meta) == FsKind::Gvfs { - let file = gio::File::for_path(&tab_path); + let file = gio::File::for_path(tab_path); // gio crate expects a comma delimited string let mut attr_string = String::new(); - for attr in vec![ + for attr in [ gio::FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE, gio::FILE_ATTRIBUTE_TIME_MODIFIED, @@ -906,11 +903,9 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { ) { Ok(res) => { remote_scannable = true; - for file in res { - if let Ok(file) = file { - let full_path = Path::new(tab_path).join(file.name()); - items.push(item_from_gvfs_info(full_path, file, sizes)); - } + for file in res.flatten() { + let full_path = Path::new(tab_path).join(file.name()); + items.push(item_from_gvfs_info(full_path, file, sizes)); } } Err(err) => { @@ -1821,36 +1816,33 @@ impl ItemThumbnail { } }; - match dyn_img { - Some(dyn_img) => { - if let Ok(cacher) = thumbnail_cacher.as_ref() { - match cacher.update_with_image(dyn_img) { - Ok(path) => { - return ItemThumbnail::Image( - widget::image::Handle::from_path(path), - None, - ); - } - Err(err) => { - log::warn!("cacher failed to decode {:?}: {}", path, err); - } + if let Some(dyn_img) = dyn_img { + if let Ok(cacher) = thumbnail_cacher.as_ref() { + match cacher.update_with_image(dyn_img) { + Ok(path) => { + return ItemThumbnail::Image( + widget::image::Handle::from_path(path), + None, + ); + } + Err(err) => { + log::warn!("cacher failed to decode {:?}: {}", path, err); } - } else { - // Fallback for when thumbnail cacher isn't available. - let thumbnail = dyn_img - .thumbnail(thumbnail_size, thumbnail_size) - .into_rgba8(); - return ItemThumbnail::Image( - widget::image::Handle::from_rgba( - thumbnail.width(), - thumbnail.height(), - thumbnail.into_raw(), - ), - Some((dyn_img.width(), dyn_img.height())), - ); } + } else { + // Fallback for when thumbnail cacher isn't available. + let thumbnail = dyn_img + .thumbnail(thumbnail_size, thumbnail_size) + .into_rgba8(); + return ItemThumbnail::Image( + widget::image::Handle::from_rgba( + thumbnail.width(), + thumbnail.height(), + thumbnail.into_raw(), + ), + Some((dyn_img.width(), dyn_img.height())), + ); } - None => (), } } @@ -1924,7 +1916,7 @@ impl ItemThumbnail { thumbnail_dir: Option<&Path>, ) -> Option<(ItemThumbnail, NamedTempFile)> { // Try external thumbnailers - for thumbnailer in thumbnailer(&mime) { + for thumbnailer in thumbnailer(mime) { let is_evince = thumbnailer.exec.starts_with("evince-thumbnailer "); let prefix = if is_evince { //TODO: apparmor config for evince-thumbnailer does not allow /tmp/cosmic-files* @@ -1934,15 +1926,13 @@ impl ItemThumbnail { }; // It's preferable to create the tempfile in the same directory as the final cached - // thumbnail to ensure that no copies accross filesytems need to be made. However, + // thumbnail to ensure that no copies across filesytems need to be made. However, // the apparmor config for evince-thumbnailer does not allow this, so we need to // fallback to the system tempdir. - let file = if thumbnail_dir.is_none() || is_evince { - tempfile::Builder::new().prefix(prefix).tempfile() - } else { - tempfile::Builder::new() - .prefix(prefix) - .tempfile_in(thumbnail_dir.unwrap()) + let dir = if is_evince { None } else { thumbnail_dir }; + let file = match dir { + Some(d) => tempfile::Builder::new().prefix(prefix).tempfile_in(d), + None => tempfile::Builder::new().prefix(prefix).tempfile(), }; let file = match file { Ok(ok) => ok, @@ -2060,7 +2050,7 @@ impl Item { widget::image(handle.clone()).into() } ItemThumbnail::Svg(handle) => widget::svg(handle.clone()).into(), - ItemThumbnail::Text(content) => widget::text_editor(&content) + ItemThumbnail::Text(content) => widget::text_editor(content) .class(cosmic::theme::iced::TextEditor::Custom(Box::new( text_editor_class, ))) @@ -2544,7 +2534,7 @@ impl Tab { .and_then(|opts| opts.get(&location_str)) .or_else(|| SORT_OPTION_FALLBACK.get(&location_str)) .cloned() - .unwrap_or_else(|| (HeadingOptions::Name, true)); + .unwrap_or((HeadingOptions::Name, true)); let location = location.normalize(); let location_ancestors = location.ancestors(); let location_title = location.title(); @@ -3404,10 +3394,10 @@ impl Tab { // Try to select previous item in current row if !col .checked_sub(1) - .map_or(false, |col| self.select_position(row, col, mod_shift)) + .is_some_and(|col| self.select_position(row, col, mod_shift)) { // Try to select last item in previous row - if !row.checked_sub(1).map_or(false, |row| { + if !row.checked_sub(1).is_some_and(|row| { let mut col = 0; if let Some(ref items) = self.items_opt { for item in items.iter() { @@ -3496,7 +3486,7 @@ impl Tab { // Try to select item in last row if !row .checked_sub(1) - .map_or(false, |row| self.select_position(row, col, mod_shift)) + .is_some_and(|row| self.select_position(row, col, mod_shift)) { // Ensure current item is still selected if there are no other items self.select_position(row, col, mod_shift); @@ -3596,9 +3586,9 @@ impl Tab { self.update(Message::Click(click_i_opt), modifiers); } if let Some(ref mut items) = self.items_opt { - if !click_i_opt.map_or(false, |click_i| { - items.get(click_i).map_or(false, |x| x.selected) - }) { + if !click_i_opt + .is_some_and(|click_i| items.get(click_i).is_some_and(|x| x.selected)) + { // If item not selected, clear selection on other items for (i, item) in items.iter_mut().enumerate() { item.selected = Some(i) == click_i_opt; @@ -3972,7 +3962,7 @@ impl Tab { } } if location != self.location || selected_paths.is_some() { - if location.path_opt().map_or(true, |path| path.is_dir()) { + if location.path_opt().is_none_or(|path| path.is_dir()) { if selected_paths.is_none() { selected_paths = self .location @@ -3995,10 +3985,10 @@ impl Tab { // Update context menu popup if self.context_menu != last_context_menu { if last_context_menu.is_some() { - commands.push(Command::ContextMenu(None, self.window_id.clone())); + commands.push(Command::ContextMenu(None, self.window_id)); } if let Some(point) = self.context_menu { - commands.push(Command::ContextMenu(Some(point), self.window_id.clone())); + commands.push(Command::ContextMenu(Some(point), self.window_id)); } } @@ -4221,7 +4211,7 @@ impl Tab { ItemThumbnail::Text(text) => { element_opt = Some( widget::container( - widget::text_editor(&text).padding(space_xxs).class( + widget::text_editor(text).padding(space_xxs).class( cosmic::theme::iced::TextEditor::Custom(Box::new( text_editor_class, )), @@ -5387,7 +5377,7 @@ impl Tab { height: s.height - top_deduct as f32, })); - let spacer_height = size.height - y as f32 - top_deduct as f32; + let spacer_height = size.height - y - top_deduct as f32; if spacer_height > 0. { children.push( widget::container(Space::with_height(Length::Fixed(spacer_height))).into(), @@ -5490,7 +5480,7 @@ impl Tab { .on_right_press(move |p| { Message::ContextMenu( if self.context_menu.is_some() { None } else { p }, - self.window_id.clone(), + self.window_id, ) }) .wayland_on_right_press_window_position(); @@ -5604,7 +5594,7 @@ impl Tab { pub fn subscription(&self, preview: bool) -> Subscription { //TODO: how many thumbnail loads should be in flight at once? - let jobs = self.thumb_config.jobs.get().clone() as usize; + let jobs = self.thumb_config.jobs.get() as usize; let mut subscriptions = Vec::with_capacity(jobs + 3); if let Some(items) = &self.items_opt { @@ -5650,9 +5640,9 @@ impl Tab { }; if can_thumbnail { let mime = item.mime.clone(); - let max_jobs = jobs.clone(); - let max_mb = self.thumb_config.max_mem_mb.get().clone() as u64; - let max_size = self.thumb_config.max_size_mb.get().clone() as u64; + let max_jobs = jobs; + let max_mb = self.thumb_config.max_mem_mb.get() as u64; + let max_size = self.thumb_config.max_size_mb.get() as u64; subscriptions.push(Subscription::run_with_id( ("thumbnail", path.clone()), stream::channel(1, move |mut output| async move { diff --git a/src/thumbnail_cacher.rs b/src/thumbnail_cacher.rs index 6337354..acdd90b 100644 --- a/src/thumbnail_cacher.rs +++ b/src/thumbnail_cacher.rs @@ -160,9 +160,9 @@ impl ThumbnailCacher { let mut image_data = vec![ 0; - reader.output_buffer_size().ok_or_else( - || "The required image buffer size is too large." - )? + reader + .output_buffer_size() + .ok_or("The required image buffer size is too large.")? ]; reader.next_frame(&mut image_data)?; From c42e37b2dd8e2c3d690a56671fdb8238869be9da Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 3 Oct 2025 18:09:11 -0400 Subject: [PATCH 4/7] chore: update libcosmic --- Cargo.lock | 65 ++++++++++++++---------------------------------------- 1 file changed, 17 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64a1f7d..3150700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "quote", "syn 2.0.106", @@ -1621,7 +1621,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "almost", "cosmic-config", @@ -3162,7 +3162,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.1", + "windows-core 0.56.0", ] [[package]] @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "dnd", "iced_accessibility", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "accesskit", "accesskit_winit", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3228,7 +3228,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "futures", "iced_core", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3276,7 +3276,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3303,7 +3303,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "bytemuck", "cosmic-text", @@ -3319,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4454,7 +4454,7 @@ checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ad1672b8815389f7c13643615c54968597ffc07e" +source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" dependencies = [ "apply", "ashpd 0.12.0", @@ -8297,20 +8297,7 @@ dependencies = [ "windows-interface 0.59.2", "windows-link 0.1.3", "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-core" -version = "0.62.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" -dependencies = [ - "windows-implement 0.60.1", - "windows-interface 0.59.2", - "windows-link 0.2.0", - "windows-result 0.4.0", - "windows-strings 0.5.0", + "windows-strings", ] [[package]] @@ -8430,15 +8417,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-result" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" -dependencies = [ - "windows-link 0.2.0", -] - [[package]] name = "windows-strings" version = "0.4.2" @@ -8448,15 +8426,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" -dependencies = [ - "windows-link 0.2.0", -] - [[package]] name = "windows-sys" version = "0.45.0" From d788fe2421df738c0535cffc872522722fe329da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Sun, 5 Oct 2025 20:00:58 +0200 Subject: [PATCH 5/7] perf(zip): don't call `sync_all()` on every file Calling it on every file massively slows down extraction of zip archives containing a lot of files. Yields a ~60x time reduction for extracting a zipped folder containing 10,000 empty txt files. From what I can find, Ark also doesn't seem to do this, and instead relies on the OS to handle it. --- src/archive.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/archive.rs b/src/archive.rs index a0b30b9..9bd3b32 100644 --- a/src/archive.rs +++ b/src/archive.rs @@ -245,7 +245,6 @@ fn zip_extract>( controller.set_progress(total_progress); } } - outfile.sync_all()?; #[cfg(unix)] { // Check for real permissions, which we'll set in a second pass From c7ee1c9ae13d7df72b01a41f311a3893ab1ea5ff Mon Sep 17 00:00:00 2001 From: therealmate <61843503+therealmate@users.noreply.github.com> Date: Sun, 5 Oct 2025 20:39:56 +0200 Subject: [PATCH 6/7] fix: update modifier state for all windows, not just the main window Fixes https://github.com/pop-os/cosmic-files/issues/1152 --- src/app.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.rs b/src/app.rs index dbbfff6..e018323 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2968,8 +2968,8 @@ impl Application for App { } }, Message::ModifiersChanged(window_id, modifiers) => { + self.modifiers = modifiers; if self.core.main_window_id() == Some(window_id) { - self.modifiers = modifiers; let entity = self.tab_model.active(); return self.update(Message::TabMessage( Some(entity), From 6e3406a4beaee454b16a77f6ad978f202f229013 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 7 Oct 2025 14:01:14 -0400 Subject: [PATCH 7/7] fix(input): update libcosmic --- Cargo.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3150700..8c61ade 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1438,7 +1438,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "quote", "syn 2.0.106", @@ -1577,7 +1577,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#8616c40d235164779cd3f2ceec1fe9b2b4aceb40" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#68331387e4336c37ce2300bea8638257feab449a" dependencies = [ "cosmic-config", "ron", @@ -1590,7 +1590,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca" +source = "git+https://github.com/pop-os/dbus-settings-bindings#37cbe4e8c165428178be23a14bd37f19a19d3757" dependencies = [ "zbus 5.11.0", ] @@ -1598,7 +1598,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#1140ce89b09433a10835d1219ea4f714329d1557" +source = "git+https://github.com/pop-os/cosmic-text.git#6514323fbe764998415068e3ae40cf476753d425" dependencies = [ "bitflags 2.9.4", "fontdb 0.23.0", @@ -1621,7 +1621,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "almost", "cosmic-config", @@ -3162,7 +3162,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.56.0", + "windows-core 0.61.2", ] [[package]] @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "dnd", "iced_accessibility", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "accesskit", "accesskit_winit", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3228,7 +3228,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "futures", "iced_core", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3276,7 +3276,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3303,7 +3303,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "bytemuck", "cosmic-text", @@ -3319,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4454,7 +4454,7 @@ checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#34f55d6720b8623050b7ac6153d07cabae253bf8" +source = "git+https://github.com/pop-os/libcosmic.git#dc4e0edd7311152963c1574ee51540ae5b20e683" dependencies = [ "apply", "ashpd 0.12.0",