diff --git a/Cargo.lock b/Cargo.lock index 91230c6..dd2ef1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1040,20 +1040,7 @@ name = "cosmic-client-toolkit" version = "0.2.0" dependencies = [ "bitflags 2.11.1", - "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)", + "cosmic-protocols", "libc", "smithay-client-toolkit", "wayland-client", @@ -1103,7 +1090,7 @@ dependencies = [ [[package]] name = "cosmic-player" -version = "1.0.14" +version = "1.0.13" dependencies = [ "ashpd 0.12.3", "clap_lex", @@ -1142,20 +1129,6 @@ dependencies = [ "wayland-server", ] -[[package]] -name = "cosmic-protocols" -version = "0.2.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2" -dependencies = [ - "bitflags 2.11.1", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "wayland-server", -] - [[package]] name = "cosmic-settings-daemon" version = "0.1.1-yoda.1" @@ -2576,7 +2549,7 @@ version = "0.14.0" dependencies = [ "bitflags 2.11.1", "bytes", - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "cosmic-client-toolkit", "dnd", "glam", "lilt", @@ -2659,7 +2632,7 @@ name = "iced_runtime" version = "0.14.0" dependencies = [ "bytes", - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "cosmic-client-toolkit", "dnd", "iced_core", "iced_futures", @@ -2707,7 +2680,7 @@ version = "0.14.0" dependencies = [ "bitflags 2.11.1", "bytemuck", - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "cosmic-client-toolkit", "cryoglyph", "futures", "glam", @@ -2732,7 +2705,7 @@ dependencies = [ name = "iced_widget" version = "0.14.2" dependencies = [ - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "cosmic-client-toolkit", "dnd", "iced_renderer", "iced_runtime", @@ -2749,7 +2722,7 @@ dependencies = [ name = "iced_winit" version = "0.14.0" dependencies = [ - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=160b086)", + "cosmic-client-toolkit", "cursor-icon", "dnd", "iced_debug", @@ -3332,7 +3305,7 @@ dependencies = [ "apply", "ashpd 0.12.3", "auto_enums", - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)", + "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", "cosmic-settings-daemon", @@ -4771,16 +4744,6 @@ dependencies = [ "font-types", ] -[[package]] -name = "redox_event" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea3e412d205440c7b0218af26247226f979ed1201674cda7a33cc70609084b5" -dependencies = [ - "bitflags 2.11.1", - "libredox", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -7012,7 +6975,7 @@ dependencies = [ "libredox", "orbclient", "raw-window-handle", - "redox_event", + "redox_syscall 0.7.5", "smol_str", "tracing", "winit-core", diff --git a/Cargo.toml b/Cargo.toml index 67474e6..2de6309 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-player" -version = "1.0.14" +version = "1.0.13" edition = "2024" rust-version = "1.93" diff --git a/TESTING.md b/TESTING.md deleted file mode 100644 index 42c3b32..0000000 --- a/TESTING.md +++ /dev/null @@ -1,16 +0,0 @@ -# Testing - -This document provides a regression testing checklist for COSMIC Files. The checklist provides a starting point for Quality Assurance reviews. - -## Checklist - -### File Operations - - - [ ] Selecting a folder with Open media folder opens the directory in the folder pane - - [ ] Selecting media from the folder pane works - - [ ] Open recent media contains a list of recently opened media - -### Navigation - - [ ] A-B repeat works with video and audio files - - [ ] A-B frame stepping works in video files - - [ ] General media navigation keybinds work and correctly update the timestamp where applicable diff --git a/debian/changelog b/debian/changelog index a962725..281fb04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -cosmic-player (1.0.14) noble; urgency=medium - - * Epoch 1.0.14 version update - - -- Jeremy Soller Tue, 26 May 2026 08:31:17 -0600 - cosmic-player (1.0.13) noble; urgency=medium * Epoch 1.0.13 version update diff --git a/i18n/ga/cosmic_player.ftl b/i18n/ga/cosmic_player.ftl index 002c492..e98e2a9 100644 --- a/i18n/ga/cosmic_player.ftl +++ b/i18n/ga/cosmic_player.ftl @@ -46,6 +46,3 @@ ab-repeat = Athsheinm A-B ab-repeat-set-a = Athsheinm A-B (A) ab-repeat-set-b = Athsheinm A-B (B) ab-repeat-clear = Glan Athsheinm A-B -xdg-name = Imreoir Meán COSMIC -xdg-comment = Seinnteoir meán don deasc COSMIC -xdg-keywords = Fuaim;Scannán;Scannán;Ceol;Fuaim;Físeán; diff --git a/i18n/hu/cosmic_player.ftl b/i18n/hu/cosmic_player.ftl index 0e916f8..46d70ad 100644 --- a/i18n/hu/cosmic_player.ftl +++ b/i18n/hu/cosmic_player.ftl @@ -1,6 +1,6 @@ album = Album: { $album } audio = Hang -no-video-or-audio-file-open = Nincs megnyitva videó- vagy hangfájl +no-video-or-audio-file-open = Nincs videó- vagy hangfájl megnyitva open-file = Fájl megnyitása open-folder = Mappa megnyitása subtitles = Feliratok diff --git a/i18n/zh-TW/cosmic_player.ftl b/i18n/zh-TW/cosmic_player.ftl index a9e810b..036ed4f 100644 --- a/i18n/zh-TW/cosmic_player.ftl +++ b/i18n/zh-TW/cosmic_player.ftl @@ -47,5 +47,5 @@ playback = 回放 next-frame = 下一幀 previous-frame = 上一幀 xdg-name = COSMIC 媒體播放器 -xdg-comment = COSMIC 桌面媒體播放器 +xdg-comment = 媒體播放器 用於 COSMIC 桌面 xdg-keywords = 音訊;影片;電影;音樂;聲音;影像; diff --git a/src/main.rs b/src/main.rs index 9883691..22fd8e7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,6 @@ use cosmic::app::{Core, Settings, Task, context_drawer}; use cosmic::command::set_theme; use cosmic::cosmic_config::{self, CosmicConfigEntry}; use cosmic::iced::event::{self, Event}; -use cosmic::iced::keyboard::key::Physical; use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers}; use cosmic::iced::mouse::{Event as MouseEvent, ScrollDelta}; use cosmic::iced::{ @@ -2062,12 +2061,9 @@ impl Application for App { let mut subscriptions = vec![ event::listen_with(|event, _status, _window_id| match event { - Event::Keyboard(KeyEvent::KeyPressed { - modifiers, - physical_key, - key, - .. - }) => Some(Message::Key(modifiers, physical_key, key)), + Event::Keyboard(KeyEvent::KeyPressed { key, modifiers, .. }) => { + Some(Message::Key(modifiers, key)) + } Event::Mouse(MouseEvent::CursorMoved { .. }) => Some(Message::ShowControls), Event::Mouse(MouseEvent::WheelScrolled { delta }) => Some(Message::Scrolled(delta)), _ => None,