Add Darwin support

nate97 · Jun 22, 2022 · daed54f · daed54f
1 parent 5530647
commit daed54f
Show file tree

Hide file tree

Showing 8 changed files with 2,658 additions and 1,258 deletions.
diff --git a/game_starter.py b/game_starter.py
@@ -14,6 +14,8 @@ def __init__(self):
 
         if CURRENT_PLATFORM == 'Linux':
             self.python_path = PYTHON_PATH
+        elif CURRENT_PLATFORM == 'Darwin':
+            self.python_path = PYTHON_PATH
         else:
             self.python_path = '"'+ CURRENT_PATH + PYTHON_PATH + '"'
 

diff --git a/images/logo_plain_sampled.png b/images/logo_plain_sampled.png
diff --git a/launcher_globals.py b/launcher_globals.py
@@ -40,6 +40,11 @@
 if CURRENT_PLATFORM == 'Linux':
     BASE_FILEPATH_S = './'
     RESOURCE_FILEPATH_S = './resources/'
+
+elif CURRENT_PLATFORM == 'Darwin':
+    BASE_FILEPATH_S = './'
+    RESOURCE_FILEPATH_S = './resources/'
+
 else:
     BASE_FILEPATH_S = '.\\'
     RESOURCE_FILEPATH_S = 'resources\\'
@@ -92,6 +97,8 @@
 ### Relative paths to python install ###
 if CURRENT_PLATFORM == 'Linux':
     PYTHON_PATH = '/usr/bin/python2'
+elif CURRENT_PLATFORM == 'Darwin':
+    PYTHON_PATH = 'python3.10'
 else:
     PYTHON_PATH = '\panda3d\python\ppython.exe'
 
diff --git a/launcher_parser.py b/launcher_parser.py
@@ -17,7 +17,7 @@ def __init__(self):
     def extractLinks(self, file_name):
         # Read the YAML file
         with open(file_name, 'r') as stream:
-            data_loaded = yaml.load(stream)
+            data_loaded = yaml.safe_load(stream)
 
         for file_data in data_loaded:
             link_line = (data_loaded[file_data])

diff --git a/qt_dev/images/logo_plain_sampled.png b/qt_dev/images/logo_plain_sampled.png
diff --git a/qt_dev/launcher_interface.ui b/qt_dev/launcher_interface.ui
@@ -176,6 +176,7 @@ font: 14pt;</string>
      <property name="styleSheet">
       <string notr="true">QLabel {
 background-color: rgba(249,249,249, 0);
+color: black;
 border-radius: 0;
 border: 0px solid #ffffff;
 padding: 0px;

diff --git a/resources_rc.py b/resources_rc.py
diff --git a/start_ui_launcher.py b/start_ui_launcher.py
@@ -24,6 +24,10 @@ def __init__(self, qApp):
         self.ui.launcher_status.setFont(QtGui.QFont("Anton", 14))
         self.ui.pushButton.setFont(QtGui.QFont("BowlbyOneSC", 12))
 
+        # Redefine stylesheet
+        self.ui.launcher_state.setStyleSheet("background-color: rgba(249,249,249, 0); color: black; border-radius: 0; border: 0px solid #ffffff; padding: 0px;")
+        self.ui.launcher_status.setStyleSheet("background-color: rgba(249,249,249, 0); color: black; border-radius: 0; border: 0px solid #ffffff; padding: 0px;")
+
         ### UI Globals ###
         self.counter = 0
         self.complete_progress = 0
@@ -55,6 +59,11 @@ def setDefaultUI(self):
         self.ui.pass_input.setDisabled(False)
         self.ui.user_input.setText('')
         self.ui.pass_input.setText('')
+
+        # Set stylesheet for user input
+        self.ui.user_input.setStyleSheet("color: black; background: white; border-radius: 8; border: 2px solid #cacaca; padding: 0px; font: 12pt")
+        self.ui.pass_input.setStyleSheet("color: black;background: white; border-radius: 8; border: 2px solid #cacaca; padding: 0px; font: 12pt")
+
         self.ui.progress_bar.setValue(self.counter)
         self.ui.progress_bar.setMaximum(100)