h3n3/jmwright-CQ-Editor
1
0
Fork 0
mirror of https://github.com/jdegenstein/jmwright-CQ-Editor.git synced 2025-12-19 22:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

more testing of pyside6

Browse Source
This commit is contained in:
jdegenstein
2023-10-11 12:11:37 -05:00
parent 8fca86e2c9
commit 960c9fe5ca
13 changed files with 1090 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
cq_editor/utils.py
View File

@@ -7,17 +7,22 @@ from PySide6.QtGui import QDesktopServices
from PySide6.QtCore import QUrl
from PySide6.QtWidgets import QFileDialog, QMessageBox
DOCK_POSITIONS = {'right' : QtCore.Qt.RightDockWidgetArea,
'left' : QtCore.Qt.LeftDockWidgetArea,
'top' : QtCore.Qt.TopDockWidgetArea,
'bottom' : QtCore.Qt.BottomDockWidgetArea}
DOCK_POSITIONS = {
"right": QtCore.Qt.RightDockWidgetArea,
"left": QtCore.Qt.LeftDockWidgetArea,
"top": QtCore.Qt.TopDockWidgetArea,
"bottom": QtCore.Qt.BottomDockWidgetArea,
}
def layout(parent,items,
top_widget = None,
layout_type = QtWidgets.QVBoxLayout,
margin = 2,
spacing = 0):
def layout(
parent,
items,
top_widget=None,
layout_type=QtWidgets.QVBoxLayout,
margin=2,
spacing=0,
):
if not top_widget:
top_widget = QtWidgets.QWidget(parent)
top_widget_was_none = True
@@ -25,110 +30,124 @@ def layout(parent,items,
top_widget_was_none = False
layout = layout_type(top_widget)
top_widget.setLayout(layout)
for item in items: layout.addWidget(item)
for item in items:
layout.addWidget(item)
layout.setSpacing(spacing)
layout.setContentsMargins(margin,margin,margin,margin)
layout.setContentsMargins(margin, margin, margin, margin)
if top_widget_was_none:
return top_widget
else:
return layout
def splitter(items,
stretch_factors = None,
orientation=QtCore.Qt.Horizontal):
def splitter(items, stretch_factors=None, orientation=QtCore.Qt.Horizontal):
sp = QtWidgets.QSplitter(orientation)
for item in items: sp.addWidget(item)
for item in items:
sp.addWidget(item)
if stretch_factors:
for i,s in enumerate(stretch_factors):
sp.setStretchFactor(i,s)
for i, s in enumerate(stretch_factors):
sp.setStretchFactor(i, s)
return sp
def dock(widget,
title,
parent,
allowedAreas = QtCore.Qt.AllDockWidgetAreas,
defaultArea = 'right',
name=None,
icon = None):
dock = QtWidgets.QDockWidget(title,parent,objectName=title)
if name: dock.setObjectName(name)
if icon: dock.toggleViewAction().setIcon(icon)
def dock(
widget,
title,
parent,
allowedAreas=QtCore.Qt.AllDockWidgetAreas,
defaultArea="right",
name=None,
icon=None,
):
dock = QtWidgets.QDockWidget(title, parent, objectName=title)
if name:
dock.setObjectName(name)
if icon:
dock.toggleViewAction().setIcon(icon)
dock.setAllowedAreas(allowedAreas)
dock.setWidget(widget)
action = dock.toggleViewAction()
action.setText(title)
dock.setFeatures(QtWidgets.QDockWidget.DockWidgetFeatures(\
QtWidgets.QDockWidget.AllDockWidgetFeatures))
parent.addDockWidget(DOCK_POSITIONS[defaultArea],
dock)
dock.setFeatures(
QtWidgets.QDockWidget.DockWidgetFeatures(
QtWidgets.QDockWidget.DockWidgetFloatable
)
)
parent.addDockWidget(DOCK_POSITIONS[defaultArea], dock)
return dock
def add_actions(menu,actions):
def add_actions(menu, actions):
if len(actions) > 0:
menu.addActions(actions)
menu.addSeparator()
def open_url(url):
QDesktopServices.openUrl(QUrl(url))
def about_dialog(parent,title,text):
QtWidgets.QMessageBox.about(parent,title,text)
QDesktopServices.openUrl(QUrl(url))
def about_dialog(parent, title, text):
QtWidgets.QMessageBox.about(parent, title, text)
def get_save_filename(suffix):
rv,_ = QFileDialog.getSaveFileName(filter='*.{}'.format(suffix))
if rv != '' and not rv.endswith(suffix): rv += '.'+suffix
rv, _ = QFileDialog.getSaveFileName(filter="*.{}".format(suffix))
if rv != "" and not rv.endswith(suffix):
rv += "." + suffix
return rv
def get_open_filename(suffix, curr_dir):
rv,_ = QFileDialog.getOpenFileName(directory=curr_dir, filter='*.{}'.format(suffix))
if rv != '' and not rv.endswith(suffix): rv += '.'+suffix
rv, _ = QFileDialog.getOpenFileName(
directory=curr_dir, filter="*.{}".format(suffix)
)
if rv != "" and not rv.endswith(suffix):
rv += "." + suffix
return rv
def check_gtihub_for_updates(parent,
mod,
github_org='cadquery',
github_proj='cadquery'):
url = f'https://api.github.com/repos/{github_org}/{github_proj}/releases'
def check_gtihub_for_updates(
parent, mod, github_org="cadquery", github_proj="cadquery"
):
url = f"https://api.github.com/repos/{github_org}/{github_proj}/releases"
resp = requests.get(url).json()
newer = [el['tag_name'] for el in resp if not el['draft'] and \
parse_version(el['tag_name']) > parse_version(mod.__version__)]
newer = [
el["tag_name"]
for el in resp
if not el["draft"]
and parse_version(el["tag_name"]) > parse_version(mod.__version__)
]
if newer:
title='Updates available'
text=f'There are newer versions of {github_proj} ' \
f'available on github:\n' + '\n'.join(newer)
title = "Updates available"
text = (
f"There are newer versions of {github_proj} "
f"available on github:\n" + "\n".join(newer)
)
else:
title='No updates available'
text=f'You are already using the latest version of {github_proj}'
QtWidgets.QMessageBox.about(parent,title,text)
def confirm(parent,title,msg):
title = "No updates available"
text = f"You are already using the latest version of {github_proj}"
QtWidgets.QMessageBox.about(parent, title, text)
def confirm(parent, title, msg):
rv = QMessageBox.question(parent, title, msg, QMessageBox.Yes, QMessageBox.No)
return True if rv == QMessageBox.Yes else False