Skip to content

Commit

Permalink
Merge pull request #292 from nasa/290-igniter-logos-not-displaying-co…
Browse files Browse the repository at this point in the history
…rrectly-1

[#290] Set PNGs to upload as binaries
  • Loading branch information
jlucas9 authored Apr 30, 2024
2 parents 3fa685d + ac7f029 commit 2a246c6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf

# Handle PNGs as binary
*.png binary
5 changes: 3 additions & 2 deletions cfg/gui/cfg_gui_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def __init__(self, *args, **kwargs):
self.ui.setupUi(self)
self.setFixedSize(655, 655)
self.setWindowTitle("NOS3 Igniter - Version 0.0.1")
self.setWindowIcon(QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/resources/nos3_original.png'))

# globals
self.dateTimeEdit = QDateTimeEdit()
Expand All @@ -32,9 +33,9 @@ def __init__(self, *args, **kwargs):
self.ui.pushButton_save.clicked.connect(lambda: self.saveXML("save"))
self.ui.pushButton_saveAs.clicked.connect(lambda: self.saveXML("saveAs"))
self.ui.spinBox_configNumber.valueChanged.connect(lambda: self.switchConfig(self.ui.spinBox_configNumber.value()))
pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/resources/JSTAR-transparent.png')
pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/resources/JSTAR-transparent_original.png')
self.ui.label_jstarLogo.setPixmap(pixmap)
pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/resources/nos3.png')
pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/resources/nos3_original.png')
self.ui.label_nos3Logo.setPixmap(pixmap)

# Build Tab
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file renamed cfg/gui/resources/nos3.png → cfg/gui/resources/nos3_original.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2a246c6

Please sign in to comment.