Use icons for file dialog favourites (#1186)

This PR adds icons to the file picker favourites buttons to make it look a bit better and to make it possible for the user to know what a favourite points to without reading the full name of it. To make that happen, I had to add icons for download, computer, document and storage.

dialog/file.go

@@ -160,13 +160,13 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 func (f *fileDialog) loadFavorites() []fyne.CanvasObject {
 	home, _ := os.UserHomeDir()
 	places := []fyne.CanvasObject{
-		widget.NewButton("Home", func() {
+		widget.NewButtonWithIcon("Home", theme.HomeIcon(), func() {
 			f.setDirectory(home)
 		}),
-		widget.NewButton("Documents", func() {
+		widget.NewButtonWithIcon("Documents", theme.DocumentIcon(), func() {
 			f.setDirectory(filepath.Join(home, "Documents"))
 		}),
-		widget.NewButton("Downloads", func() {
+		widget.NewButtonWithIcon("Downloads", theme.DownloadIcon(), func() {
 			f.setDirectory(filepath.Join(home, "Downloads"))
 		}),
 	}

dialog/file_other.go

@@ -4,11 +4,12 @@ package dialog
 
 import (
 	"fyne.io/fyne"
+	"fyne.io/fyne/theme"
 	"fyne.io/fyne/widget"
 )
 
 func (f *fileDialog) loadPlaces() []fyne.CanvasObject {
-	return []fyne.CanvasObject{widget.NewButton("Computer", func() {
+	return []fyne.CanvasObject{widget.NewButtonWithIcon("Computer", theme.ComputerIcon(), func() {
 		f.setDirectory("/")
 	})}
 }

dialog/file_windows.go

@@ -6,6 +6,7 @@ import (
 	"syscall"
 
 	"fyne.io/fyne"
+	"fyne.io/fyne/theme"
 	"fyne.io/fyne/widget"
 )
 
@@ -50,7 +51,7 @@ func (f *fileDialog) loadPlaces() []fyne.CanvasObject {
 
 	for _, drive := range listDrives() {
 		driveRoot := drive + string(os.PathSeparator) // capture loop var
-		places = append(places, widget.NewButton(drive, func() {
+		places = append(places, widget.NewButtonWithIcon(drive, theme.StorageIcon(), func() {
 			f.setDirectory(driveRoot)
 		}))
 	}

theme/gen.go

@@ -117,6 +117,7 @@ func main() {
 	bundleIcon("content-redo", f)
 	bundleIcon("content-undo", f)
 
+	bundleIcon("document", f)
 	bundleIcon("document-create", f)
 	bundleIcon("document-print", f)
 	bundleIcon("document-save", f)
@@ -174,5 +175,9 @@ func main() {
 	bundleIcon("visibility", f)
 	bundleIcon("visibility-off", f)
 
+	bundleIcon("download", f)
+	bundleIcon("computer", f)
+	bundleIcon("storage", f)
+
 	f.Close()
 }

theme/icons.go

@@ -86,19 +86,19 @@ func colorizeResource(res fyne.Resource, clr color.Color) []byte {
 }
 
 var (
-	cancel, confirm, delete, search, searchReplace, menu, menuExpand            *ThemedResource
-	checked, unchecked, radioButton, radioButtonChecked                         *ThemedResource
-	contentAdd, contentRemove, contentCut, contentCopy, contentPaste            *ThemedResource
-	contentRedo, contentUndo, info, question, warning                           *ThemedResource
-	documentCreate, documentPrint, documentSave                                 *ThemedResource
-	mailAttachment, mailCompose, mailForward, mailReply, mailReplyAll, mailSend *ThemedResource
-	mediaFastForward, mediaFastRewind, mediaPause, mediaPlay                    *ThemedResource
-	mediaRecord, mediaReplay, mediaSkipNext, mediaSkipPrevious                  *ThemedResource
-	arrowBack, arrowDown, arrowForward, arrowUp, arrowDropDown, arrowDropUp     *ThemedResource
-	file, fileApplication, fileAudio, fileImage, fileText, fileVideo            *ThemedResource
-	folder, folderNew, folderOpen, help, home, settings                         *ThemedResource
-	viewFullScreen, viewRefresh, viewZoomFit, viewZoomIn, viewZoomOut           *ThemedResource
-	visibility, visibilityOff, volumeDown, volumeMute, volumeUp                 *ThemedResource
+	cancel, confirm, delete, search, searchReplace, menu, menuExpand                *ThemedResource
+	checked, unchecked, radioButton, radioButtonChecked                             *ThemedResource
+	contentAdd, contentRemove, contentCut, contentCopy, contentPaste                *ThemedResource
+	contentRedo, contentUndo, info, question, warning                               *ThemedResource
+	document, documentCreate, documentPrint, documentSave                           *ThemedResource
+	mailAttachment, mailCompose, mailForward, mailReply, mailReplyAll, mailSend     *ThemedResource
+	mediaFastForward, mediaFastRewind, mediaPause, mediaPlay                        *ThemedResource
+	mediaRecord, mediaReplay, mediaSkipNext, mediaSkipPrevious                      *ThemedResource
+	arrowBack, arrowDown, arrowForward, arrowUp, arrowDropDown, arrowDropUp         *ThemedResource
+	file, fileApplication, fileAudio, fileImage, fileText, fileVideo                *ThemedResource
+	folder, folderNew, folderOpen, help, home, settings, storage                    *ThemedResource
+	viewFullScreen, viewRefresh, viewZoomFit, viewZoomIn, viewZoomOut               *ThemedResource
+	visibility, visibilityOff, volumeDown, volumeMute, volumeUp, download, computer *ThemedResource
 )
 
 func init() {
@@ -123,6 +123,7 @@ func init() {
 	contentRedo = NewThemedResource(contentredoIconRes, nil)
 	contentUndo = NewThemedResource(contentundoIconRes, nil)
 
+	document = NewThemedResource(documentIconRes, nil)
 	documentCreate = NewThemedResource(documentcreateIconRes, nil)
 	documentPrint = NewThemedResource(documentprintIconRes, nil)
 	documentSave = NewThemedResource(documentsaveIconRes, nil)
@@ -179,6 +180,10 @@ func init() {
 	volumeDown = NewThemedResource(volumedownIconRes, nil)
 	volumeMute = NewThemedResource(volumemuteIconRes, nil)
 	volumeUp = NewThemedResource(volumeupIconRes, nil)
+
+	download = NewThemedResource(downloadIconRes, nil)
+	computer = NewThemedResource(computerIconRes, nil)
+	storage = NewThemedResource(storageIconRes, nil)
 }
 
 // FyneLogo returns a resource containing the Fyne logo
@@ -281,6 +286,11 @@ func ContentUndoIcon() fyne.Resource {
 	return contentUndo
 }
 
+// DocumentIcon returns a resource containing the standard document icon for the current theme
+func DocumentIcon() fyne.Resource {
+	return document
+}
+
 // DocumentCreateIcon returns a resource containing the standard document create icon for the current theme
 func DocumentCreateIcon() fyne.Resource {
 	return documentCreate
@@ -525,3 +535,18 @@ func VolumeMuteIcon() fyne.Resource {
 func VolumeUpIcon() fyne.Resource {
 	return volumeUp
 }
+
+// ComputerIcon returns a resource containing the standard computer icon for the current theme
+func ComputerIcon() fyne.Resource {
+	return computer
+}
+
+// DownloadIcon returns a resource containing the standard download icon for the current theme
+func DownloadIcon() fyne.Resource {
+	return download
+}
+
+// StorageIcon returns a resource containing the standard storage icon for the current theme
+func StorageIcon() fyne.Resource {
+	return storage
+}