Addon Manager: Qt6 fixes

This commit is contained in:
Ladislav Michl
2024-01-23 12:46:32 +01:00
committed by Chris Hennes
parent 7b3ff9d9f3
commit 62c3836c97
4 changed files with 9 additions and 11 deletions

View File

@@ -36,7 +36,7 @@ from typing import Optional, Any
from urllib.parse import urlparse
try:
from PySide import QtCore, QtWidgets
from PySide import QtCore, QtGui, QtWidgets
except ImportError:
QtCore = None
QtWidgets = None
@@ -245,7 +245,7 @@ def get_readme_html_url(repo):
def is_darkmode() -> bool:
"""Heuristics to determine if we are in a darkmode stylesheet"""
pl = fci.FreeCADGui.getMainWindow().palette()
return pl.color(pl.Background).lightness() < 128
return pl.color(QtGui.QPalette.Window).lightness() < 128
def warning_color_string() -> str:

View File

@@ -216,7 +216,7 @@ class ChangeBranchDialogModel(QtCore.QAbstractTableModel):
dd = self.display_data[row]
if column == 3 or column == 4:
if dd[column] is not None:
qdate = QtCore.QDateTime.fromTime_t(dd[column])
qdate = QtCore.QDateTime.fromSecsSinceEpoch(dd[column])
return QtCore.QLocale().toString(qdate, QtCore.QLocale.ShortFormat)
elif column < len(dd):
return dd[column]

View File

@@ -133,10 +133,9 @@ class PackageDetails(QtWidgets.QWidget):
date = ""
installed_version_string = "<h3>"
if repo.updated_timestamp:
date = (
QtCore.QDateTime.fromTime_t(repo.updated_timestamp)
.date()
.toString(QtCore.Qt.SystemLocaleShortDate)
date = QtCore.QLocale().toString(
QtCore.QDateTime.fromSecsSinceEpoch(int(round(repo.updated_timestamp, 0))),
QtCore.QLocale.ShortFormat,
)
if version and date:
installed_version_string += (

View File

@@ -465,10 +465,9 @@ class PackageListItemDelegate(QtWidgets.QStyledItemDelegate):
installed_date_string = ""
if repo.updated_timestamp:
installed_date_string = "<br/>" + translate("AddonsInstaller", "Installed on") + ": "
installed_date_string += (
QtCore.QDateTime.fromTime_t(repo.updated_timestamp)
.date()
.toString(QtCore.Qt.SystemLocaleShortDate)
installed_date_string += QtCore.QLocale().toString(
QtCore.QDateTime.fromSecsSinceEpoch(int(round(repo.updated_timestamp, 0))),
QtCore.QLocale.ShortFormat,
)
available_version_string = ""