tyler.durden/Chicago95
1
0
Fork 0
mirror of https://github.com/grassmunk/Chicago95.git synced 2025-09-26 03:08:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding fix to detect if xfce4-panel-profiles is installed. If not, disable the auto panel installer.

Browse Source
This commit is contained in:
Grassmunk 2020-06-26 18:14:32 -07:00
parent 74f4a8dbfe
commit 6d9f2f713d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
installer.py
View File

@ -38,6 +38,7 @@ class InstallGUI:
self.progress_window.connect('delete-event', lambda x,y: Gtk.main_quit())
window.show_all()
self.window_installer.show_all()
print("Installer running from: " + running_folder)
def set_style(self):
# From https://gist.github.com/carlos-jenkins/8923124
@ -124,6 +125,7 @@ class InstallGUI:
else:
component_page = stack.get_child_by_name('page_customizations')
thunar_check = self.builder.get_object('thunar')
panel_check = self.builder.get_object('panel')
if not self.install_theme:
self.thunar = False
thunar_check.set_sensitive(False)
@ -133,6 +135,11 @@ class InstallGUI:
thunar_check.set_sensitive(True)
thunar_check.set_active(True)
if not self.check_xfce_panel():
self.panel = False
panel_check.set_sensitive(False)
panel_check.set_active(False)
next_button.set_label("Install")
stack.set_visible_child(component_page)
@ -377,6 +384,7 @@ class InstallGUI:
self.change_component_label()
elif from_file == "panel" and self.copy_files["panel"]:
print("Generating XFCE panel")
print("Installing Panel config from: "+ running_folder +"/Extras/Chicago95_Panel_Preferences.tar.bz2")
#xfce4-panel-profiles load Extras/Chicago95_Panel_Preferences.tar.bz2
subprocess.check_call(["xfce4-panel-profiles", "load", running_folder+"/Extras/Chicago95_Panel_Preferences.tar.bz2"], stdout=subprocess.DEVNULL)
self.change_component_label()
@ -430,6 +438,17 @@ class InstallGUI:
]
subprocess.check_call(args, stdout=subprocess.DEVNULL)
def check_xfce_panel(self):
try:
xfce_panel = subprocess.check_output(["which", "xfce4-panel-profiles"]).strip()
except subprocess.CalledProcessError:
print("WARNING! xfce4-panel-profiles not installed, manual panel installation required. View INSTALL.md.")
return False
return True
def cancel_install(self, button):
print("cancelling install")
Gtk.main_quit()