allow theme to change viewport size
This commit is contained in:
parent
0d16925666
commit
00d6f34426
647
gameview.py
647
gameview.py
File diff suppressed because it is too large
Load Diff
12
options.py
12
options.py
@ -343,21 +343,21 @@ class Settings(QtGui.QDialog):
|
||||
with open(AO2XPpath+"callwords.ini", "w") as f:
|
||||
f.write(self.callwords_edit.toPlainText().toUtf8())
|
||||
|
||||
self.gamewindow.gamewidget.text_wait_time = self.textstaytime.value()
|
||||
self.gamewindow.gamewidget.slide_enabled = self.enableslide.isChecked()
|
||||
self.gamewindow.gamewidget.textWaitTime = self.textstaytime.value()
|
||||
self.gamewindow.gamewidget.slideEnabled = self.enableslide.isChecked()
|
||||
if not self.theme_state == self.currtheme.currentText():
|
||||
self.gamewindow.gamewidget.load_theme(True)
|
||||
self.gamewindow.gamewidget.loadTheme(True)
|
||||
|
||||
if not self.gamewindow.gamewidget.demo_playing:
|
||||
if not self.gamewindow.gamewidget.demoPlaying:
|
||||
if not (self.savelogs_state == self.savetolog.isChecked() and self.combinelogs_state == self.savetolog_combine.isChecked()):
|
||||
self.gamewindow.gamewidget.ooclog.set_logfiles()
|
||||
self.gamewindow.gamewidget.iclog.set_logfiles(self.gamewindow.gamewidget.ooclog.logfile)
|
||||
|
||||
if not self.savedemos_state == self.savedemos.isChecked():
|
||||
if self.savedemos.isChecked():
|
||||
self.gamewindow.gamewidget.start_demo_recorder()
|
||||
self.gamewindow.gamewidget.startDemoRecorder()
|
||||
else:
|
||||
self.gamewindow.gamewidget.demo_recorder = None
|
||||
self.gamewindow.gamewidget.demoRecorder = None
|
||||
|
||||
self.hide()
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ from pybass_constants import *
|
||||
|
||||
def handle_packets(caller, total, record=True):
|
||||
# Record the packet if demos enabled
|
||||
if record and caller.parent.demo_recorder:
|
||||
caller.parent.demo_recorder.record(total)
|
||||
if record and caller.parent.demoRecorder:
|
||||
caller.parent.demoRecorder.record(total)
|
||||
|
||||
for network in total:
|
||||
header = network[0]
|
||||
@ -27,7 +27,7 @@ def handle_packets(caller, total, record=True):
|
||||
music = decode_ao_str(network[1])
|
||||
charid = int(network[2])
|
||||
t = time.localtime()
|
||||
timestamp = "[%d:%.2d] " % (t[3], t[4]) if not caller.parent.demo_playing else ""
|
||||
timestamp = "[%d:%.2d] " % (t[3], t[4]) if not caller.parent.demoPlaying else ""
|
||||
if charid != -1:
|
||||
try:
|
||||
name = caller.parent.charlist[charid][0]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user