Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/main.rs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-player"
-version = "1.3.0"
+version = "1.6.0"
 edition = "2024"
 rust-version = "1.93"
 

debian/changelog

@@ -1,3 +1,27 @@
+cosmic-player (1.6.0) noble; urgency=medium
+
+  * Epoch 1.6.0 version update
+
+ -- Jeremy Soller <jeremy@system76.com>  Tue, 18 Aug 2026 07:14:20 -0600
+
+cosmic-player (1.5.0) noble; urgency=medium
+
+  * Epoch 1.5.0 version update
+
+ -- Jeremy Soller <jeremy@system76.com>  Tue, 28 Jul 2026 09:14:34 -0600
+
+cosmic-player (1.4.0) noble; urgency=medium
+
+  * Epoch 1.4.0 version update
+
+ -- Jeremy Soller <jeremy@system76.com>  Mon, 20 Jul 2026 14:36:34 -0600
+
+cosmic-player (1.3.0) noble; urgency=medium
+
+  * Epoch 1.3.0 version update
+
+ -- Jeremy Soller <jeremy@system76.com>  Sun, 12 Jul 2026 13:21:52 -0600
+
 cosmic-player (1.2.0) noble; urgency=medium
 
   * Epoch 1.2.0 version update

i18n/ar/cosmic_player.ftl

@@ -17,7 +17,7 @@ settings = الإعدادات
 ### Appearance
 
 appearance = المظهر
-theme = النسق
+theme = السمة
 match-desktop = طابق سطح المكتب
 dark = داكن
 light = فاتح
@@ -34,7 +34,7 @@ close-file = أغلِق الملف
 open-media-folder = افتح مجلَّد الوسائط...
 open-recent-media-folder = افتح مجلِّد الوسائط الحديثة
 close-media-folder = أغلِق مجلد الوسائط
-quit = أنهِ
+quit = إنهِ
 off = معطّل
 clear-recent = امحُ القائمة الحديثة
 repeat-disabled = التكرار مُعطَّل

i18n/ca/cosmic_player.ftl

@@ -1,2 +1,3 @@
 quit = Surt
 settings = Configuració
+open-file = Obre el fitxer

i18n/da/cosmic_player.ftl

@@ -0,0 +1,11 @@
+quit = Afslut
+appearance = Udseende
+theme = Tema
+match-desktop = Følg skrivebordets indstillinger
+dark = Mørkt
+light = Lyst
+close-file = Luk fil
+settings = Indstillinger
+open-file = Åbn fil
+open-folder = Åbn mappe
+file = Fil

i18n/de/cosmic_player.ftl

@@ -28,10 +28,10 @@ light = Hell
 ## Datei
 
 file = Datei
-open-media = Medium öffnen...
+open-media = Medium öffnen ...
 open-recent-media = Zuletzt verwendetes Medium öffnen
 close-file = Datei schließen
-open-media-folder = Medienordner öffnen...
+open-media-folder = Medienordner öffnen ...
 open-recent-media-folder = Ordner der zuletzt verwendeten Medien öffnen
 close-media-folder = Medienordner schließen
 quit = Beenden

i18n/el/cosmic_player.ftl

@@ -10,7 +10,7 @@ untitled = Χωρίς τίτλο
 theme = Θέμα
 repeat-track = Επανάληψη κομματιού
 appearance = Εμφάνιση
-quit = Έξοδος
+quit = Τερματισμός
 album = Άλμπουμ: { $album }
 playback = Αναπαραγωγή
 next-frame = Επόμενο καρέ

i18n/en-GB/cosmic_player.ftl

@@ -0,0 +1,11 @@
+quit = Quit
+settings = Settings
+appearance = Appearance
+theme = Theme
+match-desktop = Match desktop
+dark = Dark
+light = Light
+file = File
+close-file = Close file
+open-file = Open file
+open-folder = Open folder

i18n/fa/cosmic_player.ftl

@@ -0,0 +1 @@
+quit = خروج

i18n/fi/cosmic_player.ftl

@@ -11,7 +11,7 @@ unknown-author = Tuntematon tekijä
 untitled = Nimetön
 appearance = Ulkoasu
 theme = Teema
-match-desktop = Sovita työpöytään
+match-desktop = Sama kuin työpöytä
 dark = Tumma
 light = Vaalea
 file = Tiedosto

i18n/fr/cosmic_player.ftl

@@ -2,7 +2,7 @@ album = Album : { $album }
 audio = Audio
 no-video-or-audio-file-open = Aucun média sélectionné
 open-file = Ouvrir le fichier
-open-folder = Ouvrir dossier
+open-folder = Ouvrir le dossier
 subtitles = Sous-titres
 unknown-author = Auteur Inconnu
 untitled = Sans titre

i18n/gl/cosmic_player.ftl

@@ -0,0 +1,36 @@
+settings = Axustes
+appearance = Apariencia
+theme = Tema
+match-desktop = Axustar ao escritorio
+dark = Escuro
+light = Claro
+file = Ficheiro
+close-file = Pechar ficheiro
+quit = Pechar
+open-file = Abrir ficheiro
+open-folder = Abrir cartafol
+album = Álbum: { $album }
+audio = Audio
+no-video-or-audio-file-open = Non hai ningún ficheiro de vídeo ou audio aberto
+off = Desactivado
+subtitles = Subtitulos
+unknown-author = Autor descoñecido
+untitled = Sen titulo
+open-media = Abrir multimedia..
+open-recent-media = Abrir multimedia recente
+clear-recent = Limpar lista de recentes
+open-media-folder = Abrir cartafol multimedia...
+open-recent-media-folder = Abrir o cartafol de medios recentes
+close-media-folder = Pechar carpeta multimedia
+repeat-disabled = Repetición desactivada
+repeat-track = Repetir pista
+playback = Reprodución
+next-frame = Seguinte fotograma
+previous-frame = Fotograma anterior
+ab-repeat = Repetición A-B
+ab-repeat-set-a = Repetición A-B (A)
+ab-repeat-set-b = Repetición A-B (B)
+ab-repeat-clear = Limpar repetición A-B
+xdg-name = Reproductor Multimedia COSMIC
+xdg-comment = Reprodutor multimedia para o escritorio COSMIC
+xdg-keywords = Audio;Película;Filme;Música;Son;Vídeo;

i18n/hi/cosmic_player.ftl

@@ -3,13 +3,13 @@
 
 ## Settings
 
-settings = सेटिंग
+settings = सेटिंग्स
 
 ### Appearance
 
-appearance = उपस्थिति
+appearance = रुप-रंग
-theme = थीम
+theme = प्रसंग
-match-desktop = डेस्कटॉप से मिलाएं
+match-desktop = डेस्कटॉप से मेल खाएँ
 dark = डार्क
 light = लाइट
 album = एल्बम: { $album }
@@ -24,7 +24,7 @@ close-file = फ़ाइल बंद करें
 open-media-folder = मीडिया फ़ोल्डर खोलें…
 open-recent-media-folder = हाल का मीडिया फ़ोल्डर खोलें
 close-media-folder = मीडिया फ़ोल्डर बंद करें
-quit = बंद करें
+quit = बाहर जाएँ
 no-video-or-audio-file-open = कोई वीडियो या ऑडियो फ़ाइल खुली नहीं है
 open-media = मीडिया खोलें…
 open-recent-media = हाल का मीडिया खोलें

i18n/id/cosmic_player.ftl

@@ -11,7 +11,7 @@ settings = Pengaturan
 untitled = Tidak Berjudul
 appearance = Tampilan
 theme = Tema
-match-desktop = Cocokkan desktop
+match-desktop = Cocok desktop
 dark = Gelap
 light = Terang
 file = Berkas
@@ -31,3 +31,6 @@ ab-repeat = Pengulangan A-B
 playback = Pemutaran
 next-frame = Bagian Selanjutnya
 previous-frame = Bagian Sebelumnya
+xdg-name = Pemutar Media COSMIC
+xdg-comment = Pemutar Media untuk desktop COSMIC
+xdg-keywords = Audio;Film;Film;Musik;Suara;Video;

i18n/it/cosmic_player.ftl

@@ -18,7 +18,7 @@ settings = Impostazioni
 
 appearance = Aspetto
 theme = Tema
-match-desktop = Sistema
+match-desktop = Abbina al desktop
 dark = Scuro
 light = Chiaro
 

i18n/kk/cosmic_player.ftl

@@ -1,11 +1,11 @@
 open-file = Файлды ашу
 open-folder = Буманы ашу
 settings = Баптаулар
-appearance = Сыртқы түрі
+appearance = Сыртқы көрініс
-theme = Тақырып
+theme = Тема
-match-desktop = Жұмыс үстеліне сәйкес келу
+match-desktop = Жұмыс үстеліне сәйкес болу
-dark = Қараңғы
+dark = Қою
-light = Жарық
+light = Ашық
 file = Файл
 quit = Шығу
 close-file = Файлды жабу

i18n/kmr/cosmic_player.ftl

@@ -0,0 +1,36 @@
+settings = Sazkarî
+appearance = Xuyang
+theme = Rûkar
+dark = Tarî
+light = Ronî
+quit = Biqedîne
+open-file = Pelê veke
+open-folder = Peldankê veke
+match-desktop = Bi sermaseyê re li hev bîne
+album = Elbum: { $album }
+audio = Deng
+no-video-or-audio-file-open = Tu pelê vîdiyo yan jî dengê vekirî tune ne
+off = Vemirî
+subtitles = Jêrnivîs
+unknown-author = Hunermendê nenas
+untitled = Bê sernav
+file = Pel
+open-media = Mediyayê veke...
+close-file = Pelê bigire
+ab-repeat = A-B dûbare bike
+open-recent-media = Mediyayên dawî veke
+clear-recent = Lîsteya dawî pak bike
+open-media-folder = Peldanka mediyayê veke...
+open-recent-media-folder = Peldanka mediyayê ya dawî veke
+close-media-folder = Peldanka mediyayê bigire
+repeat-disabled = Dûbarekirin neçalak e
+repeat-track = Stranê dûbare bike
+playback = Lîstin
+next-frame = Wêneya pêş
+previous-frame = Wêneya paş
+ab-repeat-set-a = A-B (A) dûbare bike
+ab-repeat-set-b = A-B (B) dûbare bike
+ab-repeat-clear = Dûbarekirina A-B pak bike
+xdg-name = Lîstikvanê mediyayê ya COSMIC
+xdg-comment = Lîstikvanê mediyayê ji bo sermaseya COSMIC
+xdg-keywords = Deng;Fîlm;Fîlm;Muzîk;Deng;Vîdiyo;

i18n/ko/cosmic_player.ftl

@@ -25,3 +25,11 @@ close-file = 파일 닫기
 repeat-disabled = 반복 비활성화
 previous-frame = 이전 프레임
 next-frame = 다음 프레임
+ab-repeat = A-B 반복
+ab-repeat-set-a = A-B 반복 (A)
+ab-repeat-set-b = A-B 반복 (B)
+ab-repeat-clear = A-B 반복 취소
+xdg-name = COSMIC 미디어 플레이어
+xdg-comment = COSMIC 데스크톱을 위한 미디어 플레이어
+playback = 재생
+repeat-track = 트랙 반복

i18n/lt/cosmic_player.ftl

@@ -1,5 +1,5 @@
-quit = Išeiti
+quit = Išjungti
-settings = Nuostatos
+settings = Nuostatai
 close-file = Uždaryti failą
 match-desktop = Pagal darbalaukio temą
 appearance = Išvaizda

i18n/oc/cosmic_player.ftl

@@ -1 +1,33 @@
 settings = Paramètres
+album = Album : { $album }
+audio = Àudio
+no-video-or-audio-file-open = Cap de fichièr vidèo o àudio pas dobèrt
+off = Desactivat
+subtitles = Sostítols
+unknown-author = Autor desconegut
+untitled = Sens títol
+appearance = Aparéncia
+theme = Tèma
+match-desktop = Assortir al burèu
+dark = Fosc
+light = Clar
+file = Fichièr
+open-media = Dorbir mèdia...
+open-recent-media = Dobrir un mèdia recent
+clear-recent = Escafar la lista recenta
+close-file = Tampar lo fichièr
+open-media-folder = Dobrir un dossièr multimèdia...
+open-recent-media-folder = Dobrir lo dossièr del mèdia recent
+close-media-folder = Tampar lo dossièr del mèdia
+repeat-disabled = Repeticion desactivada
+repeat-track = Repetir la pista
+playback = Lectura
+next-frame = Imatge seguent
+previous-frame = Imatge precedent
+ab-repeat = Repetir la seccion A-B
+ab-repeat-set-a = Repeticion A-B (A)
+ab-repeat-set-b = Repeticion A-B (B)
+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;

i18n/pa/cosmic_player.ftl

@@ -1,10 +1,10 @@
 settings = ਸੈਟਿੰਗਾਂ
 appearance = ਦਿੱਖ
 theme = ਥੀਮ
-match-desktop = ਡੈਸਕਟਾਪ ਨਾਲ ਮਿਲਦਾ
+match-desktop = ਡੈਸਕਟਾਪ ਨਾਲ ਮਿਲਾਓ
 dark = ਗੂੜ੍ਹਾ
-light = ਹਲਕਾ
+light = ਫਿੱਕਾ
-quit = ਬਾਹਰ
+quit = ਸਮਾਪਤ
 open-file = ਫ਼ਾਇਲ ਨੂੰ ਖੋਲ੍ਹੋ
 file = ਫ਼ਾਇਲ
 open-folder = ਫੋਲਡਰ ਨੂੰ ਖੋਲ੍ਹੋ

i18n/pl/cosmic_player.ftl

@@ -34,7 +34,7 @@ close-file = Zamknij plik
 open-media-folder = Otwórz katalog z nośnikami…
 open-recent-media-folder = Otwórz poprzedni katalog z nośnikami
 close-media-folder = Zamknij katalog z nośnikami
-quit = Zamknij
+quit = Zakończ
 off = Wyłączone
 clear-recent = Wyczyść listę poprzednich
 repeat-disabled = Powtarzanie wyłączone

i18n/pt-BR/cosmic_player.ftl

@@ -34,7 +34,7 @@ close-file = Fechar arquivo
 open-media-folder = Abrir pasta de mídias...
 open-recent-media-folder = Abrir pasta recente de mídias
 close-media-folder = Fechar pasta de mídias
-quit = Sair
+quit = Encerrar
 off = Desligado
 clear-recent = Limpar lista de recentes
 repeat-track = Repetir faixa

i18n/ru/cosmic_player.ftl

@@ -15,7 +15,7 @@ light = Светлая
 open-file = Открыть файл
 album = Альбом: { $album }
 audio = Аудио
-no-video-or-audio-file-open = Нет открытых видео или аудио файлов
+no-video-or-audio-file-open = Нет открытых медиафайлов
 open-folder = Открыть папку
 subtitles = Субтитры
 unknown-author = Неизвестный автор
@@ -27,7 +27,7 @@ close-file = Закрыть файл
 open-media-folder = Открыть папку медиафайлов...
 open-recent-media-folder = Открыть папку недавних медиафайлов
 close-media-folder = Закрыть папку медиафайлов
-quit = Выйти
+quit = Завершить
 off = Выкл.
 clear-recent = Очистить список недавних
 repeat-disabled = Повтор отключён

i18n/uk/cosmic_player.ftl

@@ -19,7 +19,7 @@ close-file = Закрити файл
 open-media-folder = Відкрити теку...
 open-recent-media-folder = Відкрити попередню теку
 close-media-folder = Закрити теку
-quit = Вийти
+quit = Завершити
 off = Вимк.
 clear-recent = Очистити список
 repeat-disabled = Не повторювати

i18n/zh-TW/cosmic_player.ftl

@@ -34,7 +34,7 @@ close-file = 關閉檔案
 open-media-folder = 開啟媒體資料夾...
 open-recent-media-folder = 開啟最近使用的媒體資料夾
 close-media-folder = 關閉媒體資料夾
-quit = 退出
+quit = 結束
 off = 關閉
 clear-recent = 清除最近使用清單
 repeat-disabled = 重複已經停用

src/main.rs

@@ -901,7 +901,7 @@ impl Application for App {
 
     /// Creates the application, and optionally emits command on initialize.
     fn init(mut core: Core, flags: Self::Flags) -> (Self, Task<Self::Message>) {
-        core.window.content_container = false;
+        core.window.border_padding = Some(0);
 
         #[cfg(feature = "xdg-portal")]
         let inhibit = {
@@ -1062,18 +1062,6 @@ impl Application for App {
         }
     }
 
-    fn style(&self) -> Option<cosmic::iced::core::theme::Style> {
-        // This ensures we have a solid background color even when using no content container
-
-        let theme = self.core.system_theme();
-
-        Some(cosmic::iced::core::theme::Style {
-            background_color: theme.cosmic().bg_color().into(),
-            icon_color: theme.cosmic().on_bg_color().into(),
-            text_color: theme.cosmic().on_bg_color().into(),
-        })
-    }
-
     /// Handle application events here.
     fn update(&mut self, message: Self::Message) -> Task<Self::Message> {
         match message {
@@ -1740,7 +1728,7 @@ impl Application for App {
         };
 
         let Some(video) = &self.video_opt else {
-            //TODO: use space variables
+            // TODO: use space variables
             let column = widget::column::with_capacity(4)
                 .align_x(Alignment::Center)
                 .spacing(24)
@@ -1757,11 +1745,7 @@ impl Application for App {
                 .push(widget::button::suggested(fl!("open-file")).on_press(Message::FileOpen))
                 .push(widget::space::vertical());
 
-            return widget::container(column)
+            return column.into();
-                .width(Length::Fill)
-                .height(Length::Fill)
-                .class(theme::Container::WindowBackground)
-                .into();
         };
 
         let muted = video.muted();
@@ -1781,8 +1765,9 @@ impl Application for App {
         let mut background_color = Color::BLACK;
         let mut text_color_opt = None;
         if !video.has_video() {
-            background_color = theme.cosmic().bg_component_color().into();
+            let bg = theme.cosmic().background(theme.transparent);
-            text_color_opt = Some(Color::from(theme.cosmic().on_bg_component_color()));
+            background_color = Color::TRANSPARENT;
+            text_color_opt = Some(Color::from(bg.on));
 
             let mut col = widget::column::with_capacity(10);
             col = col.push(widget::space::vertical());
@@ -1974,7 +1959,7 @@ impl Application for App {
                             //TODO: move style to libcosmic
                             .class(theme::Container::custom(|theme| {
                                 let cosmic = theme.cosmic();
-                                let component = &cosmic.background(false).component;
+                                let component = &cosmic.background(theme.transparent).component;
                                 widget::container::Style {
                                     icon_color: Some(component.on.into()),
                                     text_color: Some(component.on.into()),