diff --git a/README.md b/README.md index 64ef691..2caeebc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Download the appropriate release for your platform from [releases][releases], ex ## BUILDING Building Pesterchum yourself is not required to run it!!! This is only relevant if you know what you're doing >:3c -### PYTHON :) +### REQUIREMENTS: - [Python 3] diff --git a/memos.py b/memos.py index a0a8b82..73ca398 100644 --- a/memos.py +++ b/memos.py @@ -855,6 +855,7 @@ class PesterMemo(PesterConvo): else: self.close() msgbox = QtWidgets.QMessageBox() + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setText("%s: Invites only!" % (c)) msgbox.setInformativeText("This channel is invite-only. You must get an invitation from someone on the inside before entering.") msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok) @@ -1012,6 +1013,7 @@ class PesterMemo(PesterConvo): if chum is self.mainwindow.profile(): # are you next? msgbox = QtWidgets.QMessageBox() + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setText(self.mainwindow.theme["convo/text/kickedmemo"]) msgbox.setInformativeText("press 0k to rec0nnect or cancel to absc0nd") msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel) diff --git a/pesterchum.py b/pesterchum.py index f56945f..c784803 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -703,7 +703,20 @@ class chumArea(RightClickTree): self.resize(*theme["main/chums/size"]) self.move(*theme["main/chums/loc"]) if "main/chums/scrollbar" in theme: - self.setStyleSheet("QListWidget { %s } QScrollBar { %s } QScrollBar::handle { %s } QScrollBar::add-line { %s } QScrollBar::sub-line { %s } QScrollBar:up-arrow { %s } QScrollBar:down-arrow { %s }" % (theme["main/chums/style"], theme["main/chums/scrollbar/style"], theme["main/chums/scrollbar/handle"], theme["main/chums/scrollbar/downarrow"], theme["main/chums/scrollbar/uparrow"], theme["main/chums/scrollbar/uarrowstyle"], theme["main/chums/scrollbar/darrowstyle"] )) + self.setStyleSheet("QListWidget { %s } \ + QScrollBar { %s } \ + QScrollBar::handle { %s } \ + QScrollBar::add-line { %s } \ + QScrollBar::sub-line { %s } \ + QScrollBar:up-arrow { %s } \ + QScrollBar:down-arrow { %s }" % \ + (theme["main/chums/style"], \ + theme["main/chums/scrollbar/style"], \ + theme["main/chums/scrollbar/handle"], \ + theme["main/chums/scrollbar/downarrow"], \ + theme["main/chums/scrollbar/uparrow"], \ + theme["main/chums/scrollbar/uarrowstyle"], \ + theme["main/chums/scrollbar/darrowstyle"] )) else: self.setStyleSheet(theme["main/chums/style"]) self.pester.setText(theme["main/menus/rclickchumlist/pester"]) @@ -822,6 +835,7 @@ class chumArea(RightClickTree): gname = str(gname) if re.search("[^A-Za-z0-9_\s]", gname) is not None: msgbox = QtWidgets.QMessageBox() + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setInformativeText("THIS IS NOT A VALID GROUP NAME") msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok) ret = msgbox.exec_() @@ -1076,6 +1090,7 @@ class PesterWindow(MovingWindow): except: self.userprofile = userProfile(PesterProfile("pesterClient%d" % (random.randint(100,999)), QtGui.QColor("black"), Mood(0))) self.theme = self.userprofile.getTheme() + self.modes = "" self.sound_type = None @@ -1746,12 +1761,17 @@ class PesterWindow(MovingWindow): self.currentMoodIcon.hide() self.currentMoodIcon = None + # This is a better spot to put this :) + # Setting QMessageBox's style usually doesn't do anything. + self.setStyleSheet("QInputDialog { %s } QMessageBox { %s }" % (self.theme["main/defaultwindow/style"], self.theme["main/defaultwindow/style"])) if theme["main/mychumhandle/colorswatch/text"]: self.mychumcolor.setText(theme["main/mychumhandle/colorswatch/text"]) else: self.mychumcolor.setText("") + + if _CONSOLE: if self.console.window: # A bit of an ugly hack.... @@ -1996,6 +2016,7 @@ class PesterWindow(MovingWindow): if h.upper() == "NICKSERV" and m.startswith("Your nickname is now being changed to"): changedto = m[39:-1] msgbox = QtWidgets.QMessageBox() + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setText("This chumhandle has been registered; you may not use it.") msgbox.setInformativeText("Your handle is now being changed to %s." % (changedto)) msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok) @@ -2013,6 +2034,7 @@ class PesterWindow(MovingWindow): def deliverInvite(self, handle, channel): msgbox = QtWidgets.QMessageBox() msgbox.setText("You're invited!") + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setInformativeText("%s has invited you to the memo: %s\nWould you like to join them?" % (handle, channel)) msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel) # Find the Cancel button and make it default @@ -2405,7 +2427,6 @@ class PesterWindow(MovingWindow): self.quirkmenu = None @QtCore.pyqtSlot() def openChat(self): - self.setStyleSheet("QInputDialog {" + self.theme["convo/tabwindow/style"] + "}") if not hasattr(self, "openchatdialog"): self.openchatdialog = None if not self.openchatdialog: @@ -2445,6 +2466,7 @@ class PesterWindow(MovingWindow): msgbox = QtWidgets.QMessageBox() msgbox.setInformativeText("THIS IS NOT A VALID GROUP NAME") msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok) + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}")#Style :) (memos/style or convo/style works :3 ) ret = msgbox.exec_() self.addgroupdialog = None return diff --git a/randomer.py b/randomer.py index 511128e..f73648e 100644 --- a/randomer.py +++ b/randomer.py @@ -60,6 +60,7 @@ class RandomHandler(QtCore.QObject): if l[1] == "x": from PyQt5 import QtGui, QtWidgets msgbox = QtWidgets.QMessageBox() + msgbox.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msgbox.setText("Unable to fetch you a random encounter!") msgbox.setInformativeText("Try again later :(") msgbox.exec_()