Skip to content

Remove Mac [Beta] tag. #571

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
merged 2 commits into from
Jun 16, 2022
Merged

Remove Mac [Beta] tag. #571

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
afdf9d9
Remove Mac [Beta] tag.
john-michaelburke May 25, 2022
971c1c7
Merge branch 'main' into john-michaelburke/remove-beta
Jun 16, 2022
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
2 changes: 1 addition & 1 deletion Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ background_path = get_env BACKGROUND_PATH
version_path = get_env VERSION_PATH
version = readfile ${version_path}
version = trim_end ${version}
dmg_path = set ./${final_dir}/${app_original_name}_${version}-beta_macos.dmg
dmg_path = set ./${final_dir}/${app_original_name}_${version}_macos.dmg

old_dmgs = glob_array "./${final_dir}/*.dmg"
for path in ${old_dmgs}
Expand Down
6 changes: 1 addition & 5 deletions resources/view.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@ import SwiftConsole 1.0
ApplicationWindow {
id: main

function titleBetaTag() {
return Qt.platform.os === "osx" ? " [Beta]" : ""; // Add beta tag for mac.
}

Material.accent: Constants.swiftOrange
width: Globals.width
minimumWidth: Globals.minimumWidth
height: Globals.height
minimumHeight: Globals.minimumHeight
font.pixelSize: Constants.mediumPixelSize
visible: true
title: (loggingBar.sbpRecording ? "[L] " : " ") + statusBar.title + titleBetaTag()
title: (loggingBar.sbpRecording ? "[L] " : " ") + statusBar.title
color: Constants.swiftWhite
Component.onCompleted: {
this.x = Screen.width / 2 - width / 2;
Expand Down