diff options
author | Clément Pit--Claudel <clement.pitclaudel@live.com> | 2016-05-24 23:28:08 -0400 |
---|---|---|
committer | Clément Pit--Claudel <clement.pitclaudel@live.com> | 2016-05-24 23:28:08 -0400 |
commit | adbaafb96696f7cd65c53ecad71aac095bee1338 (patch) | |
tree | c2ec2cc4606bc8ef77e99a476307d19bb5e02fdc | |
parent | aff6697e7c2ad645ad54d29da12d65aded5e038a (diff) |
Update PG's logo
The new art is a contribution of Yoshihiro Imai
(http://proofcafe.org/~yoshihiro503/), first released at
https://github.com/yoshihiro503/generaltan and kindly made available
under the terms of the GPL. Many thanks!
16 files changed, 27 insertions, 50 deletions
diff --git a/doc/ProofGeneral-image.jpg b/doc/ProofGeneral-image.jpg Binary files differindex ab45a0d9..85babf1b 100644 --- a/doc/ProofGeneral-image.jpg +++ b/doc/ProofGeneral-image.jpg diff --git a/etc/desktop/icons/16x16/proofgeneral.png b/etc/desktop/icons/16x16/proofgeneral.png Binary files differindex 276c5d29..50a4bc5e 100644 --- a/etc/desktop/icons/16x16/proofgeneral.png +++ b/etc/desktop/icons/16x16/proofgeneral.png diff --git a/etc/desktop/icons/32x32/proofgeneral.png b/etc/desktop/icons/32x32/proofgeneral.png Binary files differindex 576e97cf..9e5cdbfc 100644 --- a/etc/desktop/icons/32x32/proofgeneral.png +++ b/etc/desktop/icons/32x32/proofgeneral.png diff --git a/etc/desktop/icons/48x48/proofgeneral.png b/etc/desktop/icons/48x48/proofgeneral.png Binary files differindex 984a7f77..148bbe6c 100644 --- a/etc/desktop/icons/48x48/proofgeneral.png +++ b/etc/desktop/icons/48x48/proofgeneral.png diff --git a/generic/proof-site.el b/generic/proof-site.el index 11d84715..f2c9dafe 100644 --- a/generic/proof-site.el +++ b/generic/proof-site.el @@ -81,7 +81,7 @@ (string-match "Version \\([^ ]+\\)\\." proof-general-version) (match-string 1 proof-general-version)))) -(defconst proof-general-version-year "2015") +(defconst proof-general-version-year "2016") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; diff --git a/generic/proof-splash.el b/generic/proof-splash.el index 19516af4..6bc20998 100644 --- a/generic/proof-splash.el +++ b/generic/proof-splash.el @@ -46,38 +46,35 @@ Proof General." (defcustom proof-splash-contents '(list - nil - (proof-get-image "pg-text" t) - nil - (proof-get-image "ProofGeneral-image") + (proof-get-image "ProofGeneral-splash.png") nil "Welcome to" (concat proof-assistant " Proof General!") nil (concat "Version " proof-general-short-version ".") nil - (concat "(C) LFCS, University of Edinburgh " proof-general-version-year) + (concat "© LFCS, University of Edinburgh & contributors " proof-general-version-year) nil nil :link '(" Read the " "Proof General documentation" - (lambda (button) (info "ProofGeneral"))) - :link '(" Please report problems at " - "Proof General trac" - (lambda (button) - (browse-url "http://proofgeneral.inf.ed.ac.uk/trac")) - "Report bugs at http://proofgeneral.inf.ed.ac.uk/trac") - :link '("Visit the " "Proof General wiki" - (lambda (button) - (browse-url "http://proofgeneral.inf.ed.ac.uk/wiki")) - "Write lots of helpful things at http://proofgeneral.inf.ed.ac.uk/wiki") + (lambda (button) (info "ProofGeneral"))) + :link '(" Please report problems on the " + "Github issue tracker" + (lambda (button) + (browse-url "https://github.com/ProofGeneral/PG/issues")) + "Report bugs at https://github.com/ProofGeneral/PG") + :link '("Visit the " "Proof General Github page" + (lambda (button) + (browse-url "https://github.com/ProofGeneral/PG")) + "PG is on Github at https://github.com/ProofGeneral/PG") :link '("or the " "homepage" - (lambda (button) - (browse-url "http://proofgeneral.inf.ed.ac.uk/")) - "Browse http://proofgeneral.inf.ed.ac.uk/") + (lambda (button) + (browse-url "http://proofgeneral.inf.ed.ac.uk/")) + "Browse http://proofgeneral.inf.ed.ac.uk/") nil - :link '("Find out about Emacs on the Help menu -- start with the " - "Emacs Tutorial" (lambda (button) (help-with-tutorial))) + :link '("Find out about Emacs on the Help menu -- start with the " + "Emacs Tutorial" (lambda (button) (help-with-tutorial))) nil "See this screen again with Proof-General -> About" ) @@ -117,27 +114,12 @@ If it is nil, a new line is inserted." (and (listp img) (eq (car img) 'image))) -(defun proof-get-image (name &optional nojpeg default) - "Construct an image instantiator for an image, or string failing that. -Different formats are chosen from according to what can be displayed. -Unless NOJPEG is set, try jpeg first. Then try gif, then xpm. -Gif filename depends on colour depth of display. -DEFAULT gives return value in case image not valid." - (let ((jpg (vector 'jpeg :file - (concat proof-images-directory name ".jpg"))) - (gif (vector 'gif :file - (concat proof-images-directory ".gif"))) - img) - (cond - (window-system - (find-image - (list - (list :type 'jpeg - :file (concat proof-images-directory name ".jpg")) - (list :type 'gif - :file (concat proof-images-directory name ".gif"))))) - (t - (or default (concat "[ image " name " ]")))))) +(defun proof-get-image (name) + "Load a PNG image NAME, or string on TTYs." + (if (display-graphic-p) + (find-image + `((:type png :file ,(expand-file-name name proof-images-directory)))) + (concat "[ image " name " ]"))) (defvar proof-splash-timeout-conf nil "Holds timeout ID and previous window config for proof splash screen.") diff --git a/images/ProofGeneral-splash.png b/images/ProofGeneral-splash.png Binary files differnew file mode 100644 index 00000000..a1006f9f --- /dev/null +++ b/images/ProofGeneral-splash.png diff --git a/images/ProofGeneral.png b/images/ProofGeneral.png Binary files differnew file mode 100644 index 00000000..bc372424 --- /dev/null +++ b/images/ProofGeneral.png diff --git a/images/README b/images/README index 9bba39f7..25a79fda 100644 --- a/images/README +++ b/images/README @@ -18,11 +18,6 @@ to the PG graphics repository. David Aspinall <da@inf.ed.ac.uk> - - - - - - - - +The 2016 “chibi” icons were contributed by Yoshihiro Imai +(http://proofcafe.org/~yoshihiro503/). They are available under the terms of the +GPL, and were originally released at https://github.com/yoshihiro503/generaltan.
\ No newline at end of file diff --git a/previous-art/doc/ProofGeneral-image.jpg b/previous-art/doc/ProofGeneral-image.jpg Binary files differnew file mode 100644 index 00000000..ab45a0d9 --- /dev/null +++ b/previous-art/doc/ProofGeneral-image.jpg diff --git a/previous-art/etc/desktop/icons/16x16/proofgeneral.png b/previous-art/etc/desktop/icons/16x16/proofgeneral.png Binary files differnew file mode 100644 index 00000000..276c5d29 --- /dev/null +++ b/previous-art/etc/desktop/icons/16x16/proofgeneral.png diff --git a/previous-art/etc/desktop/icons/32x32/proofgeneral.png b/previous-art/etc/desktop/icons/32x32/proofgeneral.png Binary files differnew file mode 100644 index 00000000..576e97cf --- /dev/null +++ b/previous-art/etc/desktop/icons/32x32/proofgeneral.png diff --git a/previous-art/etc/desktop/icons/48x48/proofgeneral.png b/previous-art/etc/desktop/icons/48x48/proofgeneral.png Binary files differnew file mode 100644 index 00000000..984a7f77 --- /dev/null +++ b/previous-art/etc/desktop/icons/48x48/proofgeneral.png diff --git a/images/ProofGeneral-image.gif b/previous-art/images/ProofGeneral-image.gif Binary files differindex 4f83fb95..4f83fb95 100644 --- a/images/ProofGeneral-image.gif +++ b/previous-art/images/ProofGeneral-image.gif diff --git a/images/ProofGeneral-image.jpg b/previous-art/images/ProofGeneral-image.jpg Binary files differindex d2c430cd..d2c430cd 100644 --- a/images/ProofGeneral-image.jpg +++ b/previous-art/images/ProofGeneral-image.jpg diff --git a/previous-art/images/ProofGeneral-splash.png b/previous-art/images/ProofGeneral-splash.png Binary files differnew file mode 100644 index 00000000..9f90884c --- /dev/null +++ b/previous-art/images/ProofGeneral-splash.png |