diff --git a/data/bin/pika-welcome-autostart b/data/bin/pika-welcome-autostart index ec527f9..8b10a34 100644 --- a/data/bin/pika-welcome-autostart +++ b/data/bin/pika-welcome-autostart @@ -1,5 +1,7 @@ #! /bin/bash AUTOSTART=$(gsettings get com.github.pikaos-linux.pikawelcome startup-show) -if [[ "$AUTOSTART" == "true" ]]; then +DISPLAY_CHECK=$(echo $DISPLAY) +WHO=$(whoami) +if [[ "$AUTOSTART" == "true" ]] && [[ $DISPLAY_CHECK ]] && [[ $WHO != "pikaos" ]] && [[ $WHO != "gnome-initial-setup" ]] ; then pika-welcome fi \ No newline at end of file diff --git a/data/config/recommended_addons.json b/data/config/recommended_addons.json index 530ef1d..34d8e6c 100644 --- a/data/config/recommended_addons.json +++ b/data/config/recommended_addons.json @@ -29,16 +29,16 @@ "title": "fabiscafe-devices-title", "subtitle": "fabiscafe-devices-subtitle", "icon": "pika-input-gaming", - "checkpkg": "fabiscafe-devices-extra", - "packages": "fabiscafe-devices-extra" + "checkpkg": "fabiscafe-devices", + "packages": "fabiscafe-devices" }, { "id": 4, "title": "ttf-mscorefonts-installer-title", "subtitle": "ttf-mscorefonts-installer-subtitle", "icon": "pika-msttf", - "checkpkg": "ttf-mscorefonts-installer-extra", - "packages": "ttf-mscorefonts-installer-extra" + "checkpkg": "ttf-mscorefonts-installer", + "packages": "ttf-mscorefonts-installer" }, { "id": 5, diff --git a/locales/en_US.json b/locales/en_US.json index 68a788d..6597e69 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -16,5 +16,57 @@ "recommended_addons_command_dialog_ok_label": "Ok", "welcome_page_text_title": "Welcome to PikaOS", "welcome_page_text_description": "Thank you for choosing PikaOS!\nThis welcome screen will help guide you through the\navailable resources for PikaOS as well as help you setup \nyour computer to your liking.\n\nEnjoy!\nThe PikaOS team", - "window_banner_no_internet": "Application Locked: No Internet Connection!" + "window_banner_no_internet": "Application Locked: No Internet Connection!", + "launch-label": "Launch", + "update-pikaos-title": "Update my system", + "update-pikaos-subtitle": "Update all applications and system packages.", + "install-media-codec-title": "Install Patented Media Codecs and Libraries", + "install-media-codec-subtitle": "Get media codecs and libraries (Such as : FFMPEG, and VA-API)\nwhich are needed for many creative applications \nand provide hardware accelerated video playback/decoding and encoding.", + "open-driver-manager-title": "Open Driver Manager", + "open-driver-manager-subtitle": "A driver utility to install various driver such as the\nproprietary NVIDIA® drivers that significantly increase performance for NVIDIA cards \nand microcode for CPUs and such.", + "open-software-manager-title": "Install more apps from the Software Manager", + "open-software-manager-subtitle": "Install and update software using the PikaOS Software Manager.", + "open-webapp-manager-title": "Install Webapps", + "open-webapp-manager-subtitle": "Install WebApps with your favourite web browser as a backend. Turn your favourite WebApps into \nnative desktop applications.", + "pika-gameutils-meta-title": "Install the PikaOS Game Utilites", + "pika-gameutils-meta-subtitle": "A meta package that installs: Steam, Lutris, Goverlay + Mangohud, Wine, Winetricks, VKBasalt, \nand many more...", + "protonup-qt-title": "Install ProtonUP-QT", + "protonup-qt-subtitle": "A tool for managing the Proton GE Compatibility tool for Steam Play based on Wine and additional components made by GloriousEggroll\nthis tool allows steam to run windows games natively on linux.", + "pika-gameutils-meta-extra-title": "Install the PikaOS Game Utilites Extras", + "pika-gameutils-meta-extra-subtitle": "Installs Heroic Game Launcher and Bottles Along side the base gameutils package", + "fabiscafe-devices-title": "Install Device Configrations for many controllers and VR equipment", + "fabiscafe-devices-subtitle": "Installs udev rule configrations for many HID Devices\nfor more info see: https://codeberg.org/fabiscafe/game-devices-udev", + "ttf-mscorefonts-installer-title": "Install Microsoft True Type Fonts", + "ttf-mscorefonts-installer-subtitle": "Installs TrueType Microsoft fonts and emulate Windows' font rendering. ", + "kdenlive-title": "Install Kdenlive Video Editor", + "kdenlive-subtitle": "KDE Non-Linear Video Editor an open source video editor built on Qt and the KDE Frameworks libraries.", + "krita-title": "Install Krita Painter", + "krita-subtitle": "KDE Krita is a professional FREE and open source painting program.", + "libreoffice-title": "Install the LibreOffice Suite", + "libreoffice-subtitle": "LibreOffice is a free and powerful office suite, and a successor to OpenOffice.org \n(commonly known as OpenOffice).", + "blender-title": "Install Blender 3D Suite", + "blender-subtitle": "Blender is the free and open source 3D creation suite. It supports the entirety of the 3D pipeline. ", + "obs-title": "Install OBS Studio", + "obs-subtitle": "Open Broadcaster Software the free and open source software for video recording and live streaming. ", + "open-pling-title": "Get new Icons and Themes", + "open-pling-subtitle": "Open pling theming store.", + "open-pika-gnome-layouts-title": "Choose a Desktop Layout", + "open-pika-gnome-layouts-subtitle": "Choose a desktop layout and accent color for Gnome.", + "open-gnome-tweaks-title": "Configure Gnome", + "open-gnome-tweaks-subtitle": "Open gnome-tweaks.", + "open-gnome-extensions-title": "Add Extensions to your desktop", + "open-gnome-extensions-subtitle": "Open Gnome extension manager.", + "contribute-github-title": "Visit Our Github Repository", + "contribute-github-subtitle": "Contribute code or open issues and pull request to PikaOS Github.", + "translate-weblate-title": "Visit Our Weblate Page", + "translate-weblate-subtitle": "Translate our Applications to your language.", + "join-discord-title": "Join Our Official Discord", + "join-discord-subtitle": "Join PikaOS Official Discord, and chat with the developers.", + "join-reddit-title": "Join Our Official Sub-Reddit", + "join-reddit-subtitle": "Join The PikaOS Official Sub-Reddit", + "open-pika-wiki-title" : "Open PikaOS Wiki", + "open-pika-wiki-title-subtitle": "Check for known issues and their solutions.", + "entry_row_button_install": "Install", + "entry_row_button_remove": "Uninstall" } + diff --git a/src/main.rs b/src/main.rs index 312d580..2b60586 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,10 +51,5 @@ fn main() { let instance = SingleInstance::new(APP_ID).unwrap(); assert!(instance.is_single()); - if get_current_username().unwrap() != "pikaos" { - application.run(); - } else { - println!("Error: This program can only be run via an installed system user"); - std::process::exit(1) - } + application.run(); } diff --git a/src/welcome_content_page/look_and_feel_page/mod.rs b/src/welcome_content_page/look_and_feel_page/mod.rs index b101a57..dd399d5 100644 --- a/src/welcome_content_page/look_and_feel_page/mod.rs +++ b/src/welcome_content_page/look_and_feel_page/mod.rs @@ -5,9 +5,9 @@ use duct::cmd; use glib::*; use serde::Deserialize; use std::cell::RefCell; -use std::{env, fs}; use std::path::Path; use std::rc::Rc; +use std::{env, fs}; use std::{thread, time}; #[allow(non_camel_case_types)]