diff --git a/Cargo.lock b/Cargo.lock index b57ff0e..bf86394 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,9 +109,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8" +checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138" dependencies = [ "cipher", "cpubits", @@ -774,9 +774,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1009,9 +1009,9 @@ dependencies = [ [[package]] name = "cmov" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" [[package]] name = "cocoa" @@ -1317,7 +1317,20 @@ name = "cosmic-client-toolkit" version = "0.2.0" dependencies = [ "bitflags 2.11.1", - "cosmic-protocols", + "cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "libc", + "smithay-client-toolkit", + "wayland-client", + "wayland-protocols", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2" +dependencies = [ + "bitflags 2.11.1", + "cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)", "libc", "smithay-client-toolkit", "wayland-client", @@ -1354,7 +1367,7 @@ dependencies = [ [[package]] name = "cosmic-files" -version = "1.0.13" +version = "1.0.14" dependencies = [ "anyhow", "atomic_float", @@ -1422,7 +1435,7 @@ dependencies = [ [[package]] name = "cosmic-files-applet" -version = "1.0.13" +version = "1.0.14" dependencies = [ "cosmic-files", "log", @@ -1444,8 +1457,8 @@ dependencies = [ [[package]] name = "cosmic-mime-apps" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-mime-apps.git#673f3758920a7b20d307d356d586deef714df6b0" +version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-mime-apps.git#a95c8043a7b41ca3c143a1fad5b3b8a5a3411008" dependencies = [ "freedesktop-desktop-entry", "mime 0.3.17", @@ -1874,9 +1887,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -3864,7 +3877,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.61.2", + "windows-link 0.2.1", ] [[package]] @@ -4360,14 +4373,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" dependencies = [ "bitflags 2.11.1", "libc", "plain", - "redox_syscall 0.7.5", + "redox_syscall 0.8.0", ] [[package]] @@ -4579,9 +4592,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memmap2" @@ -4666,9 +4679,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "log", @@ -5969,6 +5982,16 @@ dependencies = [ "url", ] +[[package]] +name = "redox_event" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c07d0d6d291e3a951bd847b1cd4af32fc6243d64116cf7702838c02797688b7" +dependencies = [ + "bitflags 2.11.1", + "libredox", +] + [[package]] name = "redox_syscall" version = "0.5.18" @@ -5980,9 +6003,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b" +checksum = "7c7591fa2c6b601dfcfe5f043f65a1c39fcdf50efefcd7f1572e538c1f4b398d" dependencies = [ "bitflags 2.11.1", ] @@ -6616,9 +6639,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -7123,9 +7146,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.11+spec-1.1.0" +version = "0.25.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" +checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" dependencies = [ "indexmap 2.14.0", "toml_datetime", @@ -8601,7 +8624,7 @@ dependencies = [ "libredox", "orbclient", "raw-window-handle", - "redox_syscall 0.7.5", + "redox_event", "smol_str", "tracing", "winit-core", @@ -9152,18 +9175,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9e3fe98..95dd3d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-files" -version = "1.0.13" +version = "1.0.14" authors = ["Jeremy Soller "] edition = "2024" license = "GPL-3.0-only" diff --git a/cosmic-files-applet/Cargo.toml b/cosmic-files-applet/Cargo.toml index 8fcf2bd..b802913 100644 --- a/cosmic-files-applet/Cargo.toml +++ b/cosmic-files-applet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-files-applet" -version = "1.0.13" +version = "1.0.14" edition = "2024" [dependencies] diff --git a/debian/changelog b/debian/changelog index e4697d2..347d255 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cosmic-files (1.0.14) noble; urgency=medium + + * Epoch 1.0.14 version update + + -- Jeremy Soller Tue, 26 May 2026 08:30:59 -0600 + cosmic-files (1.0.13) noble; urgency=medium * Epoch 1.0.13 version update diff --git a/i18n/cs/cosmic_files.ftl b/i18n/cs/cosmic_files.ftl index 29814ba..fac1794 100644 --- a/i18n/cs/cosmic_files.ftl +++ b/i18n/cs/cosmic_files.ftl @@ -427,3 +427,4 @@ context-action-confirm-warning = *[other] položek }. run = Spustit +rename-confirm = Přejmenovat diff --git a/i18n/de/cosmic_files.ftl b/i18n/de/cosmic_files.ftl index 993af2d..65a5ebf 100644 --- a/i18n/de/cosmic_files.ftl +++ b/i18n/de/cosmic_files.ftl @@ -437,3 +437,4 @@ context-action-confirm-warning = *[other] Elementen }. run = Ausführen +rename-confirm = Umbenennen diff --git a/i18n/el/cosmic_files.ftl b/i18n/el/cosmic_files.ftl index 7471630..c75e419 100644 --- a/i18n/el/cosmic_files.ftl +++ b/i18n/el/cosmic_files.ftl @@ -327,3 +327,4 @@ context-action-confirm-warning = [one] στοιχείο *[other] στοιχεία }. +rename-confirm = Μετονομασία diff --git a/i18n/fi/cosmic_files.ftl b/i18n/fi/cosmic_files.ftl index f1c3c58..6000bc7 100644 --- a/i18n/fi/cosmic_files.ftl +++ b/i18n/fi/cosmic_files.ftl @@ -414,3 +414,4 @@ context-action-confirm-warning = *[other] kohdetta }. run = Suorita +rename-confirm = Nimeä uudelleen diff --git a/i18n/fr/cosmic_files.ftl b/i18n/fr/cosmic_files.ftl index 9f7941a..e85a1f6 100644 --- a/i18n/fr/cosmic_files.ftl +++ b/i18n/fr/cosmic_files.ftl @@ -451,3 +451,4 @@ context-action-confirm-warning = }. run = Exécuter context-action = Action contextuelle +rename-confirm = Renommer diff --git a/i18n/ga/cosmic_files.ftl b/i18n/ga/cosmic_files.ftl index 04d546f..773c2fa 100644 --- a/i18n/ga/cosmic_files.ftl +++ b/i18n/ga/cosmic_files.ftl @@ -442,3 +442,4 @@ context-action-confirm-warning = *[other] míreanna }. run = Rith +rename-confirm = Athainmnigh diff --git a/i18n/hu/cosmic_files.ftl b/i18n/hu/cosmic_files.ftl index 2cf31e6..c81703b 100644 --- a/i18n/hu/cosmic_files.ftl +++ b/i18n/hu/cosmic_files.ftl @@ -2,7 +2,7 @@ cosmic-files = COSMIC Fájlok comment = Fájlkezelő a COSMIC asztali környezethez keywords = mappa;fájl;kezelő; empty-folder = Üres mappa -empty-folder-hidden = Üres mappa (Rejtett elemeket tartalmaz) +empty-folder-hidden = Üres mappa (rejtett elemeket tartalmaz) no-results = Nincs találat filesystem = Fájlrendszer home = Saját mappa @@ -47,13 +47,13 @@ resume = Folytatás ## Compress Dialog -create-archive = Tömörített fájl létrehozása +create-archive = Archívum létrehozása ## Extract Dialog extract-password-required = Jelszó szükséges extract-to = Kibontás ide… -extract-to-title = Kibontás mappába +extract-to-title = Kibontási cél kiválasztása ## Empty Trash Dialog @@ -93,7 +93,7 @@ save-file = Fájl mentése ## Open With Dialog -open-with-title = Hogyan szeretnéd megnyitni a következőt: „{ $name }”? +open-with-title = Hogyan szeretnéd megnyitni a(z) „{ $name }” fájlt? browse-store = { $store } böngészése other-apps = Egyéb alkalmazások related-apps = Hasonló alkalmazások @@ -113,7 +113,7 @@ rename-folder = Mappa átnevezése ## Replace Dialog replace = Csere -replace-title = „{ $filename }” már létezik +replace-title = „{ $filename }” már létezik ezen a helyen replace-warning = Szeretnéd lecserélni a meglévő fájlt a mentendő fájllal? A cserével felülírod annak tartalmát. replace-warning-operation = Szeretnéd lecserélni? A csere felülírja annak tartalmát. original-file = Eredeti fájl @@ -133,7 +133,7 @@ set-and-launch = Beállítás és indítás open-with = Megnyitás ezzel owner = Tulajdonos group = Csoport -other = Többi +other = Mások ### Mode 0 @@ -172,7 +172,7 @@ read-write-execute = Olvasás, írás és végrehajtás favorite-path-error = Hiba a könyvtár megnyitásakor favorite-path-error-description = Nem sikerült megnyitni ezt: „{ $path }” - „{ $path }” lehet nem létezik, vagy nincs jogosultságod a megnyitásához + A(z) „{ $path }” útvonal lehet, hogy nem létezik, vagy nincs jogosultságod a megnyitásához Szeretnéd eltávolítani az oldalsávról? remove = Eltávolítás @@ -187,9 +187,9 @@ keep = Megtartás ## Add Network Drive add-network-drive = Hálózati meghajtó hozzáadása -connect = Csatlakozás -connect-anonymously = Csatlakozás névtelenül -connecting = Csatlakozás… +connect = Kapcsolódás +connect-anonymously = Kapcsolódás névtelenül +connecting = Kapcsolódás… domain = Tartomány enter-server-address = Add meg a kiszolgáló címét network-drive-description = @@ -209,7 +209,7 @@ network-drive-schemes = network-drive-error = Nem érhető el a hálózati meghajtó password = Jelszó remember-password = Jelszó megjegyzése -try-again = Újra +try-again = Próbáld újra username = Felhasználónév ## Operations @@ -217,7 +217,7 @@ username = Felhasználónév cancelled = Megszakítva edit-history = Fájlműveleti előzmények history = Előzmények -no-history = Nem találhatók elemek az előzményekben +no-history = Nem találhatók elemek az előzményekben. pending = Függőben progress = { $percent }% progress-cancelled = { $percent }%, megszakítva @@ -330,7 +330,7 @@ items = Elemek: { $items } item-size = Méret: { $size } item-created = Létrehozva: { $created } item-modified = Módosítva: { $modified } -item-accessed = Hozzáférve: { $accessed } +item-accessed = Utolsó hozzáférés: { $accessed } calculating = Számítás… ## Settings @@ -350,7 +350,7 @@ light = Világos type-to-search = Gépeléssel keresés type-to-search-recursive = Keresés a jelenlegi mappában és almappákban -type-to-search-enter-path = Elérési út megadása +type-to-search-enter-path = Elérési út megnyitása # Context menu add-to-sidebar = Hozzáadás az oldalsávhoz compress = Tömörítés… @@ -373,7 +373,7 @@ remove-from-recents = Eltávolítás a legutóbbiak közül change-wallpaper = Háttérkép cseréje… desktop-appearance = Asztali megjelenés… -display-settings = Képernyő-beállítások… +display-settings = Kijelzőbeállítások… # Menu @@ -406,7 +406,7 @@ grid-view = Rácsnézet list-view = Listanézet show-hidden-files = Rejtett fájlok megjelenítése list-directories-first = Könyvtárak listázása először -gallery-preview = Galéria előnézet +gallery-preview = Galéria-előnézet menu-settings = Beállítások… menu-about = A COSMIC Fájlok névjegye… @@ -415,8 +415,8 @@ menu-about = A COSMIC Fájlok névjegye… sort = Rendezés sort-a-z = A-Z sort-z-a = Z-A -sort-newest-first = Legújabb előre -sort-oldest-first = Legrégibb előre +sort-newest-first = Legújabb elöl +sort-oldest-first = Legrégibb elöl sort-smallest-to-largest = Legkisebbtől a legnagyobbig sort-largest-to-smallest = Legnagyobbtól a legkisebbig repository = Tároló @@ -445,3 +445,4 @@ context-action-confirm-warning = *[other] elemen } fog lefutni. run = Futtatás +rename-confirm = Átnevezés diff --git a/i18n/nb-NO/cosmic_files.ftl b/i18n/nb-NO/cosmic_files.ftl index e0fb82c..cae2b5b 100644 --- a/i18n/nb-NO/cosmic_files.ftl +++ b/i18n/nb-NO/cosmic_files.ftl @@ -98,7 +98,7 @@ permanently-delete-question = Slett permanent permanently-delete-warning = Er du sukker på om du vil permanent slette { $target }? Dette kan ikke angres. rename-file = Endre filnavn rename-folder = Endre mappenavn -replace-title = "{ $filename }" finnes allerede på denne plasseringen. +replace-title = «{ $filename }» finnes allerede på denne plasseringen replace-warning = Vil du bytte den ut med filen du lagrer? Dette vil overskrive innholdet. replace-warning-operation = Vil du erstatte den? Dette vil overskrive innholdet. original-file = Orginalfil @@ -122,8 +122,8 @@ read-write = Kun skrive- og lesbar read-write-execute = Lesbar, skrivbar og kjørbar favorite-path-error = Feil ved åpning av mappen favorite-path-error-description = - Kunne ikke åpne "{ $path }". - Den kan ikke eksistere eller så har du ikke tilgang til å åpne den. + Klarte ikke åpne «{ $path }». + «{ $path }» finnes ikke eller så har du ikke tilgang til å åpne den. Vil du fjerne den fra sidepanelet? keep = Behold @@ -140,7 +140,7 @@ zoom-out = Zoom ut cut = Klipp ut set-and-launch = Still inn og start domain = Domene -enter-server-address = Angi serveradresse +enter-server-address = Angi tjeneradresse network-drive-description = Serveradresser inkluderer ett protokollprefiks og en addresse. Examples: ssh://192.168.0.1, ftp://[2001:db8::1] diff --git a/i18n/pl/cosmic_files.ftl b/i18n/pl/cosmic_files.ftl index 9af6027..2f58d64 100644 --- a/i18n/pl/cosmic_files.ftl +++ b/i18n/pl/cosmic_files.ftl @@ -446,3 +446,4 @@ context-action-confirm-warning = *[other] elementów }. run = Uruchom +rename-confirm = Zmień nazwę diff --git a/i18n/pt-BR/cosmic_files.ftl b/i18n/pt-BR/cosmic_files.ftl index 6d33279..6309e46 100644 --- a/i18n/pt-BR/cosmic_files.ftl +++ b/i18n/pt-BR/cosmic_files.ftl @@ -445,3 +445,4 @@ context-action-confirm-warning = *[other] itens }. run = Executar +rename-confirm = Renomear diff --git a/i18n/pt/cosmic_files.ftl b/i18n/pt/cosmic_files.ftl index 211b094..447487e 100644 --- a/i18n/pt/cosmic_files.ftl +++ b/i18n/pt/cosmic_files.ftl @@ -354,3 +354,4 @@ sort-smallest-to-largest = Do menor para o maior sort-largest-to-smallest = Do maior para o menor context-action-confirm-title = Executar "{ $name }"? run = Executar +rename-confirm = Renomear diff --git a/i18n/ru/cosmic_files.ftl b/i18n/ru/cosmic_files.ftl index f8e76c1..f34a377 100644 --- a/i18n/ru/cosmic_files.ftl +++ b/i18n/ru/cosmic_files.ftl @@ -389,3 +389,4 @@ context-action-confirm-warning = *[other] элем. }. run = Выполнить +rename-confirm = Переименовать diff --git a/i18n/sv/cosmic_files.ftl b/i18n/sv/cosmic_files.ftl index 974c7dc..506be0b 100644 --- a/i18n/sv/cosmic_files.ftl +++ b/i18n/sv/cosmic_files.ftl @@ -418,3 +418,4 @@ context-action-confirm-warning = *[other] objekt }. run = Kör +rename-confirm = Byt namn diff --git a/i18n/uk/cosmic_files.ftl b/i18n/uk/cosmic_files.ftl index 7299a7d..9f23949 100644 --- a/i18n/uk/cosmic_files.ftl +++ b/i18n/uk/cosmic_files.ftl @@ -82,7 +82,7 @@ copying = Копіювання { $items } { $items -> [one] елемента *[other] елементів - } з «{ $from }» в «{ $to }» ({ $progress })... + } з «{ $from }» до «{ $to }» ({ $progress })... copied = Скопійовано { $items } { $items -> [one] елемент @@ -95,7 +95,7 @@ moving = Переміщення { $items } { $items -> [one] елемента *[other] елементів - } з «{ $from }» в «{ $to }» ({ $progress })... + } з «{ $from }» до «{ $to }» ({ $progress })... moved = Переміщено { $items } { $items -> [one] елемент @@ -299,7 +299,7 @@ extracting = Видобування { $items } { $items -> [one] елемента *[other] елементів - } з «{ $from }» в «{ $to }» ({ $progress })... + } з «{ $from }» до «{ $to }» ({ $progress })... extracted = Видобуто { $items } { $items -> [one] елемент @@ -364,10 +364,10 @@ removed-from-recents = *[other] елементів } з { recents } empty-trash-title = Спорожити смітник? -type-to-search-select = Вибирає перший відповідний файл або папку +type-to-search-select = Вибирає перший відповідний файл або теку pasted-image = Вставлене зображення pasted-text = Вставлений текст -pasted-video = Вставлене відео +pasted-video = Вставлене видиво copy-to-button-label = Копіювати move-to-button-label = Перемістити copy-to = Копіювати до… @@ -387,3 +387,4 @@ context-action-confirm-warning = *[other] елементів }. context-action = Контекстна дія +rename-confirm = Перейменувати diff --git a/i18n/zh-CN/cosmic_files.ftl b/i18n/zh-CN/cosmic_files.ftl index abc8fda..4807c4a 100644 --- a/i18n/zh-CN/cosmic_files.ftl +++ b/i18n/zh-CN/cosmic_files.ftl @@ -445,3 +445,4 @@ context-action-confirm-warning = *[other] 项目 } 上运行。 context-action = 环境行动 +rename-confirm = 重命名 diff --git a/i18n/zh-TW/cosmic_files.ftl b/i18n/zh-TW/cosmic_files.ftl index b356db3..294ed2a 100644 --- a/i18n/zh-TW/cosmic_files.ftl +++ b/i18n/zh-TW/cosmic_files.ftl @@ -392,3 +392,4 @@ context-action-confirm-warning = *[other] 項目 } 上執行。 run = 執行 +rename-confirm = 重新命名 diff --git a/src/app.rs b/src/app.rs index 0fc82ae..2b9e6c0 100644 --- a/src/app.rs +++ b/src/app.rs @@ -7,6 +7,7 @@ use cosmic::iced::clipboard::dnd::DndAction; use cosmic::iced::core::SmolStr; use cosmic::iced::core::widget::operation::focusable::unfocus; use cosmic::iced::futures::{self, SinkExt}; +use cosmic::iced::keyboard::key::Physical; use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers}; #[cfg(all(feature = "wayland", feature = "desktop-applet"))] use cosmic::iced::platform_specific::shell::wayland::commands::overlap_notify::overlap_notify; @@ -460,7 +461,7 @@ pub enum Message { ExtractToResult(DialogResult), #[cfg(all(feature = "wayland", feature = "desktop-applet"))] Focused(window::Id), - Key(window::Id, Modifiers, Key, Option), + Key(window::Id, Modifiers, Key, Physical, Option), LaunchUrl(String), MaybeExit, ModifiersChanged(window::Id, Modifiers), @@ -3654,7 +3655,7 @@ impl Application for App { return dialog.update(dialog_message); } } - Message::Key(window_id, modifiers, key, text) => { + Message::Key(window_id, modifiers, key, physical_key, text) => { #[cfg(all(feature = "wayland", feature = "desktop-applet"))] let in_surface_ids = self.surface_ids.values().any(|id| *id == window_id); #[cfg(not(all(feature = "wayland", feature = "desktop-applet")))] @@ -7072,11 +7073,14 @@ impl Application for App { }, Event::Keyboard(KeyEvent::KeyPressed { key, + physical_key, modifiers, text, .. }) => match status { - event::Status::Ignored => Some(Message::Key(window_id, modifiers, key, text)), + event::Status::Ignored => { + Some(Message::Key(window_id, modifiers, key, physical_key, text)) + } event::Status::Captured => None, }, Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => { diff --git a/src/dialog.rs b/src/dialog.rs index 69a1e7a..3201b54 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -6,7 +6,7 @@ use cosmic::app::{Core, Task, context_drawer}; use cosmic::iced::core::SmolStr; use cosmic::iced::core::widget::operation; use cosmic::iced::futures::{self, SinkExt}; -use cosmic::iced::keyboard::key::Named; +use cosmic::iced::keyboard::key::{Named, Physical}; use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers}; use cosmic::iced::platform_specific::shell::{self as iced_winit, SurfaceIdWrapper}; use cosmic::iced::widget::scrollable; @@ -456,7 +456,7 @@ enum Message { Escape, Filename(String), Filter(usize), - Key(Modifiers, Key, Option), + Key(Modifiers, Key, Physical, Option), ModifiersChanged(Modifiers), MounterItems(MounterKey, MounterItems), Mouse(window::Id, mouse::Button), @@ -1456,7 +1456,7 @@ impl Application for App { } return self.rescan_tab(None); } - Message::Key(modifiers, key, text) => { + Message::Key(modifiers, key, physical_key, text) => { for (key_bind, action) in &self.key_binds { if key_bind.matches(modifiers, &key, None) { return self.update(Message::from(action.message())); @@ -2056,11 +2056,14 @@ impl Application for App { }, Event::Keyboard(KeyEvent::KeyPressed { key, + physical_key, modifiers, text, .. }) => match status { - event::Status::Ignored => Some(Message::Key(modifiers, key, text)), + event::Status::Ignored => { + Some(Message::Key(modifiers, key, physical_key, text)) + } event::Status::Captured => { if key == Key::Named(Named::Escape) { Some(Message::Escape) diff --git a/src/menu.rs b/src/menu.rs index d167f41..f3a106f 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -72,6 +72,7 @@ pub fn context_menu<'a>( color.alpha *= 0.75; TextStyle { color: Some(color.into()), + ..Default::default() } } fn disabled_style(theme: &cosmic::Theme) -> TextStyle { @@ -79,6 +80,7 @@ pub fn context_menu<'a>( color.alpha *= 0.5; TextStyle { color: Some(color.into()), + ..Default::default() } } diff --git a/src/tab.rs b/src/tab.rs index d7339f8..378b413 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -7595,7 +7595,10 @@ mod tests { // Text editor content may add a trailing newline assert_eq!(content.text().trim_end(), "ab"); } - _ => panic!("expected Text thumbnail with valid prefix only, got {:?}", thumb), + _ => panic!( + "expected Text thumbnail with valid prefix only, got {:?}", + thumb + ), } Ok(()) }