Skip to content
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

Jump to bottom

Shot in the dark, avoid menuitem glitch #5656

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Shot in the dark, avoid menuitem glitch #5656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
772c9ce
Shot in the dark, avoid menuitem glitch
nirvn Sep 17, 2024
98d431f
Update the bees project to allow for non-JPG attachments
nirvn Sep 17, 2024
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
Binary file modified resources/sample_projects/bees.qgz
View file
Open in desktop
Binary file not shown.
132 changes: 68 additions & 64 deletions src/qml/editorwidgets/ExternalResource.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,89 +692,93 @@ EditorWidgetBase {
hasMenu = true;
}

MenuItem {
id: capturePhotoMenuItem
text: qsTr('Take a photo')
Item {
visible: false

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_camera_photo_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: capturePhotoMenuItem
text: qsTr('Take a photo')

onTriggered: capturePhoto()
}
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_camera_photo_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

MenuItem {
id: captureVideoMenuItem
text: qsTr('Take a video')
onTriggered: capturePhoto()
}

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_camera_video_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: captureVideoMenuItem
text: qsTr('Take a video')

onTriggered: captureVideo()
}
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_camera_video_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

MenuItem {
id: captureAudioMenuItem
text: qsTr('Record an audio clip')
onTriggered: captureVideo()
}

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_microphone_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: captureAudioMenuItem
text: qsTr('Record an audio clip')

onTriggered: captureAudio()
}
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_microphone_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

MenuSeparator {
id: separatorGalleryItem
width: parent.width
}
onTriggered: captureAudio()
}

MenuItem {
id: attachGalleryMenuItem
text: qsTr('Attach a gallery item')
MenuSeparator {
id: separatorGalleryItem
width: parent.width
}

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_gallery_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: attachGalleryMenuItem
text: qsTr('Attach a gallery item')

onTriggered: attachGallery()
}
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_gallery_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

MenuItem {
id: attachFileMenuItem
text: qsTr('Attach a file')
onTriggered: attachGallery()
}

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_file_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: attachFileMenuItem
text: qsTr('Attach a file')

onTriggered: attachFile()
}
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_file_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

MenuSeparator {
id: separatorDrawingItem
width: parent.width
}
onTriggered: attachFile()
}

MenuItem {
id: attachDrawingMenuItem
text: qsTr('Draw a sketch')
MenuSeparator {
id: separatorDrawingItem
width: parent.width
}

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_freehand_white_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: attachDrawingMenuItem
text: qsTr('Draw a sketch')

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_freehand_white_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

onTriggered: {
sketcherConnection.enabled = true;
sketcher.clear();
sketcher.open();
onTriggered: {
sketcherConnection.enabled = true;
sketcher.clear();
sketcher.open();
}
}
}
}
74 changes: 39 additions & 35 deletions src/qml/editorwidgets/TextEdit.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,52 +146,56 @@ EditorWidgetBase {
hasMenu = true;
}

MenuItem {
id: copyTextItem
text: qsTr('Copy Text')
Item {
visible: false

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_copy_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
MenuItem {
id: copyTextItem
text: qsTr('Copy Text')

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_copy_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

onTriggered: {
platformUtilities.copyTextToClipboard(value);
onTriggered: {
platformUtilities.copyTextToClipboard(value);
}
}
}

MenuItem {
id: pasteTextItem
text: qsTr('Paste Text')
MenuItem {
id: pasteTextItem
text: qsTr('Paste Text')

font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_paste_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_paste_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

onTriggered: {
var text = platformUtilities.getTextFromClipboard();
text = text.trim();
valueChangeRequested(text, text == '');
onTriggered: {
var text = platformUtilities.getTextFromClipboard();
text = text.trim();
valueChangeRequested(text, text == '');
}
}
}

MenuSeparator {
id: separatorItem
width: parent.width
}
MenuSeparator {
id: separatorItem
width: parent.width
}

MenuItem {
id: scanCodeItem
text: qsTr('Scan Code')
MenuItem {
id: scanCodeItem
text: qsTr('Scan Code')

font: Theme.defaultFont
icon.source: withNfc ? Theme.getThemeVectorIcon("ic_qr_nfc_code_black_24dp") : Theme.getThemeVectorIcon("ic_qr_code_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding
font: Theme.defaultFont
icon.source: withNfc ? Theme.getThemeVectorIcon("ic_qr_nfc_code_black_24dp") : Theme.getThemeVectorIcon("ic_qr_code_black_24dp")
height: 48
leftPadding: Theme.menuItemLeftPadding

onTriggered: {
requestBarcode(topItem);
onTriggered: {
requestBarcode(topItem);
}
}
}

Expand Down
Loading