langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix about dialog collapsed on qt 5.11/12"

Browse Source 
This reverts commit edb3b176a8.

causes a lot of flickering on startup - will just move to
static sizing instead, as there is a scrollbar anyway
This commit is contained in:
Damien Elmes 2018-10-25 15:43:17 +10:00
parent 5e3f35a32c
commit 1fd7c244be
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
aqt/about.py
View File

@ -24,9 +24,7 @@ def show(mw):
mw.setupDialogGC(dialog) mw.setupDialogGC(dialog)
abt = aqt.forms.about.Ui_About() abt = aqt.forms.about.Ui_About()
abt.setupUi(dialog) abt.setupUi(dialog)
abouttext = "<style>body { margin: 0 }\n.outer { padding: 2em; }</style>" abouttext = "<center><img src='/_anki/imgs/anki-logo-thin.png'></center>"
abouttext += "<div class=outer>"
abouttext += "<center><img src='/_anki/imgs/anki-logo-thin.png'></center>"
abouttext += '<p>' + _("Anki is a friendly, intelligent spaced learning \ abouttext += '<p>' + _("Anki is a friendly, intelligent spaced learning \
system. It's free and open source.") system. It's free and open source.")
abouttext += "<p>"+_("Anki is licensed under the AGPL3 license. Please see " abouttext += "<p>"+_("Anki is licensed under the AGPL3 license. Please see "
@ -127,14 +125,9 @@ system. It's free and open source.")
please get in touch.") please get in touch.")
abouttext += '<p>' + _("A big thanks to all the people who have provided \ abouttext += '<p>' + _("A big thanks to all the people who have provided \
suggestions, bug reports and donations.") suggestions, bug reports and donations.")
abouttext += "</div>" abt.label.stdHtml(abouttext, js=" ")
dialog.show() def resizeAndShow(arg):
dialog.setMinimumWidth(800) dialog.adjustSize()
abt.label.stdHtml(abouttext) dialog.show()
if qtminor >= 11: abt.label.evalWithCallback("1", resizeAndShow)
abt.label.adjustHeightToFit()
# after the height is adjusted, adjust the dialog size
abt.label.evalWithCallback("1", lambda _: dialog.adjustSize())
else:
dialog.setMinimumHeight(600)
return dialog return dialog