kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: Add support for 'discussion' URL attribute

Browse Source
This commit is contained in:
Chris Hennes
2022-09-22 10:53:59 -05:00
parent ef6aacc318
commit 3937da0c46
4 changed files with 113 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Metadata.cpp
View File

@@ -772,6 +772,8 @@ void Metadata::parseVersion1(const DOMNode* startNode)
_name = StrXUTF8(element->getTextContent()).str;
else if (tagString == "version")
_version = Meta::Version(StrXUTF8(element->getTextContent()).str);
else if (tagString == "date")
_date = StrXUTF8(element->getTextContent()).str;
else if (tagString == "description")
_description = StrXUTF8(element->getTextContent()).str;
else if (tagString == "maintainer")

5
src/App/MetadataPyImp.cpp
View File

@@ -340,6 +340,8 @@ Py::Object MetadataPy::getUrls() const
case Meta::UrlType::bugtracker: pyUrl["type"] = Py::String("bugtracker"); break;
case Meta::UrlType::readme: pyUrl["type"] = Py::String("readme"); break;
case Meta::UrlType::documentation: pyUrl["type"] = Py::String("documentation"); break;
case Meta::UrlType::discussion: pyUrl["type"] = Py::String("discussion"); break;
default: pyUrl["type"] = Py::String("unknown"); break;
}
if (url.type == Meta::UrlType::repository)
pyUrl["branch"] = Py::String(url.branch);
@@ -378,6 +380,9 @@ void MetadataPy::setUrls(Py::Object args)
else if (typeAsString == "documentation") {
newUrl.type = Meta::UrlType::documentation;
}
else if (typeAsString == "discussion") {
newUrl.type = Meta::UrlType::discussion;
}
else {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Unrecognized URL type");
return;

10
src/Mod/AddonManager/addonmanager_devmode.py
View File

@@ -244,6 +244,8 @@ class DeveloperMode:
self.dialog.readmeURLLineEdit.setText(url["location"])
elif url["type"] == "documentation":
self.dialog.documentationURLLineEdit.setText(url["location"])
elif url["type"] == "discussion":
self.dialog.discussionURLLineEdit.setText(url["location"])
def _populate_contents_from_metadata(self, metadata):
"""Use the passed metadata object to populate the contents list"""
@@ -339,6 +341,7 @@ class DeveloperMode:
self.dialog.bugtrackerURLLineEdit.clear()
self.dialog.readmeURLLineEdit.clear()
self.dialog.documentationURLLineEdit.clear()
self.dialog.discussionURLLineEdit.clear()
self.dialog.iconDisplayLabel.setPixmap(QPixmap())
self.dialog.iconPathLineEdit.clear()
@@ -415,6 +418,13 @@ class DeveloperMode:
"type": "documentation",
}
)
if self.dialog.discussionURLLineEdit.text():
urls.append(
{
"location": self.dialog.discussionURLLineEdit.text(),
"type": "discussion",
}
)
self.metadata.Urls = urls
# Content, people, and licenses should already be sync'ed

178
src/Mod/AddonManager/developer_mode.ui
View File

@@ -54,13 +54,17 @@
<string>Metadata</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelDisplayName">
<property name="toolTip">
<string>Displayed in the Addon Manager's list of Addons. Should not include the word &quot;FreeCAD&quot;, and must be a valid directory name on all support operating systems.</string>
</property>
<item row="12" column="0">
<widget class="QLabel" name="labelIcon">
<property name="text">
<string>Addon Name</string>
<string>Icon</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="labelReadmeURL">
<property name="text">
<string>README URL</string>
</property>
</widget>
</item>
@@ -71,19 +75,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelDescription">
<property name="toolTip">
<string>Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon.</string>
</property>
<property name="text">
<string>Description</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPlainTextEdit" name="descriptionTextEdit">
<property name="toolTip">
@@ -97,6 +88,40 @@
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="readmeURLLineEdit">
<property name="placeholderText">
<string>(Recommended)</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="websiteURLLineEdit">
<property name="placeholderText">
<string>(Optional)</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="bugtrackerURLLineEdit">
<property name="placeholderText">
<string>(Optional)</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="peopleAndLicenseshorizontalLayout"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelDisplayName">
<property name="toolTip">
<string>Displayed in the Addon Manager's list of Addons. Should not include the word &quot;FreeCAD&quot;, and must be a valid directory name on all support operating systems.</string>
</property>
<property name="text">
<string>Addon Name</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelVersion">
<property name="text">
@@ -104,26 +129,12 @@
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLineEdit" name="versionLineEdit">
<property name="placeholderText">
<string>Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="versionToTodayButton">
<property name="text">
<string>Set to today (CalVer style)</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="peopleAndLicenseshorizontalLayout"/>
<item row="10" column="0">
<widget class="QLabel" name="labelDocumentationURL">
<property name="text">
<string>Documentation URL</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelRepoURL">
@@ -149,52 +160,23 @@
</item>
</layout>
</item>
<item row="7" column="0">
<widget class="QLabel" name="labelReadmeURL">
<item row="11" column="0">
<widget class="QLabel" name="labelDiscssionURL">
<property name="text">
<string>README URL</string>
<string>Discussion URL</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="readmeURLLineEdit">
<property name="placeholderText">
<string>(Recommended)</string>
<item row="1" column="0">
<widget class="QLabel" name="labelDescription">
<property name="toolTip">
<string>Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon.</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="labelWebsiteURL">
<property name="text">
<string>Website URL</string>
<string>Description</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="websiteURLLineEdit">
<property name="placeholderText">
<string>(Optional)</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="labelBugtrackerURL">
<property name="text">
<string>Bugtracker URL</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="bugtrackerURLLineEdit">
<property name="placeholderText">
<string>(Optional)</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="labelDocumentationURL">
<property name="text">
<string>Documentation URL</string>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
@@ -205,14 +187,39 @@
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="labelIcon">
<item row="8" column="0">
<widget class="QLabel" name="labelWebsiteURL">
<property name="text">
<string>Icon</string>
<string>Website URL</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="9" column="0">
<widget class="QLabel" name="labelBugtrackerURL">
<property name="text">
<string>Bugtracker URL</string>
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLineEdit" name="versionLineEdit">
<property name="placeholderText">
<string>Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="versionToTodayButton">
<property name="text">
<string>Set to today (CalVer style)</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="12" column="1">
<layout class="QHBoxLayout" name="iconHorizontalLayout">
<item>
<widget class="QLabel" name="iconDisplayLabel"/>
@@ -229,6 +236,13 @@
</item>
</layout>
</item>
<item row="11" column="1">
<widget class="QLineEdit" name="discussionURLLineEdit">
<property name="placeholderText">
<string>(Optional)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>