Skip to content

Environmental changes are now optional #369

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
tlecomte merged 2 commits into from
Sep 14, 2025
Merged

Environmental changes are now optional #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abfd71a
Environment overrides are now optional
Robin-K-Lynn Sep 4, 2025
36c83cc
Fixed icons being blank in other QT styles
Robin-K-Lynn Sep 4, 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
4 changes: 4 additions & 0 deletions friture/FritureMainWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Rectangle { // eventually move to ApplicationWindow
checkable: true
checked: mainWindow.main_window_view_model.toolbar_view_model.recording
icon.source: startButton.checked ? "qrc:/images-src/stop.svg" : "qrc:/images-src/start.svg"
icon.color: undefined
text: startButton.checked ? qsTr("Stop") : qsTr("Start")
ToolTip.text: qsTr("Start/Stop")
icon.height: 32
Expand All @@ -41,6 +42,7 @@ Rectangle { // eventually move to ApplicationWindow
ToolButton {
id: newDockButton
icon.source: "qrc:/images-src/new-dock.svg"
icon.color: undefined
text: qsTr("New dock")
ToolTip.text: qsTr("Add a new dock to Friture window")
icon.height: 32
Expand All @@ -52,6 +54,7 @@ Rectangle { // eventually move to ApplicationWindow
ToolButton {
id: settingsButton
icon.source: "qrc:/images-src/tools.svg"
icon.color: undefined
text: qsTr("Settings")
ToolTip.text: qsTr("Display settings dialog")
icon.height: 32
Expand All @@ -63,6 +66,7 @@ Rectangle { // eventually move to ApplicationWindow
ToolButton {
id: aboutButton
icon.source: "qrc:/images-src/window-icon.svg"
icon.color: undefined
text: qsTr("About Friture")
icon.height: 32
icon.width: 32
Expand Down
6 changes: 4 additions & 2 deletions friture/analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ def main():
logger.info("Applying Windows-specific setup")

# enable automatic scaling for high-DPI screens
os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1"
if "QT_AUTO_SCREEN_SCALE_FACTOR" not in os.environ:
os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1"

# set the App ID for Windows 7 to properly display the icon in the
# taskbar.
Expand All @@ -479,7 +480,8 @@ def main():
# Set the style for Qt Quick Controls
# We choose the Fusion style as it is a desktop-oriented style
# It uses the standard system palettes to provide colors that match the desktop environment.
os.environ["QT_QUICK_CONTROLS_STYLE"] = "Fusion"
if "QT_QUICK_CONTROLS_STYLE" not in os.environ:
os.environ["QT_QUICK_CONTROLS_STYLE"] = "Fusion"

# Splash screen
if not program_arguments.no_splash:
Expand Down