diff --git a/vasl_templates/main.py b/vasl_templates/main.py index e66379d..41e0191 100755 --- a/vasl_templates/main.py +++ b/vasl_templates/main.py @@ -24,6 +24,16 @@ import click from vasl_templates.webapp.utils import SimpleError +# NOTE: We're supposed to do the following to support HiDPI, but it causes the main window +# to become extremely large when the Windows zoom level is high (and it doesn't really fix +# the dialog layout problems anyway :-/).# Since we're a webapp running in a browser, +# desktop DPI isn't really an issue for us, we just need to make sure that the Qt dialogs +# look OK. I adjusted the layout for the About box so it's correct for HiDPI; it doesn't +# look great for normal DPI (too much whitespace), but it's useable. +# # nb: this must be done before the QApplication object is created +# QApplication.setAttribute( PyQt5.QtCore.Qt.AA_EnableHighDpiScaling, True ) +# QApplication.setAttribute( PyQt5.QtCore.Qt.AA_UseHighDpiPixmaps, True ) + # FUDGE! This needs to be created before showing any UI elements e.g. an error message box. qt_app = QApplication( sys.argv ) diff --git a/vasl_templates/ui/about.ui b/vasl_templates/ui/about.ui index e62debd..63c4dd3 100644 --- a/vasl_templates/ui/about.ui +++ b/vasl_templates/ui/about.ui @@ -9,8 +9,8 @@ 0 0 - 410 - 150 + 460 + 182 @@ -40,13 +40,19 @@ 80 20 - 321 - 44 + 371 + 61 + + + 0 + 0 + + DejaVu Sans @@ -60,6 +66,12 @@ + + + 0 + 0 + + DejaVu Sans @@ -77,8 +89,8 @@ 10 - 110 - 391 + 140 + 441 31 @@ -118,11 +130,17 @@ 10 - 100 - 391 - 17 + 120 + 441 + 21 + + + 0 + 0 + + *** HOME URL *** @@ -134,8 +152,8 @@ 10 - 80 - 388 + 100 + 441 17 diff --git a/vasl_templates/ui/server_settings.ui b/vasl_templates/ui/server_settings.ui index 70b45bf..0c8e351 100644 --- a/vasl_templates/ui/server_settings.ui +++ b/vasl_templates/ui/server_settings.ui @@ -37,7 +37,7 @@ 10 30 381 - 51 + 58 @@ -152,7 +152,7 @@ 10 30 381 - 111 + 116 @@ -357,7 +357,7 @@ 10 30 381 - 81 + 86 @@ -446,18 +446,6 @@ - - - 0 - 0 - - - - - DejaVu Sans - 8 - - Image s&caling: @@ -486,12 +474,6 @@ 16777215 - - - DejaVu Sans - 8 - -