From 8310c1d51bb9b0c649d29b221b37427dcbd71073 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 01:28:12 +0200 Subject: [PATCH 01/12] Bundle Adwaita icons (wip) --- theme/adwaita.go | 3 + theme/adwaita_colors_generator.go | 285 +++++++++++++++++- theme/adwaita_icons.go | 465 ++++++++++++++++++++++++++++++ 3 files changed, 743 insertions(+), 10 deletions(-) create mode 100644 theme/adwaita_icons.go diff --git a/theme/adwaita.go b/theme/adwaita.go index 698224a9..ec714e58 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -43,6 +43,9 @@ func (a *Adwaita) Font(style fyne.TextStyle) fyne.Resource { // Icon returns the named resource for the current theme. func (a *Adwaita) Icon(name fyne.ThemeIconName) fyne.Resource { + if icon, ok := adwaitaIcons[name]; ok { + return icon + } return theme.DefaultTheme().Icon(name) } diff --git a/theme/adwaita_colors_generator.go b/theme/adwaita_colors_generator.go index 45d2c8f0..d3d1f4ca 100644 --- a/theme/adwaita_colors_generator.go +++ b/theme/adwaita_colors_generator.go @@ -10,23 +10,32 @@ is the name of the color in the Adwaita page without the "@". package main import ( + "archive/tar" "bytes" "fmt" "go/format" "image/color" + "io" "io/ioutil" "log" "net/http" "os" + "path/filepath" "regexp" "strings" "text/template" + + "fyne.io/fyne/v2" ) const ( - adwaitaColorPage = "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.0/named-colors.html" - output = "adwaita_colors.go" - sourceTpl = `package theme + adwaitaColorPage = "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.0/named-colors.html" // the gnome page describing the colors + adwaitaIconsPage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/master/adwaita-icon-theme-master.tar?path=Adwaita" // gitlab page with the icons, tar file here + colorSchemeOutput = "adwaita_colors.go" + iconsOutput = "adwaita_icons.go" + + // the template to generate the color scheme + colorSourceTpl = `package theme // This file is generated by adwaita_colors_generator.go // Please do not edit manually, use: @@ -52,6 +61,30 @@ var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ {{$key}}: {{$value.Col}}, // Adwaita color name @{{$value.AdwName}} {{- end }} }` + // the template where to bundle the icons in a map + iconSourceTpl = `package theme + +import ( + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/theme" +) + +var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ +{{range $name, $icon := .Icons}} +{{ if contains $icon.StaticName "symbolic" }} + theme.{{$name}}: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "{{$icon.StaticName}}", + StaticContent: []byte({{ printf "%q" $icon.Content}}), + }), +{{else}} + theme.{{$name}}: &fyne.StaticResource{ + StaticName: "{{$icon.StaticName}}", + StaticContent: []byte({{ printf "%q" $icon.Content}}), + }, +{{end}} +{{end}} +} +` ) var ( @@ -90,6 +123,115 @@ var ( "theme.ColorBrown": "brown_3", "theme.ColorGray": "dark_2", } + + // map to describe the icons to get from the Adwaita gitlab page and the name of the icon in the Fyne theme + iconsToGet = map[string]string{ + "IconNameCancel": "symbolic/ui/window-close-symbolic.svg", + "IconNameConfirm": "symbolic/actions/object-select-symbolic.svg", + "IconNameDelete": "symbolic/places/user-trash-symbolic.svg", + "IconNameSearch": "symbolic/actions/system-search-symbolic.svg", + "IconNameSearchReplace": "symbolic/actions/system-search-symbolic.svg", // to be changed + "IconNameMenu": "symbolic/actions/open-menu-symbolic.svg", + "IconNameMenuExpand": "symbolic/ui/pan-end-symbolic.svg", + + "IconNameCheckButton": "symbolic/ui/checkbox-symbolic.svg", + "IconNameCheckButtonChecked": "symbolic/ui/checkbox-checked-symbolic.svg", + "IconNameRadioButton": "symbolic/ui/radio-symbolic.svg", + "IconNameRadioButtonChecked": "symbolic/ui/radio-checked-symbolic.svg", + + "IconNameContentAdd": "symbolic/actions/list-add-symbolic.svg", + "IconNameContentClear": "symbolic/actions/edit-clear-symbolic.svg", + "IconNameContentRemove": "symbolic/actions/list-remove-symbolic.svg", + "IconNameContentCut": "symbolic/actions/edit-cut-symbolic.svg", + "IconNameContentCopy": "symbolic/actions/edit-copy-symbolic.svg", + "IconNameContentPaste": "symbolic/actions/edit-paste-symbolic.svg", + "IconNameContentRedo": "symbolic/actions/edit-redo-symbolic.svg", + "IconNameContentUndo": "symbolic/actions/edit-undo-symbolic.svg", + + "IconNameColorAchromatic": "", + "IconNameColorChromatic": "", + "IconNameColorPalette": "", + + "IconNameDocument": "symbolic/mimetypes/text-x-generic-symbolic.svg", + "IconNameDocumentCreate": "symbolic/actions/document-new-symbolic.svg", + "IconNameDocumentPrint": "symbolic/actions/document-print-symbolic.svg", + "IconNameDocumentSave": "symbolic/actions/document-save-symbolic.svg", + + "IconNameMoreHorizontal": "symbolic/actions/view-more-horizontal-symbolic.svg", + "IconNameMoreVertical": "symbolic/actions/view-more-symbolic.svg", + + "IconNameInfo": "symbolic/status/dialog-information-symbolic.svg", + "IconNameQuestion": "symbolic/status/dialog-question-symbolic.svg", + "IconNameWarning": "symbolic/status/dialog-warning-symbolic.svg", + "IconNameError": "symbolic/status/dialog-error-symbolic.svg", + + "IconNameMailAttachment": "", + "IconNameMailCompose": "", + "IconNameMailForward": "", + "IconNameMailReply": "", + "IconNameMailReplyAll": "", + "IconNameMailSend": "", + + "IconNameMediaMusic": "symbolic/mimetypes/audio-x-generic-symbolic.svg", + "IconNameMediaPhoto": "symbolic/mimetypes/image-x-generic-symbolic.svg", + "IconNameMediaVideo": "symbolic/mimetypes/video-x-generic-symbolic.svg", + "IconNameMediaFastForward": "symbolic/actions/media-seek-forward-symbolic.svg", + "IconNameMediaFastRewind": "symbolic/actions/media-seek-backward-symbolic.svg", + "IconNameMediaPause": "symbolic/actions/media-playback-pause-symbolic.svg", + "IconNameMediaPlay": "symbolic/actions/media-playback-start-symbolic.svg", + "IconNameMediaRecord": "symbolic/actions/media-record-symbolic.svg", + "IconNameMediaReplay": "symbolic/actions/media-seek-backward-symbolic.svg", + "IconNameMediaSkipNext": "symbolic/actions/media-skip-forward-symbolic.svg", + "IconNameMediaSkipPrevious": "symbolic/actions/media-skip-backward-symbolic.svg", + "IconNameMediaStop": "symbolic/actions/media-playback-stop-symbolic.svg", + + "IconNameNavigateBack": "symbolic/actions/go-previous-symbolic.svg", + "IconNameMoveDown": "symbolic/actions/go-down-symbolic.svg", + "IconNameNavigateNext": "symbolic/actions/go-next-symbolic.svg", + "IconNameMoveUp": "symbolic/actions/go-up-symbolic.svg", + "IconNameArrowDropDown": "symbolic/actions/go-down-symbolic.svg", + "IconNameArrowDropUp": "symbolic/actions/go-up-symbolic.svg", + + "IconNameFile": "", + "IconNameFileApplication": "scalable/mimetypes/application-x-executable.svg", + "IconNameFileAudio": "scalable/mimetypes/audio-x-generic.svg", + "IconNameFileImage": "scalable/mimetypes/image-x-generic.svg", + "IconNameFileText": "scalable/mimetypes/text-x-generic.svg", + "IconNameFileVideo": "scalable/mimetypes/video-x-generic.svg", + "IconNameFolder": "scalable/places/folder.svg", + "IconNameFolderNew": "symbolic/actions/folder-new-symbolic.svg", + "IconNameFolderOpen": "symbolic/status/folder-open-symbolic.svg", + "IconNameHelp": "symbolic/actions/help-about-symbolic.svg", + "IconNameHistory": "", + "IconNameHome": "symbolic/places/user-home-symbolic.svg", + "IconNameSettings": "symbolic/categories/applications-system-symbolic.svg", + + "IconNameViewFullScreen": "", + "IconNameViewRefresh": "", + "IconNameViewRestore": "", + "IconNameViewZoomFit": "", + "IconNameViewZoomIn": "", + "IconNameViewZoomOut": "", + + "IconNameVisibility": "", + "IconNameVisibilityOff": "", + + "IconNameVolumeDown": "", + "IconNameVolumeMute": "", + "IconNameVolumeUp": "", + + "IconNameDownload": "symbolic/places/folder-download-symbolic.svg", + "IconNameComputer": "symbolic/devices/computer-symbolic.svg", + "IconNameStorage": "symbolic/devices/drive-harddisk-symbolic.svg", + "IconNameUpload": "symbolic/actions/send-to-symbolic.svg", + + "IconNameAccount": "symbolic/status/avatar-default-symbolic.svg", + "IconNameLogin": "", + "IconNameLogout": "", + + "IconNameList": "symbolic/actions/view-list-symbolic.svg", + "IconNameGrid": "symbolic/actions/view-grid-symbolic.svg", + } ) type colorInfo struct { @@ -97,20 +239,142 @@ type colorInfo struct { AdwName string // Adwaita color name from the documentation without the "@" } +type iconInfo struct { + StaticName string // the theme name of the icon for Fyne + Content string // the content of the icon, SVG content +} + func main() { + if err := generateColorScheme(); err != nil { + log.Fatal(err) + } + + if err := generateIcons(); err != nil { + log.Fatal(err) + } + +} + +// generateIcons generates the icons file from the Adwaita icon theme. It downloads the theme from the gitlab repository +// as a tar file and extracts it in a temporary directory. +// Then, using the icons map, it get the corresponding icon and generate the go file. +func generateIcons() error { + + // get https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/master/adwaita-icon-theme-master.tar?path=Adwaita as a tar file and extract it in memory + resp, err := http.Get(adwaitaIconsPage) + if err != nil { + return err + } + defer resp.Body.Close() + tarReader := tar.NewReader(resp.Body) + + // extract in a temporary directory + tmpDir, err := ioutil.TempDir("", "adwaita") + if err != nil { + return err + } + defer os.RemoveAll(tmpDir) + for { + header, err := tarReader.Next() + if err == io.EOF { + break + } + if err != nil { + return err + + } + if header.Typeflag == tar.TypeReg { + target := filepath.Join(tmpDir, header.Name) + if err := os.MkdirAll(filepath.Dir(target), 0755); err != nil { + return err + } + file, err := os.Create(target) + if err != nil { + return err + } + defer file.Close() + if _, err := io.Copy(file, tarReader); err != nil { + return err + } + } + } + + icons := map[string]iconInfo{} + for name, iconfile := range iconsToGet { + if iconfile == "" { + continue + } + res, err := fyne.LoadResourceFromPath(filepath.Join(tmpDir, "adwaita-icon-theme-master-Adwaita", "Adwaita", iconfile)) + if err != nil { + log.Println("Error bundeling", name, "from", iconfile, ":", err) + continue + } + + filecontent := res.Content() + //// replace fill= to fill=none on the firts path + //if strings.Contains(file, "symbolic") { + // filecontent = regexp.MustCompile(`fill="[^"]*"`).ReplaceAll(filecontent, []byte(`fill="#000000"`)) + //} + icons[name] = struct { + StaticName string + Content string + }{ + StaticName: filepath.Base(iconfile), + Content: string(filecontent), + } + } + + tpl := template.New("source") + tpl = tpl.Funcs(template.FuncMap{ + "contains": strings.Contains, + }) + tpl, err = tpl.Parse(iconSourceTpl) + if err != nil { + return fmt.Errorf("Error parsing template: %w", err) + } + // generate the source + buffer := bytes.NewBuffer(nil) + err = tpl.Execute(buffer, struct { + Icons map[string]iconInfo + }{ + Icons: icons, + }) + if err != nil { + log.Fatal(err) + } + + result := buffer.Bytes() + + //result, err = format.Source(result) + //if err != nil { + // return fmt.Errorf("error formatting source: %w", err) + //} + + err = ioutil.WriteFile(iconsOutput, result, 0644) + if err != nil { + return fmt.Errorf("error writing source: %w\n%s", err, string(iconSourceTpl)) + } + return nil +} + +// generateColorScheme generates the color scheme file from the Adwaita documentation. It downloads the documentation +// page and parse it to get the color scheme. Following the documentation and recommendations, it generates the light and dark +// color schemes. +func generateColorScheme() error { + rows := [][]string{} darkScheme := map[string]colorInfo{} lightScheme := map[string]colorInfo{} reps, err := http.Get(adwaitaColorPage) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to get page: %w", err) } defer reps.Body.Close() htpage, err := ioutil.ReadAll(reps.Body) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to read body: %w", err) } // find all the rows in the tables rows = tableRowMatcher.FindAllStringSubmatch(string(htpage), -1) @@ -193,16 +457,16 @@ func main() { } } - out, err := os.Create(output) + out, err := os.Create(colorSchemeOutput) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to create output file: %w", err) } defer out.Close() tpl := template.New("source") - tpl, err = tpl.Parse(sourceTpl) + tpl, err = tpl.Parse(colorSourceTpl) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to parse template: %w", err) } // generate the source buffer := bytes.NewBuffer(nil) @@ -223,9 +487,10 @@ func main() { } else { out.Write(formatted) } - + return nil } +// stringToColor converts a string to a color.RGBA func stringToColor(s string) (c color.RGBA, err error) { c.A = 0xff switch len(s) { diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go new file mode 100644 index 00000000..72c06f5c --- /dev/null +++ b/theme/adwaita_icons.go @@ -0,0 +1,465 @@ +package theme + +import ( + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/theme" +) + +var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ + + + theme.IconNameAccount: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "avatar-default-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameArrowDropDown: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-down-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameArrowDropUp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-up-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameCancel: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "window-close-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameCheckButton: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "checkbox-symbolic.svg", + StaticContent: []byte("\n\n\n\n\n\n"), + }), + + + + theme.IconNameCheckButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "checkbox-checked-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameComputer: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "computer-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameConfirm: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "object-select-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentAdd: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "list-add-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentClear: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-clear-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentCopy: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-copy-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentCut: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-cut-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentPaste: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-paste-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentRedo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-redo-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentRemove: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "list-remove-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameContentUndo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-undo-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameDelete: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "user-trash-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n\n"), + }), + + + + theme.IconNameDocument: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "text-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameDocumentCreate: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-new-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameDocumentPrint: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-print-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameDocumentSave: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-save-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameDownload: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-download-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameError: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-error-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameFileApplication: &fyne.StaticResource{ + StaticName: "application-x-executable.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFileAudio: &fyne.StaticResource{ + StaticName: "audio-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFileImage: &fyne.StaticResource{ + StaticName: "image-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFileText: &fyne.StaticResource{ + StaticName: "text-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFileVideo: &fyne.StaticResource{ + StaticName: "video-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFolder: &fyne.StaticResource{ + StaticName: "folder.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + + + theme.IconNameFolderNew: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-new-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameFolderOpen: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-open-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameGrid: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-grid-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameHelp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "help-about-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameHome: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "user-home-symbolic.svg", + StaticContent: []byte("\n\n \n \n\n"), + }), + + + + theme.IconNameInfo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-information-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameList: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-list-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMediaFastForward: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-forward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaFastRewind: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaMusic: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "audio-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMediaPause: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-pause-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaPhoto: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "image-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaPlay: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-start-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMediaRecord: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-record-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMediaReplay: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaSkipNext: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-skip-forward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaSkipPrevious: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-skip-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMediaStop: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-stop-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMediaVideo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "video-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + + + theme.IconNameMenu: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "open-menu-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n\n"), + }), + + + + theme.IconNameMenuExpand: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "pan-end-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMoreHorizontal: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-more-horizontal-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMoreVertical: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-more-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMoveDown: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-down-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameMoveUp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-up-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameNavigateBack: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-previous-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameNavigateNext: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-next-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameQuestion: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-question-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameRadioButton: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "radio-symbolic.svg", + StaticContent: []byte("\n\n\n\n\n\n"), + }), + + + + theme.IconNameRadioButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "radio-checked-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameSearch: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "system-search-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameSearchReplace: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "system-search-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameSettings: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "applications-system-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameStorage: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "drive-harddisk-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameUpload: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "send-to-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + + + theme.IconNameWarning: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-warning-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + +} From 2ebaeb035d94f3ffab1b436977fde1c0a31f93f4 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 01:30:38 +0200 Subject: [PATCH 02/12] Renamed generator and use goreorder --- theme/adwaita.go | 10 +- theme/adwaita_colors.go | 1 - theme/adwaita_icons.go | 783 ++++++++---------- ...enerator.go => adwaita_theme_generator.go} | 205 +++-- 4 files changed, 433 insertions(+), 566 deletions(-) rename theme/{adwaita_colors_generator.go => adwaita_theme_generator.go} (99%) diff --git a/theme/adwaita.go b/theme/adwaita.go index ec714e58..2be114f0 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -8,19 +8,19 @@ import ( ) // must be in sync with adwaita_colors_generator.go - getting the colors from the Adwaita document page. -//go:generate go run ./adwaita_colors_generator.go +//go:generate go run ./adwaita_theme_generator.go var _ fyne.Theme = (*Adwaita)(nil) +// Adwaita is a theme that follows the Adwaita theme. +// See: https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html +type Adwaita struct{} + // AdwaitaTheme returns a new Adwaita theme. func AdwaitaTheme() fyne.Theme { return &Adwaita{} } -// Adwaita is a theme that follows the Adwaita theme. -// See: https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html -type Adwaita struct{} - // Color returns the named color for the current theme. func (a *Adwaita) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { switch variant { diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index 4030e0e9..42f44aea 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -35,7 +35,6 @@ var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorRed: color.RGBA{0xc0, 0x1c, 0x28, 0xff}, // Adwaita color name @red_4 theme.ColorYellow: color.RGBA{0xf6, 0xd3, 0x2d, 0xff}, // Adwaita color name @yellow_3 } - var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorBlue: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @blue_3 theme.ColorBrown: color.RGBA{0x98, 0x6a, 0x44, 0xff}, // Adwaita color name @brown_3 diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index 72c06f5c..de0bbf29 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -1,465 +1,334 @@ package theme import ( - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/theme" + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/theme" ) var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ - - theme.IconNameAccount: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "avatar-default-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameArrowDropDown: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-down-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameArrowDropUp: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-up-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameCancel: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "window-close-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameCheckButton: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "checkbox-symbolic.svg", - StaticContent: []byte("\n\n\n\n\n\n"), - }), - - - - theme.IconNameCheckButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "checkbox-checked-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameComputer: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "computer-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameConfirm: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "object-select-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentAdd: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "list-add-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentClear: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-clear-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentCopy: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-copy-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentCut: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-cut-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentPaste: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-paste-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentRedo: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-redo-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentRemove: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "list-remove-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameContentUndo: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "edit-undo-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameDelete: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "user-trash-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n\n"), - }), - - - - theme.IconNameDocument: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "text-x-generic-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameDocumentCreate: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "document-new-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameDocumentPrint: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "document-print-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameDocumentSave: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "document-save-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameDownload: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "folder-download-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameError: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "dialog-error-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameFileApplication: &fyne.StaticResource{ - StaticName: "application-x-executable.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFileAudio: &fyne.StaticResource{ - StaticName: "audio-x-generic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFileImage: &fyne.StaticResource{ - StaticName: "image-x-generic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFileText: &fyne.StaticResource{ - StaticName: "text-x-generic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFileVideo: &fyne.StaticResource{ - StaticName: "video-x-generic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFolder: &fyne.StaticResource{ - StaticName: "folder.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n\n"), - }, - - - - theme.IconNameFolderNew: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "folder-new-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameFolderOpen: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "folder-open-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameGrid: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "view-grid-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameHelp: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "help-about-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameHome: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "user-home-symbolic.svg", - StaticContent: []byte("\n\n \n \n\n"), - }), - - - - theme.IconNameInfo: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "dialog-information-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameList: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "view-list-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMediaFastForward: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-seek-forward-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaFastRewind: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-seek-backward-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaMusic: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "audio-x-generic-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMediaPause: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-playback-pause-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaPhoto: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "image-x-generic-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaPlay: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-playback-start-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMediaRecord: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-record-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMediaReplay: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-seek-backward-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaSkipNext: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-skip-forward-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaSkipPrevious: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-skip-backward-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMediaStop: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "media-playback-stop-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMediaVideo: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "video-x-generic-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n\n"), - }), - - - - theme.IconNameMenu: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "open-menu-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n\n"), - }), - - - - theme.IconNameMenuExpand: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "pan-end-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMoreHorizontal: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "view-more-horizontal-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMoreVertical: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "view-more-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMoveDown: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-down-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameMoveUp: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-up-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameNavigateBack: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-previous-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameNavigateNext: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "go-next-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameQuestion: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "dialog-question-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameRadioButton: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "radio-symbolic.svg", - StaticContent: []byte("\n\n\n\n\n\n"), - }), - - - - theme.IconNameRadioButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "radio-checked-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameSearch: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "system-search-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameSearchReplace: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "system-search-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameSettings: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "applications-system-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameStorage: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "drive-harddisk-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameUpload: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "send-to-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - - - theme.IconNameWarning: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "dialog-warning-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - - + theme.IconNameAccount: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "avatar-default-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameArrowDropDown: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-down-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameArrowDropUp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-up-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameCancel: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "window-close-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameCheckButton: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "checkbox-symbolic.svg", + StaticContent: []byte("\n\n\n\n\n\n"), + }), + + theme.IconNameCheckButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "checkbox-checked-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameComputer: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "computer-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameConfirm: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "object-select-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentAdd: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "list-add-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentClear: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-clear-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentCopy: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-copy-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentCut: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-cut-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentPaste: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-paste-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentRedo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-redo-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentRemove: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "list-remove-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameContentUndo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-undo-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameDelete: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "user-trash-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n\n"), + }), + + theme.IconNameDocument: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "text-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameDocumentCreate: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-new-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameDocumentPrint: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-print-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameDocumentSave: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "document-save-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameDownload: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-download-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameError: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-error-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameFileApplication: &fyne.StaticResource{ + StaticName: "application-x-executable.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFileAudio: &fyne.StaticResource{ + StaticName: "audio-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFileImage: &fyne.StaticResource{ + StaticName: "image-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFileText: &fyne.StaticResource{ + StaticName: "text-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFileVideo: &fyne.StaticResource{ + StaticName: "video-x-generic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFolder: &fyne.StaticResource{ + StaticName: "folder.svg", + StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n\n"), + }, + + theme.IconNameFolderNew: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-new-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameFolderOpen: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "folder-open-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameGrid: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-grid-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameHelp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "help-about-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameHome: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "user-home-symbolic.svg", + StaticContent: []byte("\n\n \n \n\n"), + }), + + theme.IconNameInfo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-information-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameList: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-list-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMediaFastForward: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-forward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaFastRewind: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaMusic: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "audio-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMediaPause: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-pause-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaPhoto: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "image-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaPlay: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-start-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMediaRecord: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-record-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMediaReplay: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-seek-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaSkipNext: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-skip-forward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaSkipPrevious: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-skip-backward-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMediaStop: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "media-playback-stop-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMediaVideo: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "video-x-generic-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMenu: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "open-menu-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n \n\n"), + }), + + theme.IconNameMenuExpand: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "pan-end-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMoreHorizontal: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-more-horizontal-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMoreVertical: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-more-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMoveDown: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-down-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMoveUp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-up-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameNavigateBack: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-previous-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameNavigateNext: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "go-next-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameQuestion: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-question-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameRadioButton: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "radio-symbolic.svg", + StaticContent: []byte("\n\n\n\n\n\n"), + }), + + theme.IconNameRadioButtonChecked: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "radio-checked-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameSearch: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "system-search-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameSearchReplace: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "system-search-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameSettings: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "applications-system-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameStorage: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "drive-harddisk-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameUpload: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "send-to-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameWarning: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "dialog-warning-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), } diff --git a/theme/adwaita_colors_generator.go b/theme/adwaita_theme_generator.go similarity index 99% rename from theme/adwaita_colors_generator.go rename to theme/adwaita_theme_generator.go index d3d1f4ca..362831d4 100644 --- a/theme/adwaita_colors_generator.go +++ b/theme/adwaita_theme_generator.go @@ -238,7 +238,6 @@ type colorInfo struct { Col string // go formated color (color.RGBA{0x00, 0x00, 0x00, 0x00}) AdwName string // Adwaita color name from the documentation without the "@" } - type iconInfo struct { StaticName string // the theme name of the icon for Fyne Content string // the content of the icon, SVG content @@ -256,108 +255,6 @@ func main() { } -// generateIcons generates the icons file from the Adwaita icon theme. It downloads the theme from the gitlab repository -// as a tar file and extracts it in a temporary directory. -// Then, using the icons map, it get the corresponding icon and generate the go file. -func generateIcons() error { - - // get https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/master/adwaita-icon-theme-master.tar?path=Adwaita as a tar file and extract it in memory - resp, err := http.Get(adwaitaIconsPage) - if err != nil { - return err - } - defer resp.Body.Close() - tarReader := tar.NewReader(resp.Body) - - // extract in a temporary directory - tmpDir, err := ioutil.TempDir("", "adwaita") - if err != nil { - return err - } - defer os.RemoveAll(tmpDir) - for { - header, err := tarReader.Next() - if err == io.EOF { - break - } - if err != nil { - return err - - } - if header.Typeflag == tar.TypeReg { - target := filepath.Join(tmpDir, header.Name) - if err := os.MkdirAll(filepath.Dir(target), 0755); err != nil { - return err - } - file, err := os.Create(target) - if err != nil { - return err - } - defer file.Close() - if _, err := io.Copy(file, tarReader); err != nil { - return err - } - } - } - - icons := map[string]iconInfo{} - for name, iconfile := range iconsToGet { - if iconfile == "" { - continue - } - res, err := fyne.LoadResourceFromPath(filepath.Join(tmpDir, "adwaita-icon-theme-master-Adwaita", "Adwaita", iconfile)) - if err != nil { - log.Println("Error bundeling", name, "from", iconfile, ":", err) - continue - } - - filecontent := res.Content() - //// replace fill= to fill=none on the firts path - //if strings.Contains(file, "symbolic") { - // filecontent = regexp.MustCompile(`fill="[^"]*"`).ReplaceAll(filecontent, []byte(`fill="#000000"`)) - //} - icons[name] = struct { - StaticName string - Content string - }{ - StaticName: filepath.Base(iconfile), - Content: string(filecontent), - } - } - - tpl := template.New("source") - tpl = tpl.Funcs(template.FuncMap{ - "contains": strings.Contains, - }) - tpl, err = tpl.Parse(iconSourceTpl) - if err != nil { - return fmt.Errorf("Error parsing template: %w", err) - } - // generate the source - buffer := bytes.NewBuffer(nil) - err = tpl.Execute(buffer, struct { - Icons map[string]iconInfo - }{ - Icons: icons, - }) - if err != nil { - log.Fatal(err) - } - - result := buffer.Bytes() - - //result, err = format.Source(result) - //if err != nil { - // return fmt.Errorf("error formatting source: %w", err) - //} - - err = ioutil.WriteFile(iconsOutput, result, 0644) - if err != nil { - return fmt.Errorf("error writing source: %w\n%s", err, string(iconSourceTpl)) - } - return nil -} - // generateColorScheme generates the color scheme file from the Adwaita documentation. It downloads the documentation // page and parse it to get the color scheme. Following the documentation and recommendations, it generates the light and dark // color schemes. @@ -506,3 +403,105 @@ func stringToColor(s string) (c color.RGBA, err error) { } return } + +// generateIcons generates the icons file from the Adwaita icon theme. It downloads the theme from the gitlab repository +// as a tar file and extracts it in a temporary directory. +// Then, using the icons map, it get the corresponding icon and generate the go file. +func generateIcons() error { + + // get https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/master/adwaita-icon-theme-master.tar?path=Adwaita as a tar file and extract it in memory + resp, err := http.Get(adwaitaIconsPage) + if err != nil { + return err + } + defer resp.Body.Close() + tarReader := tar.NewReader(resp.Body) + + // extract in a temporary directory + tmpDir, err := ioutil.TempDir("", "adwaita") + if err != nil { + return err + } + defer os.RemoveAll(tmpDir) + for { + header, err := tarReader.Next() + if err == io.EOF { + break + } + if err != nil { + return err + + } + if header.Typeflag == tar.TypeReg { + target := filepath.Join(tmpDir, header.Name) + if err := os.MkdirAll(filepath.Dir(target), 0755); err != nil { + return err + } + file, err := os.Create(target) + if err != nil { + return err + } + defer file.Close() + if _, err := io.Copy(file, tarReader); err != nil { + return err + } + } + } + + icons := map[string]iconInfo{} + for name, iconfile := range iconsToGet { + if iconfile == "" { + continue + } + res, err := fyne.LoadResourceFromPath(filepath.Join(tmpDir, "adwaita-icon-theme-master-Adwaita", "Adwaita", iconfile)) + if err != nil { + log.Println("Error bundeling", name, "from", iconfile, ":", err) + continue + } + + filecontent := res.Content() + //// replace fill= to fill=none on the firts path + //if strings.Contains(file, "symbolic") { + // filecontent = regexp.MustCompile(`fill="[^"]*"`).ReplaceAll(filecontent, []byte(`fill="#000000"`)) + //} + icons[name] = struct { + StaticName string + Content string + }{ + StaticName: filepath.Base(iconfile), + Content: string(filecontent), + } + } + + tpl := template.New("source") + tpl = tpl.Funcs(template.FuncMap{ + "contains": strings.Contains, + }) + tpl, err = tpl.Parse(iconSourceTpl) + if err != nil { + return fmt.Errorf("Error parsing template: %w", err) + } + // generate the source + buffer := bytes.NewBuffer(nil) + err = tpl.Execute(buffer, struct { + Icons map[string]iconInfo + }{ + Icons: icons, + }) + if err != nil { + log.Fatal(err) + } + + result := buffer.Bytes() + + //result, err = format.Source(result) + //if err != nil { + // return fmt.Errorf("error formatting source: %w", err) + //} + + err = ioutil.WriteFile(iconsOutput, result, 0644) + if err != nil { + return fmt.Errorf("error writing source: %w\n%s", err, string(iconSourceTpl)) + } + return nil +} From 31c30265cea5978cab8db1aa2d18fd63680e7b1b Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 01:40:03 +0200 Subject: [PATCH 03/12] Cleanup code, better doc --- theme/adwaita_colors.go | 1 + theme/adwaita_theme_generator.go | 80 ++++++++++++-------------------- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index 42f44aea..4030e0e9 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -35,6 +35,7 @@ var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorRed: color.RGBA{0xc0, 0x1c, 0x28, 0xff}, // Adwaita color name @red_4 theme.ColorYellow: color.RGBA{0xf6, 0xd3, 0x2d, 0xff}, // Adwaita color name @yellow_3 } + var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorBlue: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @blue_3 theme.ColorBrown: color.RGBA{0x98, 0x6a, 0x44, 0xff}, // Adwaita color name @brown_3 diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 362831d4..9bb7ee2f 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -311,11 +311,11 @@ func generateColorScheme() error { for colname, color := range colorToGet { lcol, err := getWidgetColorFor(color, "light") if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to get light color for %s: %w", color, err) } dcol, err := getWidgetColorFor(color, "dark") if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to get dark color for %s: %w", color, err) } lightScheme[colname] = colorInfo{ Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", lcol.R, lcol.G, lcol.B, lcol.A), @@ -338,11 +338,11 @@ func generateColorScheme() error { lcol, err := getStandardColorFor(lightColorName) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to get light color for %s: %w", lightColorName, err) } dcol, err := getStandardColorFor(darkColorName) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to get dark color for %s: %w", darkColorName, err) } lightScheme[colname] = colorInfo{ Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", lcol.R, lcol.G, lcol.B, lcol.A), @@ -354,12 +354,6 @@ func generateColorScheme() error { } } - out, err := os.Create(colorSchemeOutput) - if err != nil { - return fmt.Errorf("failed to create output file: %w", err) - } - defer out.Close() - tpl := template.New("source") tpl, err = tpl.Parse(colorSourceTpl) if err != nil { @@ -375,33 +369,15 @@ func generateColorScheme() error { DarkScheme: darkScheme, }) if err != nil { - log.Fatal(err) + return fmt.Errorf("failed to execute template: %w", err) } // format the file if formatted, err := format.Source(buffer.Bytes()); err != nil { - log.Fatal(err) + return fmt.Errorf("failed to format source: %w", err) } else { - out.Write(formatted) - } - return nil -} - -// stringToColor converts a string to a color.RGBA -func stringToColor(s string) (c color.RGBA, err error) { - c.A = 0xff - switch len(s) { - case 7: - _, err = fmt.Sscanf(s, "#%02x%02x%02x", &c.R, &c.G, &c.B) - case 9: - _, err = fmt.Sscanf(s, "#%02x%02x%02x%02x", &c.R, &c.G, &c.B, &c.A) - default: - // rgba(...) format - var a float32 - _, err = fmt.Sscanf(s, "rgba(%d, %d, %d, %f)", &c.R, &c.G, &c.B, &a) - c.A = uint8(a * 255) + return ioutil.WriteFile(colorSchemeOutput, formatted, 0644) } - return } // generateIcons generates the icons file from the Adwaita icon theme. It downloads the theme from the gitlab repository @@ -460,14 +436,8 @@ func generateIcons() error { } filecontent := res.Content() - //// replace fill= to fill=none on the firts path - //if strings.Contains(file, "symbolic") { - // filecontent = regexp.MustCompile(`fill="[^"]*"`).ReplaceAll(filecontent, []byte(`fill="#000000"`)) - //} - icons[name] = struct { - StaticName string - Content string - }{ + + icons[name] = iconInfo{ StaticName: filepath.Base(iconfile), Content: string(filecontent), } @@ -489,19 +459,29 @@ func generateIcons() error { Icons: icons, }) if err != nil { - log.Fatal(err) + return fmt.Errorf("Error executing template: %w", err) } - result := buffer.Bytes() - - //result, err = format.Source(result) - //if err != nil { - // return fmt.Errorf("error formatting source: %w", err) - //} + if formatted, err := format.Source(buffer.Bytes()); err != nil { + return fmt.Errorf("error formatting source: %w", err) + } else { + return ioutil.WriteFile(iconsOutput, formatted, 0644) + } +} - err = ioutil.WriteFile(iconsOutput, result, 0644) - if err != nil { - return fmt.Errorf("error writing source: %w\n%s", err, string(iconSourceTpl)) +// stringToColor converts a string to a color.RGBA +func stringToColor(s string) (c color.RGBA, err error) { + c.A = 0xff + switch len(s) { + case 7: + _, err = fmt.Sscanf(s, "#%02x%02x%02x", &c.R, &c.G, &c.B) + case 9: + _, err = fmt.Sscanf(s, "#%02x%02x%02x%02x", &c.R, &c.G, &c.B, &c.A) + default: + // rgba(...) format + var a float32 + _, err = fmt.Sscanf(s, "rgba(%d, %d, %d, %f)", &c.R, &c.G, &c.B, &a) + c.A = uint8(a * 255) } - return nil + return } From 91a3aa277a17b7db0dbff134818b2cf08dbc6f44 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 01:44:41 +0200 Subject: [PATCH 04/12] More information about not defined Icons Not defined icons are set to the default. I don't have listed everything yet. --- theme/adwaita_icons.go | 5 ----- theme/adwaita_theme_generator.go | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index de0bbf29..fadb6084 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -307,11 +307,6 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ StaticContent: []byte("\n\n \n\n"), }), - theme.IconNameSearchReplace: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "system-search-symbolic.svg", - StaticContent: []byte("\n\n \n\n"), - }), - theme.IconNameSettings: theme.NewThemedResource(&fyne.StaticResource{ StaticName: "applications-system-symbolic.svg", StaticContent: []byte("\n\n \n\n"), diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 9bb7ee2f..c8c5aaaa 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -125,12 +125,13 @@ var ( } // map to describe the icons to get from the Adwaita gitlab page and the name of the icon in the Fyne theme + // note: all empty icons are those that are not defined yet. We should make some choices about them. iconsToGet = map[string]string{ "IconNameCancel": "symbolic/ui/window-close-symbolic.svg", "IconNameConfirm": "symbolic/actions/object-select-symbolic.svg", "IconNameDelete": "symbolic/places/user-trash-symbolic.svg", "IconNameSearch": "symbolic/actions/system-search-symbolic.svg", - "IconNameSearchReplace": "symbolic/actions/system-search-symbolic.svg", // to be changed + "IconNameSearchReplace": "", "IconNameMenu": "symbolic/actions/open-menu-symbolic.svg", "IconNameMenuExpand": "symbolic/ui/pan-end-symbolic.svg", From eee44a320e61af148511d4b8741c8e08ab1942ae Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 09:14:27 +0200 Subject: [PATCH 05/12] Changed some icons, add others --- theme/adwaita_icons.go | 101 ++++++++++++++++++++++++++++++- theme/adwaita_theme_generator.go | 42 ++++++------- 2 files changed, 119 insertions(+), 24 deletions(-) diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index fadb6084..c75e7695 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -88,8 +88,8 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ }), theme.IconNameDelete: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "user-trash-symbolic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n\n"), + StaticName: "edit-delete-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), }), theme.IconNameDocument: theme.NewThemedResource(&fyne.StaticResource{ @@ -187,6 +187,41 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ StaticContent: []byte("\n\n \n\n"), }), + theme.IconNameLogout: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "system-log-out-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameMailAttachment: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-attachment-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMailCompose: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-message-new-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMailForward: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-forward-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMailReply: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-reply-sender-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMailReplyAll: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-reply-all-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameMailSend: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "mail-send-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + theme.IconNameMediaFastForward: theme.NewThemedResource(&fyne.StaticResource{ StaticName: "media-seek-forward-symbolic.svg", StaticContent: []byte("\n\n \n \n \n \n\n"), @@ -303,10 +338,15 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ }), theme.IconNameSearch: theme.NewThemedResource(&fyne.StaticResource{ - StaticName: "system-search-symbolic.svg", + StaticName: "edit-find-symbolic.svg", StaticContent: []byte("\n\n \n\n"), }), + theme.IconNameSearchReplace: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "edit-find-replace-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + theme.IconNameSettings: theme.NewThemedResource(&fyne.StaticResource{ StaticName: "applications-system-symbolic.svg", StaticContent: []byte("\n\n \n\n"), @@ -322,6 +362,61 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ StaticContent: []byte("\n\n \n\n"), }), + theme.IconNameViewFullScreen: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-fullscreen-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameViewRefresh: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-refresh-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameViewRestore: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-restore-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameViewZoomFit: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "zoom-fit-best-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameViewZoomIn: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "zoom-in-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameViewZoomOut: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "zoom-out-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameVisibility: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-reveal-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameVisibilityOff: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "view-conceal-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameVolumeDown: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "audio-volume-low-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + + theme.IconNameVolumeMute: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "audio-volume-muted-symbolic.svg", + StaticContent: []byte("\n\n \n \n \n \n\n"), + }), + + theme.IconNameVolumeUp: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "audio-volume-high-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + theme.IconNameWarning: theme.NewThemedResource(&fyne.StaticResource{ StaticName: "dialog-warning-symbolic.svg", StaticContent: []byte("\n\n \n\n"), diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index c8c5aaaa..0bff2fdc 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -129,9 +129,9 @@ var ( iconsToGet = map[string]string{ "IconNameCancel": "symbolic/ui/window-close-symbolic.svg", "IconNameConfirm": "symbolic/actions/object-select-symbolic.svg", - "IconNameDelete": "symbolic/places/user-trash-symbolic.svg", - "IconNameSearch": "symbolic/actions/system-search-symbolic.svg", - "IconNameSearchReplace": "", + "IconNameDelete": "symbolic/actions/edit-delete-symbolic.svg", + "IconNameSearch": "symbolic/actions/edit-find-symbolic.svg", + "IconNameSearchReplace": "symbolic/actions/edit-find-replace-symbolic.svg", "IconNameMenu": "symbolic/actions/open-menu-symbolic.svg", "IconNameMenuExpand": "symbolic/ui/pan-end-symbolic.svg", @@ -166,12 +166,12 @@ var ( "IconNameWarning": "symbolic/status/dialog-warning-symbolic.svg", "IconNameError": "symbolic/status/dialog-error-symbolic.svg", - "IconNameMailAttachment": "", - "IconNameMailCompose": "", - "IconNameMailForward": "", - "IconNameMailReply": "", - "IconNameMailReplyAll": "", - "IconNameMailSend": "", + "IconNameMailAttachment": "symbolic/status/mail-attachment-symbolic.svg", + "IconNameMailCompose": "symbolic/actions/mail-message-new-symbolic.svg", + "IconNameMailForward": "symbolic/actions/mail-forward-symbolic.svg", + "IconNameMailReply": "symbolic/actions/mail-reply-sender-symbolic.svg", + "IconNameMailReplyAll": "symbolic/actions/mail-reply-all-symbolic.svg", + "IconNameMailSend": "symbolic/actions/mail-send-symbolic.svg", "IconNameMediaMusic": "symbolic/mimetypes/audio-x-generic-symbolic.svg", "IconNameMediaPhoto": "symbolic/mimetypes/image-x-generic-symbolic.svg", @@ -207,19 +207,19 @@ var ( "IconNameHome": "symbolic/places/user-home-symbolic.svg", "IconNameSettings": "symbolic/categories/applications-system-symbolic.svg", - "IconNameViewFullScreen": "", - "IconNameViewRefresh": "", - "IconNameViewRestore": "", - "IconNameViewZoomFit": "", - "IconNameViewZoomIn": "", - "IconNameViewZoomOut": "", + "IconNameViewFullScreen": "symbolic/actions/view-fullscreen-symbolic.svg", + "IconNameViewRefresh": "symbolic/actions/view-refresh-symbolic.svg", + "IconNameViewRestore": "symbolic/actions/view-restore-symbolic.svg", + "IconNameViewZoomFit": "symbolic/actions/zoom-fit-best-symbolic.svg", + "IconNameViewZoomIn": "symbolic/actions/zoom-in-symbolic.svg", + "IconNameViewZoomOut": "symbolic/actions/zoom-out-symbolic.svg", - "IconNameVisibility": "", - "IconNameVisibilityOff": "", + "IconNameVisibility": "symbolic/actions/view-reveal-symbolic.svg", + "IconNameVisibilityOff": "symbolic/actions/view-conceal-symbolic.svg", - "IconNameVolumeDown": "", - "IconNameVolumeMute": "", - "IconNameVolumeUp": "", + "IconNameVolumeDown": "symbolic/status/audio-volume-low-symbolic.svg", + "IconNameVolumeMute": "symbolic/status/audio-volume-muted-symbolic.svg", + "IconNameVolumeUp": "symbolic/status/audio-volume-high-symbolic.svg", "IconNameDownload": "symbolic/places/folder-download-symbolic.svg", "IconNameComputer": "symbolic/devices/computer-symbolic.svg", @@ -228,7 +228,7 @@ var ( "IconNameAccount": "symbolic/status/avatar-default-symbolic.svg", "IconNameLogin": "", - "IconNameLogout": "", + "IconNameLogout": "symbolic/actions/system-log-out-symbolic.svg", "IconNameList": "symbolic/actions/view-list-symbolic.svg", "IconNameGrid": "symbolic/actions/view-grid-symbolic.svg", From 50d9a41c6c2d59c232a66aaf2df7019fd846321b Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 09:32:11 +0200 Subject: [PATCH 06/12] Fix template usage - prefer to use fully named properties in color struct - prefer to use template to `printf` elements intead of doing it in the functions --- theme/adwaita_colors.go | 80 ++++++++++++++++---------------- theme/adwaita_icons.go | 7 +++ theme/adwaita_theme_generator.go | 32 ++++++++----- 3 files changed, 68 insertions(+), 51 deletions(-) diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index 4030e0e9..ad2b53dd 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -14,47 +14,47 @@ import ( ) var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ - theme.ColorBlue: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @blue_3 - theme.ColorBrown: color.RGBA{0x98, 0x6a, 0x44, 0xff}, // Adwaita color name @brown_3 - theme.ColorGray: color.RGBA{0x5e, 0x5c, 0x64, 0xff}, // Adwaita color name @dark_2 - theme.ColorGreen: color.RGBA{0x26, 0xa2, 0x69, 0xff}, // Adwaita color name @green_5 - theme.ColorNameBackground: color.RGBA{0x24, 0x24, 0x24, 0xff}, // Adwaita color name @window_bg_color - theme.ColorNameButton: color.RGBA{0x30, 0x30, 0x30, 0xff}, // Adwaita color name @headerbar_bg_color - theme.ColorNameError: color.RGBA{0xc0, 0x1c, 0x28, 0xff}, // Adwaita color name @error_bg_color - theme.ColorNameForeground: color.RGBA{0xff, 0xff, 0xff, 0xff}, // Adwaita color name @window_fg_color - theme.ColorNameInputBackground: color.RGBA{0x1e, 0x1e, 0x1e, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.RGBA{0x1e, 0x1e, 0x1e, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameOverlayBackground: color.RGBA{0x1e, 0x1e, 0x1e, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNamePrimary: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameSelection: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameShadow: color.RGBA{0x00, 0x00, 0x00, 0x5b}, // Adwaita color name @shade_color - theme.ColorNameSuccess: color.RGBA{0x26, 0xa2, 0x69, 0xff}, // Adwaita color name @success_bg_color - theme.ColorNameWarning: color.RGBA{0xcd, 0x93, 0x09, 0xff}, // Adwaita color name @warning_bg_color - theme.ColorOrange: color.RGBA{0xff, 0x78, 0x00, 0xff}, // Adwaita color name @orange_3 - theme.ColorPurple: color.RGBA{0x91, 0x41, 0xac, 0xff}, // Adwaita color name @purple_3 - theme.ColorRed: color.RGBA{0xc0, 0x1c, 0x28, 0xff}, // Adwaita color name @red_4 - theme.ColorYellow: color.RGBA{0xf6, 0xd3, 0x2d, 0xff}, // Adwaita color name @yellow_3 + theme.ColorBlue: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 + theme.ColorBrown: color.RGBA{R: 0x98, G: 0x6a, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 + theme.ColorGray: color.RGBA{R: 0x5e, G: 0x5c, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 + theme.ColorGreen: color.RGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @green_5 + theme.ColorNameBackground: color.RGBA{R: 0x24, G: 0x24, B: 0x24, A: 0xff}, // Adwaita color name @window_bg_color + theme.ColorNameButton: color.RGBA{R: 0x30, G: 0x30, B: 0x30, A: 0xff}, // Adwaita color name @headerbar_bg_color + theme.ColorNameError: color.RGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @error_bg_color + theme.ColorNameForeground: color.RGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}, // Adwaita color name @window_fg_color + theme.ColorNameInputBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameOverlayBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNamePrimary: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameSelection: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameShadow: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @shade_color + theme.ColorNameSuccess: color.RGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @success_bg_color + theme.ColorNameWarning: color.RGBA{R: 0xcd, G: 0x93, B: 0x09, A: 0xff}, // Adwaita color name @warning_bg_color + theme.ColorOrange: color.RGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 + theme.ColorPurple: color.RGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 + theme.ColorRed: color.RGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @red_4 + theme.ColorYellow: color.RGBA{R: 0xf6, G: 0xd3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 } var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ - theme.ColorBlue: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @blue_3 - theme.ColorBrown: color.RGBA{0x98, 0x6a, 0x44, 0xff}, // Adwaita color name @brown_3 - theme.ColorGray: color.RGBA{0x5e, 0x5c, 0x64, 0xff}, // Adwaita color name @dark_2 - theme.ColorGreen: color.RGBA{0x2e, 0xc2, 0x7e, 0xff}, // Adwaita color name @green_4 - theme.ColorNameBackground: color.RGBA{0xfa, 0xfa, 0xfa, 0xff}, // Adwaita color name @window_bg_color - theme.ColorNameButton: color.RGBA{0xeb, 0xeb, 0xeb, 0xff}, // Adwaita color name @headerbar_bg_color - theme.ColorNameError: color.RGBA{0xe0, 0x1b, 0x24, 0xff}, // Adwaita color name @error_bg_color - theme.ColorNameForeground: color.RGBA{0x00, 0x00, 0x00, 0xcc}, // Adwaita color name @window_fg_color - theme.ColorNameInputBackground: color.RGBA{0xff, 0xff, 0xff, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.RGBA{0xff, 0xff, 0xff, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameOverlayBackground: color.RGBA{0xff, 0xff, 0xff, 0xff}, // Adwaita color name @view_bg_color - theme.ColorNamePrimary: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameSelection: color.RGBA{0x35, 0x84, 0xe4, 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameShadow: color.RGBA{0x00, 0x00, 0x00, 0x11}, // Adwaita color name @shade_color - theme.ColorNameSuccess: color.RGBA{0x2e, 0xc2, 0x7e, 0xff}, // Adwaita color name @success_bg_color - theme.ColorNameWarning: color.RGBA{0xe5, 0xa5, 0x0a, 0xff}, // Adwaita color name @warning_bg_color - theme.ColorOrange: color.RGBA{0xff, 0x78, 0x00, 0xff}, // Adwaita color name @orange_3 - theme.ColorPurple: color.RGBA{0x91, 0x41, 0xac, 0xff}, // Adwaita color name @purple_3 - theme.ColorRed: color.RGBA{0xe0, 0x1b, 0x24, 0xff}, // Adwaita color name @red_3 - theme.ColorYellow: color.RGBA{0xf6, 0xd3, 0x2d, 0xff}, // Adwaita color name @yellow_3 + theme.ColorBlue: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 + theme.ColorBrown: color.RGBA{R: 0x98, G: 0x6A, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 + theme.ColorGray: color.RGBA{R: 0x5e, G: 0x5C, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 + theme.ColorGreen: color.RGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @green_4 + theme.ColorNameBackground: color.RGBA{R: 0xfa, G: 0xFA, B: 0xfa, A: 0xff}, // Adwaita color name @window_bg_color + theme.ColorNameButton: color.RGBA{R: 0xeb, G: 0xEB, B: 0xeb, A: 0xff}, // Adwaita color name @headerbar_bg_color + theme.ColorNameError: color.RGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @error_bg_color + theme.ColorNameForeground: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xcc}, // Adwaita color name @window_fg_color + theme.ColorNameInputBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameOverlayBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNamePrimary: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameSelection: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameShadow: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x11}, // Adwaita color name @shade_color + theme.ColorNameSuccess: color.RGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @success_bg_color + theme.ColorNameWarning: color.RGBA{R: 0xe5, G: 0xA5, B: 0x0a, A: 0xff}, // Adwaita color name @warning_bg_color + theme.ColorOrange: color.RGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 + theme.ColorPurple: color.RGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 + theme.ColorRed: color.RGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @red_3 + theme.ColorYellow: color.RGBA{R: 0xf6, G: 0xD3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 } diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index c75e7695..4d73c069 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -1,5 +1,12 @@ package theme +// This file is generated by adwaita_colors_generator.go - DO NOT EDIT +// +// This icons come from "GNOME Project" +// Repository: https://gitlab.gnome.org/GNOME/adwaita-icon-theme +// Licence: CC-BY-SA 3.0 +// See: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/master/COPYING_CCBYSA3 + import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/theme" diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 0bff2fdc..0d05caf5 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -52,18 +52,25 @@ import ( var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ {{- range $key, $value := .DarkScheme }} - {{$key}}: {{$value.Col}}, // Adwaita color name @{{$value.AdwName}} + {{ $key }}: {{ printf "color.RGBA{R: 0x%02x, G: 0x%02x, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} {{- end }} } var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ {{- range $key, $value := .LightScheme }} - {{$key}}: {{$value.Col}}, // Adwaita color name @{{$value.AdwName}} + {{ $key }}: {{ printf "color.RGBA{R: 0x%02x, G: 0x%02X, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} {{- end }} }` // the template where to bundle the icons in a map iconSourceTpl = `package theme +// This file is generated by adwaita_colors_generator.go - DO NOT EDIT +// +// This icons come from "GNOME Project" +// Repository: https://gitlab.gnome.org/GNOME/adwaita-icon-theme +// Licence: CC-BY-SA 3.0 +// See: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/master/COPYING_CCBYSA3 + import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/theme" @@ -236,8 +243,8 @@ var ( ) type colorInfo struct { - Col string // go formated color (color.RGBA{0x00, 0x00, 0x00, 0x00}) - AdwName string // Adwaita color name from the documentation without the "@" + Col color.Color // go formated color (color.RGBA{0x00, 0x00, 0x00, 0x00}) + AdwName string // Adwaita color name from the documentation without the "@" } type iconInfo struct { StaticName string // the theme name of the icon for Fyne @@ -319,11 +326,11 @@ func generateColorScheme() error { return fmt.Errorf("failed to get dark color for %s: %w", color, err) } lightScheme[colname] = colorInfo{ - Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", lcol.R, lcol.G, lcol.B, lcol.A), + Col: lcol, AdwName: color, } darkScheme[colname] = colorInfo{ - Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", dcol.R, dcol.G, dcol.B, dcol.A), + Col: dcol, AdwName: color, } } @@ -346,16 +353,16 @@ func generateColorScheme() error { return fmt.Errorf("failed to get dark color for %s: %w", darkColorName, err) } lightScheme[colname] = colorInfo{ - Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", lcol.R, lcol.G, lcol.B, lcol.A), + Col: lcol, AdwName: lightColorName, } darkScheme[colname] = colorInfo{ - Col: fmt.Sprintf("color.RGBA{0x%02x, 0x%02x, 0x%02x, 0x%02x}", dcol.R, dcol.G, dcol.B, dcol.A), + Col: dcol, AdwName: darkColorName, } } - tpl := template.New("source") + tpl := template.New("AdwaitaColorScheme") tpl, err = tpl.Parse(colorSourceTpl) if err != nil { return fmt.Errorf("failed to parse template: %w", err) @@ -386,7 +393,7 @@ func generateColorScheme() error { // Then, using the icons map, it get the corresponding icon and generate the go file. func generateIcons() error { - // get https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/master/adwaita-icon-theme-master.tar?path=Adwaita as a tar file and extract it in memory + // get and untar the Adwaita icons from gitlab repository resp, err := http.Get(adwaitaIconsPage) if err != nil { return err @@ -400,6 +407,8 @@ func generateIcons() error { return err } defer os.RemoveAll(tmpDir) + + // extract the tar file for { header, err := tarReader.Next() if err == io.EOF { @@ -425,6 +434,7 @@ func generateIcons() error { } } + // get the wanted icons icons := map[string]iconInfo{} for name, iconfile := range iconsToGet { if iconfile == "" { @@ -444,7 +454,7 @@ func generateIcons() error { } } - tpl := template.New("source") + tpl := template.New("AdwaitaIcons") tpl = tpl.Funcs(template.FuncMap{ "contains": strings.Contains, }) From a7b71318907e53309e951f6575cb1da9808cfed3 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 09:41:38 +0200 Subject: [PATCH 07/12] Fix docstring --- theme/adwaita.go | 6 ++---- theme/adwaita_colors.go | 2 +- theme/adwaita_icons.go | 4 +++- theme/adwaita_theme_generator.go | 20 +++++++++++++++----- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/theme/adwaita.go b/theme/adwaita.go index 2be114f0..3a8f0727 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -1,3 +1,4 @@ +//go:generate go run ./adwaita_theme_generator.go package theme import ( @@ -7,12 +8,9 @@ import ( "fyne.io/fyne/v2/theme" ) -// must be in sync with adwaita_colors_generator.go - getting the colors from the Adwaita document page. -//go:generate go run ./adwaita_theme_generator.go - var _ fyne.Theme = (*Adwaita)(nil) -// Adwaita is a theme that follows the Adwaita theme. +// Adwaita is a theme that follows the Adwaita theme. It provides a light and dark theme + icons. // See: https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html type Adwaita struct{} diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index ad2b53dd..0e150d03 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -1,6 +1,6 @@ package theme -// This file is generated by adwaita_colors_generator.go +// This file is generated by adwaita_theme_generator.go // Please do not edit manually, use: // go generate ./theme/... // diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index 4d73c069..8efd5296 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -1,6 +1,8 @@ package theme -// This file is generated by adwaita_colors_generator.go - DO NOT EDIT +// This file is generated by adwaita_theme_generator.go +// Please do not edit manually, use: +// go generate ./theme/... // // This icons come from "GNOME Project" // Repository: https://gitlab.gnome.org/GNOME/adwaita-icon-theme diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 0d05caf5..c37b52e8 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -2,9 +2,17 @@ // +build ignore /* -This tool will visit the Adwaita color page and generate a Go file with all the colors. -To add a new color, just add it to the colorToGet map. The key is the name of the color for Fyne, and the color name -is the name of the color in the Adwaita page without the "@". +This tool generates the Adwaita theme for Fyne. + +It takes the colors from the Adwaita page: https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.0/named-colors.html +and the icons from the Adwaita icon theme: https://gitlab.gnome.org/GNOME/adwaita-icon-theme + +There are 2 outputs: +- adwaita_colors.go: the colors for the theme as map[fyne.ThemeColorName]color.Color +- adwaita_icons.go: the icons for the theme as fyne.Resource (themed for symbolic icons) + +Usage: +go generate ./theme/... */ package main @@ -37,7 +45,7 @@ const ( // the template to generate the color scheme colorSourceTpl = `package theme -// This file is generated by adwaita_colors_generator.go +// This file is generated by adwaita_theme_generator.go // Please do not edit manually, use: // go generate ./theme/... // @@ -64,7 +72,9 @@ var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ // the template where to bundle the icons in a map iconSourceTpl = `package theme -// This file is generated by adwaita_colors_generator.go - DO NOT EDIT +// This file is generated by adwaita_theme_generator.go +// Please do not edit manually, use: +// go generate ./theme/... // // This icons come from "GNOME Project" // Repository: https://gitlab.gnome.org/GNOME/adwaita-icon-theme From c0baa2d0876c7067b7589f50f3ad878f6965631f Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 09:45:27 +0200 Subject: [PATCH 08/12] Go generate comment should not be the first line --- theme/adwaita.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/theme/adwaita.go b/theme/adwaita.go index 3a8f0727..7455b383 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -1,4 +1,3 @@ -//go:generate go run ./adwaita_theme_generator.go package theme import ( @@ -8,6 +7,8 @@ import ( "fyne.io/fyne/v2/theme" ) +//go:generate go run ./adwaita_theme_generator.go + var _ fyne.Theme = (*Adwaita)(nil) // Adwaita is a theme that follows the Adwaita theme. It provides a light and dark theme + icons. From 12b4d47fdd1f0375c03da1f85346e21c218fd456 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 11:11:22 +0200 Subject: [PATCH 09/12] Convert 2 problematic icons to PNG oksvg has got some problems with gradients and with masked icon. Today, use inkscape in command line to convert them to PNG. Warning, inkscape says that it crashes with core dump even if the convertion worked. This is a bug from inkscape. The PNG files are well converted anyway. --- theme/adwaita_icons.go | 18 ++++++++++---- theme/adwaita_theme_generator.go | 41 ++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/theme/adwaita_icons.go b/theme/adwaita_icons.go index 8efd5296..433dccc0 100644 --- a/theme/adwaita_icons.go +++ b/theme/adwaita_icons.go @@ -46,6 +46,11 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ StaticContent: []byte("\n\n \n\n"), }), + theme.IconNameColorPalette: theme.NewThemedResource(&fyne.StaticResource{ + StaticName: "applications-graphics-symbolic.svg", + StaticContent: []byte("\n\n \n\n"), + }), + theme.IconNameComputer: theme.NewThemedResource(&fyne.StaticResource{ StaticName: "computer-symbolic.svg", StaticContent: []byte("\n\n \n\n"), @@ -131,14 +136,19 @@ var adwaitaIcons = map[fyne.ThemeIconName]fyne.Resource{ StaticContent: []byte("\n\n \n\n"), }), + theme.IconNameFile: &fyne.StaticResource{ + StaticName: "application-x-generic.svg", + StaticContent: []byte("\n\n \n \n\n"), + }, + theme.IconNameFileApplication: &fyne.StaticResource{ - StaticName: "application-x-executable.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + StaticName: "application-x-executable.png", + StaticContent: []byte("\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00w\x00\x00\x00w\b\x06\x00\x00\x0099ߊ\x00\x00\x00\tpHYs\x00\x00\x0e\xc3\x00\x00\x0e\xc3\x01\xc7o\xa8d\x00\x00\x00\x19tEXtSoftware\x00www.inkscape.org\x9b\xee<\x1a\x00\x00\x10\xa9IDATx\x9cݝ{\x8c\\\xd5}\xc7?\xe7\xbef\xee\xcc\xec\xecs\xd6އ\x97\xdd\xf5\xda\xc6\xc6\x10\b\x04\xc2#D!\x82\x94\xaa\xa9Ԧ\xff\xb4A\xaa\xaa\xb4\xe4\x81ڨI\xd5\xfe\xd1JQ\x84\xa2J\x91\xa8ڤM\x89\x924R\vj*\xaaHQi @\xa3R\xa0\x94\x02q\xd8\xda\x18\xb0\x8d\x1f\xd8\x18\xdb\xeb}\xce\xfb>N\xff\x98\x1d{gwfw\x1e\xf7\u07b9w\xbf\xff\xac\xf6\xce}\x9c;\x9f9\xbfs\xce\xef\xfc\xce\xef\b)%\xdbU\x02\xc4-\xdf8\xf7\x80\x80\xdf\x06q\x13\xc8!\x10s\x02\xf9\v\x81\xf2\xa3W\xfe|\xe41\t\xdb\xf6\v\x10\xdb\x15\xee]ߜ\xeb)[\xa5\x97\x80\xeb79\xed\xb0b\x17\xee\xfc\x9f\xaf\xcd,\aU\xae \xb5-\xe1\xde\xf6\x97\xe7\x06\xa5+ު\xd4\xd4\xcd%$\xf3\x8e\xa9\xec{\xed\xab#sA\x94-Hm;\xb8\x15\xb0\xbc\x03\f4{\x8d\x90bYs\xd4=/}m\xc7E\x1f\x8b\x16\xb8\x94n\x17\xc0K\xb5\x03\x16@\n\x99\xb6U\xe7\u061d_\xbf0\xecSѺ\xa2m\x03\xb7]\xb0UmG\xc0\xdb\x02n\xa7`\xab\xdan\x80#\x0f\xd7+\xb0Um'\xc0\x91\x86\xeb5ت\xb6\v\xe0\xc8\u009d\xfc\xe2\x7f\xdd#]\xe99ت\xb6\x03\xe0H\u009d|\xf0\xb9\xcf\xd8\xc5\xdcs+\v\x17}\x01[U\xd4\x01G\x0e\xee\xe4\x83\xcf}ƶ\xac'\xa4t\xc5\xf2\xe5\x0f\xb0\xcbE_\x9f\x17e\xc0\x91\x82\xbb\x16,@<у\xaa\xc7|\x7fnT\x01G\x06\xeez\xb0F<\xc1\xc0\xc8$B\x88@\x9e\x1fE\xc0\x91\x80\xbb\x1e\xac\xaa\x1b\f\x8cN#D\xb0ŏ\x1a\xe0\xd0\xc3]\x0fVQ5\x86\xc6v\xa3\xaaZW\xca\x13%\xc0\xa1\x86\xbb\x1e\xac\x10\n\x83\xa3\xd3h\x01\xb4\xb3\x9b)*\x80C\vw=X\x80\xde\xcc\x18F<\xd1\xcdb]Q\x14\x00\x87\x12n=\xb0\x00\xc5\xdcb\xb7\x8aTWa\a\x1c:\xb8\x8d\xc0\x02\x14s+\x94\xf2+\xdd(VC\x85\x19p\xa8\xe0n\x06\xb6\xaa\xa5\xcb\xe7\x83,RS\n+\xe0\xd0\xc0m\x06,\x80U\xccS*\xe4\x82*V\xd3\n#\xe0P\x84\xd94\v\xb6\xaax\xb2\x97\xc1\xd1)\x00\\\xc7\xc6u\x1d\xa4\xe3\xe0\xba6\x8e\xed\xa0\xa8\n\xf1d\xaf\xafen\xa40\x85\xect\x1dn\xab`+\x12(\xaa\x8a\xeb\xdau\x03S\x15Ue\xe7\xd4\xc1\xc0\xbcW\xeb\x15\x16\xc0]5\xcb\xed\x81\x05\x90\xb8N}\xb0\x00\xae\xe3P.v\xcft\x87\xc5Dw\rn\xfb`\x9bS1\xdb\xddaS\x18\x00w\x05\xae\xdf`\xa12l궺\r8p\xb8A\x80\x05\xb0\xed\x12\x8ec\xfb\xf9\x88\xa6\xd4M\xc0\x81\xc2\r\n,\x00\x12\xcaŬ\xef\x8fiF\xdd\x02\x1c\x18\xdc@\xc1\xae\xca.\x97\x83z\x14\xaa\"ؑV\xb9a\xdc@\xad\xd3K\xef\x06\xe0@\x86BA\x835\xcc$=\xfd\xc3\xc4\x13\xbd\xe0\xe3\x13\a\x92*\x13\x83*\xbb\x064\x86R\n\xca*ԗ\x8e\x17y\xeb\xbcU\xf7\x9a \x87I\xbe\xc3\r\x12\xec\x15\xa8>;0\x06\x92*\x9f<\x10'\x1d\xafo\xf8\xb2%\xc9\x13\xaf\xe6p\x1b|\xb7A\x01\xf6\xd5,\a\x056\x96\xe8!\xb3k/\x99\xf1=\x81x\xa6T\x85\x86`\x01R1\xc1\xee\xe1\xc6\xc1\x04U\x13\xfd\xc7O\xe4n\xf4\xa3|U\xf9\x067(\xb0\xf1T/Cc\xbb\x03\x9d\xe7-Y[[\xbb\x0f\xed26m\x11\xa4\x90\xe9\xa4^z\xf5\x9bO-|ֻ\x92\xd5\xca\x17\xb8A\x9abǮ߶\xf9\xa9\xa2\xbd5\xdc^Sa*Ӹ\xf6\xc64\xc1h\x9f\xaa\xa5L\xe51\xbf\x00{\x0e7\xe8Γc\a\xd7#\xae\xcardS\xb9\x16n\x9c\xa8_{\x85\x80\xa9\x8c\x86\xaa\bTE\xe0\x17`O;T\xdd\x18\xee `l\xa6\xf3\xa6+\x11S(Y\x12\xc7m\xee\xfb\xf8\xecGS\xc4\xf5\xad_\xf3̼\x8d\xa6\b\x921\x81\xa9\vtUPo>\xc3q%ق\xfb\xc0\x9f\xde\xdf\xffx\xabeo$\xcfjnW\xc0Be\xf2\xa0\xc3\x1f\xe8\xe4\x90\xc6oޔ\xe0\xfe\xebMbZs\xc5o\xa6\xdd\x05\x98\x18\xd0\x18\xedS\xe95\x15\f\xad>X\xc0\x97\x1a\xec\tܮ\x81]\x95+ݶ\xae\xd3T\xb8kO\x9cO\xee7\x89\xe9\x15'įݘ \x15\xdb\xfa5J\x8e\xf7CH\xaf\x01wl\x96\xbb\r\x16 \u0557\xc1L\xf7c\x18\x89\xa6\x9d\x16\tC\xe1\xbe\x03&\x83=\x1b\x7f\xdf\xf9\xb2\xcb3\x87\v\\\xcem\xfc\xd1\xf4\x9a\n\a\xc7\f\xf6쨴\x99~\xc8+\x13\xdd\x11\xdc0\x80]+U30Si\xccT\x1fF<\xd5\x10\xf4`O\x05l\xc2hl\xb8,\x1b\xfe\xe3h\x9es\x8b\x0e\x00}\t\x85[&\r&\x06\xf4\x86\xa6\xd5Ky\x01\xb8m\xb8a\x03\xbb^\xaaf`\xf6\xf4\xd1ӗA\xd1\xf4\x9a\xcf~\xfd\xc6\x04\x99\x1eu\xcb{8\xae\xe4\x95wK\f\xa6T\xf6\xee\b\x06\xea\xfa\xe7w\x02\xb8-\xb8a\a\xbbV\x99\xf1\x19\f3UsljH\xe3\x9e\xfdf\x97JԚ:\x01\xdcr\x87*J`\x01\x84\xaao8vj\xcef\xa1N{\x1aFu\xd2\xc9j\tn\xd4\xc0\x02\xa8\xca\xc6W\x94\xc0\xa1\xf7J\xc1\x17\xa6M\xb5\v\xb8i\xb8Q\x04\v\x02E\xab\xef\x02<5g3\x9fs\x02.O\xfbj\apSp\xa3\t\x16T]\xa7Q\x97YJ\xf8\xe5{\xc1\xbb.;Q\xab\x80\xb7\xecPE\x15,\xd4\x06\xafד\x00~\xe3\xc3I\xfa\x93\xfeL\x8e\x15,\xc9|\xcee\xb9ಘw)\x94],g\xd57-AW\xc1\xd0\x04\x86&\xe85\x15\xfaL\x85\xfe\x94\xba\xa5\x13\xa5\xd9N֦+\x98\xa3\f\x16@7\xe2\x9b~n\xe8\x02/\xd3-K\t\xe7\x97\x1c\xce\xccۼ\xbfh\xb3\x98sۺ{*&\x18\xe9\xd3\x18\xef\u05f8fP\xdd\xe0,YS\x83\xd9\fpÚ\x1b\x05\xb0z,N<ً\x10*\x8a\xaa\xa2(\n\x8a\xaa\"\x84\x82\xa2j\xa8\x9a\x81\xa8ӡ\x82J\xad\xf9\x95\x83\t\x86\xd3[\x8fw\xb7R\xb6$y\xeb|\x99\xe3\x17-r%oݒ\xba\x06S\x83:\u05ce\xe8\x1b\xc6\xe6[\xd5\xe0\xbap\xa3\x00\x16\xa0ox\x9cdomJ\xe5t\\\xe1\x86]\x06'.Y|\xb0\xe8ԭ9B\xc0\xa7\xaeK0\xd6\xdf\x19إ\x82\xcb\x1b\xef\x959q\xd1n\x18R\xe3\xa5\xc6\xfaT>4a0\xd2{\xd5\xe0n\x06x\x03ܨ\x80\x05\xd89u\x00U3j\x8e\xddw\x9dɮ\x81\xca˗l\xc9\xc99\x9b\x13\x17,.,_\x05}\xdbt\x8c\x83c\x06\xed\xcar\xe1\xffΖ\x99}\xaf\xdc\xf4\x14\xa1\x97\x9a\x18и}&~\xa5mn\x04\xb8\x06n\x94\xc0\xea\x86\xc9\xf05\xfbj\x8eMg4>qm}\xcf\xd3J\xd1\xe5\xddK6%Kr\xebt\xfb95\xce\xccۼt\xbcD\xbe\xd4]'\x88\xa6\u0087'b\x1c\x1c\xaf\x04\x04\xd4\x03|\x05n\x94\xc0\x02\xf4\x0e\x8d\x92\xea\xbf\x1a\x02\xac+\xf0[\x1fIn:\x19Љ\x1cW\xf2\xda\xe92GΖC\xb5\xe3\xc5x\xbf\xc6\xdd\xfb☺\xd8\x00X\x01\x98|\xe8\x99;\xa2\x04V\bA\"\xdd_sl\xff\xa8\xe1\x1bؒ-\xf9\xe9l\x81\xc3!\x03\vpv\xc1\xe6'\x87r\xccg]TE\xd0c\xaa\xff\xf4\xf0Ss\x1f\aP\x0e~\xfdM\xc3-\x8b\x9fG\x05,\x80\xa2\xea5\t\xc6t\x15\x0e\x8e\xb7߆n\xa6\\\xc9姳\x05.\xae\x84כ\x95+I\x9e\x9c\xcdqn\xd1AQ\x10\tU\xff\xd9\xe7_GW\x8a\x97\xe6\xbf\xefX\xe5\xee&vjQ\x8e]\xe6\xe2{Ǯ\x04\xc7\xed\xdda`6\x11\xcfԪ\xb2%ɿ\xbd\x91\x8f\x84\x9b\xd2r\xe0\xd9#\x05\xce-:\x98\xba\x8c\xa9G\xce\x7fOM\xdf\xf8;?t\x1dg\xf3\xd1~\b\xe5:6\xf9\x95E\xe2\x89\x14\x8bE\x95\x1eSa\xc0COSђ<5\x9bg\xa5\x186C\xdcXR©\xcb\x16\xc2\xc9\xe3\xda\xf65\x8ac\xd9\xe9\xd05$M\xcau,.\x9d=A.\xbb\xc4\xf3o\x17\x98=덯\xd8q%\xcf\x1c)\xb0X\x88ƴ\xe0Z\x95\x8ae^<2\x8fe9iŕNŞI\"\xb9\xf1\x99t\x1d\xe6ϟ$\xbb8ǫ'K\xbct\xbc\xd8i0$\xaf\xbc[\xe2R\x88\xdb\xd8Frl\x8b\xfc\xca\x02\x96#9z\xbe\x8c\xa2\b\xb5\xf6\xab\x88\"`)Y\xbcx\x96Bv\x89\xb7\xce[M\xb2\xb2\xb0\xb1\xed])\xba\\\\\xae\x1flުr!\x8b\xb2\xf0\x12l\xe5\xba6\\3\xad\x8e\x83u#Nzh\xa4\x92\x97Q\xc2\xf2\xfc\xf9M;M\x00\x8a\xa2ҿ\xf3\x1a\xe2\xc9t\xddϓ1\xc1\xe4\x90\xceԐ\xc6pZmk\xe8\xfd\xe3\xd7\xf3,\xe4\xc3\xd1\xeez\r\xb6rm\xbb91>\xf7\xb3\x87l\xc7\xfdvèI\x0113I\xaa\x7fx\x15P\xedi\xb9\xa59\x96.\x9d\xa3\xde\xf3U\xcd`hl\x1am\x8b\x85\\U\xa5b\x82Ɍ\xce\xf4\x90\xd6T\xae\x8b\xaa\xfe\xe5\x7f\xb3d=^\xdbӎ\x1a\x82E\x94\xec\xfc\xca'\x8e=\xfa\xf1\x97۹o۽\x93S?\xf8\xd4\xdfi\xaa\xf2\x87\x8d&\x1bbf\x0fCW\xb2\xa8n\xe4\x9f\xec\x1db`\xe7䆅Z\xb1D\x0f\x99\x89=M\x83\x85J\x94\xe2\xe1\xb3e\x9e\x7f\xa7\xb5\x89v\xb7\x81\xe1\tR~\x81\x85\x0e\x93\x8cm\x06ر\xcb[&\u074c\xa7z\x19\x1aݍ\xa2j \x04\xe9\xa1\x11\x86ƦQ\xeb\xe4\xb1hFN\x8b\x89\xbfto|!m\xcbO\xb0\xe0A\x06\xb9F\x80]ǡ\xb0\xbc\xb0%`\xc3L\x92ٵ\x87\xcc\xf8^z\xfawЉ\xe3\xbaո\xa9V#5\xbc\x94\xdf`\xc1\xa3\xf4\x80\xf5\x00K\xe9\xe2J\xb7)\xc0\x9a\x1eÈw\x9e:\xc8rZK\x03\x19W\xbbc\x96\x83\x00\v\x1e&\xf6\\\x0fX\xae\xce76\v\xd8\v\xb9R\x92o\xc1\x9d\x986\x83\xdfV)(\xb0\xe0q\xbe\xe5\x1a\xc0k\xb2\xa9\x06\t\xb8\x95\x95\xedA\xc3\r\x12,\xf8\x90L{-`\xb9&Z\xc0o\xc0qCp\xcbd\x8c\xfeT\xf3\xbd\xa4\xfedp=\xaa\xa0\xc1\x82\x8f\xbb\x93L\xfe\xfe\xd3_\x8a%\xfa\x1f\x11\x9aV3\xa6Q\x84\x82\x99\xeeG\xd5\xda\xeb\x11\xaf\x97\xa9\v\x0e\x8e\x1b\x1c\x181\xd0Zde\xb9\xf0\xf8\xcbY\xdfW\xc7w\x03,\xf8\xbc\xf5\xcc̗_\xbcYS\xcd\x17\x80\x9aޒ\x17\x80S\xb1\n\xd4kw\xea\x1d\xa5\xc6}\xf2\x8d<\x17\x96\xfd\xf3Ru\v,\x04\xb0\xaf\x90\x1f\x80\x0f\x8e\x19\xdc:\x15\xf3$\x8b\xea/Δ9tڟT\x81\xdd\x04\v\x01l\xf7v\xfco\xeez\xddv\n\x1f\x03j\x02\x95:j\x83\x05\x9e\xa5ǝɴ\x16\xbcެ\xba\r\x16\x02\xda\xcb\xcfk\xc0\x17\x96\xbc3\xa3iSi\xc9\x1f\u074c\xc2\x00\x16\x02ܨ\xd1K\xc0\x97\xb3.\xb6\x87\xcd\xe4\xbe\x11o:w\x10\x1e\xb0\x10\xf0\x16\xab^\x01v\xa5\xe4\x83e\xef\xf6\xc6ݝњڴb+\x85\t,tasd\xaf\x00\x9f\xbe\xec\x1d\\U\x11\\?\xdeYZ\x90\xb0\x81\x85.mk\xee\x05\xe0\xd3s\xb6\xa7K@\xf6\xed\xd4\xe8ma}\xd1Z\x85\x11,\x04\xb4\x7fn#u:L\xbay2\x86\xa6T\xf2D\x95,y\xe5oq\xf5\xef\xfd7$6\xdd-s\xbd\xce-8<}8\xdf\xd2;\x84\x15,t\x19.\xf8\xeb\xe880\xaas\xfb\xee\xd6\x12\xf5\xfc\xe7[\x05N\\j\xce\xe4\x87\x19,t\xc9,\xaf\x95/\xe3\xe0U\xbds\xc1jy\x81\xd7\xed3qz\x9a\xa8\xeda\a\v!\x80\v\xfe\x01\xb6\x1d\x98m1\xd5}L\x13ܳ?\xbe\xa9K3\n`!$p\xc1?\xc0G\u07b7Z\x0e\x82\x1bJ\xa9ܽ7^\xd7\v\x16\x15\xb0\x10\"\xb8\xe0\x0f`Ǖ\x1c}\xbf\xf5\xe4c\xd3\x19\x8d[\xa7j\x87GQ\x02\v!\x83\v\xde\x03NǕ\xb6\x93~\x1e\x1c3\xf8\xc8T\fA\xf4\xc0B\b\xe1\x82w\x80\xe3\xba\xe0\xbe\xeb̎\x96\xa0\xdc0np\xeb\x94Jay1R`!\xa4p\xa1s\xc0\xba\x02\xf7\x1e0\xdbvLT\x95+\x96YY\x98gjHA_s\xab\xb0\x83\x85\x10\x8cs\xb7R;\xe3`!\xe0\xde\xfd&\xbbZL|\xb2^\xb9b\x99\xd9c\x17)\xaf\xc6̖\x1dɩ9\x87\\I\x86\x1e,D\x00.\xb4\x0e\xf8\x8e\x998\xfb;\x9c\xe9Y\x0f\xb6*!\x04\x8e#~\xf7G_\xb9\xee\x1f;z@\x00\n\xadY^\xabVL\xf4H\xaf\xea+ؔi\xfcI\x14\xc0BD\xe0B\xf3\x80\xcf/9\x1d\xcd\x18m\x066\x16\x8b}\xf9\xbb\x0f\xee}\xa4\xed\x9b\a\xac\xc8\xc0\x85\xe6\x01\xbfx\xacH\xae\x89\xada\xa4\xac]R\xbcU\x8d\xfd\x87/\xec\xf9V\xc7/\x11\xa0\"\x05\x17\x9a\x03\\\xb4$Ͽ\xdd8\xa9\xb6\x94p\xec\x82ſ\xbe\x96\xe3\x85w*\xe7m\x056J5\xb6\xaaHt\xa8꩙N\xd6\xfe\x11\x9d;f\xae\xce\nI\t'.Y\x1c:]\xaeI\x990\x92\x96\xf4\xb2\x8c\xedl\x04ۓ0\xbe\xfa\xe8\x1f\xec\xfd+\x7f\xdf\xc6\x1fE\x16.4\x06,\x84\xc0L\xf5\xa2\x19qn\xdf]\xe99\x9f\xbal\xf3\xfa\xe9\x12K뒜\xd8\xe5\x12\x85\xec\"\xa6\x0e\xd3\x19\x1dC\xbdz\x8f\xa8\xd6ت\"\r\x176\x01\x8cD3Lb\xc9$}\x89؆\xe4&\x8ecc\x15\xb2X\xa5\x02r5\xb8UW\x05\xd3\x19\x8dTL\x89t\x8d\xad*\xf2p\xa11\xe0\xaa\x14UCU\x15\x84\xa2\"]\a\xc7qp\x9d\xfa\xe1\x93\xe3}\xba=3\x12\xff\xb3\xa8\x83\x85m\x02\x17\xb6\x06܌\x04\xa2\xf4\xd1}\xe9\xaf\xfc\xf0\xf33\xdf\xf1\xb0h]Ӷ\x81\v\x9d\x01\x16\x88Ҡ\xe9~\xfa\xc5o\xdc\xf2\xac\x0fE늶\x15\\h\x0fp\x14&\x01\xdaѶ\x83\v0\xf9G/\xdfd\xea\xb1\x17\xa4\x94ɭ\xceU\x10\xf9\xbcp\xef:\xf5\xc8-\x87\x82([\x90\x8a\x9c\x13\xa3\x19\x9d\xfa\xd6\xed\x874\xb2\xfbUM?\xdd\xe8\x1c\x01h\x9a~F\x15\xd9k\xb7#Xئ5\xb7*\x01↿x狮c?\x80\x94\xd7J){\x84\x10+\b\x8e*Z\xec\xb1هg\x1e\x95]\xdf\x7f\xc5?\xfd?7u\xd2W_^\xf1;\x00\x00\x00\x00IEND\xaeB`\x82"), }, theme.IconNameFileAudio: &fyne.StaticResource{ - StaticName: "audio-x-generic.svg", - StaticContent: []byte("\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n"), + StaticName: "audio-x-generic.png", + StaticContent: []byte("\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00t\x00\x00\x00l\b\x06\x00\x00\x00\xbb\x1f\x96\xd1\x00\x00\x00\tpHYs\x00\x00\x0e\xc3\x00\x00\x0e\xc3\x01\xc7o\xa8d\x00\x00\x00\x19tEXtSoftware\x00www.inkscape.org\x9b\xee<\x1a\x00\x00\x19\xdaIDATx\x9c\xed\x9d\x7f\xb4\x1dWu\xdf?\xfb\x9c\xb9\xf7==Y\xb6\x8c\x89M!\r\xe0Ę\x1fF\xd8\xd6\x0fS\xd2Յ\xca*]-mI\x17e\x11ۈ\xd0\xfc\x80\xac\x14hh\x01\xff\x92\xad\xaa\xc6!ul\xa7\x85`H\xb2ZV\xa9\x1d\x88\xa8\x9b\x06\xb2\xb2\xa0]ش\v\x82\xf1\x8fز\x84-\xc9\x04\xd9\xc6ƿ-Y\x96\xf4\u07bd3g\xef\xfeq\xce̝{？\xf7Y\xef\xf9\xf5}\xd7\x1a\xe9\u07b93g\xf6\xd9߽\xf7\xd9g\x9f\x99ybf\xac\x14lٻ\xfdo\x9b\xdaV\x8c-*v\xb6 g\x02\xa7\x02\xeb\x80l\x89\xc5+\x91\x03G\x81g\x80\x1f\x03\xfb\xcc\xe4\xfb\x85\xb4n۽a\xc7S\xa36./uBϿ\xe7\x92W\xfa̿\xdfL\xb6\x01\xe7,\xb5<#\xc0\x80\x1f\x80\xfc\xb7\xae\x84\xaf\xdc\xf7\xe6\xcf\x1cZH#/YB7\xde\x7f\xd9/H\xe1/\x05\xdb\x06\xb4\x97Z\x9eE\xc6Q\x81/x\xc7\xf5\xb7\x9fs͓\xf39\xf1%G覻wNH\xab\xfb)\x83K\x81\xb1\xa5\x96\xe7E\xc61\x84\xab\xd7=۾\xfe\xb6\xb7\xef(\xe6r\xc2K\x8a\xd0-\xf7^\xb6Y\x9d\xfb*p\xe6R\xcbr\x82\xf1\x83\xa0\xfa\xcb\xf7\x9c\xfb\x99\x87f;н\xf8\xb2,\x0e6\xef\xbe\xfc\xc3\xea\xdcw\xf9\xff\x8fL\x80\v\xbcs\x7f\xbdq\xf7\x15\xffp\xb6\x03_\x12\x84n\xdas\xc5%&\xf2EV\xdeX9\x1f\x9c*\xc2_l\xde}ů\xcetв\x0f\xb9\x9bvo\xbf\x1a\xb1\xedK-\xc72\x82\n\\|\xe7\x86k\xbe\xda\xf4\xe3\xb2&t\xf3\x9e\xed\x1f1\xb3\xcf-\xb5\x1c\xcb\x10]\xc3\xfd\xa3\xbb7\\}\xeb\xe0\x0f˖Ѝ\xf7m\x7f\xab`\xff\x17h-\xb5,\xcb\x14O\x17&\xe7\xdd\xfb\x96O?V߹,\xc7\xd0\r{.;U\xb0\xaf\xb1J\xe6L\xf8\x99\xcc\xe9M\x82H}\xe7\xb2$\xb4m\xeew\x80\x9f]j9\x96=L\xde~\xfe\xee\xcb>Xߵ\xecB\xee\xc6=\x97m\x14sw\xb0L\x8dm\x19\xe2\xe9l\xb2\xfd\v\xb7_\xb0\xe3\b,C\xa5\x89\xb9+Y\x86r-c\xfcL1\xde\xf9\xad\xf2˲\xf2\xd0-\xbb\xafz\x93J\xd8\x03Ȭ\a\xaf\xa2\x06{j\xdd\xc9c\xaf\xbe\xed5;\xa6\x96\x95'\x98\x14\xbf\xce*\x99\v\x80\x9c~\xf4H\xfe.X>k\x84l\xfd\xce\xce\xcc^&\x17.f\x9b\xa6`\x1d\b]\xc1\xba\x8av\x02V(V\x04,h܊\x00'\"J9p-\x87_\x93\x91\x9d\xd2\";\xa5\xbd\xa8\xa6kq\xd5\xe9\x96e\x13r\xb7\xec\xdd\xfe6U\xfb\xdeb\xb5\x97\x1f\xeaR\x1cVܚqp\x02\xa1F\xe4R\x10:\x007\xe6\x18\xfb[\x13d\xa7,\xda\xcc\xec\xf8T\xd6>uل\\Sۺ8\r\x19S\x7f\xf3<\x9d\x87\x8ea\xc5\xf20\xd6&hG\x99|\xe8(\x9d\xc7'\x17\xabɉv\xc8ߺ|\b\x15\xfe\xceb\xb4s\xec\xfeg\xe9\xfc\xf4\xd8b4uB\xd0}j\x8a\ue4cbC\xaaS}۲\x19C1^?j\x13\x9d\x87\x0f\xd3y\xf8\b~\xddx\xb9k\x12\xb8\xc5D\xfe\\\x9d\xdf=ac\x8f\xdd\xf5\xcfv\x1c\x1f\xf5:\v\xc1Y7\x7f\xecd\xd1\xf0*\xc4ފ\xf2K\"\xfc\x13\xd2\xf4\xac\xf3\xc4\x14~m\v\x7f\xd2ht\x98\xba\x7f\xb0,\xc6\xd0Mw\x7f\xb8E\xeb哀_h\x1b\x16\x8cC\x7fy\x00|\v\xbfn\x1c\x7fҚ\x9bZ\xeb\xd7\\\xbe\xe7\xdd\xd7\xffd\x11E]4\xbc\xe1揾YC\xf1\xfb\x88\xbc\x03\xc0\xafɘ8k\xddH\x89\x92\x1aO.\x8b\x90\xebמv2#\x90\t0\xf5\xe3\xe7\b\x93\x05@.\"\xbf\xb9\xefWnܶ\\\xc9\x04x\xe0\xe2\xcf\xed9p\xf0\x15\xef4\xecZ\x800\x15\b\xc7\xc3Hm\nrʲ \xb4;e\xebFm\xa3\xf3\xc8a\x00L\xe4\xa3\a~\xeb\xbf\xfc\xe1\xc8B\x9d\x00؎\x1dz`\xdb\x17.1\xf8\x8f\x00\xe1\x859\xdd64S\x8b\xedeAh沑o\xf6*\x9e9\x8e\xc0\x97\x0e^\xf2'/\t2\xebxp\xfc\x99O\x00\x7f\xa5\x9d\xd1<\x14\x13\xb7,\b\x1d\x19\x06a2\x9f,Z\xfe\xaa\xa5\x16e!\xb0\xf7\xee\n8\xfd\xb8\x16:rB\xb3\"\b5U\bv\xf3\xa3;nyt\xa9eY(\xf6_\xf4\x85;0\xfez\xd4vV\x04\xa1\x00\xe6\xf8\x9fK-èp-\xff\xbfGnc1\x04Y\x0ehu\xfd\xddK-èp\x9e=#\xb7\xb1\x18\x82,\a<\xf4\xf4ڧ\x97Z\x86Q!kZ\xf3z\xec\xa1\t+\x83P\x03۵k\xc4\x14q\x19@\x18\xb9f\xb92\b]E\x85UBW\x18V\t]aX\x11\x84J\xe6\x16mQq)1\xfe\xb2\xf6HI\x918{dE\x10\xba\x8a\x1eV\t]aX%t\x85a\x95\xd0\x15\x86UBW\x18V\t]aX%t\x85a\x95\xd0\x15\x86UBW\x18V\t]aX%t\x85a\x95\xd0\x15\x86UBW\x18V\t]aX%t\x85a\x95\xd0\x15\x86UBW\x18V\t]aX%t\x85aў\xe0\xbe`\xff\x95\xafUd\xab\xe16\x8a\xe9\xeb0y\xad\b/38\t01;\xa6\xf0\x8c\xc0A\x8c\x03\bw\xfa\xdc\xdfz\xfb\x86\x1d/\xd9\xe7Q\x9ap\xde\x03W\x9e\xe5\n\xdb*\x9e\xf3\xc48\x1b\x91\u05c8\xb1\xde\xe2_\xa6\b\xc01\x13\x9e\x96\xc0A\xb0}\x86\xddI\xc6mw\xbd\xe1\x9a\xc7\x17\xe3\xfa#=\xc1\xbd\xe5\xc1\x9dgZ\xd0m\x06\x17\x8bp\u058c\a\xd7/S^\xd3\xc0\x8c\xfb\x05\xfb\x96\x05\xfd\xf8\x82\x05\x81ɻ6\\31\xc2\xf9#aӞ\xcb_/\xe2\xb6!r1\xf0j\xa0\xf6$\xf6\xe0#\xd96\xf41\xaa\xc3\xee\x15\xf8K3\xbb\x9c\x85S\xf2Ȃ<\xf4\x82\x03W\xbdEM\xfe-p\x11\"\xbe\xfe>Ⱥ\xf8\xc3r\xd9\xc0Q\x86\xc0\x1b\x817\x8aw\xf1)\xb2\xa5\x7fC\xc0\x9c\xb1\xf9\x87\x97\xff\xa2\x99\xbfT\x9c\x7f\x17 \xb1[2\xcbc\xf5\xc3\x04\xc7=r\xae\x19\xe7\"\x8c\xf4\x9a\x9dy\x11\xba\xe5\xfe\x9d\xaf0\xafׂ\xbc\x1fD*\xd9{\xff\xf4\xa1\x7f\x8fU\xa2Gׄ\xf8fP\x03\x13\x10C\x9c\xc3\xcc`\xf4\xc7$_T\x9c\xbb{\xfb\xab\xbc\xe73N\xfc6\x11\xa8\xdepZvO\xe6\xfa\xa2\x04c\xc0\xb8\x01\xc1\\\xed\xe7y\x92;gB\xb7\xec\xdfq\xb1y>/\xc8)N\x04' \xceŋ:\"\x11\b\x06\xa8Yr\xb4\xba0ɀ\a\x89e\x80ԲC\v\xe8̉\xc0\xa6\xbd\xdb\x7f3\xcb\xe4:\x81\xb5u\x8f\x14\a\xce\x1cN\xa4\x8fP#\xeaB)u\x14\xf7F\f\xea!~\x16$\x1e+\x03\x87\xcf\x01\xb3\x12z֏>6vjx\xd9\x1f\x80\xfcz\xcb9Z\xce\x11\x8d\xb2|\xf5\xae\x03\x89\xc2Z\xea\x80J$UU\xe9\x7f\x82(\x12\x17\xcf+\x89\x1d \x15\xeby\xee<;\xf3b\xe2-\xf7}rmۍ\xfdg\x11y_\x9dH/\x8e\x96\xf3\x88@|\x1e>釞\xe8\x8a\xc5\xcd\xe2\xc3\xc9\x05\x82Q'w\xd8\xc0{\xa4\x96\xba\x99\x9b\x9c3\x12z\xce\xfd;OZ\xef\xd6ߒ9\xf7ζsx\xe7p\x808\xc1\x89\x03\x04\x11\xc3,y\x95$\xe1\xd5P1\x828\x9c\x19\xc1\x14m\x10\\\xcc0\x19 \xb5\xdc\x0f\x03jY:l\xd8s٩-7\xf6\x17\x88\xbc\xad$\xd3\t\x8c\xf9\x16>\xe9\u0089\xe0\x10\xc4Y-\x16Eh\xa2/\x98\x11D\xf0\x18\xc1\x8c\"h\xea\x7fy\xb4Ĩ$\x03\xa4\x12\xa3\xd7\\T1-\xa1\x7fw\xff%\xeb&\xfc\xf8\xb7\xc7\\\xb6\xb9\xed3\xbc\b\x99\xb8h\x89\xe2p\xc9;#\xa1\x80H\xcf;\xc5P3\x02F\xa1J@(\xd4(\xac\xf4\xd7A\xf2\x92\xc05\x02\xa5n\xc5K\xc8馻w\xbe\xbc\xdd\xf6\xdf\x11\x917\xa5\xd0D\xe6\x84q\xd7\xc2{G&\xd1Ƚ\xebyf$$\xf6\xc5R?4\x91\xa88\x02Ja\x8a\x13\xa1PM\x84\xd7\f{\x90\xd4z\xf4\x9a\x05\x8d\x84\x9es\xff\xce\xf6Z\xb7濯\xc9\xfc\xe6\xb6\xcbh\x89\xe0\xc5\xe1\xc4\xe1}\xb2\xc4\x14r%\t`Nb\x98M\xa3F!\xe0P\x1cB\x81!(\x98Q\xa8\xf5\t\xdc\v\xb7u\t\xea\xc2/\x9d\x97n\xba{焍\xe5\x7f\xee\xead\x8ag\xc2gd.\xea$s\xd1;\xbd\bB\x19\xb9\x18\x18\x86\xa2wz\x89\x91+7ALp\xaa\xe0\x13\xa9\xaa\xfdѪ\xee\x99u\x1d̢\x8aFB\xd7\xf8\xe2\xc61\xdf~\xe7\x98\xcbh9\x17\x05\x17GV\v/^\xa4\xca\xd0\xcd\xc0\\\f\x0f\xc1\xa2\x97:\x94`B!\x8a\xa0\xc9\x00<\"J\x1e\xb4O\xe0\xd2\x16\xfbCo\xa5\x95\x05\x132*l,\xff\xb2\x94a6\xf5ym+#\x13O\xe6\xa2>2qxIz1p\xae?)R\x14\xb5\x98\x14\x854\xfc\x88A0\xc8E@\x15\x1c\x14XJ&\x87\xf3\x8a^\xac\x9aݸ\x87\b\xdd\xf2\xc0\x8e\xf7\xb5}\xf6k\xe3\x92ђ\x98\x04E\xa1\x1d\x99\bޕ\x1dH^JԹ\x02\xe6\xa8Bm@(L\xa3.\x8c\xf8\x8aS\x8b#\xa9:#(\xf4<\xb3\x14\xba\x9fL\xc1b\xa4a\xd6~,:6\xed\xbd\U000a30bc\xa7\x9cJ\b0\xe1۴\x12\x99\xad\xe4\x9d>E/\x9f\xc6P\x87\xa4\x03\xa4\xe6\x81R\x12h\x86\x8aCј\x9e\x97\xe7\xa7\xf1ER\x8a?T\xdbZ\xe2:\xc2\xe6\xddW\x9d\x87gk\xdd;\x05h{\x9f\xe4\xa7\xd7\x17\xe9\xcf\xf8\xa3\x91\xa7\x90\x9c\xbc)\x98\xe1\x9c#\xb78 \x05\x11\\\x9f>b\xb9P\xd2\xf4.\xfe\xa2\xc3\xde9\x8fjQ\x06`^?\x80\x88s\"U\xe5M\x92\x95\xc5B\x82$\x92\xe3\x80\xed+\x8b\x8c\xa1W1r1\xd44\n,\x0eGL\xcf˨)\b\xa2\x80$\xa1\xa5'g\x1f\xfa\xf6\x9dX\x86͇_)K\x99\xa5w:\x89sF\x9c \x12\x8b\a8)Sª\xc8R\x11\x8b\xd0\":F\x81Ʃ\x1c!\x12h\x92\xbc0\x99sY\xbf\x16Aj\x975]\xf8\x10\xe4\x00L\xec\"\xa0\x9a\x1cWgW\t\xca`\xa3\xbd\xc6뿊\x94\x9d\xedy\x9c\x88Л{H\xad\xa80\xd4\xf2\x92B\xd8\xe9@.\x94\xc1>\x97\xe1\xb7\xfe\xddzS\t\xa0ֿ\x92\x14\xab\xed\xb6\xfe6j\x15P\x19\xdcQwȪ\xc9\xf9i)\xdbt\xffΟ\xeb-N\v\xb8^\x91\x9dr\x9a\x91\xa6%\xe5Xib\xa9\xfaSV\x86 \xa4\xb9\x96\xa6l7\x1e/\xa8(\xa4\xf2\xa0Iꨒ\xeaI\r\x1eh\xd3~\x99\x1e2\xbaml\xda\x1d\xdeb\x9e\xd3kmV\x06YJQ\xae\x9c\x00QO\xa9_Q?\xb1\uf165\xb9\xb3\x95\xf5\xecr\xf5)\xce/\xd5,U\x90\x04M\xb6a$\xfd\x10\xe7\xadQ\xcb4\x06\xa8\x99r\nA$s\x14\xef(\x97\xb3\x82\xa5\x15\x81t\xd1`\xe0\x1d\xa8\xa5zl\xca\xd6\xf2\x8a\xf2\x18:\rP\x8d徐\xaa !\xa5\xeb=\x81\xd32\x92\xf6:\xa0s\xc8^\xad\xfag\x86cl\xf4{\xa3\xcc\xe9\xd6\xeaK\x9f\x97\xf6\b\x88\x06\x1d\rV\x15\x82\x03/\x1a\x93\x1f\\2pŧs5\xe9!\x10uYVmU\x92+\x18\x94\xb5\xdeR\xa3}F3\xdf>\x98\x8ee&nc\xa91\x95T\\'fb>\x95\xad\x82x\x1c)\xf5\x16\x8biw\x1a\x17\xcap\x13\xeb\x95\x1aIE\t\xa6\xa9#\x9a:\x93\x8dJ\xb4\x1b:Y\xaf\x9d\x9e\xe0\x10\xadF\r2+\x97\xc5bYK\x10\x9c\x8b+'\x94\v\xdcU\xa9\xb1,.H\xbc\xe3/yg$\xd5\x1anc\xac\tZ\xef\x84\xd1С\xe9a\xdd\xc1\xf1x\x01\xb0\xb2\x9aS\xd7C\xffW5%GR$\x8aCLp\x0eoV\x15\xda\xcbp'5[U\xa2\xc1\xc6{\xac\xd2L\u0094B\r\xb3z\xa8\xed\xf5{(\xe86z\xea@\x17:\x05\x99i\xbcS\xado\"\x9d\xc6\x00U\xa5+\x82S\xc3;\x17\xbd\xb3$5Ya\xfdn\xeb\xf2\xde>M\x16YNc\xcaBEl\xde\xfa\x05\x1f\"o\xfei^qdj\x9e\xf9`?6\xfc\xafOL\xd8\x19Te\xdc\xfe\xeb\x97\xf3\xab\xf8ـ\\5\x16\x15,\xe6\x11e1\xbe\xca+\xa4\xf4\xd0\x1e9\xa1\xd2I\x1c3u(A\x18\xf8<\xadaO\xdf\xd5\xf0|G3\n,\xae\r5w\x00\xca\xcaH\xa0(W\x19,-n\x1bQ\vXu\x9a\xa5[8\xb5&He\x81\x95\xa0\x83\xff\xf7\x7f\xee\xb3\xd89 \x1c\x9e\x1a\xf9\x0f\b\x989\xc4\x02\xbd\x1av\xdaOs5\xd5,.Zc\x8aS\x97n\xe1,\xbd\xd3U\xfa\xb4ԟ\xf2\xf6֚R\x86\xfbZ7\xf2\xe9\x12\xc4\x19tR\x1c\x9e̝\x9aLU\x92W'\f\xdc\xf9^StP#\x0f\x81N\x88Ӗ\xae\x16q*\x13\x02y\b1TkOX\x1b\"\xaf\xf7\x7f\xcf;\a\xf71kx\xa9#\x7f\xf6\xf8\vs>\xb8\x01\xf7\xbd\xf3\xba\xe3\xa6\xf4\xe2\xf6\f\xc6\xd6D\x84j\x9a\xd2hL\xfa\xbaZ\xd0\rEԉ&\x9d\xa4\xfb\x85\x9a۰\x06\xfd\f|\x9e\x83u\xe7\xcf\x1c?\xe44ȳ\x15yC\x9eRkl\xc8\xcbz\x84M\xb7M/l\x8d\xcc>-Vڜ;\x1b\x06ݟ\x1e\x19\xe9\xd5\xde\x16+\xe9G\x87eI\xbf6\xc9X'd(D6m\xf4}\x1e2\xf4\xbekM\xe7\x9d\xd3\xebł\xd2}\xe2\xf9\xc7\x1c*\a\xcc\xeaa\xb6\xfa\xccg\xf8)u\xdbD\xe6\xdc\xf3\t+\x94\xeecG\x10gwgZط][0Z\x88嘤\xf2V\xb9\xbaZ\x9bh\xd6\x1f\x03\xec_\xa3\xefk\xbe\xb2&\xab\xffS\x19~\x93e\xce.t\x13:\x8f\x1d\xc5:\x85\xd2v\xffg\xde'\x0f@\xbc\xdej\xb4@2b%\xb1\\E.\xefP\xe8\xe9 .!\xd6~\xa7ן攸\xfe\xb9\xa6\x1c+\x8b\x05Þo\xbd\x83f\x95\xbd\xf3\xf0\x11\xacЩ\xechq\xbb\xdb\xfb\x8b;\x1e\x01\x0e \xed(\xe4\xd0E\x06/\xd8\xf3Xk\xb4\xca\xde\xfef\x8b\xec\xb57\n\x99\x18L\xfe\xf80\x02w\xfe\xe4\x86o>7\xff\x06\xfaq\xeff\xee\x03\x9e4\x19\x9b^\xb6>\xcfi\x8e6\xcd۰.\x9a\xa3V\xbaH\xdf\xfeYԠ\xc6\xd4\xc1\xc3\b|\xe7\xe0\x97n\x9bJ\xf7\x14\xf1'&\x1e|\xbb\xc1r\x9a\bI\xdf\xd5\x06\x84\xb5\x81d\xa8\xb9\x8d\x1e\xe1\x03\n\x9b\a\xba\x8f\x1fC\x8f\xe5\x18v\xf3\x82\x1a\x18\x80\xb1CA\xbeb.\x83\xacE\xd9\xfd\xfe\xbc\xa2?\x1cZ\x93N\x1a\xf5\x01\xcdD6\x939\x1f\xddt\x1f=\x8av\x02&\xdc\feQ\xdb\xe9\x97\x01\xa5=Q\xf6\xae\xba\xf8L\xb1\xbf\x12\xb8\xbe5vf\x90\xc8ڶ\x10\xe5\x17\xc6\xd4#G\x01\xba\xadv\xf6\xa7\vj\xa4\xb9\xe5\xff\n@{-\xbd\x10K\x03i\f\xf5\xc9\xfa\xfa\xdc\xff\xb9\x8a^\xca4\xbadA\x86n\xb9\xd2\xf9\xc91\x80\x17:ݩ?\x83D\xe8\xee\r\xdb\x0f\x82\xfd\x19\xe2`┾\v5\x0f\xea\xf5\x0e6m\xfd\xa4\r[si\x91\vC\xe7\xd1\xe3X\xa1\x80}\xf9G;\xfe\xc7S\vo\xa9\x1f\xf7\x9c{\xf9\xbd\b\xb7\"\x1e֬\xebS\xf4\x10\x11\f\xeb\xa4\xfa\xa8i+mvPo\rS\xba\xa1\xf0;\aL=|\x1cS\x03\xe1\x8bO\xfc\u07b7\x8eAm\xd9I\xb1k\x00\x93\xb15\xb8\x89\xb5\x03\xd6\xd8#\xb6,x4\x86\x97>C\xa8\x19À\xa7\x8e\x82\xe2y\xa58R\x00\x14\x0e\xfd\x0f#5\xd6\x00\x15\xfb4\x80\x8cO \xe3k\xaaP8s\x11a\xf0\xfb\xb0>\xa6\xff\xbe\xb0\xa8\x95\x1f\n\x84c\x05\xc0\xa4y\xbd\xa1\xdc_\x11z\xef\x1b/\xbd\xc7\xe0&\x009\xf9Tܚ5\xf1\x87\x06\xa1g\xab\x105\x928\xa2W\x02hW\xc8\x0fU\xeb\xfa7\xfe\xe8\xd2]?\x1a\xad\xc5a\xdc{\xf6\xa7n\x13\xf8\x06\x80[\x7f\x1a266\x10\xad\x98\x85\xaci\xb6!Gh\x8a~s\xd4CG(\x0e\xa7\xf2\xb5ɵ\a?\xb9\xeb\x89\U000b7f85\xe1\x96s\x9f\x04\x0e#\x82?\xfd\f\xa4=\xd6\xfb\xb1\xd1ꚶ\x86\xe3\x16\x01څ\xf0B\x14\xd7\xe0\xc9е\x1d\x8b\xd3\xf20\f\xff\x11\xe0\x18\"dg\x9c\x01Y\x9bz\x88\xed\x11\xcb,z\x19&\xb6/r- ji\a\x8a\x17*\xda\x1e>\xdeή\xad\xff\xdeG\xe8\xed\xaf\xfd\xd7O\x8aȇ\x01\x10\x17I\x1d\x1bo\xea\xf1,\xe1e\xce\xf2\xcd\ta\xd2ȟ\xab\xfam\x82|\xe8\xe0o\x7f\xe9\xf0\xe2^\xa5\x87\xbb\xce\xfc\xd8#\"|\n\x00\xe7\xf1\xa7\xbf\"\x92:\xe0\x95\xf5a\xa8\x99`zc\xaa\xd5\x12\xa7\xc1p=G\xe8q#?T}-\f\xde\xff؇\xfe\xf0x\xfd\x98\xa1[7\xeexտ\xdae&\x7f\x04\xc4\xe7P֟\x06cK\xf6\xd65\x8a#\x81\xfc\xd9\xdaB\x88ٵ\xfb\xde\xff\xb9\xaf\xbf\xd8\u05fd\xe3\x95\x1f\xb9\x11\xd8\x05 \xce\xe1ֿ\x1cZ\xe33\x8e\x9d\xcd\x15\xa2\x01\x12u\xfeD\x1a\x90\x1f\x0et\x9f\xeb\xe9A`\xfb\xfem\x9f\xff\xee్\xf7\xe2\xe8\xe9\xf2\x11C\xbeU\x9e*kN\x86\xb1u\x9cȧQ,\x18\x9d\xc7s\xf2\xe7\xfa\x96:\xbf~\xc6)'m?Q2\xf8\xa9\xe3\x1f\x04\xbe\aĻ3֞\x82\x95S\x9aAol\x9a\x93\x0f\ud7ff\fV\x18\x9d\x9fv{cf\xc4M?|\xf7u\xd76\x1d\xdfH\xe8]|(Ϻ\xbc\x17\xe1\x8e^\xefڨ_G\xac\xfb\xbe\xb8\xc4\xe6\xcf\xe7L\x1e\x9c$\x1c\xabuB\xec;/8\xff\xbe\xdb\u07bec\xa4;\xfc惿\xfaُO*\xadw\v\xb6\xb7\xda\xe9\xc7Qw\x12f\xad\xe1\x13\x9ar\x8a\x11\x90?\xd7e\xf2\xe0$:\xa9u\x95\x7f\xe34\xe7\xffeYY\x1eĴw\xcb}\xf7\xe5\xbf\xfa\xc2dg\xfc\xefc|\xb3\xb7WP\x1b\xa3\x98j\x11\xba\x8b|\xa3\x9dAq\xb8˱}G\xe8<:\x89\x85\x9a\xbc\"__w\xd2\xd4?>\xf8\xf6\x1dS\x8b{\xd1\xd9\xf1\x83u\x1fx6s\xe1\xef!\xf2\xbd\x9e<\x0e\rm\x8a\xa9\x16\xda]\xe4\v\x1a䇺\x1c\xdb\xf7<\x9dǧ\xe2<\xb3\xf7\xd3Mc\xa7=\U000de64cz\xd6\u05eb\x9es\xff\xd7\xdakNz\xe2\xb3\xd6\xcd?\xac\x9d\x02\xeb\x16\x94\xff[\x91\xe3Z\x86_\xe3p\xed\x85y\xadN\x05\xf2C]\x8aC\x1d4\x8f\xb2H\xe6\xe3\xe6\xbdI\xe6oxS\xe7\xa1Kv\xbdw\xd7ȷ\x99\x8c\x82M\x8f\xffф+\xa6\xfe8L\x15\x17Y\xb7\xc0:\x05\xda-\xb0N\x0e\xa1@Z\x86\x9fp\xb8\xd6\xc2\xf4\x10&\x03š\x0e\xf9\xe1.6\xa8\x87\xcc\a\x97ɿ\xff\xe1?\xbd\xfe\xea\xe9<\xb3Ĝߗ\xbb\xf9\xc1\xeb/\f\xddp\xa3u\x8b\xf5=b\xf3\x8a`,\xe0\xc7\x1dn\x8dǍy\xfc\x98\x8bϊ\xfa\xf8@\x93i\xbc\xbdӺ\x01\xed(\xc5\xf1\x82\xf0B\x8e\x15\xc3\xd7O\x9dx\x1a\xe7~\xed\x81\xf7\xdc\xf0\x8d\x05\xe8\xe7E\xc3\xc6\x037\xfc\x86\xe5\xc5\xef[\xa7X[\x12\xaa5\x82\xc5\x147\xee\xf0\x13Q\x0f\xd2r\xb8,\xde\xc3\\&IV\x18\xdaQ\xb4\x13\xd0\xe3\x81p\xb4@\x8b\xe1;\x17\x93\x1e\x1e\xf3Y\xeb\x03{\xff\xf9\xef\xdd:\x17\xf9\xe6\xf5\x02\xe4\v\xf6}\xe6\xb4\xee\x94\xfd\x8eN\x15\xbfa\xddB\xea\x84Z\xb7\xc0\xf2Eq\"\x13\x9f\xddd\xd2\xfe7\xfb/\xbc\xee\x99\xc5hp\xb1q\xfe\xfek_\xa9\xc7\xf2ߵn\xd86H\xa8u\n\xacX\x14=\x14\xe2ݍ\xc1ܕ\x0f^\xfc\xd9#s=iAo\xb4\xde\xf0\xfd\xab\xdf,E\xf7\x93)\xfc\xf8E\"T\x81[\xd4\xe9\xbf{\xf0\xe2/\xde?JC'\n\xe7~\xff\xea\xf3\xb4\x9b_\xa6\xdd\xfc_X\xa7\x90E\"4\a\xbe\xea\xcc}\xfa\x81\x0f\xfc\xc1\xbco\xad\x19\xe9\x15\xe5o\xf8\xe6e\xaf\xf1\xa1\xd8\x16:\xf9E\xd6\r\xaf_\x18\xa1\xb6GDn\x0e\x92\xdd\xfc\xe0ş}I\xbe\x7f\xfe\r߾\xfcu~\xb2\xd8\x16\xba\xf9E\xd6)\xce\\\x00\xa1&\xd8=\x86\xbb\xa9\x15\xf8\xca\xde\x0f~\xfe\x89\xd9Oi\xc6H\x84\xd6q\xce\xd7~\xfb\xe7\xf2\xc9\xeeV\x90M\bg\x9b\xd9kD8\x8d\xf4G\x04\x80\xa3\xc0\xb3\x06\a1\xdb琻h\xfb[\xf7\xfd\xf2\xe7~\xba(\x02,\x13\x9c\xf5\xa7\x1f\xfby\x97\x17[\xcd8_\xcc^\x87ȫ\xa1\xd2C \xe9\x01\xe4o\x10ۇٝyV\xdc\xf6\xe3\v\xffx\xa4;\x17K\xfc?:\xda\\\x86s0\x9b\x04\x00\x00\x00\x00IEND\xaeB`\x82"), }, theme.IconNameFileImage: &fyne.StaticResource{ diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index c37b52e8..16171ea6 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -28,6 +28,7 @@ import ( "log" "net/http" "os" + "os/exec" "path/filepath" "regexp" "strings" @@ -168,7 +169,7 @@ var ( "IconNameColorAchromatic": "", "IconNameColorChromatic": "", - "IconNameColorPalette": "", + "IconNameColorPalette": "symbolic/categories/applications-graphics-symbolic.svg", "IconNameDocument": "symbolic/mimetypes/text-x-generic-symbolic.svg", "IconNameDocumentCreate": "symbolic/actions/document-new-symbolic.svg", @@ -210,7 +211,7 @@ var ( "IconNameArrowDropDown": "symbolic/actions/go-down-symbolic.svg", "IconNameArrowDropUp": "symbolic/actions/go-up-symbolic.svg", - "IconNameFile": "", + "IconNameFile": "scalable/mimetypes/application-x-generic.svg", "IconNameFileApplication": "scalable/mimetypes/application-x-executable.svg", "IconNameFileAudio": "scalable/mimetypes/audio-x-generic.svg", "IconNameFileImage": "scalable/mimetypes/image-x-generic.svg", @@ -250,6 +251,11 @@ var ( "IconNameList": "symbolic/actions/view-list-symbolic.svg", "IconNameGrid": "symbolic/actions/view-grid-symbolic.svg", } + inkscape, _ = exec.LookPath("inkscape") + forcePNG = map[string]bool{ + "IconNameFileAudio": true, + "IconNameFileApplication": true, + } ) type colorInfo struct { @@ -450,16 +456,23 @@ func generateIcons() error { if iconfile == "" { continue } - res, err := fyne.LoadResourceFromPath(filepath.Join(tmpDir, "adwaita-icon-theme-master-Adwaita", "Adwaita", iconfile)) + + iconPath := filepath.Join(tmpDir, "adwaita-icon-theme-master-Adwaita", "Adwaita", iconfile) + if _, ok := forcePNG[name]; ok { + svgToPng(iconPath) + iconPath = strings.TrimSuffix(iconPath, ".svg") + ".png" + } + + res, err := fyne.LoadResourceFromPath(iconPath) if err != nil { - log.Println("Error bundeling", name, "from", iconfile, ":", err) + log.Println("Error bundeling", name, "from", iconPath, ":", err) continue } filecontent := res.Content() icons[name] = iconInfo{ - StaticName: filepath.Base(iconfile), + StaticName: filepath.Base(iconPath), Content: string(filecontent), } } @@ -490,6 +503,24 @@ func generateIcons() error { } } +// svgToPng converts an SVG file to a PNG file using inkscape. +// +// TODO: fix oksvg to support all SVG files. +func svgToPng(filename string) error { + // use inkscape to fix SVG files + if inkscape == "" { + return fmt.Errorf("inkscape not found") + } + log.Println("Converting", filename, "to PNG") + cmd := exec.Command( + inkscape, + "--export-type=png", + "--export-area-drawing", + "--vacuum-defs", + filename) + return cmd.Run() +} + // stringToColor converts a string to a color.RGBA func stringToColor(s string) (c color.RGBA, err error) { c.A = 0xff From a4f3fdc051dc84924003486dafb6cbf90c100de2 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 14:25:27 +0200 Subject: [PATCH 10/12] Fixup sizes (see details), scrollbar colors - sizes of icon and text should respect the Adwaita sizes, so I need to set up: - padding to 8 - inline icons to 16 - text to 12 - fixed the scrollbar color to respect Adwaita colors (estimation made, there is no color set fot scrollbar in the documentation) --- theme/adwaita.go | 8 ++++ theme/adwaita_colors.go | 82 ++++++++++++++++---------------- theme/adwaita_theme_generator.go | 13 ++++- 3 files changed, 61 insertions(+), 42 deletions(-) diff --git a/theme/adwaita.go b/theme/adwaita.go index 7455b383..6e46362e 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -50,5 +50,13 @@ func (a *Adwaita) Icon(name fyne.ThemeIconName) fyne.Resource { // Size returns the size of the named resource for the current theme. func (a *Adwaita) Size(name fyne.ThemeSizeName) float32 { + switch name { + case theme.SizeNamePadding: + return 8 + case theme.SizeNameInlineIcon: + return 16 + case theme.SizeNameText: + return 12 + } return theme.DefaultTheme().Size(name) } diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index 0e150d03..1f62b40d 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -14,47 +14,49 @@ import ( ) var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ - theme.ColorBlue: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 - theme.ColorBrown: color.RGBA{R: 0x98, G: 0x6a, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 - theme.ColorGray: color.RGBA{R: 0x5e, G: 0x5c, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 - theme.ColorGreen: color.RGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @green_5 - theme.ColorNameBackground: color.RGBA{R: 0x24, G: 0x24, B: 0x24, A: 0xff}, // Adwaita color name @window_bg_color - theme.ColorNameButton: color.RGBA{R: 0x30, G: 0x30, B: 0x30, A: 0xff}, // Adwaita color name @headerbar_bg_color - theme.ColorNameError: color.RGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @error_bg_color - theme.ColorNameForeground: color.RGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}, // Adwaita color name @window_fg_color - theme.ColorNameInputBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameOverlayBackground: color.RGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNamePrimary: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameSelection: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameShadow: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @shade_color - theme.ColorNameSuccess: color.RGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @success_bg_color - theme.ColorNameWarning: color.RGBA{R: 0xcd, G: 0x93, B: 0x09, A: 0xff}, // Adwaita color name @warning_bg_color - theme.ColorOrange: color.RGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 - theme.ColorPurple: color.RGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 - theme.ColorRed: color.RGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @red_4 - theme.ColorYellow: color.RGBA{R: 0xf6, G: 0xd3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 + theme.ColorBlue: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 + theme.ColorBrown: color.NRGBA{R: 0x98, G: 0x6a, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 + theme.ColorGray: color.NRGBA{R: 0x5e, G: 0x5c, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 + theme.ColorGreen: color.NRGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @green_5 + theme.ColorNameBackground: color.NRGBA{R: 0x24, G: 0x24, B: 0x24, A: 0xff}, // Adwaita color name @window_bg_color + theme.ColorNameButton: color.NRGBA{R: 0x30, G: 0x30, B: 0x30, A: 0xff}, // Adwaita color name @headerbar_bg_color + theme.ColorNameError: color.NRGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @error_bg_color + theme.ColorNameForeground: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}, // Adwaita color name @window_fg_color + theme.ColorNameInputBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameOverlayBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNamePrimary: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameScrollBar: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x5b}, // Adwaita color name @light_1 + theme.ColorNameSelection: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameShadow: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @shade_color + theme.ColorNameSuccess: color.NRGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @success_bg_color + theme.ColorNameWarning: color.NRGBA{R: 0xcd, G: 0x93, B: 0x09, A: 0xff}, // Adwaita color name @warning_bg_color + theme.ColorOrange: color.NRGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 + theme.ColorPurple: color.NRGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 + theme.ColorRed: color.NRGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @red_4 + theme.ColorYellow: color.NRGBA{R: 0xf6, G: 0xd3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 } var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ - theme.ColorBlue: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 - theme.ColorBrown: color.RGBA{R: 0x98, G: 0x6A, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 - theme.ColorGray: color.RGBA{R: 0x5e, G: 0x5C, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 - theme.ColorGreen: color.RGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @green_4 - theme.ColorNameBackground: color.RGBA{R: 0xfa, G: 0xFA, B: 0xfa, A: 0xff}, // Adwaita color name @window_bg_color - theme.ColorNameButton: color.RGBA{R: 0xeb, G: 0xEB, B: 0xeb, A: 0xff}, // Adwaita color name @headerbar_bg_color - theme.ColorNameError: color.RGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @error_bg_color - theme.ColorNameForeground: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xcc}, // Adwaita color name @window_fg_color - theme.ColorNameInputBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameOverlayBackground: color.RGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNamePrimary: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameSelection: color.RGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color - theme.ColorNameShadow: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x11}, // Adwaita color name @shade_color - theme.ColorNameSuccess: color.RGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @success_bg_color - theme.ColorNameWarning: color.RGBA{R: 0xe5, G: 0xA5, B: 0x0a, A: 0xff}, // Adwaita color name @warning_bg_color - theme.ColorOrange: color.RGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 - theme.ColorPurple: color.RGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 - theme.ColorRed: color.RGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @red_3 - theme.ColorYellow: color.RGBA{R: 0xf6, G: 0xD3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 + theme.ColorBlue: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @blue_3 + theme.ColorBrown: color.NRGBA{R: 0x98, G: 0x6A, B: 0x44, A: 0xff}, // Adwaita color name @brown_3 + theme.ColorGray: color.NRGBA{R: 0x5e, G: 0x5C, B: 0x64, A: 0xff}, // Adwaita color name @dark_2 + theme.ColorGreen: color.NRGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @green_4 + theme.ColorNameBackground: color.NRGBA{R: 0xfa, G: 0xFA, B: 0xfa, A: 0xff}, // Adwaita color name @window_bg_color + theme.ColorNameButton: color.NRGBA{R: 0xeb, G: 0xEB, B: 0xeb, A: 0xff}, // Adwaita color name @headerbar_bg_color + theme.ColorNameError: color.NRGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @error_bg_color + theme.ColorNameForeground: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xcc}, // Adwaita color name @window_fg_color + theme.ColorNameInputBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameOverlayBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNamePrimary: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameScrollBar: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @dark_5 + theme.ColorNameSelection: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameShadow: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x11}, // Adwaita color name @shade_color + theme.ColorNameSuccess: color.NRGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @success_bg_color + theme.ColorNameWarning: color.NRGBA{R: 0xe5, G: 0xA5, B: 0x0a, A: 0xff}, // Adwaita color name @warning_bg_color + theme.ColorOrange: color.NRGBA{R: 0xff, G: 0x78, B: 0x00, A: 0xff}, // Adwaita color name @orange_3 + theme.ColorPurple: color.NRGBA{R: 0x91, G: 0x41, B: 0xac, A: 0xff}, // Adwaita color name @purple_3 + theme.ColorRed: color.NRGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @red_3 + theme.ColorYellow: color.NRGBA{R: 0xf6, G: 0xD3, B: 0x2d, A: 0xff}, // Adwaita color name @yellow_3 } diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 16171ea6..6220fed2 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -61,13 +61,13 @@ import ( var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ {{- range $key, $value := .DarkScheme }} - {{ $key }}: {{ printf "color.RGBA{R: 0x%02x, G: 0x%02x, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} + {{ $key }}: {{ printf "color.NRGBA{R: 0x%02x, G: 0x%02x, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} {{- end }} } var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ {{- range $key, $value := .LightScheme }} - {{ $key }}: {{ printf "color.RGBA{R: 0x%02x, G: 0x%02X, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} + {{ $key }}: {{ printf "color.NRGBA{R: 0x%02x, G: 0x%02X, B: 0x%02x, A: 0x%02x}" $value.Col.R $value.Col.G $value.Col.B $value.Col.A }}, // Adwaita color name @{{$value.AdwName}} {{- end }} }` // the template where to bundle the icons in a map @@ -140,6 +140,8 @@ var ( "theme.ColorPurple": "purple_3", "theme.ColorBrown": "brown_3", "theme.ColorGray": "dark_2", + // specific + "theme.ColorNameScrollBar": "dark_5,light_1", // and we will change the alpha value later } // map to describe the icons to get from the Adwaita gitlab page and the name of the icon in the Fyne theme @@ -368,6 +370,13 @@ func generateColorScheme() error { if err != nil { return fmt.Errorf("failed to get dark color for %s: %w", darkColorName, err) } + + // special case, alpha channel is 0x5b for scrollbar + if colname == "theme.ColorNameScrollBar" { + lcol.A = 0x5b + dcol.A = 0x5b + } + lightScheme[colname] = colorInfo{ Col: lcol, AdwName: lightColorName, From 083362f6aec2b8dfc2949be2adf6eff4d403c126 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Mon, 3 Jul 2023 14:39:04 +0200 Subject: [PATCH 11/12] Fixup the color of selection and menu Actually, Adwaita doesn't document everything - at this time I need to decide which is the closer color using the theme on GNOME and comparing with a Fyne application. --- theme/adwaita_colors.go | 8 ++++---- theme/adwaita_theme_generator.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/theme/adwaita_colors.go b/theme/adwaita_colors.go index 1f62b40d..85b78be1 100644 --- a/theme/adwaita_colors.go +++ b/theme/adwaita_colors.go @@ -23,11 +23,11 @@ var adwaitaDarkScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorNameError: color.NRGBA{R: 0xc0, G: 0x1c, B: 0x28, A: 0xff}, // Adwaita color name @error_bg_color theme.ColorNameForeground: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}, // Adwaita color name @window_fg_color theme.ColorNameInputBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.NRGBA{R: 0x38, G: 0x38, B: 0x38, A: 0xff}, // Adwaita color name @popover_bg_color theme.ColorNameOverlayBackground: color.NRGBA{R: 0x1e, G: 0x1e, B: 0x1e, A: 0xff}, // Adwaita color name @view_bg_color theme.ColorNamePrimary: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color theme.ColorNameScrollBar: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0x5b}, // Adwaita color name @light_1 - theme.ColorNameSelection: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameSelection: color.NRGBA{R: 0x30, G: 0x30, B: 0x30, A: 0xff}, // Adwaita color name @headerbar_bg_color theme.ColorNameShadow: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @shade_color theme.ColorNameSuccess: color.NRGBA{R: 0x26, G: 0xa2, B: 0x69, A: 0xff}, // Adwaita color name @success_bg_color theme.ColorNameWarning: color.NRGBA{R: 0xcd, G: 0x93, B: 0x09, A: 0xff}, // Adwaita color name @warning_bg_color @@ -47,11 +47,11 @@ var adwaitaLightScheme = map[fyne.ThemeColorName]color.Color{ theme.ColorNameError: color.NRGBA{R: 0xe0, G: 0x1B, B: 0x24, A: 0xff}, // Adwaita color name @error_bg_color theme.ColorNameForeground: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xcc}, // Adwaita color name @window_fg_color theme.ColorNameInputBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color - theme.ColorNameMenuBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color + theme.ColorNameMenuBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @popover_bg_color theme.ColorNameOverlayBackground: color.NRGBA{R: 0xff, G: 0xFF, B: 0xff, A: 0xff}, // Adwaita color name @view_bg_color theme.ColorNamePrimary: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color theme.ColorNameScrollBar: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x5b}, // Adwaita color name @dark_5 - theme.ColorNameSelection: color.NRGBA{R: 0x35, G: 0x84, B: 0xe4, A: 0xff}, // Adwaita color name @accent_bg_color + theme.ColorNameSelection: color.NRGBA{R: 0xeb, G: 0xEB, B: 0xeb, A: 0xff}, // Adwaita color name @headerbar_bg_color theme.ColorNameShadow: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x11}, // Adwaita color name @shade_color theme.ColorNameSuccess: color.NRGBA{R: 0x2e, G: 0xC2, B: 0x7e, A: 0xff}, // Adwaita color name @success_bg_color theme.ColorNameWarning: color.NRGBA{R: 0xe5, G: 0xA5, B: 0x0a, A: 0xff}, // Adwaita color name @warning_bg_color diff --git a/theme/adwaita_theme_generator.go b/theme/adwaita_theme_generator.go index 6220fed2..fa99b3d5 100644 --- a/theme/adwaita_theme_generator.go +++ b/theme/adwaita_theme_generator.go @@ -115,10 +115,10 @@ var ( // map to describe the colors to get from the Adwaita page and the name of the color in the Fyne theme colorToGet = map[string]string{ - "theme.ColorNameBackground": "window_bg_color", // or "view_bg_color" - "theme.ColorNameForeground": "window_fg_color", // or "view_fg_color" - "theme.ColorNameMenuBackground": "view_bg_color", // not sure about this one - "theme.ColorNameSelection": "accent_bg_color", + "theme.ColorNameBackground": "window_bg_color", // or "view_bg_color" + "theme.ColorNameForeground": "window_fg_color", // or "view_fg_color" + "theme.ColorNameMenuBackground": "popover_bg_color", // not sure about this one + "theme.ColorNameSelection": "headerbar_bg_color", "theme.ColorNameOverlayBackground": "view_bg_color", // not sure about this one "theme.ColorNamePrimary": "accent_bg_color", // accent_color is the primary color for Adwaita "theme.ColorNameInputBackground": "view_bg_color", // or "window_bg_color" From 9d104824aaf743b7608ce346457fdaf0059768e8 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Fri, 6 Oct 2023 00:10:48 +0200 Subject: [PATCH 12/12] Remove the modified sizes --- theme/adwaita.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/theme/adwaita.go b/theme/adwaita.go index 6e46362e..7455b383 100644 --- a/theme/adwaita.go +++ b/theme/adwaita.go @@ -50,13 +50,5 @@ func (a *Adwaita) Icon(name fyne.ThemeIconName) fyne.Resource { // Size returns the size of the named resource for the current theme. func (a *Adwaita) Size(name fyne.ThemeSizeName) float32 { - switch name { - case theme.SizeNamePadding: - return 8 - case theme.SizeNameInlineIcon: - return 16 - case theme.SizeNameText: - return 12 - } return theme.DefaultTheme().Size(name) }