widgets from default theme scale properly
This commit is contained in:
parent
d8e202bbad
commit
9cbf55bbe5
@ -12,7 +12,7 @@ self.viewport.resize(256 * _scale, 192 * _scale)
|
|||||||
self.name.move(8 * _scale, -15 + 7 * _scale)
|
self.name.move(8 * _scale, -15 + 7 * _scale)
|
||||||
self.name.resize(248, 32)
|
self.name.resize(248, 32)
|
||||||
self.name.setStyleSheet('color: white')
|
self.name.setStyleSheet('color: white')
|
||||||
self.text.setGeometry(8 * _scale, 16 * _scale, self.viewport.width() - 32, 112)
|
self.text.setGeometry(8 * _scale, 16 * _scale, self.viewport.width() - 32, 56 * _scale)
|
||||||
self.text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;")
|
self.text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;")
|
||||||
self.nameFontPointSize = 6 * _scale
|
self.nameFontPointSize = 6 * _scale
|
||||||
self.textFontPointSize = 12 * _scale
|
self.textFontPointSize = 12 * _scale
|
||||||
@ -38,17 +38,20 @@ self.effectdropdown.setGeometry(self.posdropdown.x(), self.colordropdown.y(), 72
|
|||||||
self.callmodbtn.setGeometry(10, viewportBottom + 31, 60, 23)
|
self.callmodbtn.setGeometry(10, viewportBottom + 31, 60, 23)
|
||||||
self.settingsbtn.setGeometry(self.callmodbtn.x()+self.callmodbtn.size().width(), viewportBottom + 31, self.callmodbtn.width(), 23)
|
self.settingsbtn.setGeometry(self.callmodbtn.x()+self.callmodbtn.size().width(), viewportBottom + 31, self.callmodbtn.width(), 23)
|
||||||
self.changechar.setGeometry(10, viewportBottom + 7, self.callmodbtn.size().width() + self.settingsbtn.size().width(), 23)
|
self.changechar.setGeometry(10, viewportBottom + 7, self.callmodbtn.size().width() + self.settingsbtn.size().width(), 23)
|
||||||
self.shownameedit.setGeometry(self.posdropdown.x() + self.posdropdown.width() + 4, self.posdropdown.y(), 168 + 56, 20)
|
self.shownameedit.move(self.posdropdown.x() + self.posdropdown.width() + 4, self.posdropdown.y())
|
||||||
|
self.shownameedit.resize(viewportRight - self.shownameedit.x(), 20)
|
||||||
|
|
||||||
self.gametabs.move(8, viewportBottom + 61)
|
self.gametabs.move(8, viewportBottom + 61)
|
||||||
self.gametabs.resize(714 - 304, 256)
|
self.gametabs.resize(viewportRight - 102, 256)
|
||||||
|
|
||||||
self.iclog.setGeometry(8, 8, 714 - 304 - 22, 212)
|
leftSideHeight = self.gametabs.y() + self.gametabs.height() + 6
|
||||||
|
|
||||||
|
self.iclog.setGeometry(8, 8, self.gametabs.width() - 22, 212)
|
||||||
|
|
||||||
self.evidencedropdown.setGeometry(8, 8, 192, 20)
|
self.evidencedropdown.setGeometry(8, 8, 192, 20)
|
||||||
self.privatedropdown.setGeometry(8, 8, 192, 20)
|
self.privatedropdown.setGeometry(8, 8, 192, 20)
|
||||||
self.evidencedesc.setGeometry(8, 108, 714 - 304 - 22, 112)
|
self.evidencedesc.setGeometry(8, 108, self.gametabs.width() - 22, 112)
|
||||||
self.evidenceimage.setGeometry(326, 8, 70, 70)
|
self.evidenceimage.setGeometry(self.evidencedesc.x() + self.evidencedesc.width() - 70, 8, 70, 70)
|
||||||
|
|
||||||
self.evidenceadd.move(8, 32)
|
self.evidenceadd.move(8, 32)
|
||||||
self.evidenceadd.resize(30, 26)
|
self.evidenceadd.resize(30, 26)
|
||||||
@ -75,10 +78,9 @@ self.evidenceswitchglobal.move(3 + self.evidencemoveallprivate.x() + self.eviden
|
|||||||
self.evidenceload.move(3 + self.evidenceswitchprivate.x() + self.evidenceswitchprivate.size().width(), self.evidenceadd.y())
|
self.evidenceload.move(3 + self.evidenceswitchprivate.x() + self.evidenceswitchprivate.size().width(), self.evidenceadd.y())
|
||||||
self.evidencesave.move(3 + self.evidenceload.x() + self.evidenceload.size().width(), self.evidenceadd.y())
|
self.evidencesave.move(3 + self.evidenceload.x() + self.evidenceload.size().width(), self.evidenceadd.y())
|
||||||
|
|
||||||
self.evidencepresent.move((714 - 304 - 22) / 2 - self.evidencepresent.button_off.size().width() / 2, self.evidencedesc.y() - self.evidencepresent.button_off.size().height())
|
self.evidencepresent.move(self.evidencedesc.x() + self.evidencedesc.width() / 2 - self.evidencepresent.button_off.size().width() / 2, self.evidencedesc.y() - self.evidencepresent.button_off.size().height())
|
||||||
|
|
||||||
self.msgqueue_list.setGeometry(8, 8, 714 - 304 - 22, 180)
|
self.msgqueue_list.setGeometry(8, 8, self.gametabs.width() - 22, 180)
|
||||||
self.player_list.setGeometry(8, 8, 268, 180)
|
|
||||||
self.remove_queue.resize(self.remove_queue.sizeHint())
|
self.remove_queue.resize(self.remove_queue.sizeHint())
|
||||||
self.remove_queue.move(8, self.msgqueue_list.size().height() + 16)
|
self.remove_queue.move(8, self.msgqueue_list.size().height() + 16)
|
||||||
self.clear_queue.move(self.remove_queue.x() + self.remove_queue.size().width(), self.remove_queue.y())
|
self.clear_queue.move(self.remove_queue.x() + self.remove_queue.size().width(), self.remove_queue.y())
|
||||||
@ -112,37 +114,53 @@ self.pair_order.setGeometry(self.pairOffset.x(), self.pair_order_l.y()-4, 80, se
|
|||||||
self.spacebartext.move(self.mocktext.x(), self.mocktext.y()+24)
|
self.spacebartext.move(self.mocktext.x(), self.mocktext.y()+24)
|
||||||
self.autocaps.move(self.spacebartext.x(), self.spacebartext.y()+24)
|
self.autocaps.move(self.spacebartext.x(), self.spacebartext.y()+24)
|
||||||
|
|
||||||
# IC image buttons
|
# Judge options
|
||||||
self.defensebar.moveBar(429, viewportBottom + 61)
|
self.defensebar.moveBar(self.gametabs.x() + self.gametabs.width() + 11, viewportBottom + 61)
|
||||||
self.prosecutionbar.moveBar(429, viewportBottom + 75)
|
self.prosecutionbar.moveBar(self.defensebar.x(), viewportBottom + 75)
|
||||||
self.realizationbtn.move(429, viewportBottom + 89)
|
self.realizationbtn.move(self.defensebar.x(), viewportBottom + 89)
|
||||||
self.shakebtn.move(471, self.realizationbtn.y())
|
self.shakebtn.move(self.realizationbtn.x() + self.realizationbtn.width(), self.realizationbtn.y())
|
||||||
|
|
||||||
self.wtcebtn_1.move(429, viewportBottom + 137)
|
self.wtcebtn_1.move(self.defensebar.x(), viewportBottom + 137)
|
||||||
self.wtcebtn_2.move(self.wtcebtn_1.x(), self.wtcebtn_1.y() + self.wtcebtn_1.size().height())
|
self.wtcebtn_2.move(self.wtcebtn_1.x(), self.wtcebtn_1.y() + self.wtcebtn_1.size().height())
|
||||||
self.notguiltybtn.move(self.wtcebtn_1.x(), self.wtcebtn_2.y() + self.wtcebtn_2.size().height())
|
self.notguiltybtn.move(self.wtcebtn_1.x(), self.wtcebtn_2.y() + self.wtcebtn_2.size().height())
|
||||||
self.guiltybtn.move(self.wtcebtn_1.x(), self.notguiltybtn.y() + self.notguiltybtn.size().height())
|
self.guiltybtn.move(self.wtcebtn_1.x(), self.notguiltybtn.y() + self.notguiltybtn.size().height())
|
||||||
|
|
||||||
self.holditbtn.move(viewportRight + 14, 352)
|
## Sidebar
|
||||||
|
|
||||||
|
# OOC chat
|
||||||
|
self.ooclog.setGeometry(viewportRight + 14, 0, 288, max(730, leftSideHeight) - 482)
|
||||||
|
self.oocnameinput.resize(self.oocnameinput.sizeHint().width() - 32, self.oocnameinput.sizeHint().height())
|
||||||
|
self.oocnameinput.move(viewportRight + 14, self.ooclog.y() + self.ooclog.height())
|
||||||
|
self.oocinput.resize(self.ooclog.width() - self.oocnameinput.width(), self.oocinput.sizeHint().height())
|
||||||
|
self.oocinput.move(viewportRight + 14 + self.oocnameinput.size().width(), self.oocnameinput.y())
|
||||||
|
|
||||||
|
oocBottom = self.oocnameinput.y() + self.oocnameinput.height() # 268
|
||||||
|
|
||||||
|
# Volume sliders and mod login
|
||||||
|
self.musicslider.setGeometry(self.oocnameinput.x(), oocBottom + 8, 192, 16)
|
||||||
|
self.soundslider.setGeometry(self.oocnameinput.x(), oocBottom + 32, 192, 16)
|
||||||
|
self.blipslider.setGeometry(self.oocnameinput.x(), oocBottom + 56, 192, 16)
|
||||||
|
self.sliderlabel1.move(self.musicslider.x() + self.musicslider.size().width()+8, self.musicslider.y())
|
||||||
|
self.sliderlabel2.move(self.soundslider.x() + self.soundslider.size().width()+8, self.soundslider.y())
|
||||||
|
self.sliderlabel3.move(self.blipslider.x() + self.blipslider.size().width()+8, self.blipslider.y())
|
||||||
|
|
||||||
|
self.pinglabel.setGeometry(self.sliderlabel3.x() + 32, self.sliderlabel3.y(), 96, 14)
|
||||||
|
self.ooclogin.resize(48, 20)
|
||||||
|
self.ooclogin.move(viewportRight + 14 + self.ooclog.size().width() - (self.ooclogin.size().width()), oocBottom + 6)
|
||||||
|
|
||||||
|
# Objection and emote buttons
|
||||||
|
self.holditbtn.move(viewportRight + 14, oocBottom + 84)
|
||||||
self.objectbtn.move(self.holditbtn.x() + 70, self.holditbtn.y())
|
self.objectbtn.move(self.holditbtn.x() + 70, self.holditbtn.y())
|
||||||
self.takethatbtn.move(self.objectbtn.x() + 70, self.holditbtn.y())
|
self.takethatbtn.move(self.objectbtn.x() + 70, self.holditbtn.y())
|
||||||
self.customobject.move(self.takethatbtn.x() + 70, self.holditbtn.y())
|
self.customobject.move(self.takethatbtn.x() + 70, self.holditbtn.y())
|
||||||
|
|
||||||
self.emotePageGeometry = (viewportRight + 14, 384, 288, 98)
|
self.emotePageGeometry = (viewportRight + 14, oocBottom + 116, 288, 98)
|
||||||
self.prevemotepage.move(viewportRight + 8, 415)
|
self.prevemotepage.move(viewportRight + 8, oocBottom + 147)
|
||||||
self.nextemotepage.move(viewportRight + 286, 415)
|
self.nextemotepage.move(viewportRight + 286, self.prevemotepage.y())
|
||||||
|
|
||||||
# OOC chat
|
|
||||||
self.ooclog.setGeometry(viewportRight + 14, 0, 288, 248)
|
|
||||||
self.oocnameinput.resize(self.oocnameinput.sizeHint().width() - 32, self.oocnameinput.sizeHint().height())
|
|
||||||
self.oocnameinput.move(viewportRight + 14, 248)
|
|
||||||
self.oocinput.resize(self.ooclog.width() - self.oocnameinput.width(), self.oocinput.sizeHint().height())
|
|
||||||
self.oocinput.move(viewportRight + 14 + self.oocnameinput.size().width(), 248)
|
|
||||||
self.ooclogin.resize(48, 20)
|
|
||||||
self.ooclogin.move(viewportRight + 14 + self.ooclog.size().width() - (self.ooclogin.size().width()), self.oocinput.y() + self.ooclogin.size().height())
|
|
||||||
|
|
||||||
# Server tabs
|
# Server tabs
|
||||||
self.musicareatabs.setGeometry(viewportRight + 14, 468, 288, 258)
|
self.musicareatabs.setGeometry(viewportRight + 14, oocBottom + 200, 288, 258)
|
||||||
|
|
||||||
self.musicitems.setGeometry(8, 8, 268, 184)
|
self.musicitems.setGeometry(8, 8, 268, 184)
|
||||||
self.musicsearch.setGeometry(8, self.musicitems.size().height() + 16, 268, self.musicsearch.sizeHint().height())
|
self.musicsearch.setGeometry(8, self.musicitems.size().height() + 16, 268, self.musicsearch.sizeHint().height())
|
||||||
self.found_songitem_color = "#80ff80"
|
self.found_songitem_color = "#80ff80"
|
||||||
@ -152,6 +170,7 @@ self.backgroundsearch.setGeometry(8, self.musicitems.size().height() + 16, 268 -
|
|||||||
self.backgroundrefresh.resize(self.backgroundrefresh.sizeHint())
|
self.backgroundrefresh.resize(self.backgroundrefresh.sizeHint())
|
||||||
self.backgroundrefresh.move(268 - self.backgroundrefresh.sizeHint().width(), self.backgrounditems.size().height() + 16)
|
self.backgroundrefresh.move(268 - self.backgroundrefresh.sizeHint().width(), self.backgrounditems.size().height() + 16)
|
||||||
|
|
||||||
|
self.player_list.setGeometry(8, 8, 268, 180)
|
||||||
self.player_pair.resize(self.player_pair.sizeHint())
|
self.player_pair.resize(self.player_pair.sizeHint())
|
||||||
self.player_kick.resize(self.player_kick.sizeHint())
|
self.player_kick.resize(self.player_kick.sizeHint())
|
||||||
self.player_ban.resize(self.player_ban.sizeHint())
|
self.player_ban.resize(self.player_ban.sizeHint())
|
||||||
@ -159,16 +178,6 @@ self.player_pair.move(8, self.player_list.size().height() + 16)
|
|||||||
self.player_kick.move(8 + self.player_pair.x() + self.player_pair.size().width(), self.player_list.size().height() + 16)
|
self.player_kick.move(8 + self.player_pair.x() + self.player_pair.size().width(), self.player_list.size().height() + 16)
|
||||||
self.player_ban.move(8 + self.player_kick.x() + self.player_kick.size().width(), self.player_list.size().height() + 16)
|
self.player_ban.move(8 + self.player_kick.x() + self.player_kick.size().width(), self.player_list.size().height() + 16)
|
||||||
|
|
||||||
self.musicslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+24, 192, 16)
|
|
||||||
self.soundslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+48, 192, 16)
|
|
||||||
self.blipslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+72, 192, 16)
|
|
||||||
|
|
||||||
self.sliderlabel1.move(self.musicslider.x() + self.musicslider.size().width()+8, self.musicslider.y())
|
|
||||||
self.sliderlabel2.move(self.soundslider.x() + self.soundslider.size().width()+8, self.soundslider.y())
|
|
||||||
self.sliderlabel3.move(self.blipslider.x() + self.blipslider.size().width()+8, self.blipslider.y())
|
|
||||||
|
|
||||||
self.pinglabel.setGeometry(self.sliderlabel3.x() + 32, self.sliderlabel3.y(), 96, 14)
|
|
||||||
|
|
||||||
# Main window
|
# Main window
|
||||||
self.width = self.ooclog.x() + self.ooclog.width() + 4
|
self.width = self.ooclog.x() + self.ooclog.width() + 4
|
||||||
self.height = max(730, self.gametabs.y() + self.gametabs.height() + 6)
|
self.height = max(730, leftSideHeight)
|
||||||
Loading…
Reference in New Issue
Block a user