Compare commits
13 commits
post-1.8-m
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e55e68c08 | |||
| 1d3445b1c3 | |||
|
|
900453787f | ||
|
|
a6af9a48c2 | ||
|
|
882d16513b | ||
|
|
8923105997 | ||
|
|
f62353fd0a | ||
|
|
8ad21891b3 | ||
| 3ee781bfc2 | |||
| cfdeaa3ae1 | |||
|
|
3b016ff126 | ||
|
|
66b3f34335 | ||
|
|
3d8af19ac4 |
18 changed files with 456 additions and 351 deletions
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -1,8 +1,10 @@
|
|||
- [ ] I have disclosed use of any AI generated code in my commit messages.
|
||||
- If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR.
|
||||
- In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment.
|
||||
- [ ] I understand these changes in full and will be able to respond to review comments.
|
||||
- [ ] My change is accurately described in the commit message.
|
||||
- [ ] My contribution is tested and working as described.
|
||||
- [ ] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
|
||||
Replace this text with a description of your changes, and why these changes are important. Read and acknowledge the list below. PRs without a completed checkbox will be closed.
|
||||
|
||||
---
|
||||
|
||||
- I have not included any LLM (also known as AI) generated content in this PR, including code, comments, and descriptions.
|
||||
- I understand these changes in full and will be able to respond to review comments.
|
||||
- My change is accurately described in the commit message.
|
||||
- My contribution is tested and working as described.
|
||||
- I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
|
||||
- [ ] I have read and followed all of the above requirements. For more information, see our [contributor guide](https://github.com/pop-os/pop/blob/master/CONTRIBUTING.md).
|
||||
|
|
|
|||
14
.github/workflows/require-checklist.yml
vendored
Normal file
14
.github/workflows/require-checklist.yml
vendored
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# From https://github.com/mheap/require-checklist-action, license MIT
|
||||
name: Require Checklist
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, edited, synchronize]
|
||||
|
||||
jobs:
|
||||
job1:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: mheap/require-checklist-action@v2
|
||||
with:
|
||||
requireChecklist: true
|
||||
637
Cargo.lock
generated
637
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "cosmic-player"
|
||||
version = "1.8.0"
|
||||
version = "1.10.0"
|
||||
edition = "2024"
|
||||
rust-version = "1.93"
|
||||
|
||||
|
|
|
|||
70
cargo.just
Normal file
70
cargo.just
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
cargo-target-dir := env('CARGO_TARGET_DIR', 'target')
|
||||
|
||||
# Compile with debug profile
|
||||
[no-cd]
|
||||
build-debug *args:
|
||||
cargo build {{args}}
|
||||
|
||||
# Compile with release profile
|
||||
[no-cd]
|
||||
build-release *args: (build-debug '--release' args)
|
||||
|
||||
# Compile with a vendored tarball
|
||||
[no-cd]
|
||||
build-vendored *args: vendor-extract (build-release '--frozen --offline' args)
|
||||
|
||||
# Check for errors and linter warnings
|
||||
[no-cd]
|
||||
check *args:
|
||||
cargo clippy --all-features {{args}} -- -W clippy::pedantic
|
||||
|
||||
# Runs a check with JSON message format for IDE integration
|
||||
[no-cd]
|
||||
check-json: (check '--message-format=json')
|
||||
|
||||
# Remove Cargo build artifacts
|
||||
[no-cd]
|
||||
clean:
|
||||
cargo clean
|
||||
|
||||
# Also remove .cargo and vendored dependencies
|
||||
[no-cd]
|
||||
clean-dist: clean
|
||||
rm -rf .cargo vendor vendor.tar target
|
||||
|
||||
# Run the application for testing purposes
|
||||
[no-cd]
|
||||
run *args:
|
||||
cargo run {{args}}
|
||||
|
||||
# Run `cargo test`
|
||||
[no-cd]
|
||||
test *args:
|
||||
cargo test {{args}}
|
||||
|
||||
# Vendor Cargo dependencies locally
|
||||
[no-cd]
|
||||
vendor:
|
||||
#!/usr/bin/env bash
|
||||
mkdir -p .cargo
|
||||
cargo vendor --locked | head -n -1 > .cargo/config.toml
|
||||
echo 'directory = "vendor"' >> .cargo/config.toml
|
||||
echo >> .cargo/config.toml
|
||||
echo '[env]' >> .cargo/config.toml
|
||||
if [ -n "${SOURCE_DATE_EPOCH}" ]
|
||||
then
|
||||
source_date="$(date -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%d")"
|
||||
echo "VERGEN_GIT_COMMIT_DATE = \"${source_date}\"" >> .cargo/config.toml
|
||||
fi
|
||||
if [ -n "${SOURCE_GIT_HASH}" ]
|
||||
then
|
||||
echo "VERGEN_GIT_SHA = \"${SOURCE_GIT_HASH}\"" >> .cargo/config.toml
|
||||
fi
|
||||
tar pcf vendor.tar .cargo vendor
|
||||
rm -rf .cargo vendor
|
||||
|
||||
# Extracts vendored dependencies
|
||||
[no-cd]
|
||||
vendor-extract:
|
||||
rm -rf vendor
|
||||
tar pxf vendor.tar
|
||||
12
debian/changelog
vendored
12
debian/changelog
vendored
|
|
@ -1,3 +1,15 @@
|
|||
cosmic-player (1.10.0) noble; urgency=medium
|
||||
|
||||
* Epoch 1.10.0 version update
|
||||
|
||||
-- Michael Murphy <michael@mmurphy.dev> Mon, 05 Oct 2026 21:25:27 +0200
|
||||
|
||||
cosmic-player (1.9.0) noble; urgency=medium
|
||||
|
||||
* Epoch 1.9.0 version update
|
||||
|
||||
-- Michael Murphy <michael@mmurphy.dev> Mon, 14 Sep 2026 21:57:45 +0200
|
||||
|
||||
cosmic-player (1.8.0) noble; urgency=medium
|
||||
|
||||
* Epoch 1.8.0 version update
|
||||
|
|
|
|||
6
debian/source/options
vendored
6
debian/source/options
vendored
|
|
@ -1,4 +1,6 @@
|
|||
tar-ignore=.github
|
||||
tar-ignore=.vscode
|
||||
tar-ignore=target/.rustc_info.json
|
||||
tar-ignore=target/CACHEDIR.TAG
|
||||
tar-ignore=target/debug
|
||||
tar-ignore=target/release
|
||||
tar-ignore=vendor
|
||||
tar-ignore=target
|
||||
|
|
@ -46,6 +46,6 @@ ab-repeat = A-B-Wiederholung
|
|||
ab-repeat-set-a = A-B-Wiederholung (A)
|
||||
ab-repeat-set-b = A-B-Wiederholung (B)
|
||||
ab-repeat-clear = A-B-Wiederholung löschen
|
||||
xdg-keywords = Audio;Film;Musik;Ton;Video;
|
||||
xdg-keywords = Audio;Film;Musik;Klang;Ton;Video;
|
||||
xdg-name = COSMIC Mediaplayer
|
||||
xdg-comment = Mediaplayer für den COSMIC-Desktop
|
||||
|
|
|
|||
0
i18n/fil/cosmic_player.ftl
Normal file
0
i18n/fil/cosmic_player.ftl
Normal file
|
|
@ -1,7 +1,7 @@
|
|||
settings = Axustes
|
||||
appearance = Apariencia
|
||||
theme = Tema
|
||||
match-desktop = Axustar ao escritorio
|
||||
match-desktop = Emparexar co escritorio
|
||||
dark = Escuro
|
||||
light = Claro
|
||||
file = Ficheiro
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ settings = Pengaturan
|
|||
untitled = Tidak Berjudul
|
||||
appearance = Tampilan
|
||||
theme = Tema
|
||||
match-desktop = Cocok desktop
|
||||
match-desktop = Sesuaikan desktop
|
||||
dark = Gelap
|
||||
light = Terang
|
||||
file = Berkas
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ open-file = Ldi afaylu
|
|||
open-folder = Ldi akaram
|
||||
repeat-disabled = Allus yensa
|
||||
repeat-track = Ales tazribt
|
||||
quit = Tuffɣa
|
||||
quit = Ffeɣ
|
||||
settings = Iɣewwaṛen
|
||||
appearance = Timeẓri
|
||||
theme = Asentel
|
||||
dark = Aɣmayan
|
||||
light = Aceɛlal
|
||||
match-desktop = Amṣada d tnarit
|
||||
match-desktop = Semṣada akked tnarit
|
||||
file = Afaylu
|
||||
close-file = Mdel afaylu
|
||||
album = Album: { $album }
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ open-folder = Буманы ашу
|
|||
settings = Баптаулар
|
||||
appearance = Сыртқы көрініс
|
||||
theme = Тема
|
||||
match-desktop = Жұмыс үстеліне сәйкес болу
|
||||
dark = Қою
|
||||
match-desktop = Жұмыс үстеліне сәйкес
|
||||
dark = Қараңғы
|
||||
light = Ашық
|
||||
file = Файл
|
||||
quit = Шығу
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ light = Ronî
|
|||
quit = Biqedîne
|
||||
open-file = Pelê veke
|
||||
open-folder = Peldankê veke
|
||||
match-desktop = Bi sermaseyê re li hev bîne
|
||||
match-desktop = Bi sermaseyê re guncav bike
|
||||
album = Elbum: { $album }
|
||||
audio = Deng
|
||||
no-video-or-audio-file-open = Tu pelê vîdiyo yan jî dengê vekirî tune ne
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
settings = Paramètres
|
||||
settings = Configuracion
|
||||
album = Album : { $album }
|
||||
audio = Àudio
|
||||
no-video-or-audio-file-open = Cap de fichièr vidèo o àudio pas dobèrt
|
||||
|
|
@ -9,7 +9,7 @@ untitled = Sens títol
|
|||
appearance = Aparéncia
|
||||
theme = Tèma
|
||||
match-desktop = Assortir al burèu
|
||||
dark = Fosc
|
||||
dark = Escur
|
||||
light = Clar
|
||||
file = Fichièr
|
||||
open-media = Dorbir mèdia...
|
||||
|
|
@ -31,3 +31,4 @@ ab-repeat-clear = Escafar la repeticion A-B
|
|||
xdg-name = Lector multimèdia COSMIC
|
||||
xdg-comment = Lector multimèdia pel burèu COSMIC
|
||||
xdg-keywords = Àudio;Musica;Vidèo;Film;Son;
|
||||
quit = Quitar
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
settings = การตั้งค่า
|
||||
dark = มืด
|
||||
light = สว่าง
|
||||
appearance = ลักษณะ
|
||||
|
|
@ -9,7 +9,7 @@ untitled = Без назви
|
|||
settings = Налаштування
|
||||
appearance = Вигляд
|
||||
theme = Тема
|
||||
match-desktop = Системна
|
||||
match-desktop = Підігнати під стільницю
|
||||
dark = Темна
|
||||
light = Світла
|
||||
file = Файл
|
||||
|
|
|
|||
23
src/main.rs
23
src/main.rs
|
|
@ -350,6 +350,8 @@ pub enum Message {
|
|||
VideoAreaClick,
|
||||
PlaybackSpeed(f64),
|
||||
ShowControls,
|
||||
ControlsHoverEnter,
|
||||
ControlsHoverExit,
|
||||
SystemThemeModeChange(cosmic_theme::ThemeMode),
|
||||
ToggleAbout,
|
||||
WindowClose,
|
||||
|
|
@ -363,6 +365,7 @@ pub struct App {
|
|||
album_art_opt: Option<tempfile::NamedTempFile>,
|
||||
controls: bool,
|
||||
controls_time: Instant,
|
||||
controls_hovered: bool,
|
||||
dropdown_opt: Option<DropdownKind>,
|
||||
fullscreen: bool,
|
||||
key_binds: HashMap<KeyBind, Action>,
|
||||
|
|
@ -661,6 +664,7 @@ impl App {
|
|||
|
||||
fn update_controls(&mut self, in_use: bool) {
|
||||
if in_use
|
||||
|| self.controls_hovered
|
||||
|| !self
|
||||
.video_opt
|
||||
.as_ref()
|
||||
|
|
@ -959,6 +963,7 @@ impl Application for App {
|
|||
album_art_opt: None,
|
||||
controls: true,
|
||||
controls_time: Instant::now(),
|
||||
controls_hovered: false,
|
||||
dropdown_opt: None,
|
||||
fullscreen: false,
|
||||
key_binds: key_binds(),
|
||||
|
|
@ -1696,6 +1701,18 @@ impl Application for App {
|
|||
Message::ShowControls => {
|
||||
self.update_controls(true);
|
||||
}
|
||||
Message::ControlsHoverEnter => {
|
||||
if !self.controls_hovered {
|
||||
self.controls_hovered = true;
|
||||
self.update_controls(true);
|
||||
}
|
||||
}
|
||||
Message::ControlsHoverExit => {
|
||||
if self.controls_hovered {
|
||||
self.controls_hovered = false;
|
||||
self.update_controls(false);
|
||||
}
|
||||
}
|
||||
Message::SystemThemeModeChange(_theme_mode) => {
|
||||
return self.update_config();
|
||||
}
|
||||
|
|
@ -2165,7 +2182,11 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
if !popup_items.is_empty() {
|
||||
popover = popover.popup(widget::column::with_children(popup_items));
|
||||
popover = popover.popup(
|
||||
widget::mouse_area(widget::column::with_children(popup_items))
|
||||
.on_enter(Message::ControlsHoverEnter)
|
||||
.on_exit(Message::ControlsHoverExit),
|
||||
);
|
||||
}
|
||||
|
||||
widget::container(popover)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue