Merge branch 'feature/colorblind-icons' into 'master'

Feature/icon-theme

@byako @bobot

See merge request !153

Makefile

@@ -173,7 +173,7 @@ OPT_LIBS+= $(GEN_OPT_LIBS)
 ICONS:= $(addprefix share/, \
 		frama-c.ico frama-c.gif unmark.png )
 
-FEEDBACK_ICONS:= $(addprefix share/feedback/, \
+FEEDBACK_ICONS_NAMES:= \
 		never_tried.png \
 		unknown.png \
 		surely_valid.png \
@@ -186,7 +186,12 @@ FEEDBACK_ICONS:= $(addprefix share/feedback/, \
 		valid_but_dead.png \
 		inconsistent.png \
 		switch-on.png \
-		switch-off.png )
+		switch-off.png
+
+FEEDBACK_ICONS_DEFAULT:= \
+	$(addprefix share/theme/default/, $(FEEDBACK_ICONS_NAMES))
+FEEDBACK_ICONS_COLORBLIND:= \
+	$(addprefix share/theme/colorblind/, $(FEEDBACK_ICONS_NAMES))
 
 ROOT_LIBC_DIR:= share/libc
 LIBC_SUBDIRS:= . sys netinet linux net arpa
@@ -245,7 +250,7 @@ DISTRIB_FILES:= cil/*/*.ml* cil/*/*.in        				\
 	  $(wildcard $(CIL_PATH)/*/*.ml*))                              \
       bin/*2*.sh							\
       share/frama-c.WIN32.rc share/frama-c.Unix.rc                      \
-      $(ICONS) $(FEEDBACK_ICONS)			 		\
+      $(ICONS) $(FEEDBACK_ICONS_DEFAULT) $(FEEDBACK_ICONS_COLORBLIND)	\
       man/frama-c.1 doc/manuals/*.pdf doc/README			\
       doc/code/docgen_*.ml						\
       doc/code/*.css doc/code/intro_plugin.txt				\
@@ -1943,7 +1948,8 @@ install::
 	$(MKDIR) $(BINDIR)
 	$(MKDIR) $(MANDIR)/man1
 	$(MKDIR) $(FRAMAC_PLUGINDIR)/gui
-	$(MKDIR) $(FRAMAC_DATADIR)/feedback
+	$(MKDIR) $(FRAMAC_DATADIR)/theme/default
+	$(MKDIR) $(FRAMAC_DATADIR)/theme/colorblind
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/sys
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/netinet
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/linux
@@ -1957,7 +1963,8 @@ install::
           share/configure.ac \
 	  $(FRAMAC_DATADIR)
 	$(CP) share/frama-c.rc $(ICONS) $(FRAMAC_DATADIR)
-	$(CP) $(FEEDBACK_ICONS) $(FRAMAC_DATADIR)/feedback
+	$(CP) $(FEEDBACK_ICONS_DEFAULT) $(FRAMAC_DATADIR)/theme/default
+	$(CP) $(FEEDBACK_ICONS_COLORBLIND) $(FRAMAC_DATADIR)/theme/colorblind
 	if [ -d $(EMACS_DATADIR) ]; then \
 	  $(CP) share/acsl.el $(EMACS_DATADIR); \
 	fi
@@ -2164,7 +2171,8 @@ NO_CHECK_HEADERS=tests/*/* doc/manuals/*.pdf \
 		 src/wp/Changelog \
 		 .force-reconfigure \
 		 licenses/* VERSION INSTALL bin/sed* \
-		 share/Makefile.kernel $(ICONS) $(FEEDBACK_ICONS) \
+		 share/Makefile.kernel $(ICONS) $(FEEDBACK_ICONS_DEFAULT) \
+		 $(FEEDBACK_ICONS_COLORBLIND) \
 		 INSTALL_WITH_WHY
 
 .PHONY: check-headers check-headers-xunit