[master] 2055-Custom_Main_Window

[memurats]

main window changes

[Rello]

Very complex diff to be analyzed

[nilsding]

just pushed a merge commit that resolves the conflicts. The only change in the merge commit is the movement of the (invisible) accountServer EnforcedPlainTextLabel component above the statusLayout:

% git diff --ignore-space-at-eol origin/nmc/master/custom_main_window...nmc/master/custom_main_window src/gui/tray/MainWindow.qml src/gui/tray/UserLine.qml src/gui/tray/TrayWindowHeader.qml
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index b3739356e..7cd5ed483 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -106,6 +106,23 @@ AbstractButton {
                         : userLine.parent.palette.text)
             }
 
+            EnforcedPlainTextLabel {
+                id: accountServer
+                visible: false
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                verticalAlignment: Text.AlignTop
+                text: server
+                elide: Text.ElideRight
+                font.pixelSize: Style.subLinePixelSize
+
+                color: !userLine.parent.enabled
+                    ? userLine.parent.palette.mid
+                    : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
+                        ? userLine.parent.palette.highlightedText
+                        : userLine.parent.palette.text)
+            }
+
             RowLayout {
                 id: statusLayout
                 Layout.fillWidth: true
@@ -141,23 +158,6 @@ AbstractButton {
                             : userLine.parent.palette.text)
                 }
             }
-
-            EnforcedPlainTextLabel {
-                id: accountServer
-                visible: false
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                verticalAlignment: Text.AlignTop
-                text: server
-                elide: Text.ElideRight
-                font.pixelSize: Style.subLinePixelSize
-
-                color: !userLine.parent.enabled
-                    ? userLine.parent.palette.mid
-                    : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
-                        ? userLine.parent.palette.highlightedText
-                        : userLine.parent.palette.text)
-            }
         }
 
         Item { // Spacer

The other customisations are unchanged from before apart from the line endings (which is why I ran git diff with --ignore-space-at-eol set).

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud