Permalink
Browse files

Include higher-resolution icons

Load icons as TIFF with multiple images (for different resolutions).

Conflicts:

	Makefile.in
	aquamacs/src/site-lisp/aquamacs-tool-bar.el
	lisp/tool-bar.el
	src/nsimage.m
  • Loading branch information...
1 parent 6299dad commit 46c87481390f2e5894aa2cf0f48a8c438c019613 @davidswelt committed Jun 30, 2012
Showing with 44 additions and 22 deletions.
  1. +16 −16 Makefile.in
  2. +15 −2 aquamacs/Icons/build/COPYING
  3. BIN aquamacs/Icons/build/backward.png
  4. BIN aquamacs/Icons/build/backward.tiff
  5. BIN aquamacs/Icons/build/bibtex.png
  6. BIN aquamacs/Icons/build/bibtex.tiff
  7. BIN aquamacs/Icons/build/close.png
  8. BIN aquamacs/Icons/build/close.tiff
  9. BIN aquamacs/Icons/build/copy.png
  10. BIN aquamacs/Icons/build/copy.tiff
  11. BIN aquamacs/Icons/build/cut.png
  12. BIN aquamacs/Icons/build/cut.tiff
  13. BIN aquamacs/Icons/build/forward.png
  14. BIN aquamacs/Icons/build/forward.tiff
  15. BIN aquamacs/Icons/build/help.dis.tiff
  16. BIN aquamacs/Icons/build/help.png
  17. BIN aquamacs/Icons/build/help.tiff
  18. BIN aquamacs/Icons/build/history.png
  19. BIN aquamacs/Icons/build/history.tiff
  20. BIN aquamacs/Icons/build/home.png
  21. BIN aquamacs/Icons/build/home.tiff
  22. BIN aquamacs/Icons/build/new.png
  23. BIN aquamacs/Icons/build/new.tiff
  24. BIN aquamacs/Icons/build/open.png
  25. BIN aquamacs/Icons/build/open.tiff
  26. BIN aquamacs/Icons/build/paste.png
  27. BIN aquamacs/Icons/build/paste.tiff
  28. BIN aquamacs/Icons/build/preferences.png
  29. BIN aquamacs/Icons/build/preferences.tiff
  30. BIN aquamacs/Icons/build/print.png
  31. BIN aquamacs/Icons/build/print.tiff
  32. BIN aquamacs/Icons/build/redo.png
  33. BIN aquamacs/Icons/build/redo.tiff
  34. BIN aquamacs/Icons/build/save.png
  35. BIN aquamacs/Icons/build/save.tiff
  36. BIN aquamacs/Icons/build/saveas.png
  37. BIN aquamacs/Icons/build/saveas.tiff
  38. BIN aquamacs/Icons/build/search.png
  39. BIN aquamacs/Icons/build/search.tiff
  40. BIN aquamacs/Icons/build/stop.png
  41. BIN aquamacs/Icons/build/stop.tiff
  42. BIN aquamacs/Icons/build/undo.png
  43. BIN aquamacs/Icons/build/undo.tiff
  44. BIN aquamacs/Icons/build/update.tiff
  45. BIN aquamacs/Icons/history.png
  46. +4 −1 aquamacs/Icons/make-xpm
  47. BIN aquamacs/Icons/update.png
  48. +1 −0 aquamacs/doc/latex/changelog.tex
  49. +3 −1 aquamacs/src/site-lisp/aquamacs-tool-bar.el
  50. +4 −1 lisp/tool-bar.el
  51. +1 −1 src/nsimage.m
View
32 Makefile.in
@@ -449,7 +449,7 @@ AQUAMACS_APPLE_VERSION=${AQUAMACS_MAIN_VERSION}.${HEADDATE}# string with integer
install-aquamacs: mkdir
if test "${ns_appdir}" != ""; then \
- ( cp $(AQUAMACS_DIR)/Icons/build/*.png $(ns_appresdir)/etc/images/ ; \
+ ( cp $(AQUAMACS_DIR)/Icons/build/*.tiff $(AQUAMACS_DIR)/Icons/build/*.png $(ns_appresdir)/etc/images/ ; \
cd $(ns_appresdir) ; \
cp -r $(AQUAMACS_DIR)/src/commandline-tool/Aquamacs\ Command\ Line\ Tool.mpkg .; \
cd - >/dev/null ; \
@@ -518,26 +518,26 @@ install-arch-indep: mkdir info install-etc
[ -d $${dir} ] \
&& [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
&& (echo "Copying $${dir} to $${dest}..." ; \
- (cd $${dir}; tar -chf - . ) \
- | (cd $${dest}; umask 022; \
+ (cd $${dir}; tar -chf - . ) \
+ | (cd $${dest}; umask 022; \
tar -xf - && cat > /dev/null) || exit 1; \
find $${dest} -exec chown $${installuser} {} ';' ;\
for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
chmod a+rx $${subdir} ; \
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
rm -f $${subdir}/.cvsignore ; \
- rm -f $${subdir}/.gitignore ; \
- rm -f $${subdir}/.arch-inventory ; \
- rm -f $${subdir}/.DS_Store ; \
- rm -f $${subdir}/\#* ; \
- rm -f $${subdir}/.\#* ; \
- rm -f $${subdir}/*~ ; \
- rm -f $${subdir}/*.orig ; \
+ rm -f $${subdir}/.gitignore ; \
+ rm -f $${subdir}/.arch-inventory ; \
+ rm -f $${subdir}/.DS_Store ; \
+ rm -f $${subdir}/\#* ; \
+ rm -f $${subdir}/.\#* ; \
+ rm -f $${subdir}/*~ ; \
+ rm -f $${subdir}/*.orig ; \
[ "$${dir}" != "${srcdir}/etc" ] && \
rm -f $${subdir}/[mM]akefile*.c $${subdir}/[mM]akefile*[.-]in \
$${subdir}/[mM]akefile ; \
- rm -f $${subdir}/ChangeLog* ; \
+ rm -f $${subdir}/ChangeLog* ; \
rm -f $${subdir}/dired.todo ; \
done) ; \
done
@@ -573,7 +573,7 @@ install-arch-indep: mkdir info install-etc
(cd ./etc; tar -chf - $${docfile}) \
|(cd $(DESTDIR)${docdir}; umask 022; tar -xf - && cat > /dev/null) || exit 1; \
(cd $(DESTDIR)$(docdir); \
- $(set_installuser); \
+ $(set_installuser); \
chown $${installuser} DOC*; chmod a+r DOC*; \
if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
else true; fi
@@ -618,7 +618,7 @@ install-arch-indep: mkdir info install-etc
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
chmod a+r $(DESTDIR)${infodir}/$$f; \
test "$ff" != "dir" && test "${GZIP_PROG}" && \
- ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
+ ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
done; \
done); \
else true; fi
@@ -628,8 +628,8 @@ install-arch-indep: mkdir info install-etc
then \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- (cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+ (cd $${thisdir}; \
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
else true; fi
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
@@ -851,7 +851,7 @@ dist:
.PHONY: info dvi dist check html
-info-real:
+info-real:
(cd doc/emacs; $(MAKE) $(MFLAGS) info)
(cd doc/misc; $(MAKE) $(MFLAGS) info)
(cd doc/lispref; $(MAKE) $(MFLAGS) info)
View
17 aquamacs/Icons/build/COPYING
@@ -2,14 +2,27 @@ Aquamacs Icon set
-`new_window', `history', `tab_new', `view_bottom':
+`new_window', `tab_new', `view_bottom':
(C) Copyright 2007, Nuovext project
http://nuovext.pwsp.net/
Licensed under the GPL. These icons may be redistributed
under the GNU Public License 2.
-`Preferences', `update', `circle_stop', `bibtex', `pdftex', `tex':
+`history'
+
+ (C) Copyright 2007, David Vignoni
+ http://www.icon-king.com
+ http://commons.wikimedia.org/wiki/File:Nuvola_apps_clock.png
+ Licensed under the LGPL.
+
+`update'
+ (C) MySite Myway
+ http://icons.mysitemyway.com/black-white-pearls-icons-arrows/#full-set
+ free license
+
+
+`Preferences', `circle_stop', `bibtex', `pdftex', `tex':
(C) Copyright 2007 by Jasper Hauser
All rights reserved.
View
BIN aquamacs/Icons/build/backward.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/backward.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/bibtex.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/bibtex.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/close.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/close.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/copy.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/copy.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/cut.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/cut.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/forward.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/forward.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/help.dis.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/help.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/help.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/history.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/history.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/home.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/home.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/new.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/new.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/open.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/open.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/paste.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/paste.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/preferences.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/preferences.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/print.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/print.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/redo.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/redo.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/save.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/save.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/saveas.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/saveas.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/search.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/search.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/stop.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/stop.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/undo.png
Deleted file not rendered
View
BIN aquamacs/Icons/build/undo.tiff
Binary file not shown.
View
BIN aquamacs/Icons/build/update.tiff
Binary file not shown.
View
BIN aquamacs/Icons/history.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
5 aquamacs/Icons/make-xpm
@@ -64,7 +64,10 @@ do
#convert "$P/$file" -resize x32 $file
convert "$P/$file" -resize x28 -matte -bordercolor none -border 2 $file
-
+convert "$P/$file" -matte -bordercolor none -border 2 $BASE\@2x.png
+convert $file $BASE\@2x.png $BASE.tiff
+rm $file $BASE\@2x.png
+# tiffutil won't work due to a conflict between libjpeg and libJPEG
#convert p2.png -resize x32 /Applications/Aquamacs\ Emacs.app/Contents/Resources/etc/images/print.png
View
BIN aquamacs/Icons/update.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1 aquamacs/doc/latex/changelog.tex
@@ -8,6 +8,7 @@ \subsection{Changes--- dev}
\item S-tab no longer mapped to C-y (ASCII 25, end of medium). Now properly handled as backtab. Patch by Gracjan Polak.
\item Full-screen now supports the standard Mac OS X 10.7 ``Lion'' full-screen mode: The frame takes up the full (main) display and uses its own screen. Users may switch between screens as usual (mouse swipe or C-left/right, for instance). The old-style fullscreen mode is still available, however. To maximize a frame on the current space, allowing other frames on this space, type C-u A-S-Return, or prepend any of the commands that enter fullscreen mode with C-u.
Thanks for research: Sandy Patterson and Daisuke Murase.
+\item Retina displays are now supported (higher-resolution artwork is included in most cases).
\item Aquamacs now provides experimental session persistency: you can load and save sessions. Use the new {\em Load Session, Save Session As} menu entries in the {\em File} menu to use these new functions. Note: Unlike the formerly available functions from the `desktop' package, all frames, windows, tabs, buffers and some customizations are saved. Buffers not linked to a file, such as those showing processes, will not be restored, and frames may not end up on the same space at this time. Aquamacs now includes an adapted version of the {\tt revive.el} package by Hirose Yuuji. We recommend that you do not load a different version of this package yourself.
% , and under Mac OS X 10.7 or later, sessions are reguarily saved and restored in case of unexpected program termination or reboot
% and the new customization variable `revive-desktop-after-launching' to turn the behavior off, or enable automatic session persistency even on pre-Lion operating systems
View
4 aquamacs/src/site-lisp/aquamacs-tool-bar.el
@@ -116,7 +116,9 @@
:image (vector img img) ;; 1st: Emacs, 2nd: XEma
:help ""))))))
(reverse (cdr keymap))) meaning))
-
+
+(require 'image)
+
;; this to overwrite the tool-bar setup function
; (aquamacs-tool-bar-setup)
(defun aquamacs-tool-bar-setup ()
View
5 lisp/tool-bar.el
@@ -93,6 +93,9 @@ E.g. foo_dis.xpm becomes foo_sel.xpm if EXTENSION is '_sel'."
nil
(list :type 'xpm :file
(concat "low-color/" icon ".xpm"))))
+ (tiff-spec (if (image-type-available-p 'png)
+ (list :type 'png :file (concat icon ".tiff")
+ :background "grey")))
(png-spec (if (image-type-available-p 'png)
(list :type 'png :file (concat icon ".png")
:background "grey")))
@@ -104,7 +107,7 @@ E.g. foo_dis.xpm becomes foo_sel.xpm if EXTENSION is '_sel'."
;; (list png-spec xpm-lo-spec xpm-spec pbm-spec xbm-spec)
;; (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
(format-spec (if tool-bar-load-png-only
- (list png-spec)
+ (list tiff-spec png-spec)
(list png-spec xpm-lo-spec xpm-spec pbm-spec xbm-spec)))
(image (find-image format-spec))
(image-sel (find-image
View
2 src/nsimage.m
@@ -95,7 +95,7 @@ Updated by Christian Limpach (chris@nice.ch)
else
{
NSData *data = [NSData dataWithBytes: SDATA (spec_data)
- length: SBYTES (spec_data)];
+ length: SBYTES (spec_data)];
eImg = [[EmacsImage alloc] initWithData: data];
[eImg setPixmapData];
}

0 comments on commit 46c8748

Please sign in to comment.