Skip to content

Commit

Permalink
a0.6 Pre-1 Hotfix 1
Browse files Browse the repository at this point in the history
I need to think of a proper versioning system.

fixed missing refresh.png
fixed crash on opening options or the instance manager.
  • Loading branch information
calmilamsy committed Mar 14, 2019
1 parent 8bed00c commit 58633fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion compile_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ echo Creating venv.
%pythonver% -m venv venv

echo Activating venv.
venv\Scripts\activate & echo Adding dependencies. & pip install pyqt5 requests appdirs pypresence & echo Using pyinstaller. & pyinstaller -y -F -i "favicon.ico" --add-data "background.png";"." --add-data "logo.png";"." --add-data "favicon.ico";"." --add-data "blogbackground.png";"." --add-data "blog.html";"." --hidden-import pypresence launcher.py & echo Complete! & PAUSE
venv\Scripts\activate && echo Adding dependencies. && pip install pyqt5 requests appdirs pypresence && echo Using pyinstaller. && pyinstaller -y -F -i "favicon.ico" --add-data "background.png";"." --add-data "logo.png";"." --add-data "favicon.ico";"." --add-data "blogbackground.png";"." --add-data "blog.html";"." --add-data "refresh.png";"." --hidden-import pypresence launcher.py && echo Complete! & PAUSE
12 changes: 3 additions & 9 deletions launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
import functools
import urllib

from PyQt5.QtCore import Qt
from PyQt5.QtGui import QIcon, QFont
from PyQt5.QtWidgets import QApplication, QWidget, QTextEdit, QPushButton, QLabel, QLineEdit, QMessageBox, QDialog, \
QComboBox, QScrollArea, QVBoxLayout, QFileDialog, QTabWidget, QGroupBox
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *


class mainWindow(QWidget):
Expand Down Expand Up @@ -347,7 +346,6 @@ def __init__(self, parent=None):

# Same drill. Does visible things.
def initUI(self):
self.setWindowFlag(Qt.WindowContextHelpButtonHint, False)
self.setWindowTitle(self.title)
self.setGeometry(self.left, self.top, 480, 240)
self.setFixedSize(self.size())
Expand Down Expand Up @@ -408,7 +406,6 @@ class instanceWindow(QDialog):
def __init__(self, parent=None):
super().__init__(parent)
self.progressWin = installWindow(self)
self.setWindowFlag(Qt.WindowContextHelpButtonHint, False)
self.getModpackRepo.result.connect(self.updateRepo)
optionWindow.launcherConfig = utils.loadSettings(self)
screen_resolution = app.desktop().screenGeometry()
Expand Down Expand Up @@ -686,7 +683,6 @@ class installWindow(QDialog):
# Same drill. Does background things.
def __init__(self, parent=None):
super().__init__(parent)
self.setWindowFlag(Qt.WindowContextHelpButtonHint, False)
screen_resolution = app.desktop().screenGeometry()
self.title = config.NAME + " " + config.VER + " Modpack Export Wizard"
self.setWindowIcon(QIcon(config.ICON))
Expand Down Expand Up @@ -728,8 +724,6 @@ class exportWindow(QDialog):
# Same drill. Does background things.
def __init__(self, parent=None):
super().__init__(parent)
self.setWindowFlag(Qt.WindowCloseButtonHint, False)
self.setWindowFlag(Qt.WindowContextHelpButtonHint, False)
screen_resolution = app.desktop().screenGeometry()
self.title = config.NAME + " " + config.VER + " Modpack Installer"
self.setWindowIcon(QIcon(config.ICON))
Expand Down

0 comments on commit 58633fc

Please sign in to comment.