diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor index 2fba79ad1e..ba7dd4d95e 100644 --- a/basis/tools/deploy/unix/unix.factor +++ b/basis/tools/deploy/unix/unix.factor @@ -6,17 +6,17 @@ tools.deploy.backend tools.deploy.config tools.deploy.config.editor vocabs.loader vocabs.metadata ; IN: tools.deploy.unix -: used-ico ( vocab -- ico ) - dup vocab-windows-icon-path vocab-append-path - [ exists? ] keep "vocab:ui/backend/gtk/icon.ico" ? ; +: used-icon ( vocab -- ico ) + dup vocab-dir "icon.png" append-path vocab-append-path + [ exists? ] keep "vocab:ui/backend/gtk/icon.png" ? ; -: copy-ico ( vocab bundle-name -- ) - [ used-ico ] - [ "ui/backend/gtk/icon.ico" append-path ] bi* +: copy-icon ( vocab bundle-name -- ) + [ used-icon ] + [ "ui/backend/gtk/icon.png" append-path ] bi* copy-file ; : create-app-dir ( vocab bundle-name -- vm ) - [ copy-vm ] [ copy-ico ] 2bi + [ copy-vm ] [ copy-icon ] 2bi dup OCT: 755 set-file-permissions ; : bundle-name ( -- str ) diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor index 2e0a776dfe..57b406f6fd 100644 --- a/basis/ui/backend/gtk/gtk.factor +++ b/basis/ui/backend/gtk/gtk.factor @@ -270,7 +270,7 @@ SYMBOL: next-timeout ! This file is not in a resource.txt because it can be ! overwritten when deploying. See 'Vocabulary icons' ! in the docs. - "vocab:ui/backend/gtk/icon.ico" + "vocab:ui/backend/gtk/icon.png" normalize-path utf8 string>alien { { pointer: GError initial: f } } [ gtk_window_set_default_icon_from_file ] with-out-parameters diff --git a/basis/ui/backend/gtk/icon.ico b/basis/ui/backend/gtk/icon.ico deleted file mode 100644 index 1df40e3d4e..0000000000 Binary files a/basis/ui/backend/gtk/icon.ico and /dev/null differ diff --git a/basis/ui/backend/gtk/icon.png b/basis/ui/backend/gtk/icon.png new file mode 100644 index 0000000000..a1da637d21 Binary files /dev/null and b/basis/ui/backend/gtk/icon.png differ diff --git a/core/vocabs/loader/loader-docs.factor b/core/vocabs/loader/loader-docs.factor index 0224ec9450..033479f910 100755 --- a/core/vocabs/loader/loader-docs.factor +++ b/core/vocabs/loader/loader-docs.factor @@ -28,7 +28,12 @@ ARTICLE: "vocabs.roots" "Vocabulary roots" { $subsections "add-vocab-roots" } ; ARTICLE: "vocabs.icons" "Vocabulary icons" -"An icon file representing the vocabulary can be provided for use by " { $link "tools.deploy" } ". A file named " { $snippet "icon.ico" } " will be used as the application icon when the application is deployed on Windows, Linux or the *BSD. A file named " { $snippet "icon.icns" } " will be used when the application is deployed on MacOS X." ; +"An icon file representing the vocabulary can be provided for use by " { $link "tools.deploy" } ". If any of the following files exist inside the vocabulary directory, they will be used as icons when the application is deployed." +{ $list + { { $snippet "icon.ico" } " on Windows" } + { { $snippet "icon.icns" } " on MacOS X" } + { { $snippet "icon.png" } " on Linux and *BSD" } +} ; ARTICLE: "vocabs.loader" "Vocabulary loader" "The " { $link POSTPONE: USE: } " and " { $link POSTPONE: USING: } " words load vocabularies using the vocabulary loader. The vocabulary loader is implemented in the " { $vocab-link "vocabs.loader" } " vocabulary." diff --git a/extra/hello-ui/deploy.factor b/extra/hello-ui/deploy.factor index ceff9857cb..cf851f5a95 100644 --- a/extra/hello-ui/deploy.factor +++ b/extra/hello-ui/deploy.factor @@ -5,7 +5,7 @@ H{ { deploy-c-types? f } { deploy-unicode? f } { "stop-after-last-window?" t } - { deploy-io 1 } + { deploy-io 2 } { deploy-reflection 1 } { deploy-word-props? f } { deploy-math? t }