mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 15:07:28 -06:00
Added 'dismiss' link and logic for removing the item from the dialog
CURA-7090
This commit is contained in:
parent
e5f464f7e7
commit
c86cc3ae5a
3 changed files with 47 additions and 3 deletions
|
@ -104,7 +104,7 @@ UM.Dialog{
|
||||||
{
|
{
|
||||||
width: parent.width
|
width: parent.width
|
||||||
property int lineHeight: 60
|
property int lineHeight: 60
|
||||||
visible: !model.is_compatible
|
visible: !model.is_compatible && !model.is_dismissed
|
||||||
height: visible ? (lineHeight + UM.Theme.getSize("default_margin").height) : 0 // We only show the incompatible packages here
|
height: visible ? (lineHeight + UM.Theme.getSize("default_margin").height) : 0 // We only show the incompatible packages here
|
||||||
Image
|
Image
|
||||||
{
|
{
|
||||||
|
@ -117,6 +117,7 @@ UM.Dialog{
|
||||||
}
|
}
|
||||||
Label
|
Label
|
||||||
{
|
{
|
||||||
|
id: packageName
|
||||||
text: model.name
|
text: model.name
|
||||||
font: UM.Theme.getFont("medium_bold")
|
font: UM.Theme.getFont("medium_bold")
|
||||||
anchors.left: packageIcon.right
|
anchors.left: packageIcon.right
|
||||||
|
@ -125,6 +126,22 @@ UM.Dialog{
|
||||||
color: UM.Theme.getColor("text")
|
color: UM.Theme.getColor("text")
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Label
|
||||||
|
{
|
||||||
|
id: dismissLabel
|
||||||
|
text: "(Dismiss)"
|
||||||
|
font: UM.Theme.getFont("small")
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.verticalCenter: packageIcon.verticalCenter
|
||||||
|
color: UM.Theme.getColor("text")
|
||||||
|
|
||||||
|
MouseArea
|
||||||
|
{
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: toolbox.dismissIncompatiblePackage(model.package_id)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,10 @@ from PyQt5.QtCore import Qt
|
||||||
from UM.Qt.ListModel import ListModel
|
from UM.Qt.ListModel import ListModel
|
||||||
from cura import ApplicationMetadata
|
from cura import ApplicationMetadata
|
||||||
|
|
||||||
|
from PyQt5.QtCore import pyqtSlot
|
||||||
|
|
||||||
|
from UM.Logger import Logger
|
||||||
|
|
||||||
|
|
||||||
class SubscribedPackagesModel(ListModel):
|
class SubscribedPackagesModel(ListModel):
|
||||||
def __init__(self, parent = None):
|
def __init__(self, parent = None):
|
||||||
|
@ -18,6 +22,9 @@ class SubscribedPackagesModel(ListModel):
|
||||||
self.addRoleName(Qt.UserRole + 1, "name")
|
self.addRoleName(Qt.UserRole + 1, "name")
|
||||||
self.addRoleName(Qt.UserRole + 2, "icon_url")
|
self.addRoleName(Qt.UserRole + 2, "icon_url")
|
||||||
self.addRoleName(Qt.UserRole + 3, "is_compatible")
|
self.addRoleName(Qt.UserRole + 3, "is_compatible")
|
||||||
|
self.addRoleName(Qt.UserRole + 4, "is_dismissed")
|
||||||
|
self.addRoleName(Qt.UserRole + 5, "package_id")
|
||||||
|
|
||||||
|
|
||||||
def setMetadata(self, data):
|
def setMetadata(self, data):
|
||||||
if self._metadata != data:
|
if self._metadata != data:
|
||||||
|
@ -33,7 +40,11 @@ class SubscribedPackagesModel(ListModel):
|
||||||
for item in self._metadata:
|
for item in self._metadata:
|
||||||
if item["package_id"] not in self._discrepancies:
|
if item["package_id"] not in self._discrepancies:
|
||||||
continue
|
continue
|
||||||
package = {"name": item["display_name"], "sdk_versions": item["sdk_versions"]}
|
package = {"package_id": item["package_id"],
|
||||||
|
"name": item["display_name"],
|
||||||
|
"sdk_versions": item["sdk_versions"],
|
||||||
|
"is_dismissed": False
|
||||||
|
}
|
||||||
if self._sdk_version not in item["sdk_versions"]:
|
if self._sdk_version not in item["sdk_versions"]:
|
||||||
package.update({"is_compatible": False})
|
package.update({"is_compatible": False})
|
||||||
else:
|
else:
|
||||||
|
@ -44,8 +55,10 @@ class SubscribedPackagesModel(ListModel):
|
||||||
package.update({"icon_url": ""})
|
package.update({"icon_url": ""})
|
||||||
|
|
||||||
self._items.append(package)
|
self._items.append(package)
|
||||||
|
print("All items:: %s" % self._items)
|
||||||
self.setItems(self._items)
|
self.setItems(self._items)
|
||||||
|
|
||||||
|
|
||||||
def hasCompatiblePackages(self) -> bool:
|
def hasCompatiblePackages(self) -> bool:
|
||||||
has_compatible_items = False
|
has_compatible_items = False
|
||||||
for item in self._items:
|
for item in self._items:
|
||||||
|
@ -59,3 +72,12 @@ class SubscribedPackagesModel(ListModel):
|
||||||
if item['is_compatible'] == False:
|
if item['is_compatible'] == False:
|
||||||
has_incompatible_items = True
|
has_incompatible_items = True
|
||||||
return has_incompatible_items
|
return has_incompatible_items
|
||||||
|
|
||||||
|
@pyqtSlot(str)
|
||||||
|
def setDismiss(self, package_id) -> None:
|
||||||
|
package_id_in_list_of_items = self.find(key="package_id", value=package_id)
|
||||||
|
if package_id_in_list_of_items != -1:
|
||||||
|
self.setProperty(package_id_in_list_of_items, property="is_dismissed", value=True)
|
||||||
|
Logger.debug("Package {} has been dismissed".format(package_id))
|
||||||
|
|
||||||
|
# Now store this package_id as DISMISSED somewhere in local files
|
|
@ -556,6 +556,11 @@ class Toolbox(QObject, Extension):
|
||||||
populated += 1
|
populated += 1
|
||||||
return populated == len(self._server_response_data.items())
|
return populated == len(self._server_response_data.items())
|
||||||
|
|
||||||
|
@pyqtSlot(str)
|
||||||
|
def dismissIncompatiblePackage(self, package_id):
|
||||||
|
print("---in toolbox: %s" % package_id)
|
||||||
|
self._models["subscribed_packages"].setDismiss(package_id)
|
||||||
|
|
||||||
# Make API Calls
|
# Make API Calls
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
def _makeRequestByType(self, request_type: str) -> None:
|
def _makeRequestByType(self, request_type: str) -> None:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue