From 8ef9a385bd10a6cb64a18b7551d78a8daa85207e Mon Sep 17 00:00:00 2001 From: Stefano Capitani Date: Mon, 8 Jan 2024 11:49:23 +0100 Subject: [PATCH] Add Rescue option --- CHANGELOG.md | 3 + data/preferences.json | 1 + src/__init__.py | 2 +- src/manjaro_hello.py | 6 +- ui/manjaro-hello.glade | 273 +++++++++++++++++++---------------------- 5 files changed, 136 insertions(+), 149 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c848a1..a7c1603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.7.2] - 2024-01-09 +### Added +- Add System Recovery option ## [0.6.7] - 2020-07-11 ### Added - Some design changes diff --git a/data/preferences.json b/data/preferences.json index cec44da..5cfb7ae 100644 --- a/data/preferences.json +++ b/data/preferences.json @@ -4,6 +4,7 @@ "data_path": "/usr/share/manjaro-hello/data/", "desktop_path": "/usr/share/applications/manjaro-hello.desktop", "installer_path": "/usr/bin/calamares", + "rescue_path": "/usr/bin/manjaro-rescue", "plasmawelcome_path": "/usr/bin/plasma-welcome", "gnometour_path": "/usr/bin/gnome-tour", "live_path": "/run/miso/bootmnt/manjaro", diff --git a/src/__init__.py b/src/__init__.py index 4c498b0..7cfbe1c 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,2 +1,2 @@ __all__ = ["manjaro_hello"] -__version__ = "0.7.1" +__version__ = "0.7.2" diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py index 8451305..a60551d 100644 --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -203,6 +203,8 @@ class Hello(Gtk.Window): if os.path.exists(self.preferences["live_path"]) and os.path.isfile(self.preferences["installer_path"]): self.builder.get_object("installlabel").set_visible(True) self.builder.get_object("install").set_visible(True) + if os.path.exists(self.preferences["live_path"]) and os.path.isfile(self.preferences["rescue_path"]): + self.builder.get_object("rescue").set_visible(True) # Installed systems else: manager = EmbedManager(EmbedBrowser(), EmbedLayouts()) @@ -270,6 +272,7 @@ class Hello(Gtk.Window): "forum", "install", "installlabel", + "rescue" , "involved", "mailling", "readme", @@ -359,6 +362,8 @@ class Hello(Gtk.Window): name = action.get_name() if name == "install": subprocess.Popen(["calamares_polkit"]) + elif name == "rescue": + subprocess.Popen(["manjaro-rescue"]) elif name == "autostart": self.set_autostart(action.get_active()) elif name == "about": @@ -373,7 +378,6 @@ class Hello(Gtk.Window): elif de == "gnome": subprocess.Popen(["gnome-tour"]) - def on_btn_clicked(self, btn): """Event for applications button.""" name = btn.get_name() diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade index 9aa4fad..838032f 100644 --- a/ui/manjaro-hello.glade +++ b/ui/manjaro-hello.glade @@ -1,41 +1,42 @@ - - + + + - True False help-about + True False - center - 800 500 + 800 True - + center + - True False True crossfade + True - True False + True + 10 + 10 10 10 10 - 10 20 - 10 - True + True 0 @@ -45,10 +46,10 @@ - True True True Welcome to Manjaro! + True @@ -62,15 +63,15 @@ - True False + fill Thank you for joining our community! We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we enjoy building it. The links below will help you get started with your new operating system. So enjoy the experience, and don't hesitate to send us your feedback. - fill - True - 1 1 + True + 1 + True 0 @@ -80,9 +81,9 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False DOCUMENTATION + True @@ -94,9 +95,9 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False SUPPORT + True @@ -108,9 +109,9 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False PROJECT + True @@ -122,12 +123,12 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + False Read me readme - True - False True - + True + 0 @@ -136,13 +137,13 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False Release info release - True - False True - True - + True + 0 @@ -151,15 +152,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False + right Wiki wiki - True - False True Web resource - right - True - + True + 0 @@ -168,12 +169,12 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + False Get involved involved - True - False True - + True + 2 @@ -182,15 +183,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False + right Forums forum - True - False True Web resource - right - True - + True + 1 @@ -199,15 +200,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False + right Software software - True - False True Web resource - right - True - + True + 1 @@ -216,15 +217,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False + right Mailing lists mailling - True - False True Web resource - right - True - + True + 1 @@ -233,15 +234,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we + True + False + right Development development - True - False True Web resource - right - True - + True + 2 @@ -250,15 +251,15 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 2 @@ -267,15 +268,16 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False + 10 end True - 10 + True - True False + True + Albanian Arabic @@ -323,42 +325,38 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we Ukrainian Vietnamese (Viet Nam) - False True - 0 - True False end + Launch at start center True - Launch at start + True True True - 1 - autostart - True True + autostart center True - + True + False False - 2 @@ -381,13 +379,27 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 8 + + + True + System Recovery + rescue + True + System Recovery + + + + 2 + 8 + + + False Launch installer install - False True - + 1 @@ -396,55 +408,52 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - boxPlugins - True False center - 20 True + boxPlugins + 20 + True + False Applications appBrowser - False True Common application selection - + True True - 0 + False Gnome Layouts Manager appLayouts - False True Manjaro Gnome config tool - + False True - 1 + True <dewelcome> deWelcome - True True Desktop Environent-specific Welcome - + True True - 2 @@ -456,89 +465,85 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False center - end 10 + end + True + False youtube True - False - + - True False YouTube + True False True - 0 + False facebook True - False - + - True False Facebook + True False True - 1 + False twitter True - False - + - True False Twitter + True False True - 2 + False reddit True - False - + - True False Reddit + True False True - 3 @@ -577,44 +567,28 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - True False - Manjaro Hello True - - - + Manjaro Hello + True - about - True False + abouticon + about True About - abouticon - + True + end - 1 - - - - False - About - dialog - window - Manjaro Hello - 0.7.1 - Welcome screen for Manjaro - https://gitlab.manjaro.org/applications/manjaro-hello - GitLab Hugo Posnic Johnathan Jenkins Frede Hundewadt @@ -622,6 +596,13 @@ Bernhard Landauer Philip Müller Papa Joker Oguz Kagan EREN + False + Welcome screen for Manjaro + gpl-3-0 + + Manjaro Hello + About + window abdelhak gasmi Al Manja Albert Cutrona @@ -654,8 +635,10 @@ Stefano Capitani Stéphane Πέτρος Σαμαράς Андрей Раугас - - gpl-3-0 + dialog + 0.7.2 + https://gitlab.manjaro.org/applications/manjaro-hello + GitLab True @@ -670,12 +653,8 @@ Stéphane False False - 0 - - -