mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 12:53:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #565 from Arfs6/profile-dialog-fixes

Browse Source 
Show Profile dialog fixes
This commit is contained in:
Manuel Cortez 2023-12-27 12:32:50 -06:00 committed by GitHub
commit 701c509cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/wxUI/dialogs/mastodon/showUserProfile.py
View File

@ -6,12 +6,13 @@ from pubsub import pub
from typing import Tuple from typing import Tuple
import requests import requests
import wx import wx
from logging import getLogger
from threading import Thread
from sessions.mastodon.utils import html_filter from sessions.mastodon.utils import html_filter
def _(s): log = getLogger(__name__)
return s
def selectUserDialog(users: list) -> tuple: def selectUserDialog(users: list) -> tuple:
@ -72,7 +73,7 @@ class ShowUserProfile(wx.Dialog):
self.SetTitle(_("{}'s Profile").format(user.display_name)) self.SetTitle(_("{}'s Profile").format(user.display_name))
self.panel = wx.Panel(self) self.panel = wx.Panel(self)
wrapperSizer = wx.BoxSizer(wx.VERTICAL) wrapperSizer = wx.BoxSizer(wx.VERTICAL)
mainSizer = wx.GridSizer(12, 2, 5, 5) mainSizer = wx.GridSizer(2, 5, 5)
# create widgets # create widgets
nameLabel = wx.StaticText(self.panel, label=_("Name: ")) nameLabel = wx.StaticText(self.panel, label=_("Name: "))
@ -101,37 +102,19 @@ class ShowUserProfile(wx.Dialog):
# header # header
headerLabel = wx.StaticText(self.panel, label=_("Header: ")) headerLabel = wx.StaticText(self.panel, label=_("Header: "))
try:
response = requests.get(user.header)
except requests.exceptions.RequestException:
# Create empty image # Create empty image
headerImage = wx.StaticBitmap() self.headerImage = wx.StaticBitmap(self.panel)
else: self.headerImage.AcceptsFocusFromKeyboard = returnTrue
image_bytes = BytesIO(response.content)
image = wx.Image(image_bytes, wx.BITMAP_TYPE_ANY)
image.Rescale(300, 100, wx.IMAGE_QUALITY_HIGH)
headerImage = wx.StaticBitmap(self.panel, bitmap=image.ConvertToBitmap())
headerImage.AcceptsFocusFromKeyboard = returnTrue
mainSizer.Add(headerLabel, wx.SizerFlags().Center()) mainSizer.Add(headerLabel, wx.SizerFlags().Center())
mainSizer.Add(headerImage, wx.SizerFlags().Center()) mainSizer.Add(self.headerImage, wx.SizerFlags().Center())
# avatar # avatar
avatarLabel = wx.StaticText(self.panel, label=_("Avatar: ")) avatarLabel = wx.StaticText(self.panel, label=_("Avatar: "))
try:
response = requests.get(user.avatar)
except requests.exceptions.RequestException:
# Create empty image # Create empty image
avatarImage = wx.StaticBitmap() self.avatarImage = wx.StaticBitmap(self.panel)
else: self.avatarImage.AcceptsFocusFromKeyboard = returnTrue
image_bytes = BytesIO(response.content)
image = wx.Image(image_bytes, wx.BITMAP_TYPE_ANY)
image.Rescale(150, 150, wx.IMAGE_QUALITY_HIGH)
avatarImage = wx.StaticBitmap(self.panel, bitmap=image.ConvertToBitmap())
avatarImage.AcceptsFocusFromKeyboard = returnTrue
mainSizer.Add(avatarLabel, wx.SizerFlags().Center()) mainSizer.Add(avatarLabel, wx.SizerFlags().Center())
mainSizer.Add(avatarImage, wx.SizerFlags().Center()) mainSizer.Add(self.avatarImage, wx.SizerFlags().Center())
self.fields = [] self.fields = []
for num, field in enumerate(user.fields): for num, field in enumerate(user.fields):
@ -194,6 +177,8 @@ class ShowUserProfile(wx.Dialog):
self.panel.Center() self.panel.Center()
mainSizer.Fit(self) mainSizer.Fit(self)
self.Center() self.Center()
imageDownloaderThread = Thread(target=self._getImages)
imageDownloaderThread.start()
def createTextCtrl(self, text: str, size: Tuple[int, int], multiline: bool = False) -> wx.TextCtrl: def createTextCtrl(self, text: str, size: Tuple[int, int], multiline: bool = False) -> wx.TextCtrl:
@ -226,3 +211,29 @@ class ShowUserProfile(wx.Dialog):
def onFollowers(self, *args): def onFollowers(self, *args):
"""Open followers timeline for this user""" """Open followers timeline for this user"""
pub.sendMessage('execute-action', action='openFollowersTimeline', kwargs=dict(user=self.user)) pub.sendMessage('execute-action', action='openFollowersTimeline', kwargs=dict(user=self.user))
def _getImages(self):
"""Downloads image from mastodon server
This method should run on a separate thread
"""
log.debug("Downloading user's header and avatar images...")
try:
header = requests.get(self.user.header)
avatar = requests.get(self.user.avatar)
except requests.exceptions.RequestException as mess:
log.exception("An exception was raised while downloading images:", mess)
return
wx.CallAfter(self._drawImages, header.content, avatar.content)
def _drawImages(self, headerImageBytes, avatarImageBytes):
"""Draws images on the bitmap ui"""
# log.debug("Drawing images...")
# Header
headerImage = wx.Image(BytesIO(headerImageBytes), wx.BITMAP_TYPE_ANY)
headerImage.Rescale(300, 100, wx.IMAGE_QUALITY_HIGH)
self.headerImage.SetBitmap(headerImage.ConvertToBitmap())
# Avatar
avatarImage = wx.Image(BytesIO(avatarImageBytes), wx.BITMAP_TYPE_ANY)
avatarImage.Rescale(150, 150, wx.IMAGE_QUALITY_HIGH)
self.avatarImage.SetBitmap(avatarImage.ConvertToBitmap())