diff --git a/src/App/Document.cpp b/src/App/Document.cpp index d3d9f966aa..4446d2a3fd 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1594,6 +1594,18 @@ Document::Document(const char *name) license = "FreeArt"; licenseUrl = "https://artlibre.org/licence/lal"; break; + case 9: + license = "CERN Open Hardware Licence strongly-reciprocal"; + licenseUrl = "https://cern-ohl.web.cern.ch/"; + break; + case 10: + license = "CERN Open Hardware Licence weakly-reciprocal"; + licenseUrl = "https://cern-ohl.web.cern.ch/"; + break; + case 11: + license = "CERN Open Hardware Licence permissive"; + licenseUrl = "https://cern-ohl.web.cern.ch/"; + break; default: license = "Other"; break; diff --git a/src/Gui/DlgProjectInformationImp.cpp b/src/Gui/DlgProjectInformationImp.cpp index 5ac518847d..7139b8833a 100644 --- a/src/Gui/DlgProjectInformationImp.cpp +++ b/src/Gui/DlgProjectInformationImp.cpp @@ -69,6 +69,9 @@ DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* << "Creative Commons Attribution-NonCommercial-NoDerivatives" << "Public Domain" << "FreeArt" + << "CERN Open Hardware Licence strongly-reciprocal" + << "CERN Open Hardware Licence weakly-reciprocal" + << "CERN Open Hardware Licence permissive" << "Other"; for (QList::iterator it = rawLicenses.begin(); it != rawLicenses.end(); ++it) { QString text = QApplication::translate("Gui::Dialog::DlgSettingsDocument", it->constData()); @@ -170,6 +173,9 @@ void DlgProjectInformationImp::onLicenseTypeChanged(int index) case 8: ui->lineEditLicenseURL->setText(QString::fromLatin1("http://artlibre.org/licence/lal")); break; + case 9: case 10: case 11: + ui->lineEditLicenseURL->setText(QString::fromLatin1("https://cern-ohl.web.cern.ch/")); + break; default: ui->lineEditLicenseURL->setText(QString::fromUtf8(_doc->LicenseURL.getValue())); break; diff --git a/src/Gui/DlgSettingsDocument.ui b/src/Gui/DlgSettingsDocument.ui index 32aeb1248d..810e580f4b 100644 --- a/src/Gui/DlgSettingsDocument.ui +++ b/src/Gui/DlgSettingsDocument.ui @@ -725,6 +725,21 @@ You can also use the form: John Doe <john@doe.com> FreeArt + + + CERN Open Hardware Licence strongly-reciprocal + + + + + CERN Open Hardware Licence weakly-reciprocal + + + + + CERN Open Hardware Licence permissive + + Other diff --git a/src/Gui/DlgSettingsDocumentImp.cpp b/src/Gui/DlgSettingsDocumentImp.cpp index 17f24da5bb..b70b6b5865 100644 --- a/src/Gui/DlgSettingsDocumentImp.cpp +++ b/src/Gui/DlgSettingsDocumentImp.cpp @@ -178,6 +178,9 @@ void DlgSettingsDocumentImp::onLicenseTypeChanged(int index) case 8: ui->prefLicenseUrl->setText(QString::fromLatin1("http://artlibre.org/licence/lal")); break; + case 9: case 10: case 11: + ui->prefLicenseUrl->setText(QString::fromLatin1("https://cern-ohl.web.cern.ch/")); + break; default: ui->prefLicenseUrl->clear(); ui->prefLicenseUrl->setReadOnly(false);