Skip to content

V
vmj-qt
Commit 80f2deb9 authored by Dan Pascu's avatar Dan Pascu
Browse files
Options

Fixed fonts in the chat web view

parent afc68db1
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
blink/chatwindow.py
View file @ 80f2deb9
......@@ -378,16 +378,6 @@ class ChatWebView(QWebView):
self.setAttribute(Qt.WA_OpaquePaintEvent, False)
self.settings().setAttribute(QWebSettings.DeveloperExtrasEnabled, True) # temporary for debugging -Dan
def setChatFont(self, family, size):
settings = self.settings()
settings.setFontFamily(QWebSettings.StandardFont, family)
settings.setFontFamily(QWebSettings.FixedFont, family)
settings.setFontFamily(QWebSettings.SerifFont, family)
settings.setFontFamily(QWebSettings.SansSerifFont, family)
settings.setFontSize(QWebSettings.DefaultFontSize, size)
settings.setFontSize(QWebSettings.DefaultFixedFontSize, size)
self.update()
def contextMenuEvent(self, event):
menu = self.page().createStandardContextMenu()
if any(action.isVisible() and not action.isSeparator() for action in menu.actions()):
......@@ -574,9 +564,10 @@ class ChatWidget(base_class, ui_class):
blink_settings = BlinkSettings()
self.style = ChatMessageStyle(blink_settings.chat_window.style)
self.style_variant = blink_settings.chat_window.style_variant or self.style.default_variant
self.font_family = blink_settings.chat_window.font or self.style.font_family
self.font_size = blink_settings.chat_window.font_size or self.style.font_size
self.user_icons_css_class = 'show-icons' if blink_settings.chat_window.show_user_icons else 'hide-icons'
self.chat_view.setChatFont(blink_settings.chat_window.font or self.style.font_family, blink_settings.chat_window.font_size or self.style.font_size)
self.chat_view.setHtml(self.chat_template.format(base_url=FileURL(self.style.path)+'/', style_url=self.style_variant+'.style'))
self.chat_view.setHtml(self.chat_template.format(base_url=FileURL(self.style.path)+'/', style_url=self.style_variant+'.style', font_family=self.font_family, font_size=self.font_size))
self.chat_element = self.chat_view.page().mainFrame().findFirstElement('#chat')
self.composing_timer = QTimer()
self.last_message = None
......
blink/preferences.py
View file @ 80f2deb9
......@@ -853,10 +853,11 @@ class PreferencesWindow(base_class, ui_class):
style = self.style_button.itemData(self.style_button.currentIndex())
style_variant = self.style_variant_button.itemText(self.style_variant_button.currentIndex())
font_family = blink_settings.chat_window.font or style.font_family
font_size = blink_settings.chat_window.font_size or style.font_size
user_icons = 'show-icons' if blink_settings.chat_window.show_user_icons else 'hide-icons'
self.style_view.setChatFont(blink_settings.chat_window.font or style.font_family, blink_settings.chat_window.font_size or style.font_size)
self.style_view.setHtml(self.style_view.template.format(base_url=FileURL(style.path)+'/', style_url=style_variant+'.style'))
self.style_view.setHtml(self.style_view.template.format(base_url=FileURL(style.path)+'/', style_url=style_variant+'.style', font_family=font_family, font_size=font_size))
chat_element = self.style_view.page().mainFrame().findFirstElement('#chat')
chat_element.last_message = None
......
resources/chat/template.html
View file @ 80f2deb9
......@@ -17,6 +17,11 @@
<style id="main_style" type="text/css" media="screen,print">
@import url("{style_url}");
</style>
<!-- The selected font !-->
<style id="font_style" type="text/css" media="screen,print">
body {{ font: {font_size}px {font_family}; }}
</style>
</head>
<body>
<div id="chat"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023