+1 -1

gtk/build-aux/mg.tsirysndr.Rockbox.Devel.json gtk/build-aux/io.github.tsirysndr.Rockbox.json

··· 1 1 { 2 2 - "id": "mg.tsirysndr.Rockbox.Devel", 2 2 + "id": "io.github.tsirysndr.Rockbox", 3 3 "runtime": "org.gnome.Platform", 4 4 "runtime-version": "47", 5 5 "sdk": "org.gnome.Sdk",

+1 -1

gtk/data/gtk/album_details.blp

··· 19 19 valign: start; 20 20 width-request: 230; 21 21 height-request: 230; 22 22 - resource: "/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 22 22 + resource: "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 23 23 } 24 24 25 25 styles [

+1 -1

gtk/data/gtk/current_playlist.blp

··· 19 19 Image album_cover { 20 20 width-request: 300; 21 21 height-request: 300; 22 22 - resource: "/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 22 22 + resource: "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 23 23 } 24 24 } 25 25

+1 -1

gtk/data/gtk/media_controls.blp

··· 85 85 Image album_art { 86 86 width-request: 68; 87 87 height-request: 68; 88 88 - resource: "/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 88 88 + resource: "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 89 89 } 90 90 91 91 styles [

+1 -1

gtk/data/gtk/song.blp

··· 34 34 Image album_art { 35 35 width-request: 50; 36 36 height-request: 50; 37 37 - resource: "/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 37 37 + resource: "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg"; 38 38 } 39 39 40 40 styles [

+1 -1

gtk/data/gtk/window.blp

··· 255 255 orientation: vertical; 256 256 257 257 Image { 258 258 - resource: "/mg/tsirysndr/Rockbox/icons/jpg/disc.png"; 258 258 + resource: "/io/github/tsirysndr/Rockbox/icons/jpg/disc.png"; 259 259 width-request: 300; 260 260 height-request: 300; 261 261 margin-top: 20;

gtk/data/icons/hicolor/scalable/apps/mg.tsirysndr.Rockbox.Devel.svg gtk/data/icons/hicolor/scalable/apps/io.github.tsirysndr.Rockbox.Devel.svg

gtk/data/icons/hicolor/scalable/apps/mg.tsirysndr.Rockbox.svg gtk/data/icons/hicolor/scalable/apps/io.github.tsirysndr.Rockbox.svg

gtk/data/icons/hicolor/symbolic/apps/mg.tsirysndr.Rockbox-symbolic.svg gtk/data/icons/hicolor/symbolic/apps/io.github.tsirysndr.Rockbox-symbolic.svg

gtk/data/icons/hicolor/symbolic/apps/mg.tsirysndr.Rockbox.Devel-symbolic.svg gtk/data/icons/hicolor/symbolic/apps/io.github.tsirysndr.Rockbox.Devel-symbolic.svg

+11

gtk/data/io.github.tsirysndr.Rockbox.desktop.in.in

··· 1 1 + [Desktop Entry] 2 2 + Name=Rockbox 3 3 + GenericName=Rockbox 4 4 + Comment=Rockbox is a GTK frontend for the Rockbox Media Player 5 5 + Exec=rockbox-gtk 6 6 + Icon=@APP_ID@ 7 7 + Terminal=false 8 8 + Type=Application 9 9 + Categories=GNOME;GTK;Music;Audio;AudioVideo; 10 10 + Keywords=music;player;media;audio;playlist; 11 11 + StartupNotify=true

+4 -4

gtk/data/meson.build

··· 39 39 40 40 appstream_file = i18n.merge_file( 41 41 input: configure_file( 42 42 - input: 'mg.tsirysndr.Rockbox.metainfo.xml.in.in', 42 42 + input: 'io.github.tsirysndr.Rockbox.metainfo.xml.in.in', 43 43 output: app_id + '.metainfo.xml.in', 44 44 configuration: conf, 45 45 ), ··· 51 51 52 52 desktop_file = i18n.merge_file( 53 53 input: configure_file( 54 54 - input: 'mg.tsirysndr.Rockbox.desktop.in', 55 55 - output: 'rockbox.desktop.in', 54 54 + input: 'io.github.tsirysndr.Rockbox.desktop.in.in', 55 55 + output: 'io.github.tsirysndr.Rockbox.desktop.in', 56 56 configuration: conf, 57 57 ), 58 58 - output: 'rockbox.desktop', 58 58 + output: 'io.github.tsirysndr.Rockbox.desktop', 59 59 type: 'desktop', 60 60 po_dir: '../po', 61 61 install: true,

-11

gtk/data/mg.tsirysndr.Rockbox.desktop.in

··· 1 1 - [Desktop Entry] 2 2 - Name=Rockbox 3 3 - GenericName=Rockbox 4 4 - Comment=Rockbox is a GTK frontend for the Rockbox Media Player 5 5 - Exec=rokcbox-gtk 6 6 - Icon=@APP_ID@ 7 7 - Terminal=false 8 8 - Type=Application 9 9 - Categories=GNOME;GTK;Game; 10 10 - Keywords=gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;retroarch; 11 11 - StartupNotify=true

+2 -2

gtk/data/mg.tsirysndr.Rockbox.metainfo.xml.in.in gtk/data/io.github.tsirysndr.Rockbox.metainfo.xml.in.in

··· 4 4 <id>@APP_ID@</id> 5 5 <name>@NAME@</name> 6 6 <translation type="gettext">@PKGNAME@</translation> 7 7 - <launchable type="desktop-id">rockbox.desktop</launchable> 7 7 + <launchable type="desktop-id">@APP_ID@.desktop</launchable> 8 8 9 9 <!-- General --> 10 10 <summary>A Modern Gtk Application for Rockbox</summary> ··· 20 20 21 21 <!-- Branding --> 22 22 <developer_name>Tsiry Sandratraina</developer_name> 23 23 - <developer id="mg.tsirysndr"> 23 23 + <developer id="io.github.tsirysndr"> 24 24 <name>Tsiry Sandratraina</name> 25 25 </developer> 26 26 <branding>

+5 -5

gtk/meson.build

··· 18 18 19 19 # Initialize project variables 20 20 name = 'Rockbox' 21 21 - base_id = 'mg.tsirysndr.Rockbox' 22 22 - path_id = '/mg/tsirysndr/Rockbox' 21 21 + base_id = 'io.github.tsirysndr.Rockbox' 22 22 + path_id = '/io/github/tsirysndr/Rockbox' 23 23 app_id = base_id 24 24 vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip() 25 25 datadir = join_paths(get_option('prefix'), get_option('datadir')) 26 26 localedir = join_paths(get_option('prefix'), get_option('localedir')) 27 27 bindir = join_paths(get_option('prefix'), get_option('bindir')) 28 28 29 29 - app_id = 'mg.tsirysndr.Rockbox' 30 30 - prefix = '/mg/tsirysndr/Rockbox' 29 29 + app_id = 'io.github.tsirysndr.Rockbox' 30 30 + prefix = '/io/github/tsirysndr/Rockbox' 31 31 32 32 conf = configuration_data() 33 33 conf.set('APP_ID', app_id) ··· 36 36 conf.set('pkgdatadir', pkgdatadir) 37 37 38 38 subdir('src') 39 39 - subdir('data') 39 39 + subdir('data')

+2 -2

gtk/src/app.rs

··· 78 78 pub fn run() -> glib::ExitCode { 79 79 // Create new GObject and downcast it into RbApplication 80 80 let app = glib::Object::builder::<RbApplication>() 81 81 - .property("application-id", Some("mg.tsirysndr.Rockbox")) 81 81 + .property("application-id", Some("io.github.tsirysndr.Rockbox")) 82 82 .property("flags", gio::ApplicationFlags::empty()) 83 83 - .property("resource-base-path", Some("/mg/tsirysndr/Rockbox")) 83 83 + .property("resource-base-path", Some("/io/github/tsirysndr/Rockbox")) 84 84 .build(); 85 85 86 86 // Start running gtk::Application

+2 -1

gtk/src/ui/about_dialog.rs

··· 3 3 use crate::ui::window::RbApplicationWindow; 4 4 5 5 pub fn show(parent: &RbApplicationWindow) { 6 6 - let about = adw::AboutDialog::from_appdata("/mg/tsirysndr/Rockbox/metainfo.xml", Some("")); 6 6 + let about = 7 7 + adw::AboutDialog::from_appdata("/io/github/tsirysndr/Rockbox/metainfo.xml", Some("")); 7 8 about.set_designers(&["Tsiry Sandratraina"]); 8 9 about.set_developers(&["Tsiry Sandratraina https://github.com/tsirysndr"]); 9 10 about.set_copyright("© 2024 Tsiry Sandratraina");

+1 -1

gtk/src/ui/album_tracks.rs

··· 15 15 use super::*; 16 16 17 17 #[derive(Debug, Default, CompositeTemplate)] 18 18 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/album_tracks.ui")] 18 18 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/album_tracks.ui")] 19 19 pub struct AlbumTracks { 20 20 #[template_child] 21 21 pub volume: TemplateChild<Label>,

+1 -1

gtk/src/ui/artist.rs

··· 8 8 use super::*; 9 9 10 10 #[derive(Debug, Default, CompositeTemplate)] 11 11 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/artist.ui")] 11 11 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/artist.ui")] 12 12 pub struct Artist { 13 13 #[template_child] 14 14 pub artist_image: TemplateChild<Image>,

+1 -1

gtk/src/ui/file.rs

··· 21 21 use super::*; 22 22 23 23 #[derive(Debug, Default, CompositeTemplate)] 24 24 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/file.ui")] 24 24 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/file.ui")] 25 25 pub struct File { 26 26 #[template_child] 27 27 pub file_icon: TemplateChild<Image>,

+5 -4

gtk/src/ui/media_controls.rs

··· 35 35 use super::*; 36 36 37 37 #[derive(Debug, Default, CompositeTemplate)] 38 38 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/media_controls.ui")] 38 38 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/media_controls.ui")] 39 39 pub struct MediaControls { 40 40 #[template_child] 41 41 pub shuffle_button: TemplateChild<Button>, ··· 323 323 let path = format!("{}/.config/rockbox.org/covers/{}", home, filename); 324 324 album_art.set_from_file(Some(&path)); 325 325 } else { 326 326 - album_art 327 327 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 326 326 + album_art.set_resource(Some( 327 327 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 328 328 + )); 328 329 } 329 330 330 331 match state.is_liked_track(&track.id) { ··· 551 552 let path = format!("{}/.config/rockbox.org/covers/{}", home, filename); 552 553 album_art.set_from_file(Some(&path)); 553 554 } else { 554 554 - album_art.set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 555 555 + album_art.set_resource(Some("/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 555 556 } 556 557 557 558 let state = self.imp().state.upgrade().unwrap();

+4 -3

gtk/src/ui/pages/album_details.rs

··· 21 21 use super::*; 22 22 23 23 #[derive(Debug, Default, CompositeTemplate)] 24 24 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/album_details.ui")] 24 24 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/album_details.ui")] 25 25 pub struct AlbumDetails { 26 26 #[template_child] 27 27 pub album_cover: TemplateChild<Image>, ··· 159 159 self.album_cover.set_from_file(Some(&path)); 160 160 } 161 161 None => { 162 162 - self.album_cover 163 163 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 162 162 + self.album_cover.set_resource(Some( 163 163 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 164 164 + )); 164 165 } 165 166 } 166 167

+2 -2

gtk/src/ui/pages/albums.rs

··· 19 19 use super::*; 20 20 21 21 #[derive(Debug, Default, CompositeTemplate)] 22 22 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/albums.ui")] 22 22 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/albums.ui")] 23 23 pub struct Albums { 24 24 #[template_child] 25 25 pub library: TemplateChild<FlowBox>, ··· 114 114 Some(filename) => { 115 115 Image::from_file(&format!("{}/.config/rockbox.org/covers/{}", home, filename)) 116 116 } 117 117 - None => Image::from_resource("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg"), 117 117 + None => Image::from_resource("/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg"), 118 118 }; 119 119 image.set_size_request(200, 200); 120 120 let image_container = Box::new(Orientation::Vertical, 0);

+5 -5

gtk/src/ui/pages/artist_details.rs

··· 25 25 use super::*; 26 26 27 27 #[derive(Debug, Default, CompositeTemplate)] 28 28 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/artist_details.ui")] 28 28 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/artist_details.ui")] 29 29 pub struct ArtistDetails { 30 30 #[template_child] 31 31 pub artist_image: TemplateChild<Image>, ··· 210 210 } 211 211 None => { 212 212 song.imp().album_art.set_resource(Some( 213 213 - "/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 213 213 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 214 214 )); 215 215 } 216 216 } ··· 233 233 format!("{}/.config/rockbox.org/covers/{}", home, filename); 234 234 Image::from_file(&path) 235 235 } 236 236 - None => { 237 237 - Image::from_resource("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg") 238 238 - } 236 236 + None => Image::from_resource( 237 237 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 238 238 + ), 239 239 }; 240 240 image.set_size_request(200, 200); 241 241 let image_container = gtk::Box::new(Orientation::Vertical, 0);

+1 -1

gtk/src/ui/pages/artists.rs

··· 21 21 use super::*; 22 22 23 23 #[derive(Debug, Default, CompositeTemplate)] 24 24 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/artists.ui")] 24 24 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/artists.ui")] 25 25 pub struct Artists { 26 26 #[template_child] 27 27 pub artists: TemplateChild<FlowBox>,

+6 -6

gtk/src/ui/pages/current_playlist.rs

··· 22 22 use super::*; 23 23 24 24 #[derive(Debug, Default, CompositeTemplate)] 25 25 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/current_playlist.ui")] 25 25 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/current_playlist.ui")] 26 26 pub struct CurrentPlaylist { 27 27 #[template_child] 28 28 pub album_cover: TemplateChild<Image>, ··· 258 258 self.imp().album_cover.set_from_file(Some(&path)); 259 259 } 260 260 None => { 261 261 - self.imp() 262 262 - .album_cover 263 263 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 261 261 + self.imp().album_cover.set_resource(Some( 262 262 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 263 263 + )); 264 264 } 265 265 } 266 266 } 267 267 None => { 268 268 self.imp() 269 269 .album_cover 270 270 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 270 270 + .set_resource(Some("/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 271 271 self.imp().track_title.set_text("No song playing"); 272 272 self.imp().track_artist.set_text(""); 273 273 } ··· 368 368 None => { 369 369 song.imp() 370 370 .album_art 371 371 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 371 371 + .set_resource(Some("/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 372 372 } 373 373 } 374 374

+1 -1

gtk/src/ui/pages/files.rs

··· 21 21 use super::*; 22 22 23 23 #[derive(Debug, Default, CompositeTemplate)] 24 24 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/files.ui")] 24 24 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/files.ui")] 25 25 pub struct Files { 26 26 #[template_child] 27 27 pub files: TemplateChild<ListBox>,

+4 -4

gtk/src/ui/pages/likes.rs

··· 18 18 use super::*; 19 19 20 20 #[derive(Debug, Default, CompositeTemplate)] 21 21 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/likes.ui")] 21 21 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/likes.ui")] 22 22 pub struct Likes { 23 23 #[template_child] 24 24 pub tracks: TemplateChild<ListBox>, ··· 118 118 song.imp().album_art.set_from_file(Some(&path)); 119 119 } 120 120 None => { 121 121 - song.imp() 122 122 - .album_art 123 123 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 121 121 + song.imp().album_art.set_resource(Some( 122 122 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 123 123 + )); 124 124 } 125 125 } 126 126

+1 -1

gtk/src/ui/pages/search.rs

··· 16 16 use super::*; 17 17 18 18 #[derive(Debug, Default, CompositeTemplate)] 19 19 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/search.ui")] 19 19 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/search.ui")] 20 20 pub struct Search { 21 21 #[template_child] 22 22 pub albums: TemplateChild<Button>,

+4 -4

gtk/src/ui/pages/songs.rs

··· 20 20 use super::*; 21 21 22 22 #[derive(Debug, Default, CompositeTemplate)] 23 23 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/songs.ui")] 23 23 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/songs.ui")] 24 24 pub struct Songs { 25 25 #[template_child] 26 26 pub tracks: TemplateChild<ListBox>, ··· 135 135 song.imp().album_art.set_from_file(Some(&path)); 136 136 } 137 137 None => { 138 138 - song.imp() 139 139 - .album_art 140 140 - .set_resource(Some("/mg/tsirysndr/Rockbox/icons/jpg/albumart.jpg")); 138 138 + song.imp().album_art.set_resource(Some( 139 139 + "/io/github/tsirysndr/Rockbox/icons/jpg/albumart.jpg", 140 140 + )); 141 141 } 142 142 } 143 143

+1 -1

gtk/src/ui/preferences_dialog.rs

··· 79 79 use super::*; 80 80 81 81 #[derive(Debug, Default, CompositeTemplate)] 82 82 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/preferences.ui")] 82 82 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/preferences.ui")] 83 83 pub struct RbPreferencesDialog { 84 84 #[template_child] 85 85 pub library_location_label: TemplateChild<gtk::Label>,

+1 -1

gtk/src/ui/song.rs

··· 22 22 use super::*; 23 23 24 24 #[derive(Debug, Default, CompositeTemplate)] 25 25 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/song.ui")] 25 25 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/song.ui")] 26 26 pub struct Song { 27 27 #[template_child] 28 28 pub container: TemplateChild<gtk::Box>,

+1 -1

gtk/src/ui/window.rs

··· 40 40 use super::*; 41 41 42 42 #[derive(Debug, Default, CompositeTemplate)] 43 43 - #[template(resource = "/mg/tsirysndr/Rockbox/gtk/window.ui")] 43 43 + #[template(resource = "/io/github/tsirysndr/Rockbox/gtk/window.ui")] 44 44 pub struct RbApplicationWindow { 45 45 #[template_child] 46 46 pub show_sidebar_button: TemplateChild<Button>,