add object names to widgets for better ao2 css theme support
This commit is contained in:
parent
70d8c376e1
commit
3146d2c3b4
@ -1,5 +1,5 @@
|
||||
QMainWindow, QSlider, QCheckBox, QLabel#lblMusicVolume,
|
||||
QLabel#lblSoundVolume, QLabel#lblBlipsVolume, QLabel#lblNotMuted,
|
||||
QMainWindow, QSlider, QCheckBox, QLabel#ui_music_label,
|
||||
QLabel#ui_sfx_label, QLabel#ui_blip_label, QLabel#lblNotMuted,
|
||||
QLabel#lblMuted, QLabel#lblIniSwapInfo, QLabel#lblPairOffset,
|
||||
QLabel#lblPairOffsetY, QLabel#lblPairOrder, QWidget#tabLog,
|
||||
QWidget#tabEvidence, QWidget#tabMute, QWidget#tabIniSwap,
|
||||
|
||||
54
gameview.py
54
gameview.py
@ -1100,6 +1100,7 @@ class GUI(QtGui.QWidget):
|
||||
self.background = 'default'
|
||||
|
||||
self.viewport = QtGui.QWidget(self)
|
||||
self.viewport.setObjectName("ui_viewport")
|
||||
self.court = QtGui.QLabel(self.viewport)
|
||||
|
||||
self.slideBg = QtGui.QLabel(self.viewport)
|
||||
@ -1212,11 +1213,14 @@ class GUI(QtGui.QWidget):
|
||||
self.OOCLog = ChatLogs(self, 1)
|
||||
self.OOCLog.setReadOnly(True)
|
||||
self.OOCLog.textChanged.connect(self.onOOCLogChanged)
|
||||
self.OOCLog.setObjectName("ui_ooc_chatlog")
|
||||
self.OOCNameInput = QtGui.QLineEdit(self)
|
||||
self.OOCNameInput.setPlaceholderText('Enter a name...')
|
||||
self.OOCNameInput.setObjectName("ui_ooc_chat_message")
|
||||
self.OOCInput = QtGui.QLineEdit(self)
|
||||
self.OOCInput.setPlaceholderText('Server chat/OOC chat...')
|
||||
self.OOCInput.returnPressed.connect(self.onOOCReturn)
|
||||
self.OOCInput.setObjectName("ui_ooc_chat_message")
|
||||
self.OOCLogin = QtGui.QPushButton("Lo&gin", self)
|
||||
self.OOCLogin.clicked.connect(self.onOOCLoginClicked)
|
||||
|
||||
@ -1224,6 +1228,7 @@ class GUI(QtGui.QWidget):
|
||||
self.ICLog = ChatLogs(self.tabLog, 0, self.OOCLog.logfile)
|
||||
self.ICLog.setReadOnly(True)
|
||||
self.ICLog.textChanged.connect(self.onICLogChanged)
|
||||
self.ICLog.setObjectName("ui_ic_chatlog")
|
||||
|
||||
# Evidence
|
||||
self.boxEvidence = QtGui.QComboBox(self.tabEvidence)
|
||||
@ -1368,6 +1373,7 @@ class GUI(QtGui.QWidget):
|
||||
self.musicSearch = QtGui.QLineEdit(self.tabMusic)
|
||||
self.musicSearch.setPlaceholderText("Search...")
|
||||
self.musicSearch.textChanged.connect(self.onMusicSearch)
|
||||
self.musicSearch.setObjectName("ui_music_search")
|
||||
self.foundSongItemColor = "background: #80FF80;"
|
||||
self.btnMusicOptions = QtGui.QPushButton(QtGui.QIcon(AO2XPpath + "icons/" + "cog.png"), "", self.tabMusic)
|
||||
self.btnMusicOptions.setToolTip('Music options')
|
||||
@ -1424,6 +1430,7 @@ class GUI(QtGui.QWidget):
|
||||
# Player list
|
||||
self.playerItems = QtGui.QListWidget(self.tabPlayers)
|
||||
self.playerItems.itemClicked.connect(self.onPlayerItemClicked)
|
||||
self.playerItems.setObjectName("ui_player_list")
|
||||
self.btnPlayerPair = QtGui.QPushButton(self.tabPlayers)
|
||||
self.btnPlayerPair.setText('Pair')
|
||||
self.btnPlayerPair.clicked.connect(self.onPlayerPairClicked)
|
||||
@ -1465,54 +1472,65 @@ class GUI(QtGui.QWidget):
|
||||
|
||||
self.btnChangeChar = QtGui.QPushButton(self)
|
||||
self.btnChangeChar.clicked.connect(self.onChangeCharClicked)
|
||||
self.btnChangeChar.setObjectName("ui_change_character")
|
||||
|
||||
self.btnCallMod = QtGui.QPushButton(self)
|
||||
self.btnCallMod.setText('Call mod')
|
||||
self.btnCallMod.clicked.connect(self.onCallModClicked)
|
||||
self.btnCallMod.setObjectName("ui_call_mod")
|
||||
|
||||
self.btnReloadTheme = QtGui.QPushButton(self)
|
||||
self.btnReloadTheme.setText('Reload theme')
|
||||
self.btnReloadTheme.clicked.connect(self.onReloadThemeClicked)
|
||||
self.btnReloadTheme.setVisible(False)
|
||||
self.btnReloadTheme.setObjectName("ui_reload_theme")
|
||||
|
||||
self.btnSettings = QtGui.QPushButton("Settings", self)
|
||||
self.btnSettings = QtGui.QPushButton("&Settings", self)
|
||||
self.btnSettings.clicked.connect(self.gamewindow.showSettings)
|
||||
self.btnSettings.setObjectName("ui_settings")
|
||||
|
||||
self.boxEmotes = QtGui.QComboBox(self)
|
||||
self.boxEmotes.currentIndexChanged.connect(partial(self.changeEmote, True))
|
||||
self.boxEmotes.setToolTip('Select an emotion for your character')
|
||||
self.boxEmotes.setObjectName('ui_emote_dropdown')
|
||||
|
||||
self.boxColors = QtGui.QComboBox(self)
|
||||
self.boxColors.currentIndexChanged.connect(self.setChatColor)
|
||||
self.boxColors.setToolTip('Change the color of your message')
|
||||
self.boxColors.setObjectName('ui_text_color')
|
||||
|
||||
self.defaultPositions = ["def", "pro", "wit", "hld", "hlp", "jud", "jur", "sea"]
|
||||
self.boxPositions = QtGui.QComboBox(self)
|
||||
self.boxPositions.addItems(self.defaultPositions)
|
||||
self.boxPositions.currentIndexChanged.connect(self.setPosition)
|
||||
self.boxPositions.setToolTip('Select your position in the courtroom')
|
||||
self.boxPositions.setObjectName('ui_pos_dropdown')
|
||||
|
||||
self.boxEffects = QtGui.QComboBox(self)
|
||||
self.boxEffects.currentIndexChanged.connect(self.ICChatFocus)
|
||||
self.boxEffects.setToolTip('Show this effect on your next message')
|
||||
self.boxEffects.setObjectName('ui_effects_dropdown')
|
||||
|
||||
self.showname = ""
|
||||
self.shownameEdit = QtGui.QLineEdit(self)
|
||||
self.shownameEdit.textChanged.connect(self.onShownameChanged)
|
||||
self.shownameEdit.setPlaceholderText("Showname")
|
||||
self.shownameEdit.setToolTip('Set a custom name for your character')
|
||||
self.shownameEdit.setObjectName("ui_ic_chat_name")
|
||||
|
||||
self.cbFlip = QtGui.QCheckBox(self)
|
||||
self.cbFlip.stateChanged.connect(self.changeFlipCheck)
|
||||
self.cbFlip.setText('&Flip')
|
||||
self.cbFlip.resize(self.cbFlip.sizeHint())
|
||||
self.cbFlip.setToolTip("Mirror your character horizontally")
|
||||
self.cbFlip.setObjectName('ui_flip')
|
||||
|
||||
self.cbPreanim = QtGui.QCheckBox(self)
|
||||
self.cbPreanim.setChecked(True)
|
||||
self.cbPreanim.stateChanged.connect(self.changePreanimCheck)
|
||||
self.cbPreanim.setText('&Pre-anim')
|
||||
self.cbPreanim.setToolTip("Play a character-specific animation before the next message")
|
||||
self.cbPreanim.setObjectName('ui_pre')
|
||||
|
||||
self.cbBench = QtGui.QCheckBox(self)
|
||||
self.cbBench.setChecked(True)
|
||||
@ -1522,7 +1540,7 @@ class GUI(QtGui.QWidget):
|
||||
|
||||
self.cbSlide = QtGui.QCheckBox(self)
|
||||
self.cbSlide.stateChanged.connect(self.ICChatFocus)
|
||||
self.cbSlide.setText('&Slide')
|
||||
self.cbSlide.setText('Slide')
|
||||
self.cbSlide.resize(self.cbSlide.sizeHint())
|
||||
self.cbSlide.setToolTip("Tell clients to play courtroom slide animations for your message")
|
||||
|
||||
@ -1531,6 +1549,7 @@ class GUI(QtGui.QWidget):
|
||||
self.cbNoInterrupt.stateChanged.connect(self.ICChatFocus)
|
||||
self.cbNoInterrupt.setText('&No interrupt')
|
||||
self.cbNoInterrupt.setToolTip("Show the next message immediately, ignoring animations")
|
||||
self.cbNoInterrupt.setObjectName('ui_immediate')
|
||||
|
||||
self.cbAdditive = QtGui.QCheckBox(self)
|
||||
self.cbAdditive.setChecked(False)
|
||||
@ -1538,12 +1557,15 @@ class GUI(QtGui.QWidget):
|
||||
self.cbAdditive.resize(self.cbAdditive.sizeHint())
|
||||
self.cbAdditive.clicked.connect(self.ICChatFocus)
|
||||
self.cbAdditive.setToolTip('Append the next message to the previous one, without a new textbox')
|
||||
self.cbAdditive.setObjectName('ui_additive')
|
||||
|
||||
# Emotions
|
||||
self.btnPrevEmotePage = buttons.BackEmoteButton(self)
|
||||
self.btnPrevEmotePage.hide()
|
||||
self.btnPrevEmotePage.setObjectName("ui_emote_left")
|
||||
self.btnNextEmotePage = buttons.NextEmoteButton(self)
|
||||
self.btnNextEmotePage.show()
|
||||
self.btnNextEmotePage.setObjectName("ui_emote_right")
|
||||
self.currentEmotePage = 0
|
||||
self.maxEmotesOnPage = 0
|
||||
self.emoteButtons = []
|
||||
@ -1552,42 +1574,58 @@ class GUI(QtGui.QWidget):
|
||||
self.btnRealization = buttons.AOToggleButton(self, "realization")
|
||||
self.btnRealization.clicked.connect(self.onRealizationClicked)
|
||||
self.btnRealization.setToolTip('Show the next message with a realization effect')
|
||||
self.sndRealization = audio.loadHandle(False, AOpath + 'sounds/general/sfx-realization.wav', 0, 0, 0)
|
||||
self.btnRealization.setObjectName("ui_realization")
|
||||
|
||||
self.btnShake = buttons.AOToggleButton(self, "screenshake") # AO 2.8
|
||||
self.btnShake.clicked.connect(self.onShakeClicked)
|
||||
self.btnShake.setToolTip('Show the next message with a shaking effect')
|
||||
self.btnShake.setObjectName("ui_screenshake")
|
||||
|
||||
self.sndRealization = audio.loadHandle(False, AOpath + 'sounds/general/sfx-realization.wav', 0, 0, 0)
|
||||
#self.sndShake = audio.loadHandle(False, AOpath + 'sounds/general/sfx-damage.wav', 0, 0, 0)
|
||||
|
||||
# Objections
|
||||
self.btnCustomObjection = buttons.CustomObjection(self)
|
||||
self.btnCustomObjection.clicked.connect(self.ICChatFocus)
|
||||
self.btnCustomObjection.setToolTip("Custom objection")
|
||||
self.btnCustomObjection.setObjectName("ui_custom_objection")
|
||||
self.btnTakeThat = buttons.Objections(self, 3)
|
||||
self.btnTakeThat.clicked.connect(self.ICChatFocus)
|
||||
self.btnTakeThat.setToolTip("Take that!")
|
||||
self.btnTakeThat.setObjectName("ui_take_that")
|
||||
self.btnObjection = buttons.Objections(self, 2)
|
||||
self.btnObjection.clicked.connect(self.ICChatFocus)
|
||||
self.btnObjection.setToolTip("Objection!")
|
||||
self.btnObjection.setObjectName("ui_objection")
|
||||
self.btnHoldIt = buttons.Objections(self, 1)
|
||||
self.btnHoldIt.clicked.connect(self.ICChatFocus)
|
||||
self.btnHoldIt.setToolTip("Hold it!")
|
||||
self.btnHoldIt.setObjectName("ui_hold_it")
|
||||
self.sndObjection = 0
|
||||
|
||||
# Judge buttons
|
||||
self.btnDefenseBar = buttons.PenaltyBars(self, 1)
|
||||
self.btnDefenseBar.minusClicked.connect(self.onPenaltyBarMinusClicked)
|
||||
self.btnDefenseBar.plusClicked.connect(self.onPenaltyBarPlusClicked)
|
||||
self.btnDefenseBar.btnMinus.setObjectName("ui_defense_minus")
|
||||
self.btnDefenseBar.btnPlus.setObjectName("ui_defense_plus")
|
||||
self.btnProsecutionBar = buttons.PenaltyBars(self, 2)
|
||||
self.btnProsecutionBar.minusClicked.connect(self.onPenaltyBarMinusClicked)
|
||||
self.btnProsecutionBar.plusClicked.connect(self.onPenaltyBarPlusClicked)
|
||||
self.btnProsecutionBar.btnMinus.setObjectName("ui_prosecution_minus")
|
||||
self.btnProsecutionBar.btnPlus.setObjectName("ui_prosecution_plus")
|
||||
self.btnWitnessTestimony = buttons.WTCEbuttons(self, 0)
|
||||
self.btnWitnessTestimony.clicked.connect(self.OnWTCEButtonClicked)
|
||||
self.btnWitnessTestimony.setObjectName("ui_witness_testimony")
|
||||
self.btnCrossExamination = buttons.WTCEbuttons(self, 1)
|
||||
self.btnCrossExamination.clicked.connect(self.OnWTCEButtonClicked)
|
||||
self.btnCrossExamination.setObjectName("ui_cross_examination")
|
||||
self.btnNotGuilty = buttons.WTCEbuttons(self, 2, 0)
|
||||
self.btnNotGuilty.clicked.connect(self.OnWTCEButtonClicked)
|
||||
self.btnNotGuilty.setObjectName("ui_not_guitly")
|
||||
self.btnGuilty = buttons.WTCEbuttons(self, 2, 1)
|
||||
self.btnGuilty.clicked.connect(self.OnWTCEButtonClicked)
|
||||
self.btnGuilty.setObjectName("ui_guilty")
|
||||
self.btnWitnessTestimony.show()
|
||||
self.btnCrossExamination.show()
|
||||
self.btnNotGuilty.show()
|
||||
@ -1608,6 +1646,12 @@ class GUI(QtGui.QWidget):
|
||||
self.sliMusicVolume.valueChanged.connect(self.changeMusicVolume)
|
||||
self.sliSoundVolume.valueChanged.connect(self.changeSoundVolume)
|
||||
self.sliBlipsVolume.valueChanged.connect(self.changeBlipVolume)
|
||||
self.sliMusicVolume.setObjectName("ui_music_slider")
|
||||
self.sliSoundVolume.setObjectName("ui_sfx_slider")
|
||||
self.sliBlipsVolume.setObjectName("ui_blip_slider")
|
||||
self.lblMusicVolume.setObjectName("ui_music_label")
|
||||
self.lblSoundVolume.setObjectName("ui_sfx_label")
|
||||
self.lblBlipsVolume.setObjectName("ui_blip_label")
|
||||
|
||||
# Demo playback seekbar
|
||||
self.sliDemoSeekbar = QtGui.QSlider(QtCore.Qt.Horizontal, self)
|
||||
@ -1615,10 +1659,6 @@ class GUI(QtGui.QWidget):
|
||||
self.sliDemoSeekbar.setVisible(False)
|
||||
self.sliDemoSeekbar.setMinimum(0)
|
||||
|
||||
self.gamewindow.setObjectName("mainWindow")
|
||||
self.lblMusicVolume.setObjectName("lblMusicVolume")
|
||||
self.lblSoundVolume.setObjectName("lblSoundVolume")
|
||||
self.lblBlipsVolume.setObjectName("lblBlipsVolume")
|
||||
self.lblNotMuted.setObjectName("lblNotMuted")
|
||||
self.lblMuted.setObjectName("lblMuted")
|
||||
self.lblIniSwapInfo.setObjectName("lblIniSwapInfo")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user