Skip to content

Misc cosmetic fixes #181

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Misc cosmetic fixes #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ff814c
Added missing override keyword to avoid compiler warning.
kenmcgaugh Nov 15, 2025
1356b49
Fixed typo in show_viewer_hotkey text.
kenmcgaugh Nov 15, 2025
15e372c
Small fixes to avoid benign QML warnings.
kenmcgaugh Nov 15, 2025
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
2 changes: 1 addition & 1 deletion src/plugin/viewport_layout/composite_viewport_layout/src/composite_viewport_layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace ui {

protected:
virtual ViewportRenderer *
make_renderer(const std::string &window_id, const utility::JsonStore &prefs);
make_renderer(const std::string &window_id, const utility::JsonStore &prefs) override;

void do_layout(
const std::string &layout_mode,
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/viewport_layout/wipe_viewport_layout/src/wipe_viewport_layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace ui {

protected:
virtual ViewportRenderer *
make_renderer(const std::string &window_id, const utility::JsonStore &prefs);
make_renderer(const std::string &window_id, const utility::JsonStore &prefs) override;

void do_layout(
const std::string &layout_mode,
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/viewport_overlay/media_metadata_hud/src/media_metadata_hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ void MediaMetadataHUD::register_hotkeys() {
show_viewer_hotkey_ = register_hotkey(
int('Q'),
ui::NoModifier,
"Show Metadata Viewrt",
"Show Metadata Viewer",
"Shows or hides the pop-out Media Metadata Panel");
}

Expand Down
2 changes: 1 addition & 1 deletion ...in/viewport_overlay/media_metadata_hud/src/qml/MediaMetadataHUD.1/MediaMetadataViewer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Item {
}
property var backendV: search_string
onBackendVChanged: {
if (backendV != text) {
if (backendV != undefined && backendV != text) {
text = backendV
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/viewport_overlay/media_metadata_hud/src/qml/MediaMetadataHUD.1/MetadataGroup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Item {
visible: select_mode
Layout.preferredHeight: rowHeight
Layout.preferredWidth: rowHeight
property var checkedOverride: profile_field_paths.includes(path)
property var checkedOverride: profile_field_paths == undefined ? false : profile_field_paths.includes(path)
onCheckedOverrideChanged: {
// when you click, qml sets checked and kills any
// binding we try to set-up on that attr
Expand Down
2 changes: 1 addition & 1 deletion ui/qml/xstudio/views/media/list_view/data_indicators/XsMediaTextItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Item{

id: dateDiv
property var leftMargin: 12
property var text
property var text: "null"
property var isIndex: false
property bool showBorder: actorUuidRole == currentPlayhead.mediaUuid

Expand Down
4 changes: 2 additions & 2 deletions ui/qml/xstudio/views/python/XsPythonPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Item{
// add history, ctrl-d. ctrl-c
focus: true

Keys.onReturnPressed: {
Keys.onReturnPressed: function(event) {
// get last line.
// only capute after first 4 chars
if(event.modifiers == Qt.ControlModifier) {
Expand Down Expand Up @@ -221,7 +221,7 @@ Item{
paste()
}

Keys.onPressed: {
Keys.onPressed: function(event) {
if ((event.key == Qt.Key_C) && (event.modifiers & Qt.ControlModifier)) {
embeddedPython.sendInterrupt()
event.accepted = true;
Expand Down
Loading