Merge pull request #2 from Boria138/patch-1

Added new logo and reboot for apply mode

Author: MatveyM11

main/envycontrol_qt.py

@@ -1,33 +1,73 @@
 import sys, os, re, subprocess
-from PyQt5.QtWidgets import QApplication, QWidget, QLabel, QVBoxLayout, QPushButton, QLineEdit, QInputDialog, QSystemTrayIcon, QMenu
+from PyQt5.QtWidgets import (
+ QApplication,
+ QWidget,
+ QLabel,
+ QVBoxLayout,
+ QPushButton,
+ QLineEdit,
+ QInputDialog,
+ QSystemTrayIcon,
+ QMenu,
+ QMessageBox,
+)
 from PyQt5.QtGui import QIcon
 from PyQt5 import QtGui
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 isHybrid = True
 
-class EnvyControl(QWidget):
 
+class EnvyControl(QWidget):
  def start_status(self):
- status_output = subprocess.check_output(['envycontrol', '-q']).decode().strip()
+ status_output = subprocess.check_output(["envycontrol", "-q"]).decode().strip()
  keywords = ["hybrid", "integrated", "nvidia"]
  for keyword in keywords:
  if re.search(keyword, status_output, re.IGNORECASE):
  return keyword
  return "envycontrol -q output style was changed"
 
+ def reboot_system(self):
+ message_box = QMessageBox()
+ message_box.setText("A reboot is required to switch mode, reboot ?")
+ message_box.setWindowTitle("Confirmation")
+ message_box.setIcon(QMessageBox.Question)
+ message_box.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
+
+ # Execute the message box and get the result
+ result = message_box.exec()
+
+ def get_igpu_vendor():
+ lspci_output = subprocess.check_output(["lspci"]).decode("utf-8")
+ for line in lspci_output.splitlines():
+ if "VGA compatible controller" in line or "Display controller" in line:
+ if "Intel" in line:
+ return "intel"
+ elif "ATI" in line or "AMD" in line or "AMD/ATI" in line:
+ return "amd"
+ return None
+
+ # Check the result and act accordingly
+ if result == QMessageBox.Yes:
+ print("You clicked Yes reboot")
+ subprocess.run(["sudo", "reboot"])
+ elif result == QMessageBox.No:
+ print("You clicked No")
 
  def quit(self):
  sys.exit()
 
+ igpu_vendor = get_igpu_vendor()
 
  def nvidia_tray(self):
  icon_start = self.start_status()
  global isHybrid
  if icon_start == "hybrid" and isHybrid == True:
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('nvidia', password)
+ self.run_command("nvidia", password)
  app_path = os.path.join(current_dir, "nvidia.png")
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
@@ -37,18 +77,21 @@ def nvidia_tray(self):
  isHybrid = False
 
  def integrated_tray(self):
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('integrated', password)
- app_path = os.path.join(current_dir, "integrated_amd.png")
+ self.run_command("integrated", password)
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
  self.update_status()
 
  def hybrid_tray(self):
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('hybrid', password)
+ self.run_command("hybrid --rtd3", password)
  app_path = os.path.join(current_dir, "hybrid.png")
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
@@ -59,20 +102,20 @@ def __init__(self):
  self.initUI()
 
  def initUI(self):
- self.setWindowTitle('EnvyControl Qt')
+ self.setWindowTitle("EnvyControl Qt")
  app_path = os.path.join(current_dir, "envycontrol.png")
  icon = QtGui.QIcon(app_path)
  self.setWindowIcon(icon)
  self.status_label = QLabel()
  self.update_status()
 
- integrated_button = QPushButton('Integrated')
+ integrated_button = QPushButton("Integrated")
  integrated_button.clicked.connect(self.on_integrated_clicked)
 
- hybrid_button = QPushButton('Hybrid')
+ hybrid_button = QPushButton("Hybrid")
  hybrid_button.clicked.connect(self.on_hybrid_clicked)
 
- nvidia_button = QPushButton('Nvidia')
+ nvidia_button = QPushButton("Nvidia")
  nvidia_button.clicked.connect(self.on_nvidia_clicked)
 
  vbox = QVBoxLayout()
@@ -87,9 +130,12 @@ def initUI(self):
 
  icon_start = self.start_status()
  if icon_start == "integrated":
- app_path = os.path.join(current_dir, "./integrated_amd.png")
- icon = QtGui.QIcon(app_path)
- self.tray_icon.setIcon(QIcon(icon))
+ if igpu_vendor == "intel":
+ app_path = os.path.join(current_dir, "./integrated_intel.png")
+ elif igpu_vendor == "amd":
+ app_path = os.path.join(current_dir, "./integrated_amd.png")
+ icon = QtGui.QIcon(app_path)
+ self.tray_icon.setIcon(QIcon(icon))
  elif icon_start == "hybrid":
  app_path = os.path.join(current_dir, "hybrid.png")
  icon = QtGui.QIcon(app_path)
@@ -104,60 +150,78 @@ def initUI(self):
  print(icon_start)
 
  self.tray_menu = QMenu()
- self.tray_menu.addAction('Integrated', self.integrated_tray)
- self.tray_menu.addAction('Hybrid', self.hybrid_tray)
- self.tray_menu.addAction('Nvidia', self.nvidia_tray)
- self.tray_menu.addAction('Show', self.show)
- self.tray_menu.addAction('Quit',  self.quit)
+ self.tray_menu.addAction("Integrated", self.integrated_tray)
+ self.tray_menu.addAction("Hybrid", self.hybrid_tray)
+ self.tray_menu.addAction("Nvidia", self.nvidia_tray)
+ self.tray_menu.addAction("Show", self.show)
+ self.tray_menu.addAction("Quit", self.quit)
  self.tray_icon.setContextMenu(self.tray_menu)
 
  def closeEvent(self, event):
  self.hide()
  event.ignore()
 
  def on_integrated_clicked(self):
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('integrated', password)
+ self.run_command("integrated", password)
+ if igpu_vendor == "intel":
+ app_path = os.path.join(current_dir, "./integrated_intel.png")
+ elif igpu_vendor == "amd":
  app_path = os.path.join(current_dir, "./integrated_amd.png")
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
  self.update_status()
+ self.reboot_system()
 
  def on_hybrid_clicked(self):
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('hybrid', password)
+ self.run_command("hybrid", password)
  app_path = os.path.join(current_dir, "hybrid.png")
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
  self.update_status()
+ self.reboot_system()
 
  def on_nvidia_clicked(self):
  icon_start = self.start_status()
  global isHybrid
  if icon_start == "hybrid" and isHybrid == True:
- password, ok = QInputDialog.getText(self, 'Password', 'Enter your sudo password:', QLineEdit.Password)
+ password, ok = QInputDialog.getText(
+ self, "Password", "Enter your sudo password:", QLineEdit.Password
+ )
  if ok:
- self.run_command('nvidia', password)
+ self.run_command("nvidia", password)
  app_path = os.path.join(current_dir, "nvidia.png")
  icon = QtGui.QIcon(app_path)
  self.tray_icon.setIcon(QIcon(icon))
+ self.reboot_system()
  else:
  status = "Try switching to hybrid mode first!"
  self.status_label.setText(status)
  isHybrid = False
 
  def update_status(self):
- result = subprocess.check_output(['envycontrol', '-q'])
+ result = subprocess.check_output(["envycontrol", "-q"])
  status = result.strip().decode()
  self.status_label.setText(status)
 
  def run_command(self, mode, password):
- p = subprocess.Popen(['sudo', '-S', 'envycontrol', '-s', mode], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(
+ ["sudo", "-S", "envycontrol", "-s", mode],
+ stdout=subprocess.PIPE,
+ stdin=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
  stdout, stderr = p.communicate(input=password.encode())
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
  app = QApplication(sys.argv)
  envy = EnvyControl()
  envy.show()