3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-04 17:28:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1948 from alicevision/dev/updateAboutDialog

Browse source 
Display the changelog in the "About" dialog and update copyrights
This commit is contained in:
Fabien Castan 2023-03-27 13:57:04 +02:00 • committed by GitHub
commit 6f9544c1a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/source/conf.py
View file

@ -16,7 +16,7 @@ sys.path.append(os.path.abspath(os.getenv('PROJECT_DIR')))
sys.path.append(os.path.abspath('./_ext'))
project = 'Meshroom'
copyright = '2022, AliceVision Association'
copyright = '2023, AliceVision Association'
author = 'AliceVision Association'
# -- General configuration ---------------------------------------------------

18
meshroom/ui/app.py
View file

@ -416,6 +416,23 @@ class MeshroomApp(QApplication):
systemInfo = Property(QJsonValue, _systemInfo, constant=True)
def _changelogModel(self):
"""
Get the complete changelog for the application.
Model provides:
title: the name of the changelog
localUrl: the local path to CHANGES.md
onlineUrl: the remote path to CHANGES.md
"""
rootDir = os.environ.get("MESHROOM_INSTALL_DIR", os.getcwd())
return [
{
"title": "Changelog",
"localUrl": os.path.join(rootDir, "CHANGES.md"),
"onlineUrl": "https://raw.githubusercontent.com/alicevision/meshroom/develop/CHANGES.md"
}
]
def _licensesModel(self):
"""
Get info about open-source licenses for the application.
@ -442,6 +459,7 @@ class MeshroomApp(QApplication):
return bool(os.environ.get("MESHROOM_USE_8BIT_VIEWER", False))
changelogModel = Property("QVariantList", _changelogModel, constant=True)
licensesModel = Property("QVariantList", _licensesModel, constant=True)
pipelineTemplateFilesChanged = Signal()
recentProjectFilesChanged = Signal()

6
meshroom/ui/qml/AboutDialog.qml
View file

@ -118,7 +118,7 @@ Dialog {
font.pointSize: 10
}
Label {
text: "2010-2022 AliceVision contributors"
text: "2010-2023 AliceVision contributors"
}
}
@ -132,7 +132,7 @@ Dialog {
// OpenSource licenses
Label {
text: "Open Source Licenses"
text: "Changelog & Open Source Licenses"
Layout.alignment: Qt.AlignHCenter
}
@ -142,7 +142,7 @@ Dialog {
spacing: 2
interactive: false
model: MeshroomApp.licensesModel
model: MeshroomApp.changelogModel.concat(MeshroomApp.licensesModel)
// Exclusive ButtonGroup for licenses entries
ButtonGroup { id: licensesGroup; exclusive: true }