Skip to content

Insure that the attachment / external resource editor widget UI state is properly reset when passing on null/empty value #7641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nirvn merged 2 commits into from
Jun 26, 2026
+57 −40
Merged

Insure that the attachment / external resource editor widget UI state is properly reset when passing on null/empty value #7641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90169d5
Insure that the attachment / external resource editor widget UI state…
nirvn Jun 26, 2026
e29feb5
Remove pointless hasImage
nirvn Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 57 additions & 40 deletions src/qml/editorwidgets/ExternalResource.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,48 +114,68 @@ EditorWidgetBase {
property string audioSourcePath: ''

function prepareValue(fullValue) {
if (fullValue !== "") {
if (fullValue != "" && !config.UseLink) { // coercion needed
const mimeType = FileUtils.mimeTypeName(fullValue);
isImage = !config.UseLink && mimeType.startsWith("image/") && FileUtils.isImageMimeTypeSupported(mimeType);
isAudio = !config.UseLink && mimeType.startsWith("audio/");
isVideo = !config.UseLink && mimeType.startsWith("video/");
image.visible = isImage;
geoTagBadge.visible = isImage;
isImage = mimeType.startsWith("image/") && FileUtils.isImageMimeTypeSupported(mimeType);
isAudio = mimeType.startsWith("audio/");
isVideo = mimeType.startsWith("video/");
} else {
isImage = false;
isAudio = false;
isVideo = false;
}

if (isImage) {
mediaFrame.height = 200;
image.visible = true;
image.hasImage = true;
image.opacity = 1;
image.anchors.topMargin = 0;
image.source = UrlUtils.fromString(fullValue);
geoTagBadge.hasGeoTag = ExifTools.hasGeoTag(fullValue);
audioSourcePath = '';
} else if (isAudio) {
mediaFrame.height = 148;
image.visible = false;
image.opacity = 0.5;
image.source = '';
audioSourcePath = fullValue;
player.firstFrameDrawn = false;
player.sourceUrl = UrlUtils.fromString(fullValue);
audioAnalyzer.analyze(player.sourceUrl);
} else if (isVideo) {
mediaFrame.height = 48;
image.visible = false;
image.opacity = 0.5;
image.source = '';
audioSourcePath = '';
player.firstFrameDrawn = false;
player.sourceUrl = UrlUtils.fromString(fullValue);
}
if (isImage) {
mediaFrame.height = 200;

image.visible = true;
image.opacity = 1;
image.anchors.topMargin = 0;
image.source = UrlUtils.fromString(fullValue);
geoTagBadge.visible = true;
geoTagBadge.hasGeoTag = ExifTools.hasGeoTag(fullValue);

player.sourceUrl = '';
player.firstFrameDrawn = false;

audioSourcePath = '';
} else if (isAudio) {
Comment thread
mohsenD98 marked this conversation as resolved.
mediaFrame.height = 148;

image.visible = false;
image.opacity = 0.5;
image.source = '';
geoTagBadge.visible = false;

player.firstFrameDrawn = false;
player.sourceUrl = UrlUtils.fromString(fullValue);

audioSourcePath = fullValue;
audioAnalyzer.analyze(player.sourceUrl);
} else if (isVideo) {
mediaFrame.height = 48;

image.visible = false;
image.opacity = 0.5;
image.source = '';
geoTagBadge.visible = false;

player.firstFrameDrawn = false;
player.sourceUrl = UrlUtils.fromString(fullValue);

audioSourcePath = '';
} else {
mediaFrame.height = 48;

image.source = '';
image.visible = documentViewer == ExternalResource.DocumentImage;
image.opacity = 0.15;
geoTagBadge.visible = false;
audioSourcePath = '';

player.sourceUrl = '';
player.firstFrameDrawn = false;

audioSourcePath = '';
}
}

Expand Down Expand Up @@ -291,13 +311,10 @@ EditorWidgetBase {
Image {
id: image

property bool hasImage: false

visible: isImage
enabled: isImage
visible: false
anchors.centerIn: parent
width: hasImage ? parent.width : 24
height: hasImage ? parent.height : 24
width: isImage ? parent.width : 24
height: isImage ? parent.height : 24
opacity: 0.25
autoTransform: true
fillMode: Image.PreserveAspectFit
Expand Down
Loading