Skip to content

Commit e9c71b3

Browse files
XaytonMatteoPologruto
authored andcommitted
Fix button order and title
1 parent 144515b commit e9c71b3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

systray/systray_real.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (s *Systray) start() {
6565
mRmCrashes := systray.AddMenuItem("Remove crash reports", "")
6666
s.updateMenuItem(mRmCrashes, config.LogsIsEmpty())
6767

68-
mManageCerts := systray.AddMenuItem("Manage HTTPS certificates", "HTTPS Certs")
68+
mManageCerts := systray.AddMenuItem("Manage HTTPS certificate", "HTTPS Certs")
6969
// On linux/windows chrome/firefox/edge(chromium) the agent works without problems on plain HTTP,
7070
// so we disable the menuItem to generate/install the certificates
7171
if runtime.GOOS != "darwin" {
@@ -95,19 +95,19 @@ func (s *Systray) start() {
9595
s.updateMenuItem(mRmCrashes, config.LogsIsEmpty())
9696
case <-mManageCerts.ClickedCh:
9797
infoMsg := "The Arduino Agent needs a local HTTPS certificate to work correctly with Safari.\n\nYour HTTPS certificate status:\n"
98-
buttons := "{\"OK\", \"Install certificate for Safari\"}"
98+
buttons := "{\"Install certificate for Safari\", \"OK\"} default button \"OK\""
9999
certDir := config.GetCertificatesDir()
100100
if config.CertsExist() {
101101
expDate, err := cert.GetExpirationDate()
102102
if err != nil {
103103
log.Errorf("cannot get certificates expiration date, something went wrong: %s", err)
104104
}
105105
infoMsg = infoMsg + "- Certificate installed: Yes\n- Certificate trusted: Yes\n- Certificate expiration date: " + expDate
106-
buttons = "{\"OK\", \"Uninstall certificate for Safari\"}"
106+
buttons = "{\"Uninstall certificate for Safari\", \"OK\"} default button \"OK\""
107107
} else {
108108
infoMsg = infoMsg + "- Certificate installed: No\n- Certificate trusted: N/A\n- Certificate expiration date: N/A"
109109
}
110-
pressedButton := utilities.UserPrompt("display dialog \"" + infoMsg + "\" buttons " + buttons + " with title \"Arduino Agent: manage HTTPS certificates\"")
110+
pressedButton := utilities.UserPrompt("display dialog \"" + infoMsg + "\" buttons " + buttons + " with title \"Arduino Agent: Manage HTTPS certificate\"")
111111
if strings.Contains(pressedButton, "Install certificate for Safari") {
112112
cert.GenerateAndInstallCertificates(certDir)
113113
err := config.SetInstallCertsIni(s.currentConfigFilePath.String(), "true")

0 commit comments

Comments
 (0)