Skip to content

Take the SAT logo and the OS colour scheme from qmlcomponents #29

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

Merged
jcelerier merged 3 commits into from
Oct 12, 2026
+2 −9
Merged

Take the SAT logo and the OS colour scheme from qmlcomponents #29

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
5fbfd4b
Take the SAT logo and the OS colour scheme from qmlcomponents
jcelerier Oct 12, 2026
f60c30c
Move the submodule to the qmlcomponents branch head
jcelerier Oct 12, 2026
92e940c
qmlcomponents: re-point at the merged commit
jcelerier Oct 12, 2026
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
9 changes: 1 addition & 8 deletions qml/Main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ ApplicationWindow {
property string savedOutputDevices: "[]"
}

// Dark unless the OS explicitly asks for light (Unknown reads as dark).
Binding {
target: Theme
property: "dark"
value: Application.styleHints.colorScheme !== Qt.ColorScheme.Light
}

palette {
text: Theme.textColor
windowText: Theme.textColor
Expand Down Expand Up @@ -319,7 +312,7 @@ ApplicationWindow {
// Relative paths would resolve against AboutDialog.qml in the submodule.
logoPath: Qt.resolvedUrl("spm/resources/images/logo.png")
partnerLogos: [
{ source: Qt.resolvedUrl("spm/resources/images/sat_logo.png"), website: "https://www.sat.qc.ca" },
{ source: Theme.satLogoSource, website: "https://www.sat.qc.ca" },
{ source: Qt.resolvedUrl("spm/resources/images/ossia_logo.png"), website: "https://ossia.io" }
]
}
Expand Down
2 changes: 1 addition & 1 deletion qml/ca/qc/sat/qmlcomponents
Open in desktop
Submodule qmlcomponents updated 9 files
+13 −24 .github/workflows/ci.yml
+2 −0 .gitignore
+19 −1 examples/gallery/Main.qml
+30 −3 tests/tst_components.qml
+18 −5 theme/Theme.qml
+ − theme/images/logo-sat-black.png
+ − theme/images/logo-sat-black@2x.png
+ − theme/images/logo-sat-white.png
+ − theme/images/logo-sat-white@2x.png
Binary file removed qml/spm/resources/images/sat_logo.png
View file
Open in desktop
Binary file not shown.
Loading