diff options
-rw-r--r-- | Makefile.am | 17 | ||||
-rw-r--r-- | Makefile.in | 16 | ||||
-rw-r--r-- | data/pixmaps/camorama-webcam-16.png | bin | 1090 -> 0 bytes | |||
-rw-r--r-- | data/pixmaps/camorama-webcam-24.png | bin | 1724 -> 0 bytes | |||
-rw-r--r-- | pixmaps/camorama-128.png | bin | 0 -> 17400 bytes | |||
-rw-r--r-- | pixmaps/camorama-16.png | bin | 0 -> 826 bytes | |||
-rw-r--r-- | pixmaps/camorama-24.png | bin | 0 -> 1405 bytes | |||
-rw-r--r-- | pixmaps/camorama-256.png | bin | 0 -> 41605 bytes | |||
-rw-r--r-- | pixmaps/camorama-32.png | bin | 0 -> 2211 bytes | |||
-rw-r--r-- | pixmaps/camorama-48.png | bin | 0 -> 4033 bytes | |||
-rw-r--r-- | pixmaps/camorama-512.png | bin | 0 -> 99627 bytes | |||
-rw-r--r-- | pixmaps/camorama-64.png | bin | 0 -> 6232 bytes | |||
-rw-r--r-- | pixmaps/camorama.png | bin | 3113 -> 0 bytes | |||
-rw-r--r-- | pixmaps/camorama.xpm | 63 | ||||
-rw-r--r-- | src/camorama-stock-items.c | 10 |
15 files changed, 26 insertions, 80 deletions
diff --git a/Makefile.am b/Makefile.am index d1496a1..95c6e66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,10 +14,7 @@ EXTRA_DIST = \ autogen.sh \ camorama.1 \ camorama.desktop.in \ - camorama.appdata.xml.in \ - data/pixmaps/camorama-webcam-16.png \ - data/pixmaps/camorama-webcam-24.png - + camorama.appdata.xml.in CLEANFILES=\ camorama.desktop \ @@ -26,9 +23,14 @@ CLEANFILES=\ pixmapdir = $(datadir)/pixmaps -install-data-local: +install-icons: + for i in 16 24 32 48 64 128 256 512; do \ + $(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/devices; \ + $(INSTALL_DATA) pixmaps/camorama-$${i}.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/devices/camorama.png; \ + done + +install-data-local: install-icons @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pixmapdir); \ $(mkinstalldirs) $(DESTDIR)$(datadir)/camorama/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*.png; do \ @@ -36,8 +38,7 @@ install-data-local: $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \ fi \ - done \ -fi + done dist-hook: if test -d pixmaps; then \ diff --git a/Makefile.in b/Makefile.in index 4d4f47e..a08d6b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -372,9 +372,7 @@ EXTRA_DIST = \ autogen.sh \ camorama.1 \ camorama.desktop.in \ - camorama.appdata.xml.in \ - data/pixmaps/camorama-webcam-16.png \ - data/pixmaps/camorama-webcam-24.png + camorama.appdata.xml.in CLEANFILES = \ camorama.desktop \ @@ -953,9 +951,14 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile -install-data-local: +install-icons: + for i in 16 24 32 48 64 128 256 512; do \ + $(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/devices; \ + $(INSTALL_DATA) pixmaps/camorama-$${i}.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/devices/camorama.png; \ + done + +install-data-local: install-icons @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pixmapdir); \ $(mkinstalldirs) $(DESTDIR)$(datadir)/camorama/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*.png; do \ @@ -963,8 +966,7 @@ install-data-local: $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \ fi \ - done \ -fi + done dist-hook: if test -d pixmaps; then \ diff --git a/data/pixmaps/camorama-webcam-16.png b/data/pixmaps/camorama-webcam-16.png Binary files differdeleted file mode 100644 index dd9bbbd..0000000 --- a/data/pixmaps/camorama-webcam-16.png +++ /dev/null diff --git a/data/pixmaps/camorama-webcam-24.png b/data/pixmaps/camorama-webcam-24.png Binary files differdeleted file mode 100644 index 8bbea0b..0000000 --- a/data/pixmaps/camorama-webcam-24.png +++ /dev/null diff --git a/pixmaps/camorama-128.png b/pixmaps/camorama-128.png Binary files differnew file mode 100644 index 0000000..307e11c --- /dev/null +++ b/pixmaps/camorama-128.png diff --git a/pixmaps/camorama-16.png b/pixmaps/camorama-16.png Binary files differnew file mode 100644 index 0000000..5ea7ccc --- /dev/null +++ b/pixmaps/camorama-16.png diff --git a/pixmaps/camorama-24.png b/pixmaps/camorama-24.png Binary files differnew file mode 100644 index 0000000..555e6f1 --- /dev/null +++ b/pixmaps/camorama-24.png diff --git a/pixmaps/camorama-256.png b/pixmaps/camorama-256.png Binary files differnew file mode 100644 index 0000000..b595c7d --- /dev/null +++ b/pixmaps/camorama-256.png diff --git a/pixmaps/camorama-32.png b/pixmaps/camorama-32.png Binary files differnew file mode 100644 index 0000000..cc60c4a --- /dev/null +++ b/pixmaps/camorama-32.png diff --git a/pixmaps/camorama-48.png b/pixmaps/camorama-48.png Binary files differnew file mode 100644 index 0000000..10f8b37 --- /dev/null +++ b/pixmaps/camorama-48.png diff --git a/pixmaps/camorama-512.png b/pixmaps/camorama-512.png Binary files differnew file mode 100644 index 0000000..0dbc1ae --- /dev/null +++ b/pixmaps/camorama-512.png diff --git a/pixmaps/camorama-64.png b/pixmaps/camorama-64.png Binary files differnew file mode 100644 index 0000000..566b41a --- /dev/null +++ b/pixmaps/camorama-64.png diff --git a/pixmaps/camorama.png b/pixmaps/camorama.png Binary files differdeleted file mode 100644 index 0f25b92..0000000 --- a/pixmaps/camorama.png +++ /dev/null diff --git a/pixmaps/camorama.xpm b/pixmaps/camorama.xpm deleted file mode 100644 index 9182a50..0000000 --- a/pixmaps/camorama.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static char *camorama[] = { -/* columns rows colors chars-per-pixel */ -"32 32 25 1", -" c #000800080008", -". c #0BBF0BA90BD7", -"X c #179F173E17F3", -"o c #2FAE2F12305C", -"O c #203520251FEF", -"+ c #519E4FE9528F", -"@ c #71B56F987008", -"# c #636C6032614A", -"$ c #7EB97DB181B5", -"% c #818D7CDA7B9F", -"& c #81777FBB82CE", -"* c #8E9C88607B29", -"= c #90578F3C91C8", -"- c #9DD19DCEA1D0", -"; c #A1059FE9A237", -": c #ADBCAE57B197", -"> c #B0D4B042B217", -", c #ACF9A78D98D3", -"< c #BE5DBEF9C233", -"1 c #C096C0C4C348", -"2 c #CE15CFF5D25D", -"3 c #DB93DF88E2FB", -"4 c #DD21E0FDE3EE", -"5 c #E342E427E576", -"6 c None", -/* pixels */ -"66666666666666666666666666666666", -"6666666666666666===o666666666666", -"666666666666X>432222-+ 6666666", -"66666666666@>432212><>+. 666666", -"6666666666O>532221>2::;@ 66666", -"6666666666>542322>>>::--o 6666", -"666666666o5521>2><,,;;-;#. 6666", -"66666666 -5>@#@,<<>:--===O 666", -"66666666 =>@##+@::;--====o 66", -"66666666 -=#@*@+;:--=$=$$o 66", -"66666666 -=@*,*+-:--==$$$o 66", -"66666666 =:@,,#+;---=$$=@o 66", -"66666666 #2=##+=>;-=$$@@+X 66", -"66666666 X11===>:;===$$@+ 66", -"66666666 @22<>>;-;=$$@#. 66", -"66666666 #>32>>>;;===$=&. 666", -"6666666o333322>>>;-==$=;# 666", -"666666o233335521>;--=:22=o 666", -"6666O:333333332>23223333<$ 66", -"666#:33333332,>,=23333332:o 66", -"66@433333355%=@==<33333332=X 6", -"6+2333333333=$>;:2333333332+ 6", -"6@::::>>12223>2333333333333<o ", -"6Oo+@@--=-;:<>>2223333333333@. ", -"6 .Ooo++@@===-:22222232+ ", -"6 ..X...XOo+#-:>><><= ", -"6 X+#@@== ", -"66 .XX ", -"666666 ", -"666666666 ", -"66666666666666666666 ", -"66666666666666666666666666 " -}; diff --git a/src/camorama-stock-items.c b/src/camorama-stock-items.c index f4681a4..795bacd 100644 --- a/src/camorama-stock-items.c +++ b/src/camorama-stock-items.c @@ -39,8 +39,14 @@ camorama_stock_init(void) { gtk_icon_factory_add(factory, CAMORAMA_STOCK_WEBCAM, set); - add_default_image(CAMORAMA_STOCK_WEBCAM, 16, PACKAGE_DATA_DIR "/pixmaps/camorama-webcam-16.png"); - add_default_image(CAMORAMA_STOCK_WEBCAM, 16, PACKAGE_DATA_DIR "/pixmaps/camorama-webcam-24.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 16, PACKAGE_DATA_DIR "/icons/hicolor/16x16/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 24, PACKAGE_DATA_DIR "/icons/hicolor/24x24/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 32, PACKAGE_DATA_DIR "/icons/hicolor/32x32/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 48, PACKAGE_DATA_DIR "/icons/hicolor/48x48/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 64, PACKAGE_DATA_DIR "/icons/hicolor/64x64/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 128, PACKAGE_DATA_DIR "/icons/hicolor/128x128/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 256, PACKAGE_DATA_DIR "/icons/hicolor/256x256/devices/camorama.png"); + add_default_image(CAMORAMA_STOCK_WEBCAM, 512, PACKAGE_DATA_DIR "/icons/hicolor/512x512/devices/camorama.png"); gtk_icon_factory_add_default(factory); |