🧹 cleanup

cachyos-welcome.gresource.xml

@@ -3,5 +3,10 @@
   <gresource prefix="/org/cachyos/hello">
     <file compressed="true" preprocess="xml-stripblanks">ui/cachyos-hello.glade</file>
     <file compressed="true">ui/style.css</file>
+    <file compressed="true">data/img/external-link.png</file>
+    <file compressed="true">data/img/discord.png</file>
+    <file compressed="true">data/img/reddit.png</file>
+    <file compressed="true">data/img/telegram.png</file>
+    <file compressed="true">data/img/twitter.png</file>
   </gresource>
 </gresources>

data/pages/da/readme

@@ -26,10 +26,6 @@ CachyOS-forummet er opdelt i underfora til forskellige emner og miljøer, så op
 
 En anden mulighed er at deltage på Telegram.
 
-<b>Tilmeld dig på en mailingliste</b>
-
-En tredje måde at få hjælp på er ved at sende spørgsmål via e-mail til en CachyOS-mailingliste (der er også mulighed for at søge efter tidligere diskussioner i historikken). Tilmeld dig blot den liste du ønsker og følge instruktionerne. Der er dedikerede lister til forskellige emner. Se selv.
-
 <big>Andre ressourcer</big>
 
     - <a href="https://forum.cachyos.org">CachyOS Forum</a> - Officiel CachyOS Forum (engelsk).

data/pages/en/readme

@@ -22,10 +22,6 @@ For specific help with CachyOS we have a dedicated online forum where you can se
 
 The CachyOS forum is divided into sub-forums for different topics and environments, please post your query in the appropriate place!
 
-<b>Sign up to a mailing list</b>
-
-Another way to get help is to email questions to CachyOS mailing list (you can also search the history for past discussions). Simply sign up to the list you prefer and follow the instructions. There is a list dedicated to several topics, just take a look!
-
 <big>Other resources</big>
 
     - <a href="https://aur.archlinux.org">AUR Repository</a> - Extra software not in the regular repositories, built from source.

data/pages/es/readme

@@ -26,10 +26,6 @@ The CachyOS forum is divided into sub-forums for different topics and environmen
 
 Another option is to join us on Telegram.
 
-<b>Sign up to a mailing list</b>
-
-Another way to get help is to email questions to CachyOS mailing list (you can also search the history for past discussions). Simply sign up to the list you prefer and follow the instructions. There is a list dedicated to several topics, just take a look!
-
 <big>Other resources</big>
 
     - <a href="https://aur.archlinux.org">AUR Repository</a> - Extra software not in the regular repositories, built from source.

data/pages/it/readme

@@ -26,10 +26,6 @@ Il forum CachyOS è diviso in sotto-forum per diversi argomenti e ambienti, si p
 
 Un'altra opzione è quella di unirti a noi su Telegram.
 
-<b> Iscriviti a una mailing list </b>
-
-Un altro modo per ottenere aiuto è inviare domande via e-mail alla mailing list di CachyOS (puoi anche cercare nella cronologia le discussioni passate). Iscriviti semplicemente all'elenco che preferisci e segui le istruzioni. C'è un elenco dedicato a diversi argomenti, basta dare un'occhiata!
-
 <big> Altre risorse </big>
 
     - <a href="https://aur.archlinux.org"> Repository AUR </a> - Software aggiuntivo non presente nei normali repository, creato dal codice sorgente.

data/pages/nl/readme

@@ -26,10 +26,6 @@ De CachyOS forums zijn onderverdeeld in sub-forums naar gelang de diverse onderw
 
 Een andere optie is om je op Telegram.
 
-<b>Schrijf je in op onze mailing list</b>
-
-Nog een andere optie om hulp te bekomen is je vragen te emailen naar de CachyOS mailing list (waar je ook kan zoeken naar bestaande oplossingen). Schrijf je gewoon in op de mailing list die je aanspreekt en volg de instructies. Er zijn mailing lists omtrent diverse onderwerpen, dus neem ze even door.
-
 <big>Anderen middelen</big>
 
     - <a href="https://forum.cachyos.org">CachyOS Forum</a> - Officiële support voor onze Nederlandstalige gemeenschap.

data/pages/pl/readme

@@ -28,10 +28,6 @@ Forum CachyOS jest podzielone na pod-fora dla różnych tematów i środowisk, p
 
 Inną opcją jest dołączenie do nas na Telegram.
 
-<b> Zarejestruj się na liście mailingowej </b>
-
-Innym sposobem uzyskania pomocy jest wysłanie pytań e-mailem na listy mailingowe CachyOS (możesz również przeszukać historię pod kątem wcześniejszych dyskusji). Po prostu zarejestruj się na preferowaną listę i postępuj zgodnie z instrukcjami. Jest lista poświęcona kilku tematom, wystarczy spojrzeć!
-
 <big> Inne zasoby </big>
 
     - <a href="https://aur.archlinux.org"> Repozytorium AUR </a> - Dodatkowe oprogramowanie, którego nie ma w zwykłych repozytoriach, zbudowane ze źródeł.

data/pages/pt-BR/readme

@@ -26,10 +26,6 @@ O Fórum CachyOS está dividido em sub-fóruns para diferentes tópicos e ambien
 
 Outra opção é juntar-se a nós no Telegram.
 
-<b>Inscreva-se em uma lista de discussão</b>
-
-Outra maneira de obter ajuda é enviar e-mail perguntas para CachyOS mailing list (você também pode pesquisar o histórico de discussões anteriores). Simplesmente inscreva-se na lista que preferir e siga as instruções. Há uma lista dedicada a vários tópicos, basta dar uma olhada!
-
 <big>Outros recursos</big>
 
     - <a href="https://aur.archlinux.org">AUR Repository</a> - Software extra não disponível nos repositórios normais, construído a partir da fonte.

data/pages/pt-PT/readme

@@ -26,10 +26,6 @@ O Fórum do CachyOS está dividido em sub-fóruns para diferentes tópicos e amb
 
 Outra opção é juntar-se a nós no Telegram.
 
-<b>Inscreva-se numa lista de discussão</b>
-
-Outra forma de obter ajuda é enviar as perguntas por email, para o CachyOS mailing list (também pode pesquisar o histórico de discussões anteriores). Inscreva-se na lista que preferir e siga as instruções. Há listas dedicadas a diferentes tópicos; basta passar uma vista de olhos!
-
 <big>Outros recursos</big>
 
     - <a href="https://aur.archlinux.org">AUR Repository</a> - Software extra indisponível nos repositórios normais; compilado a partir da fonte.

data/pages/zh-CN/readme

@@ -26,10 +26,6 @@ The CachyOS forum is divided into sub-forums for different topics and environmen
 
 Another option is to join us on Telegram.
 
-<b>Sign up to a mailing list</b>
-
-Another way to get help is to email questions to CachyOS mailing list (you can also search the history for past discussions). Simply sign up to the list you prefer and follow the instructions. There is a list dedicated to several topics, just take a look!
-
 <big>Other resources</big>
 
     - <a href="https://aur.archlinux.org">AUR Repository</a> - Extra software not in the regular repositories, built from source.

data/preferences.json

@@ -5,11 +5,8 @@
     "desktop_path": "/usr/share/applications/cachyos-hello.desktop",
     "installer_path": "/usr/bin/calamares",
     "live_path": "/run/archiso/bootmnt/arch",
-    "locale_path": "/usr/share/locale/",
     "logo_path": "/usr/share/icons/hicolor/scalable/apps/",
     "save_path": "~/.config/cachyos-hello.json",
-    "ui_path": "/usr/share/cachyos-hello/ui/cachyos-hello.glade",
-    "style_path": "/usr/share/cachyos-hello/ui/style.css",
     "urls": {
         "development": "https://github.com/cachyos",
         "software": "https://github.com/cachyos/cachyos-pkgbuilds",

postinstall.sh

@@ -4,6 +4,8 @@ mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/"
 cp -r "${MESON_SOURCE_ROOT}/src/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/"
 cp -r "${MESON_SOURCE_ROOT}/data" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/"
 
+rm -rf "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/data/img"
+
 cd "${MESON_SOURCE_ROOT}/po"
 for lang in $(ls *.po); do
     lang=${lang::-3}

src/application_browser.rs

@@ -44,8 +44,6 @@ const ACTIVE: u32 = 4;
 const PACKAGE: u32 = 5;
 const INSTALLED: u32 = 6;
 
-// static mut G_APP_BROWSER: Rc<Mutex<ApplicationBrowser>> =
-// Rc::new(Mutex::new(ApplicationBrowser::new()));
 static mut G_APP_BROWSER: Lazy<Mutex<ApplicationBrowser>> = Lazy::new(|| {
     let mut app_browser = ApplicationBrowser::new();
     app_browser.create_page();

src/main.rs

@@ -28,8 +28,9 @@ use serde_json::json;
 use std::{fs, str};
 use subprocess::Exec;
 
-static G_SAVE_JSON: Lazy<Mutex<serde_json::Value>> = Lazy::new(|| Mutex::new(json!(null)));
+const RESPREFIX: &str = "/org/cachyos/hello";
 
+static G_SAVE_JSON: Lazy<Mutex<serde_json::Value>> = Lazy::new(|| Mutex::new(json!(null)));
 static mut G_HELLO_WINDOW: Option<Arc<HelloWindow>> = None;
 
 fn quick_message(message: &'static str) {
@@ -155,7 +156,7 @@ fn build_ui(application: &gtk::Application) {
 
     // Import Css
     let provider = gtk::CssProvider::new();
-    provider.load_from_resource("/org/cachyos/hello/ui/style.css");
+    provider.load_from_resource(&format!("{RESPREFIX}/ui/style.css"));
     gtk::StyleContext::add_provider_for_screen(
         &gdk::Screen::default().expect("Error initializing gtk css provider."),
         &provider,
@@ -163,7 +164,7 @@ fn build_ui(application: &gtk::Application) {
     );
 
     // Init window
-    let builder: Builder = Builder::from_resource("/org/cachyos/hello/ui/cachyos-hello.glade");
+    let builder: Builder = Builder::from_resource(&format!("{RESPREFIX}/ui/cachyos-hello.glade"));
     builder.connect_signals(|_builder, handler_name| {
         match handler_name {
             // handler_name as defined in the glade file => handler function as defined above
@@ -204,9 +205,9 @@ fn build_ui(application: &gtk::Application) {
     let social_box: gtk::Box = builder.object("social").unwrap();
     for btn in social_box.children() {
         let name = btn.widget_name();
-        let icon_path = format!("{PKGDATADIR}/data/img/{name}.png");
+        let icon_path = format!("{RESPREFIX}/data/img/{name}.png");
         let image: gtk::Image = builder.object(name.as_str()).unwrap();
-        image.set_from_file(Some(&icon_path));
+        image.set_from_resource(Some(&icon_path));
     }
 
     let homepage_grid: gtk::Grid = builder.object("homepage").unwrap();
@@ -220,9 +221,9 @@ fn build_ui(application: &gtk::Application) {
         if btn.image_position() != gtk::PositionType::Right {
             continue;
         }
-        let image_path = format!("{PKGDATADIR}/data/img/external-link.png");
+        let image_path = format!("{RESPREFIX}/data/img/external-link.png");
         let image = gtk::Image::new();
-        image.set_from_file(Some(&image_path));
+        image.set_from_resource(Some(&image_path));
         image.set_margin_start(2);
         btn.set_image(Some(&image));
     }