Bugfixes

.github/workflows/build.yml

@@ -39,20 +39,20 @@ jobs:
           - os: macos-latest
             TARGET: macos
             CMD_BUILD: >
-                pyinstaller --noconfirm --onedir --windowed --icon "./src/image-assets/appicon.ico" --name "Spritesheet and XML Generator for Friday Night Funkin" --noupx --add-data "./src/image-assets:image-assets/"  "./src/xmlpngUI.py" &&
+                pyinstaller --noconfirm --onedir --windowed --icon "./src/assets/appicon.ico" --name "Spritesheet and XML Generator for Friday Night Funkin" --noupx --add-data "./src/assets:assets/"  "./src/xmlpngUI.py" &&
                 cd dist/ &&
                 zip -r9 "FnFXMLGen-MacOS.zip" "Spritesheet and XML Generator for Friday Night Funkin/"
             OUT_FILE_NAME: FnFXMLGen-MacOS.zip
             ASSET_MIME: application/zip
           - os: windows-latest
             TARGET: windows
-            CMD_BUILD: pyinstaller --noconfirm --onedir --windowed --icon "./src/image-assets/appicon.ico" --name "Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" --noupx --add-data "./src/image-assets;image-assets/"  "./src/xmlpngUI.py" && cd dist/ && powershell Compress-Archive -LiteralPath ".\Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" -DestinationPath ".\Spritesheet-XML-Generator-FnF-Windows.zip"
+            CMD_BUILD: pyinstaller --noconfirm --onedir --windowed --icon "./src/assets/appicon.ico" --name "Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" --noupx --add-data "./src/assets;assets/"  "./src/xmlpngUI.py" && cd dist/ && powershell Compress-Archive -LiteralPath ".\Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" -DestinationPath ".\Spritesheet-XML-Generator-FnF-Windows.zip"
             OUT_FILE_NAME: Spritesheet-XML-Generator-FnF-Windows.zip
             ASSET_MIME: application/zip
           - os: ubuntu-latest
             TARGET: ubuntu
             CMD_BUILD: >
-                pyinstaller --noconfirm --onedir --windowed --icon "./src/image-assets/appicon.ico" --name "Spritesheet and XML Generator for Friday Night Funkin" --noupx --add-data "./src/image-assets:image-assets/"  "./src/xmlpngUI.py" &&
+                pyinstaller --noconfirm --onedir --windowed --icon "./src/assets/appicon.ico" --name "Spritesheet and XML Generator for Friday Night Funkin" --noupx --add-data "./src/assets:assets/"  "./src/xmlpngUI.py" &&
                 cd dist/ &&
                 zip -r9 "FnFXMLGen-Linux.zip" "Spritesheet and XML Generator for Friday Night Funkin/"
             OUT_FILE_NAME: FnFXMLGen-Linux.zip
@@ -100,7 +100,7 @@ jobs:
         include:
           - os: windows-latest
             TARGET: windows
-            CMD_BUILD: pyinstaller --noconfirm --onedir --windowed --icon "./src/image-assets/appicon.ico" --name "Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" --noupx --add-data "./src/image-assets;image-assets/"  "./src/xmlpngUI.py" && cd dist/ && powershell Compress-Archive -LiteralPath ".\Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" -DestinationPath ".\Spritesheet-XML-Generator-FnF-Windows-32bit.zip"
+            CMD_BUILD: pyinstaller --noconfirm --onedir --windowed --icon "./src/assets/appicon.ico" --name "Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" --noupx --add-data "./src/assets;assets/"  "./src/xmlpngUI.py" && cd dist/ && powershell Compress-Archive -LiteralPath ".\Spritesheet-and-XML-Generator-for-Friday-Night-Funkin" -DestinationPath ".\Spritesheet-XML-Generator-FnF-Windows-32bit.zip"
             OUT_FILE_NAME: Spritesheet-XML-Generator-FnF-Windows-32bit.zip
             ASSET_MIME: application/zip
     steps:

src/spriteframe.py

@@ -46,7 +46,7 @@ def __init__(self, imgpath, parent, imdat = None, posename = None, **texinfo):
 
         self.remove_btn = QPushButton(self.myframe)
         self.remove_btn.move(90, 90)
-        self.remove_btn.setIcon(QIcon('./image-assets/remove-frame-icon.svg'))
+        self.remove_btn.setIcon(QIcon('./assets/remove-frame-icon.svg'))
         self.remove_btn.setIconSize(QSize(40, 40))
         self.remove_btn.setFixedSize(40, 40)
         self.remove_btn.setToolTip("Delete Frame")

src/xmlpngUI.py

@@ -53,7 +53,7 @@ def __init__(self, prefs:dict):
         self.selected_labels = []
 
         self.add_img_button = QPushButton()
-        self.add_img_button.setIcon(QIcon("./image-assets/AddImg.png"))
+        self.add_img_button.setIcon(QIcon("./assets/AddImg.png"))
         self.add_img_button.setGeometry(0, 0, SPRITEFRAME_SIZE, SPRITEFRAME_SIZE)
         self.add_img_button.setFixedSize(QSize(SPRITEFRAME_SIZE, SPRITEFRAME_SIZE))
         self.add_img_button.setIconSize(QSize(SPRITEFRAME_SIZE, SPRITEFRAME_SIZE))
@@ -62,7 +62,7 @@ def __init__(self, prefs:dict):
         self.frames_layout.addWidget(self.add_img_button, 0, 0, Qt.AlignmentFlag(0x1|0x20))
         self.ui.myTabs.setCurrentIndex(0)
 
-        self.setWindowIcon(QIcon("./image-assets/appicon.png"))
+        self.setWindowIcon(QIcon("./assets/appicon.png"))
         self.icongrid_zoom = 1
         self.ui.uploadicongrid_btn.clicked.connect(self.uploadIconGrid)
         self.ui.actionImport_IconGrid.triggered.connect(self.uploadIconGrid)
@@ -134,11 +134,11 @@ def __init__(self, prefs:dict):
         darkmode_action_group.setExclusive(True)
         darkmode_action_group.triggered.connect(self.set_dark_mode)
         if prefs.get("theme", 'default') == 'dark':
-            self.set_theme(get_stylesheet_from_file("app-styles.qss"))
+            self.set_theme(get_stylesheet_from_file("assets/app-styles.qss"))
 
     def set_dark_mode(self, event):
         if event.text() == "Dark Mode":
-            styles = get_stylesheet_from_file("app-styles.qss")
+            styles = get_stylesheet_from_file("./assets/app-styles.qss")
             self.set_theme(styles)
         else:
             self.set_theme("")