diff --git a/gameview.py b/gameview.py index e25598c..c5084fe 100644 --- a/gameview.py +++ b/gameview.py @@ -737,7 +737,9 @@ class gui(QtGui.QWidget): self.ooclog = ChatLogs(self, 1) self.ooclog.setReadOnly(True) - self.ooclog.setStyleSheet('background-color: rgb(139, 139, 139);') + p = self.ooclog.viewport().palette() + p.setColor(self.ooclog.viewport().backgroundRole(), QtGui.QColor(139,139,139)) + self.ooclog.viewport().setPalette(p) self.ooclog.textChanged.connect(self.ooclog_update) self.oocnameinput = QtGui.QLineEdit(self) @@ -1426,10 +1428,10 @@ class gui(QtGui.QWidget): self.tcp.send('MC#' + item.text().toUtf8() + '#' + str(self.mychar) + '#%') def icLogChanged(self): - self.icLog.verticalScrollBar().setValue(self.icLog.verticalScrollBar().maximum()) + if self.icLog.verticalScrollBar().value() == self.icLog.verticalScrollBar().maximum(): self.icLog.verticalScrollBar().setValue(self.icLog.verticalScrollBar().maximum()) def ooclog_update(self): - self.ooclog.verticalScrollBar().setValue(self.ooclog.verticalScrollBar().maximum()) + if self.ooclog.verticalScrollBar().value() == self.ooclog.verticalScrollBar().maximum(): self.ooclog.verticalScrollBar().setValue(self.ooclog.verticalScrollBar().maximum()) def sendOOCchat(self, name, text): self.tcp.send('CT#' + name + '#' + text + '#%') diff --git a/mainmenu.py b/mainmenu.py index 962da65..a0c721b 100644 --- a/mainmenu.py +++ b/mainmenu.py @@ -92,7 +92,9 @@ class lobby(QtGui.QWidget): self.serverlist = QtGui.QListWidget(self) self.serverlist.resize(286, 240) self.serverlist.move(20, 125) - self.serverlist.setStyleSheet("background-color: rgb(114, 114, 114)") + p = self.serverlist.viewport().palette() + p.setColor(self.serverlist.viewport().backgroundRole(), QtGui.QColor(114,114,114)) + self.serverlist.viewport().setPalette(p) self.serverlist.itemClicked.connect(self.onClicked_serverlist) self.onlineplayers = QtGui.QLabel(self) @@ -104,7 +106,10 @@ class lobby(QtGui.QWidget): self.serverinfo = QtGui.QTextEdit(self) self.serverinfo.setReadOnly(True) - self.serverinfo.setStyleSheet("color: white; background-color: black") + p = self.serverinfo.viewport().palette() + p.setColor(self.serverinfo.viewport().backgroundRole(), QtGui.QColor(0,0,0)) + self.serverinfo.viewport().setPalette(p) + self.serverinfo.setTextColor(QtGui.QColor("white")) self.serverinfo.move(337, 109) self.serverinfo.resize(173, 245) @@ -120,7 +125,9 @@ class lobby(QtGui.QWidget): self.lobbychatlog = QtGui.QTextEdit(self) self.lobbychatlog.setReadOnly(True) self.lobbychatlog.setGeometry(2, 445, 513, 198) - self.lobbychatlog.setStyleSheet('background-color: rgb(139, 139, 139);') + p = self.lobbychatlog.viewport().palette() + p.setColor(self.lobbychatlog.viewport().backgroundRole(), QtGui.QColor(139,139,139)) + self.lobbychatlog.viewport().setPalette(p) self.lobbychatlog.textChanged.connect(self.lobbychatlog_update) self.whitecolor = QtGui.QColor(255, 255, 255) @@ -328,7 +335,7 @@ class lobby(QtGui.QWidget): self.oocname = self.oocnameinput.text().toUtf8() def lobbychatlog_update(self): - self.lobbychatlog.verticalScrollBar().setValue(self.lobbychatlog.verticalScrollBar().maximum()) + if self.icLog.verticalScrollBar().value() == self.icLog.verticalScrollBar().maximum(): self.lobbychatlog.verticalScrollBar().setValue(self.lobbychatlog.verticalScrollBar().maximum()) def newOOCMessage(self, name, text): self.lobbychatlog.append('%s: %s' % (name, text))