Skip to content

Commit b7491ba

Browse files
committed
Move icon in its own package
1 parent 9145567 commit b7491ba

23 files changed

+145
-1208
lines changed

icon/icon_mac_light.png

3.54 KB
Loading
+126
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@
44

55
package icon
66

7+
import (
8+
"os/exec"
9+
"strings"
10+
)
11+
12+
func GetIcon() []byte {
13+
cmd := exec.Command("defaults", "read", "-g", "AppleInterfaceStyle")
14+
output, _ := cmd.Output()
15+
if !strings.Contains(string(output), "Dark") {
16+
return Data
17+
} else {
18+
return DataLight
19+
}
20+
}
21+
22+
func GetIconHiber() []byte {
23+
return DataHibernate
24+
}
25+
726
var Data []byte = []byte{
827
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
928
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x24,
@@ -324,6 +343,113 @@ var Data []byte = []byte{
324343
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
325344
}
326345

346+
var DataLight []byte = []byte{
347+
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
348+
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x24,
349+
0x08, 0x04, 0x00, 0x00, 0x00, 0x4b, 0x09, 0x50, 0x13, 0x00, 0x00, 0x00,
350+
0x04, 0x67, 0x41, 0x4d, 0x41, 0x00, 0x00, 0xb1, 0x8f, 0x0b, 0xfc, 0x61,
351+
0x05, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4d, 0x00, 0x00, 0x7a,
352+
0x26, 0x00, 0x00, 0x80, 0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80,
353+
0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea, 0x60, 0x00, 0x00, 0x3a,
354+
0x98, 0x00, 0x00, 0x17, 0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x00,
355+
0x02, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x87, 0x8f, 0xcc, 0xbf, 0x00,
356+
0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
357+
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07,
358+
0x74, 0x49, 0x4d, 0x45, 0x07, 0xe1, 0x03, 0x09, 0x0c, 0x09, 0x08, 0xfd,
359+
0x67, 0x9d, 0xc2, 0x00, 0x00, 0x03, 0xab, 0x49, 0x44, 0x41, 0x54, 0x48,
360+
0xc7, 0x9d, 0x96, 0x6d, 0x68, 0xd5, 0x55, 0x1c, 0xc7, 0x3f, 0xf7, 0xde,
361+
0xcd, 0x6d, 0xce, 0x6c, 0xb6, 0x68, 0xba, 0x36, 0x66, 0x6b, 0x65, 0xea,
362+
0x5c, 0xae, 0xa7, 0x4d, 0x11, 0xea, 0x45, 0x6b, 0x83, 0x30, 0x8d, 0x8a,
363+
0x95, 0xa1, 0x10, 0x3d, 0x90, 0x41, 0x64, 0x44, 0x14, 0x23, 0x7b, 0x80,
364+
0x92, 0x5e, 0x08, 0x11, 0x42, 0x08, 0x11, 0xd4, 0xab, 0xea, 0x4d, 0x82,
365+
0x51, 0x1a, 0xb9, 0xec, 0xc1, 0x99, 0x5a, 0x4b, 0x33, 0x15, 0xd1, 0x56,
366+
0xb1, 0x31, 0xb7, 0x34, 0x9d, 0xe9, 0x6a, 0xf3, 0x3e, 0x7d, 0x7a, 0xf1,
367+
0xbf, 0xf7, 0xb6, 0x79, 0xef, 0xd5, 0xcd, 0xdf, 0x7d, 0x73, 0xf8, 0x9d,
368+
0x73, 0x3e, 0xe7, 0xfe, 0x1e, 0xce, 0xf7, 0x7f, 0x42, 0xe4, 0xb4, 0x73,
369+
0x4c, 0xc9, 0x3d, 0x41, 0x9c, 0xc2, 0x9c, 0xfe, 0x50, 0xb6, 0xcb, 0xf4,
370+
0x20, 0xcc, 0x15, 0x54, 0x50, 0x41, 0x09, 0x30, 0xca, 0x09, 0x06, 0x39,
371+
0x49, 0x22, 0xdf, 0xb6, 0xf3, 0x3c, 0x09, 0xc2, 0xc1, 0x60, 0x16, 0x77,
372+
0xd0, 0x42, 0x23, 0x95, 0x4c, 0xa3, 0x00, 0x88, 0xf3, 0x2f, 0x03, 0xec,
373+
0x67, 0x1b, 0x9d, 0xf4, 0x05, 0xc7, 0x85, 0xf3, 0xfc, 0x67, 0x4c, 0xff,
374+
0x2a, 0x7c, 0xce, 0x7d, 0xc6, 0xcc, 0x65, 0x71, 0x0f, 0xb9, 0xd6, 0xea,
375+
0xf4, 0xda, 0xfc, 0xa0, 0x90, 0x6d, 0x76, 0x99, 0xf4, 0xc2, 0xb6, 0xd7,
376+
0xfb, 0x8d, 0xe4, 0x01, 0x89, 0x58, 0xe4, 0xb3, 0xfe, 0xe5, 0x44, 0xec,
377+
0x8c, 0x2f, 0x5b, 0x9a, 0x03, 0x25, 0xe2, 0x14, 0x5f, 0x73, 0x74, 0x42,
378+
0x18, 0xd5, 0x98, 0x6f, 0x65, 0xa1, 0x52, 0x41, 0xad, 0x99, 0x04, 0x26,
379+
0xc8, 0xd7, 0xab, 0x16, 0x8c, 0x43, 0x89, 0xd8, 0x3a, 0xc1, 0xa0, 0xc6,
380+
0xda, 0x59, 0xdb, 0xc7, 0x80, 0xe2, 0x41, 0xa5, 0x76, 0x4c, 0x1a, 0xa3,
381+
0xba, 0xdf, 0x6b, 0x24, 0x09, 0x84, 0x21, 0x02, 0xf0, 0x20, 0x8b, 0xb9,
382+
0x14, 0x5b, 0xc0, 0x63, 0x41, 0x33, 0x86, 0x46, 0x28, 0x86, 0x99, 0x6c,
383+
0x61, 0x21, 0x00, 0x23, 0x74, 0xb3, 0x93, 0x5e, 0xc2, 0xd4, 0xb2, 0x98,
384+
0x85, 0xe3, 0x6e, 0x4a, 0x9c, 0x03, 0x74, 0x71, 0x94, 0x18, 0x55, 0x34,
385+
0xd1, 0x44, 0x29, 0x00, 0x3d, 0xb4, 0xd2, 0x93, 0x84, 0x04, 0x62, 0xbb,
386+
0x51, 0x55, 0x7f, 0xb6, 0xdd, 0xcb, 0x33, 0x8d, 0x59, 0xee, 0x2a, 0x0f,
387+
0x64, 0x82, 0x38, 0xe2, 0x93, 0x5e, 0x95, 0x99, 0x9b, 0xe6, 0x32, 0x77,
388+
0xa9, 0x9a, 0x74, 0xb5, 0x48, 0x50, 0xaf, 0x77, 0x55, 0xfd, 0xde, 0x7a,
389+
0xb1, 0xd0, 0x85, 0x2e, 0x77, 0xa9, 0xf3, 0x8c, 0x88, 0x73, 0xdd, 0xa6,
390+
0x6a, 0x97, 0x8d, 0x22, 0x5e, 0xef, 0xdd, 0xde, 0xeb, 0x2d, 0x16, 0x8b,
391+
0xb3, 0xdd, 0xaa, 0xea, 0x27, 0x4e, 0x09, 0x40, 0xe5, 0x76, 0xab, 0xc7,
392+
0x5c, 0x2c, 0xd6, 0xfa, 0xbe, 0xc7, 0x8d, 0x19, 0xb5, 0xdf, 0x8d, 0xd6,
393+
0x8a, 0xb5, 0xee, 0x70, 0x9f, 0xf3, 0xc5, 0x4a, 0xd7, 0xdb, 0x6b, 0xd4,
394+
0xb8, 0x27, 0xfd, 0xc8, 0x79, 0x62, 0x83, 0x3d, 0xea, 0x11, 0xab, 0x02,
395+
0xd0, 0x5c, 0x07, 0xd5, 0xb7, 0xc5, 0x72, 0x3f, 0x1f, 0x57, 0x93, 0x9d,
396+
0xce, 0x17, 0x1b, 0x5d, 0x34, 0xe6, 0xfc, 0x53, 0x9e, 0x56, 0xf5, 0x3b,
397+
0xab, 0xc4, 0x57, 0xd4, 0xd3, 0x36, 0x05, 0xa0, 0xdb, 0x1d, 0x76, 0xc4,
398+
0x36, 0xf1, 0x51, 0x13, 0xe7, 0x95, 0xf7, 0x8b, 0x54, 0x5e, 0xa6, 0xfb,
399+
0x71, 0xca, 0xf3, 0xb4, 0x2f, 0xa5, 0x46, 0xcf, 0x8b, 0xcd, 0x0e, 0x19,
400+
0xf3, 0x1e, 0x29, 0x00, 0x4a, 0x28, 0x64, 0x88, 0x3e, 0xa0, 0x99, 0x30,
401+
0x67, 0xd9, 0xc0, 0x00, 0x21, 0x4a, 0x58, 0xcd, 0x6c, 0xee, 0xe2, 0x71,
402+
0xde, 0x00, 0x56, 0x70, 0x1f, 0x30, 0xc0, 0x06, 0x3e, 0xa3, 0x88, 0x08,
403+
0xcf, 0x30, 0x83, 0x66, 0x22, 0xf4, 0x71, 0x8a, 0x32, 0x8a, 0xa0, 0x60,
404+
0x4c, 0x73, 0x43, 0x18, 0x48, 0x30, 0x40, 0x2f, 0x21, 0x4a, 0x89, 0x02,
405+
0xe9, 0x15, 0x05, 0x84, 0x80, 0x18, 0xfd, 0x8c, 0x10, 0xe7, 0x18, 0x89,
406+
0x2c, 0x2d, 0xcb, 0x84, 0xd6, 0x2a, 0x3e, 0x61, 0x52, 0x8d, 0x19, 0x35,
407+
0x6a, 0xcc, 0xa4, 0xba, 0xdd, 0x59, 0x22, 0x96, 0xb9, 0x49, 0xd5, 0x51,
408+
0x1f, 0x71, 0x4d, 0x2a, 0x01, 0x1d, 0x62, 0x93, 0x43, 0xc6, 0x5d, 0x16,
409+
0xe4, 0x68, 0x9e, 0x83, 0xea, 0x7a, 0xb1, 0xc2, 0xce, 0x71, 0x19, 0xda,
410+
0xe3, 0x8d, 0x62, 0xbd, 0x37, 0x8b, 0x75, 0x6e, 0x57, 0xf5, 0x77, 0x7b,
411+
0x55, 0xdd, 0x6d, 0x8d, 0xd8, 0xa1, 0xfe, 0xed, 0xa2, 0x74, 0xf9, 0x7f,
412+
0x52, 0xfb, 0xbc, 0x55, 0x9c, 0xe3, 0x87, 0x0e, 0x99, 0x30, 0xee, 0x09,
413+
0x3f, 0x70, 0x8e, 0x58, 0xe5, 0x57, 0xfe, 0xe0, 0x75, 0x62, 0x8d, 0xef,
414+
0x38, 0x68, 0x52, 0x3d, 0xe3, 0x66, 0x1b, 0xc5, 0x1b, 0x3c, 0xac, 0x1e,
415+
0xb5, 0x3a, 0xdd, 0x90, 0xef, 0xa9, 0xfa, 0xb5, 0x75, 0x62, 0xb1, 0xcd,
416+
0xae, 0xf4, 0x21, 0x6f, 0xb2, 0x50, 0xac, 0x75, 0xb3, 0xaa, 0x9d, 0xd6,
417+
0x8b, 0x11, 0x1b, 0x6c, 0x77, 0x95, 0x4b, 0x2c, 0x15, 0xab, 0xfd, 0x54,
418+
0xd5, 0x4d, 0xe9, 0x86, 0xc4, 0x15, 0x29, 0x85, 0xde, 0xed, 0x52, 0xa7,
419+
0x66, 0xae, 0xc1, 0x74, 0x1f, 0xf0, 0xc7, 0x4c, 0x98, 0x07, 0x5d, 0xe5,
420+
0x8c, 0xcc, 0x5c, 0x91, 0x2d, 0x7e, 0x93, 0x9a, 0x79, 0x4a, 0x24, 0x24,
421+
0x40, 0x25, 0x5b, 0x59, 0x00, 0xc0, 0x30, 0xbb, 0xe8, 0xe2, 0x0f, 0xc2,
422+
0xd4, 0xb2, 0x84, 0xdb, 0x28, 0x19, 0x53, 0x97, 0x73, 0xec, 0xe5, 0xdb,
423+
0xd4, 0xa5, 0x6d, 0x66, 0x09, 0x65, 0x00, 0xfc, 0x46, 0x1b, 0x47, 0xff,
424+
0x97, 0xb5, 0x17, 0xc6, 0x25, 0x39, 0x79, 0x01, 0xf9, 0x4f, 0x9e, 0xd7,
425+
0xb4, 0xeb, 0x32, 0xd2, 0x26, 0x62, 0xa5, 0x7b, 0x2e, 0x49, 0xd8, 0x0e,
426+
0x59, 0x37, 0x46, 0x23, 0xa3, 0x88, 0x4b, 0x1d, 0x9a, 0x34, 0xe6, 0x1f,
427+
0x57, 0x66, 0x6b, 0x76, 0xd8, 0x17, 0x3d, 0x37, 0x29, 0x4c, 0xc2, 0x37,
428+
0x2d, 0xcc, 0xf5, 0x1d, 0x29, 0xf6, 0xf5, 0x94, 0xc0, 0x4d, 0x0c, 0xb3,
429+
0xd1, 0xcb, 0xf2, 0x7d, 0xd9, 0x8a, 0xed, 0x48, 0x89, 0xc4, 0xc5, 0x6c,
430+
0xd8, 0x75, 0x39, 0x31, 0x19, 0x54, 0xc4, 0xe5, 0x76, 0x5f, 0x14, 0x73,
431+
0xd0, 0x87, 0x83, 0xa0, 0xf2, 0x83, 0x10, 0xab, 0x5d, 0xeb, 0xe1, 0x2c,
432+
0x65, 0x0a, 0x2c, 0x69, 0x8f, 0xeb, 0xbc, 0x36, 0xfb, 0x11, 0x11, 0xca,
433+
0x86, 0x85, 0x00, 0x6a, 0xb8, 0x93, 0x16, 0x1a, 0x98, 0x49, 0x29, 0x85,
434+
0x40, 0x8c, 0x11, 0x8e, 0xf3, 0x0b, 0xdb, 0xf8, 0x92, 0x5f, 0x73, 0x6d,
435+
0xcd, 0xf1, 0xd0, 0x4a, 0xa6, 0x9d, 0x05, 0x5c, 0xc9, 0xd5, 0xcc, 0x64,
436+
0x2a, 0x30, 0xc2, 0x09, 0xfa, 0xf9, 0x93, 0x58, 0x70, 0x5c, 0xf6, 0xdb,
437+
0x28, 0x07, 0x28, 0x58, 0x9a, 0xdf, 0x72, 0x6f, 0xf9, 0x0f, 0xe5, 0x0b,
438+
0x86, 0x4e, 0xaa, 0xa6, 0x55, 0x70, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45,
439+
0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74,
440+
0x65, 0x00, 0x32, 0x30, 0x31, 0x37, 0x2d, 0x30, 0x33, 0x2d, 0x30, 0x39,
441+
0x54, 0x31, 0x32, 0x3a, 0x30, 0x39, 0x3a, 0x34, 0x32, 0x2b, 0x30, 0x31,
442+
0x3a, 0x30, 0x30, 0xcb, 0xa2, 0xee, 0xb9, 0x00, 0x00, 0x00, 0x25, 0x74,
443+
0x45, 0x58, 0x74, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64, 0x69,
444+
0x66, 0x79, 0x00, 0x32, 0x30, 0x31, 0x37, 0x2d, 0x30, 0x33, 0x2d, 0x30,
445+
0x39, 0x54, 0x31, 0x32, 0x3a, 0x30, 0x39, 0x3a, 0x30, 0x38, 0x2b, 0x30,
446+
0x31, 0x3a, 0x30, 0x30, 0x9a, 0xc5, 0x07, 0xb1, 0x00, 0x00, 0x00, 0x19,
447+
0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65,
448+
0x00, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65,
449+
0x52, 0x65, 0x61, 0x64, 0x79, 0x71, 0xc9, 0x65, 0x3c, 0x00, 0x00, 0x00,
450+
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
451+
}
452+
327453
var DataHibernate []byte = []byte{
328454
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
329455
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x12,
+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
package icon
66

7+
func GetIcon() []byte {
8+
return Data
9+
}
10+
11+
func GetIconHiber() []byte {
12+
return DataHibernate
13+
}
14+
715
var Data []byte = []byte{
816
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
917
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x31,
+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
package icon
66

7+
func GetIcon() []byte {
8+
return Data
9+
}
10+
11+
func GetIconHiber() []byte {
12+
return DataHibernate
13+
}
14+
715
var Data []byte = []byte{
816
0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
917
0x20, 0x00, 0x68, 0x04, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x20, 0x20,

trayicon.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"runtime"
3535

3636
log "github.com/Sirupsen/logrus"
37-
"github.com/facchinm/systray/example/icon"
37+
"github.com/arduino/arduino-create-agent/icon"
3838
"github.com/getlantern/systray"
3939
"github.com/skratchdot/open-golang/open"
4040
"go.bug.st/serial.v1"
@@ -63,7 +63,7 @@ func addRebootTrayElement() {
6363

6464
func setupSysTrayReal() {
6565

66-
systray.SetIcon(icon.Data)
66+
systray.SetIcon(icon.GetIcon())
6767
mUrl := systray.AddMenuItem("Go to Arduino Create", "Arduino Create")
6868
mDebug := systray.AddMenuItem("Open debug console", "Debug console")
6969
menuVer := systray.AddMenuItem("Agent version "+version+"-"+git_revision, "")
@@ -109,7 +109,7 @@ func setupSysTrayReal() {
109109

110110
func setupSysTrayHibernate() {
111111

112-
systray.SetIcon(icon.DataHibernate)
112+
systray.SetIcon(icon.GetIconHiber())
113113
mOpen := systray.AddMenuItem("Open Plugin", "")
114114
mQuit := systray.AddMenuItem("Kill Plugin", "")
115115

0 commit comments

Comments
 (0)