From 53ac444792832e44404db915dc2fdbe171748fb9 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 28 Apr 2022 22:09:57 -0400 Subject: [PATCH] Fixed Kivy help button and updated Kivy toolbar. --- .../remix light/xlarge/{question.png => rules.png} | Bin pysollib/app.py | 2 +- pysollib/help.py | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename data/images/toolbar/remix light/xlarge/{question.png => rules.png} (100%) diff --git a/data/images/toolbar/remix light/xlarge/question.png b/data/images/toolbar/remix light/xlarge/rules.png similarity index 100% rename from data/images/toolbar/remix light/xlarge/question.png rename to data/images/toolbar/remix light/xlarge/rules.png diff --git a/pysollib/app.py b/pysollib/app.py index 5a00740c..e07f171d 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -595,7 +595,7 @@ class Application: style = self.opt.toolbar_style if TOOLKIT == 'kivy': size = 'xlarge' - style = 'bluecurve' + style = 'remix light' d = self._getImagesDir('toolbar', style, size) if d: return d diff --git a/pysollib/help.py b/pysollib/help.py index f8ff4039..0b873a67 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -145,10 +145,11 @@ def help_html(app, document, dir_, top=None): h = int(sh * .8) w = min(650, int(sw * .8)) - - th = int(top.winfo_rooty() - top.winfo_y()) - top.wm_minsize(w, min(200, h)) - top.geometry("%dx%d+%d+%d" % (w, h, (sw - w) / 2, ((sh - h) / 2) - th)) + if TOOLKIT == "tk": + th = int(top.winfo_rooty() - top.winfo_y()) + top.wm_minsize(w, min(200, h)) + top.geometry("%dx%d+%d+%d" % (w, h, (sw - w) / 2, + ((sh - h) / 2) - th)) viewer = HTMLViewer(top, app, help_html_index) viewer.display(doc)