Fix bugs

Author: CrSjimo

src/libs/application/uishell/src/qml/ProjectWindow.qml

@@ -176,7 +176,7 @@ Window {
                     id: titleBarArea
                     Layout.fillWidth: true
                     Layout.fillHeight: !window.isMacOS
-                    Layout.preferredHeight: window.isMacOS ? titleBar.height + toolBar.height : undefined
+                    Layout.preferredHeight: window.isMacOS ? titleBar.height + toolBar.height : 0
                     RowLayout {
                         anchors.right: parent.right
                         visible: !window.isMacOS

src/plugins/coreplugin/qml/panels/LoadingFailedFallbackPanel.qml

@@ -48,7 +48,7 @@ DockingPane {
             icon.color: Theme.errorColor
             spacing: 12
             Accessible.role: Accessible.staticText
-            Accessible.name: text
+            Accessible.name: qsTr("Failed to load component")
         }
         Label {
             visible: !panel.componentRegistered

src/plugins/coreplugin/res/org.diffscope.core_actions.xml

@@ -350,8 +350,8 @@
 
         <menu id="org.diffscope.core.mainToolBarMiddle">
             <group id="org.diffscope.core.toolBarTimelineNavigationActions">
-                <action id="org.diffscope.core.widget.digitalClock" />
                 <action id="org.diffscope.core.widget.tempoTimeSignatureIndicator" />
+                <action id="org.diffscope.core.widget.digitalClock" />
                 <action id="org.diffscope.core.timeline.goToStart" />
                 <action id="org.diffscope.core.timeline.goToEnd" />
             </group>

src/plugins/coreplugin/windows/ActionWindowInterfaceBase.cpp

@@ -42,17 +42,6 @@ namespace Core {
             actionContext->setMenuComponent(new QQmlComponent(RuntimeInterface::qmlEngine(), "SVSCraft.UIComponents", "Menu", q));
             actionContext->setSeparatorComponent(new QQmlComponent(RuntimeInterface::qmlEngine(), "SVSCraft.UIComponents", "MenuSeparator", q));
             actionContext->setStretchComponent(new QQmlComponent(RuntimeInterface::qmlEngine(), "SVSCraft.UIComponents", "MenuSeparator", q));
-            {
-                QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "GlobalActions");
-                if (component.isError()) {
-                    qFatal() << component.errorString();
-                }
-                auto o = component.createWithInitialProperties({
-                    {"windowHandle", QVariant::fromValue(q)}
-                });
-                o->setParent(q);
-                QMetaObject::invokeMethod(o, "registerToContext", actionContext);
-            }
         }
     };
 

src/plugins/coreplugin/windows/HomeWindowInterface.cpp

@@ -24,15 +24,28 @@ namespace Core {
         void initActionContext() {
             Q_Q(HomeWindowInterface);
             auto actionContext = q->actionContext();
-            QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "HomeActions");
-            if (component.isError()) {
-                qFatal() << component.errorString();
+            {
+                QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "GlobalActions");
+                if (component.isError()) {
+                    qFatal() << component.errorString();
+                }
+                auto o = component.createWithInitialProperties({
+                    {"windowHandle", QVariant::fromValue(q)},
+                });
+                o->setParent(q);
+                QMetaObject::invokeMethod(o, "registerToContext", actionContext);
+            }
+            {
+                QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "HomeActions");
+                if (component.isError()) {
+                    qFatal() << component.errorString();
+                }
+                auto o = component.createWithInitialProperties({
+                    {"windowHandle", QVariant::fromValue(q)},
+                });
+                o->setParent(q);
+                QMetaObject::invokeMethod(o, "registerToContext", actionContext);
             }
-            auto o = component.createWithInitialProperties({
-                {"windowHandle", QVariant::fromValue(q)},
-            });
-            o->setParent(q);
-            QMetaObject::invokeMethod(o, "registerToContext", actionContext);
         }
     };
 

src/plugins/coreplugin/windows/ProjectWindowInterface.cpp

@@ -56,15 +56,28 @@ namespace Core {
         void initActionContext() {
             Q_Q(ProjectWindowInterface);
             auto actionContext = q->actionContext();
-            QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "ProjectActions");
-            if (component.isError()) {
-                qFatal() << component.errorString();
+            {
+                QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "GlobalActions");
+                if (component.isError()) {
+                    qFatal() << component.errorString();
+                }
+                auto o = component.createWithInitialProperties({
+                    {"windowHandle", QVariant::fromValue(q)}
+                });
+                o->setParent(q);
+                QMetaObject::invokeMethod(o, "registerToContext", actionContext);
+            }
+            {
+                QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "ProjectActions");
+                if (component.isError()) {
+                    qFatal() << component.errorString();
+                }
+                auto o = component.createWithInitialProperties({
+                    {"windowHandle", QVariant::fromValue(q)},
+                });
+                o->setParent(q);
+                QMetaObject::invokeMethod(o, "registerToContext", actionContext);
             }
-            auto o = component.createWithInitialProperties({
-                {"windowHandle", QVariant::fromValue(q)},
-            });
-            o->setParent(q);
-            QMetaObject::invokeMethod(o, "registerToContext", actionContext);
         }
 
         void updateRecentFile() const {