Merge pull request #181 from kenmcgaugh/misc_cosmetic_fixes

Misc cosmetic fixes

Author: tedwaine

src/plugin/viewport_layout/composite_viewport_layout/src/composite_viewport_layout.hpp

@@ -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,

src/plugin/viewport_layout/wipe_viewport_layout/src/wipe_viewport_layout.hpp

@@ -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,

src/plugin/viewport_overlay/media_metadata_hud/src/media_metadata_hud.cpp

@@ -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");
 }
 

src/plugin/viewport_overlay/media_metadata_hud/src/qml/MediaMetadataHUD.1/MediaMetadataViewer.qml

@@ -151,7 +151,7 @@ Item {
                 }
                 property var backendV: search_string
                 onBackendVChanged: {
-                    if (backendV != text) {
+                    if (backendV != undefined && backendV != text) {
                         text = backendV
                     }
                 }

src/plugin/viewport_overlay/media_metadata_hud/src/qml/MediaMetadataHUD.1/MetadataGroup.qml

@@ -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

ui/qml/xstudio/views/media/list_view/data_indicators/XsMediaTextItem.qml

@@ -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
 

ui/qml/xstudio/views/python/XsPythonPanel.qml

@@ -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) {
@@ -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;