import the great nyanology theme done by Anisse Astier

Known missing: tab counter

.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.swo
 *.swp
+*.edj
 /Makefile
 /Makefile.in
 /aclocal.m4
@@ -18,41 +19,14 @@
 /terminology_config.h.in
 /terminology.spec
 /autom4te.cache/
-/data/Makefile
-/data/Makefile.in
-/data/desktop/Makefile
-/data/desktop/Makefile.in
-/data/fonts/Makefile
-/data/fonts/Makefile.in
-/data/icons/Makefile
-/data/icons/Makefile.in
-/data/backgrounds/Makefile
-/data/backgrounds/Makefile.in
-/data/images/Makefile
-/data/images/Makefile.in
-/data/themes/Makefile
-/data/themes/Makefile.in
-/data/themes/base16_ocean_dark.edj
-/data/themes/default.edj
-/data/themes/mild.edj
-/data/themes/black.edj
-/data/themes/solarized.edj
-/data/themes/solarized_light.edj
-/data/themes/mustang.edj
-/data/themes/images/Makefile
-/data/themes/images/Makefile.in
-/data/themes/sounds/Makefile
-/data/themes/sounds/Makefile.in
+Makefile
+Makefile.in
 /m4/libtool.m4
 /m4/ltoptions.m4
 /m4/ltsugar.m4
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
-/src/Makefile
-/src/Makefile.in
 /src/bin/.deps/
-/src/bin/Makefile
-/src/bin/Makefile.in
 /src/bin/terminology
 /src/bin/tycat
 /src/bin/tyls
@@ -64,8 +38,6 @@
 /src/bin/*_generated.h
 /src/bin/lz4/.deps/
 /src/bin/lz4/.dirstamp
-/man/Makefile
-/man/Makefile.in
 /pkgbuild/PKGBUILD
 /pkgbuild/pkg
 /pkgbuild/src

configure.ac

@@ -88,6 +88,7 @@ data/fonts/Makefile
 data/themes/Makefile
 data/themes/images/Makefile
 data/themes/sounds/Makefile
+data/themes/nyanology/Makefile
 man/Makefile
 pkgbuild/PKGBUILD
 ])

data/themes/Makefile.am

@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = images sounds
+SUBDIRS = images sounds nyanology
 
 EDJE_CC = @edje_cc@
 EDJE_FLAGS_VERBOSE_ =

data/themes/nyanology/Makefile.am

@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS =
+
+EDJE_CC = @edje_cc@
+EDJE_FLAGS_VERBOSE_ =
+EDJE_FLAGS_VERBOSE_0 =
+EDJE_FLAGS_VERBOSE_1 = -v
+EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/nyanology/images -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts -sd $(top_srcdir)/data/themes/sounds
+
+filesdir = $(pkgdatadir)/themes
+files_DATA = \
+nyanology.edj
+
+AM_V_EDJ = $(am__v_EDJ_$(V))
+am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+am__v_EDJ_0 = @echo "  EDJ   " $@;
+
+EXTRA_DIST = \
+nyanology.edc
+
+nyanology.edj: Makefile nyanology.edc
+	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \
+	$(top_srcdir)/data/themes/nyanology/nyanology.edc \
+	$(top_builddir)/data/themes/nyanology/nyanology.edj
+
+clean-local:
+	rm -f *.edj

data/themes/nyanology/README.md

@@ -0,0 +1,26 @@
+Nyanology: having fun with edje and Terminology
+==========
+
+A nyan cat in your term ? That's possible now !
+
+
+How does it look ?
+--------
+
+Demo video: http://www.youtube.com/watch?v=SN5stpMoVs0
+
+
+
+What's missing ? (TODO)
+--------
+ - proper selection. Current one might be fun, but isn't usable
+ - stop hacking Terminology's about box, and add our own
+ - optional nyan music for the mood
+
+
+Credits
+--------
+ - Anisse Astier <anisse@astier.eu>
+ - Carsten "Rasterman" Haitzler and the Terminology authors
+ - prguitarman for the original nyan cat gif
+ - saraj00n for making it popular and the vocaloid music.

data/themes/nyanology/about.edc

@@ -0,0 +1,208 @@
+#ifndef __NYANOLOGY_ABOUT
+#define __NYANOLOGY_ABOUT
+
+#include "nyancursor.edc"
+
+/*
+ * Most of the things concerning the about box go in here
+ *
+ */
+collections {
+	group { name: "nyanology/star";
+#define STAR_SIZE 40
+		images {
+			image: "star_1.png" COMP;
+			image: "star_2.png" COMP;
+			image: "star_3.png" COMP;
+			image: "star_4.png" COMP;
+			image: "star_5.png" COMP;
+			image: "star_6.png" COMP;
+		}
+		parts {
+			part { name: "star";
+				description { state: "default" 0.0;
+					min: STAR_SIZE STAR_SIZE;
+					max: STAR_SIZE STAR_SIZE;
+					fixed: 1 1;
+					fill.smooth: 0;
+					image.normal: "star_1.png";
+					aspect: 1 1;
+					aspect_preference: BOTH;
+					align: 0 0.5;
+				}
+#define STAR_FRAME(number) \
+				description { state: "anim"#number 0.0; \
+					inherit: "default"; \
+					image.normal: "star_"#number".png"; \
+					rel1.offset: ((6-(number))*STAR_SIZE*2) 0.0;\
+				}
+				STAR_FRAME(1)
+				STAR_FRAME(2)
+				STAR_FRAME(3)
+				STAR_FRAME(4)
+				STAR_FRAME(5)
+				STAR_FRAME(6)
+#undef STAR_FRAME
+			}
+		}
+		programs {
+#define STAR_PROGRAM(number, next, wait_or_transition) \
+			program { name: "anim"#number ;\
+				wait_or_transition; \
+				action: STATE_SET "anim"#number 0.0; \
+				target: "star"; \
+				after: "anim"#next; \
+			}
+			STAR_PROGRAM(1, 2, in: FRAME_DURATION 0)
+#define STAR_PROGRAM2(number, next) STAR_PROGRAM(number, next, transition: SINUSOIDAL FRAME_DURATION)
+			STAR_PROGRAM2(2, 3)
+			STAR_PROGRAM2(3, 4)
+			STAR_PROGRAM2(4, 5)
+			STAR_PROGRAM2(5, 6)
+			STAR_PROGRAM2(6, 1)
+#undef STAR_PROGRAM2
+#undef STAR_PROGRAM
+		}
+	}
+#define STAR_GROUP(number) \
+	group { name: "nyanology/star"#number; \
+		inherit: "nyanology/star"; \
+		programs { \
+			program { name: "anim"#number; \
+				signal: "show"; \
+			} \
+		} \
+	}
+	STAR_GROUP(1)
+	STAR_GROUP(2)
+	STAR_GROUP(3)
+	STAR_GROUP(4)
+	STAR_GROUP(5)
+	STAR_GROUP(6)
+#undef STAR_GROUP
+	group { name: "nyanology/stars";
+		parts{
+			part { name: "starfield";
+				type: BOX;
+				description { state: "default" 0.0;
+					box { layout: "vertical_homogeneous";
+						padding: 0 STAR_SIZE;
+					}
+				}
+				box { items {
+#define STAR_ITEM(number) \
+						item { name: "star"#number; \
+							align: 0 0.5;\
+							source: "nyanology/star"#number; }
+						STAR_ITEM(3)
+						STAR_ITEM(2)
+						STAR_ITEM(5)
+						STAR_ITEM(4)
+						STAR_ITEM(1)
+						STAR_ITEM(6)
+#undef STAR_ITEM
+				}
+				}
+			}
+		}
+	}
+#undef STAR_SIZE
+
+//////////////////////////////////////////////////////////////////////////////
+   //// the about box content image
+	group { name: "nyanology/nyancat";
+		alias: "terminology/about";
+		styles {
+			style { name: "nyanaboutstyle";
+				base: "font=Nexus font_size=10 color=#fff wrap=word";
+			}
+		}
+		parts {
+			part { name: "bg";
+				type: RECT;
+				description { state: "default" 0.0;
+					color: 0 51 102 255;
+					min: 400 400;
+				}
+			}
+			part { name: "clip";
+				type: RECT;
+				description { state: "default" 0.0;
+					min: 400 400;
+				}
+			}
+			part { name: "starfield";
+				type: GROUP;
+				source: "nyanology/stars";
+				description { state: "default" 0.0;
+				}
+			}
+			part { name: "cat";
+				type: GROUP;
+				source: "nyanology/catcursor";
+				description { state: "default" 0.0;
+					max: 291 121;
+					rel1.relative: -3.5 0 ;
+					map.alpha: 0;
+				}
+			}
+			part { name: "terminology.text";
+				type: TEXTBLOCK;
+				clip_to: "clip";
+				description { state: "default" 0.0;
+					fixed: 1 1;
+					align: 0.5 0.0;
+					max: 10000 10000;
+					rel1 {
+						relative: 0.08 1.0;
+					}
+					rel2 {
+						relative: 0.97 1.0;
+					}
+					text {
+						style: "nyanaboutstyle";
+						text: "Hello. This text shouldn't appear";
+						min: 0 1;
+					}
+				}
+				description { state: "up" 0.0;
+					inherit: "default" 0.0;
+					align: 0.5 1.0;
+					rel1.relative: 0.08 0.0;
+					rel2.relative: 0.97 0.0;
+				}
+			}
+		}
+		programs {
+			program { name: "default";
+				signal: "show";
+				action: SIGNAL_EMIT "focus,in" "terminology";
+			}
+			program { name: "begin";
+				signal: "begin";
+				source: "terminology";
+				action: ACTION_STOP;
+				target: "show";
+				target: "show2";
+				after: "begin2";
+			}
+			program { name: "begin2";
+				action: STATE_SET "default" 0.0;
+				target: "terminology.text";
+				after: "show";
+			}
+			program { name: "show";
+				action: STATE_SET "up" 0.0;
+				transition: LINEAR 15.0;
+				target: "terminology.text";
+				after: "show2";
+			}
+			program { name: "show2";
+				action: STATE_SET "default" 0.0;
+				target: "terminology.text";
+				after: "show";
+			}
+		}
+	}
+}
+#endif /* __NYANOLOGY_ABOUT */

data/themes/nyanology/nyancursor.edc

@@ -0,0 +1,195 @@
+#ifndef __NYANCAT_CURSOR
+#define __NYANCAT_CURSOR
+#define FRAME_DURATION 0.07
+collections {
+	group { name: "nyanology/catcursor";
+		alias: "terminology/cursor";
+		images {
+			image: "cat01.png" COMP;
+			image: "cat02.png" COMP;
+			image: "cat03.png" COMP;
+			image: "cat04.png" COMP;
+			image: "cat05.png" COMP;
+			image: "cat06.png" COMP;
+			image: "cat07.png" COMP;
+			image: "cat08.png" COMP;
+			image: "cat09.png" COMP;
+			image: "cat10.png" COMP;
+			image: "cat11.png" COMP;
+			image: "cat12.png" COMP;
+			image: "cr_key.png" COMP;
+		}
+		parts {
+			part { name: "cat";
+				description { state: "default" 0.0;
+					min: 0 17;
+					max: SOURCE;
+					aspect: 2.4 2.6; // aspect from the source image
+					aspect_preference: VERTICAL;
+					rel1.relative: 4.5 0;
+					image.normal: "cat01.png";
+					map.on: 1;
+				}
+				description { state: "greyed";
+					inherit: "default";
+					color: 120 120 120 255;
+				}
+				description { state: "anim1" 0.0;
+					inherit: "default";
+					image {
+						tween: "cat01.png";
+						tween: "cat02.png";
+						tween: "cat03.png";
+						tween: "cat04.png";
+						tween: "cat05.png";
+						normal: "cat06.png";
+					}
+				}
+				description { state: "anim2" 0.0;
+					inherit: "default";
+					image {
+						tween: "cat07.png";
+						tween: "cat08.png";
+						tween: "cat09.png";
+						tween: "cat10.png";
+						tween: "cat11.png";
+						normal: "cat12.png";
+					}
+				}
+				description { state: "rotation1" 0.0;
+					inherit: "default";
+					image {
+						tween: "cat01.png";
+						tween: "cat02.png";
+						normal: "cat03.png";
+					}
+					map.rotation.z: -35.0;
+				}
+				description { state: "rotation2" 0.0;
+					inherit: "default";
+					image {
+						tween: "cat04.png";
+						tween: "cat05.png";
+						tween: "cat06.png";
+						tween: "cat07.png";
+						tween: "cat08.png";
+						normal: "cat09.png";
+					}
+					map.rotation.z: 35.0;
+				}
+				description { state: "rotation3" 0.0;
+					inherit: "default";
+					image {
+						tween: "cat10.png";
+						tween: "cat11.png";
+						normal: "cat12.png";
+					}
+					map.rotation.z: 0.0;
+				}
+			}
+
+			part { name: "key";
+				mouse_events: 0;
+				description { state: "default" 0.0;
+					rel1 {
+						to: "cat";
+						offset: -5 -5;
+						relative: 0.1 0.0;
+					}
+					rel2 {
+						to: "cat";
+						offset: 4 4;
+						relative: 0.5 1.0;
+					}
+					image {
+						normal: "cr_key.png";
+						border: 4 4 4 4;
+					}
+					color: 255 255 255 0;
+				}
+				description { state: "on" 0.0;
+					inherit: "default" 0.0;
+					color: 255 255 255 255;
+				}
+				description { state: "out" 0.0;
+					inherit: "default" 0.0;
+					color: 160 100 255 0;
+					rel1.relative: -0.2 -0.18;
+					rel2.relative: 0.6 1.18;
+				}
+			}
+
+		}
+		programs {
+			program { name: "anim";
+				signal: "focus,in";
+				source: "terminology";
+				action: STATE_SET "anim1" 0.0;
+				transition: LINEAR FRAME_DURATION*6;
+				target: "cat";
+				after: "loop";
+			}
+			program { name: "loop";
+				action: STATE_SET "anim2" 0.0;
+				transition: LINEAR FRAME_DURATION*6;
+				target: "cat";
+				after: "anim";
+			}
+			program { name: "stop_anim";
+				signal: "focus,out";
+				source: "terminology";
+				action: ACTION_STOP;
+				target: "anim";
+				target: "loop";
+				target: "bellrotate1";
+				target: "bellrotate2";
+				target: "bellrotate3";
+				after: "stop_anim2";
+			}
+			// Is it that important to go back to default state ?
+			program { name: "stop_anim2";
+				action: STATE_SET "greyed" 0.0;
+				transition: LINEAR FRAME_DURATION*6;
+				target: "cat";
+			}
+			program { name: "key";
+				signal: "key,down";
+				source: "terminology";
+				action: STATE_SET "default" 0.0;
+				target: "key";
+				after: "key2";
+			}
+			program { name: "key2";
+				action: STATE_SET "on" 0.0;
+				target: "key";
+				after: "key3";
+			}
+			program { name: "key3";
+				action: STATE_SET "out" 0.0;
+				transition: DECELERATE 0.3;
+				target: "key";
+			}
+			program { name: "bellrotate1";
+				signal: "bell";
+				source: "terminology";
+				action: STATE_SET "rotation1" 0.0;
+				transition: LINEAR 0.12;
+				target: "cat";
+				after: "bellrotate2";
+			}
+			program { name: "bellrotate2";
+				action: STATE_SET "rotation2" 0.0;
+				transition: LINEAR 0.24;
+				target: "cat";
+				after: "bellrotate3";
+			}
+			program { name: "bellrotate3";
+				action: STATE_SET "rotation3" 0.0;
+				transition: LINEAR 0.12;
+				target: "cat";
+				after: "anim";
+			}
+		}
+	}
+}
+#endif /*__NYANCAT_CURSOR*/