summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-06-30 11:08:07 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-06-30 11:08:07 +0000
commitbecb0201aa28104e922f83e0b2b78f737561c455 (patch)
treeaef7abe5ee406449f9e47b30606518ff754f8ab7
parentd3a0eafd074536440b5bd1ef299a17d0174e0927 (diff)
about box is there... mwahahhahahahahahah!
SVN revision: 73080
-rw-r--r--data/icons/terminology.pngbin12742 -> 21730 bytes
-rw-r--r--data/images/terminology.pngbin12742 -> 21730 bytes
-rw-r--r--data/themes/default.edc126
-rw-r--r--data/themes/images/Makefile.am2
-rw-r--r--data/themes/images/ab_base.pngbin0 -> 8842 bytes
-rw-r--r--data/themes/images/ab_shell.pngbin0 -> 38049 bytes
-rw-r--r--src/bin/Makefile.am1
-rw-r--r--src/bin/controls.c3
8 files changed, 130 insertions, 2 deletions
diff --git a/data/icons/terminology.png b/data/icons/terminology.png
index fca757a..93e5798 100644
--- a/data/icons/terminology.png
+++ b/data/icons/terminology.png
Binary files differ
diff --git a/data/images/terminology.png b/data/images/terminology.png
index fca757a..93e5798 100644
--- a/data/images/terminology.png
+++ b/data/images/terminology.png
Binary files differ
diff --git a/data/themes/default.edc b/data/themes/default.edc
index ef8712f..fe80dde 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,7 +1,7 @@
1collections { 1collections {
2 2
3////////////////////////////////////////////////////////////////////////////// 3//////////////////////////////////////////////////////////////////////////////
4 //// the background and general contaiiner for the terminal 4 //// the background and general container for the terminal
5 group { name: "terminology/background"; 5 group { name: "terminology/background";
6 images { 6 images {
7 image: "bg_bevel.png" COMP; 7 image: "bg_bevel.png" COMP;
@@ -366,6 +366,41 @@ collections {
366 transition: DECELERATE 0.6; 366 transition: DECELERATE 0.6;
367 target: "terminology.options"; 367 target: "terminology.options";
368 } 368 }
369
370 part { name: "terminology.about"; type: SWALLOW;
371 scale: 1;
372 description { state: "default" 0.0;
373 fixed: 1 1;
374 min: 198 198;
375 max: 198 198;
376 align: 0.5 0.0;
377 visible: 0;
378 rel1.relative: 0.0 1.0;
379 rel2.relative: 1.0 1.0;
380 }
381 description { state: "visible" 0.0;
382 inherit: "default" 0.0;
383 visible: 1;
384 align: 0.5 0.5;
385 rel1.relative: 0.0 0.0;
386 rel2.relative: 1.0 1.0;
387 }
388 }
389 program { name: "ab_show";
390 signal: "about,show";
391 source: "terminology";
392 action: STATE_SET "visible" 0.0;
393 transition: SPRING 1.2 2.0 6;
394 target: "terminology.about";
395 }
396 program { name: "ab_hide";
397 signal: "about,hide";
398 source: "terminology";
399 action: STATE_SET "default" 0.0;
400 transition: DECELERATE 0.6;
401 target: "terminology.about";
402 }
403
369 part { name: "terminology.controls"; type: SWALLOW; 404 part { name: "terminology.controls"; type: SWALLOW;
370 scale: 1; 405 scale: 1;
371 description { state: "default" 0.0; 406 description { state: "default" 0.0;
@@ -780,6 +815,95 @@ collections {
780 } 815 }
781 816
782////////////////////////////////////////////////////////////////////////////// 817//////////////////////////////////////////////////////////////////////////////
818 //// the about box content image
819 group { name: "terminology/about";
820 images {
821 image: "ab_base.png" COMP;
822 image: "ab_shell.png" COMP;
823 }
824 styles {
825 style { name: "aboutstyle";
826 base: "font=Sans font_size=8 color=#3f1 style=glow glow2_color=#3f13 glow_color=#3f11 wrap=word";
827 tag: "b" "+ color=#8f8 glow2_color=#3f15 glow_color=#3f12";
828 }
829 }
830 parts {
831 part { name: "base";
832 mouse_events: 0;
833 description { state: "default" 0.0;
834 rel1 {
835 relative: (39/198) (27/198);
836 to: "shell";
837 }
838 rel2 {
839 relative: (151/198) (115/198);
840 to: "shell";
841 }
842 image.normal: "ab_base.png";
843 }
844 }
845 part { name: "baseclip"; type: RECT;
846 description { state: "default" 0.0;
847 color: 255 255 255 255;
848 rel1.to: "base";
849 rel2.to: "base";
850 }
851 }
852 part { name: "terminology.text"; type: TEXTBLOCK;
853 clip_to: "baseclip";
854 mouse_events: 1;
855 description { state: "default" 0.0;
856 fixed: 1 1;
857 align: 0.5 0.0;
858 max: 10000 10000;
859 rel1 {
860 to: "base";
861 relative: 0.08 1.0;
862 }
863 rel2 {
864 to: "base";
865 relative: 0.97 1.0;
866 }
867 text {
868 style: "aboutstyle";
869 text: "Hello world.<br>This is <b>Terminology</b>, your friendly neighbourhood terminal.<br><br>This needs more text to test vertical scrolling to see if the animation works right.<br>I hope this will be enough now.";
870 min: 0 1;
871 }
872 }
873 description { state: "up" 0.0;
874 inherit: "default" 0.0;
875 align: 0.5 1.0;
876 rel1.relative: 0.08 0.0;
877 rel2.relative: 0.97 0.0;
878 }
879 }
880 part { name: "shell";
881 description { state: "default" 0.0;
882 max: 198 198;
883 aspect: 1.0 1.0;
884 aspect_preference: BOTH;
885 image.normal: "ab_shell.png";
886 }
887 }
888 }
889 programs {
890 program { name: "show";
891 signal: "show";
892 source: "";
893 action: STATE_SET "up" 0.0;
894 transition: LINEAR 45.0;
895 target: "terminology.text";
896 after: "show2";
897 }
898 program { name: "show2";
899 action: STATE_SET "default" 0.0;
900 target: "terminology.text";
901 after: "show";
902 }
903 }
904 }
905
906//////////////////////////////////////////////////////////////////////////////
783 //// used in the font selection dialog to give a base for black text 907 //// used in the font selection dialog to give a base for black text
784 //// previews so they are always visible 908 //// previews so they are always visible
785 group { name: "terminology/fontpreview"; 909 group { name: "terminology/fontpreview";
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index ff22e08..86d3d0f 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -1,5 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2EXTRA_DIST = \ 2EXTRA_DIST = \
3ab_base.png \
4ab_shell.png \
3bg_bevel.png \ 5bg_bevel.png \
4bg_shine.png \ 6bg_shine.png \
5bg_glint.png \ 7bg_glint.png \
diff --git a/data/themes/images/ab_base.png b/data/themes/images/ab_base.png
new file mode 100644
index 0000000..21b5210
--- /dev/null
+++ b/data/themes/images/ab_base.png
Binary files differ
diff --git a/data/themes/images/ab_shell.png b/data/themes/images/ab_shell.png
new file mode 100644
index 0000000..70ad2f8
--- /dev/null
+++ b/data/themes/images/ab_shell.png
Binary files differ
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f9f7c80..8aedb06 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -10,6 +10,7 @@ terminology_LDADD = @TERMINOLOGY_LIBS@
10 10
11terminology_SOURCES = \ 11terminology_SOURCES = \
12private.h \ 12private.h \
13about.c about.h \
13col.c col.h \ 14col.c col.h \
14config.c config.h \ 15config.c config.h \
15controls.c controls.h \ 16controls.c controls.h \
diff --git a/src/bin/controls.c b/src/bin/controls.c
index 953f971..0a08ed0 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -3,6 +3,7 @@
3#include <Elementary.h> 3#include <Elementary.h>
4#include "controls.h" 4#include "controls.h"
5#include "options.h" 5#include "options.h"
6#include "about.h"
6#include "termio.h" 7#include "termio.h"
7 8
8static Evas_Object *ct_frame, *ct_box = NULL; 9static Evas_Object *ct_frame, *ct_box = NULL;
@@ -46,7 +47,7 @@ static void
46_cb_ct_about(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 47_cb_ct_about(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
47{ 48{
48 controls_toggle(ct_win, ct_bg, ct_term); 49 controls_toggle(ct_win, ct_bg, ct_term);
49 // XXX: show about box. 50 about_toggle(ct_win, ct_bg, ct_term);
50} 51}
51 52
52void 53void