summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Atton <jonathan.atton@gmail.com>2011-01-29 18:09:07 +0000
committerJonathan Atton <jonathan.atton@gmail.com>2011-01-29 18:09:07 +0000
commit740df54806c93886399c1809ddc6ab2ddf8b1685 (patch)
tree431cf2ff1dbc80fa4060d31590211195b30769b5
parent6e8f2483262b47e5bd94648e86f55bc39ca31377 (diff)
dehour-elm : improve toolbar and add pager
SVN revision: 56381
-rw-r--r--Makefile18
-rw-r--r--images/shelf_def_im0.pngbin259 -> 1240 bytes
-rw-r--r--images/shelf_def_im1.pngbin0 -> 219 bytes
-rw-r--r--main.edc359
4 files changed, 364 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index c5566ff..da9828e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ TAIL = /usr/bin/tail
9COMPILE = $(CC) $(EDJE_CC_FLAGS) 9COMPILE = $(CC) $(EDJE_CC_FLAGS)
10SRC = main.edc 10SRC = main.edc
11OUT = detour-elm.edj 11OUT = detour-elm.edj
12PATH_INSTALL = $(HOME)/.e/elementary 12PATH_INSTALL = $(HOME)/.elementary/themes
13 13
14EDJE_CC_FLAGS = -id images \ 14EDJE_CC_FLAGS = -id images \
15-id icons \ 15-id icons \
@@ -30,14 +30,14 @@ build: main.edc
30 $(COMPILE) $(SRC) -o $(OUT) 30 $(COMPILE) $(SRC) -o $(OUT)
31 31
32install: detour-elm.edj 32install: detour-elm.edj
33 #@echo "Running make install..." 33 @echo "Running make install..."
34 #if [ -e $(OUT) ]; then $(CP) $? $(PATH_INSTALL)/; fi 34 if [ -e $(OUT) ]; then $(CP) $(OUT) $(PATH_INSTALL)/; fi
35 #@echo 35 @echo
36 #@echo -------------------------------------------------- 36 @echo --------------------------------------------------
37 #@echo $(OUT) was installed in your 37 @echo $(OUT) was installed in your
38 #@echo $(PATH_INSTALL)/ directory. 38 @echo $(PATH_INSTALL)/ directory.
39 #@echo -------------------------------------------------- 39 @echo --------------------------------------------------
40 #@echo 40 @echo
41 @echo 41 @echo
42 42
43version: 43version:
diff --git a/images/shelf_def_im0.png b/images/shelf_def_im0.png
index a669e9b..65a4982 100644
--- a/images/shelf_def_im0.png
+++ b/images/shelf_def_im0.png
Binary files differ
diff --git a/images/shelf_def_im1.png b/images/shelf_def_im1.png
new file mode 100644
index 0000000..5ab01f6
--- /dev/null
+++ b/images/shelf_def_im1.png
Binary files differ
diff --git a/main.edc b/main.edc
index d348242..753f67f 100644
--- a/main.edc
+++ b/main.edc
@@ -3564,14 +3564,14 @@ collections {
3564 state: "default" 0.0; 3564 state: "default" 0.0;
3565 color: 255 255 255 200; 3565 color: 255 255 255 200;
3566 rel1 { 3566 rel1 {
3567 offset: 2 2; 3567 offset: 0 0;
3568 } 3568 }
3569 rel2 { 3569 rel2 {
3570 offset: -3 -3; 3570 offset: 0 -3;
3571 } 3571 }
3572 image { 3572 image {
3573 normal: "images/shelf_def_im0.png"; 3573 normal: "images/shelf_def_im0.png";
3574 border: 2 2 2 2; 3574 border: 2 2 2 6;
3575 } 3575 }
3576 fill { 3576 fill {
3577 smooth: 1; 3577 smooth: 1;
@@ -6088,7 +6088,7 @@ collections {
6088 } 6088 }
6089 } 6089 }
6090 } 6090 }
6091 6091
6092 6092
6093 //////////////////////////////////////////// 6093 ////////////////////////////////////////////
6094 group { name: "elm/list/h_item/default"; 6094 group { name: "elm/list/h_item/default";
@@ -6570,5 +6570,356 @@ collections {
6570 } 6570 }
6571 6571
6572 6572
6573 group { name: "elm/pager/base/default";
6574 data.item: "onshow" "raise";
6575 parts {
6576 part { name: "clip";
6577 type: RECT;
6578 mouse_events: 0;
6579 description { state: "default" 0.0;
6580 rel1 {
6581 to: "base";
6582 offset: -9999 -9999;
6583 }
6584 rel2 {
6585 to: "base";
6586 offset: 9999 9999;
6587 }
6588 color: 255 255 255 255;
6589 }
6590 description { state: "visible" 0.0;
6591 inherit: "default" 0.0;
6592 }
6593 description { state: "hidden" 0.0;
6594 inherit: "default" 0.0;
6595 color: 255 255 255 0;
6596 visible: 0;
6597 }
6598 }
6599 part { name: "base";
6600 mouse_events: 0;
6601 clip_to: "clip";
6602 description { state: "default" 0.0;
6603 }
6604 description { state: "hidden" 0.0;
6605 inherit: "default" 0.0;
6606 rel1.relative: -1.0 0.0;
6607 rel2.relative: 0.0 1.0;
6608 }
6609 description { state: "visible" 0.0;
6610 inherit: "default" 0.0;
6611 rel1.relative: 0.0 0.0;
6612 rel2.relative: 1.0 1.0;
6613 }
6614 }
6615 part { name: "elm.swallow.content";
6616 type: SWALLOW;
6617 clip_to: "clip";
6618 description { state: "default" 0.0;
6619 rel1 {
6620 to: "base";
6621 offset: 8 8;
6622 }
6623 rel2 {
6624 to: "base";
6625 offset: -9 -9;
6626 }
6627 }
6628 }
6629 }
6630 programs {
6631 program { name: "push_start";
6632 signal: "elm,action,push";
6633 source: "elm";
6634 action: STATE_SET "hidden" 0.0;
6635 target: "base";
6636 target: "clip";
6637 after: "show_start2";
6638 }
6639 program { name: "show_start";
6640 signal: "elm,action,show";
6641 source: "elm";
6642 action: STATE_SET "hidden" 0.0;
6643 target: "base";
6644 target: "clip";
6645 after: "show_start2";
6646 }
6647 program { name: "show_start2";
6648 action: STATE_SET "visible" 0.0;
6649 transition: DECELERATE 0.5;
6650 target: "base";
6651 target: "clip";
6652 after: "show_end";
6653 }
6654 program { name: "show_end";
6655 action: SIGNAL_EMIT "elm,action,show,finished" "";
6656 }
6657 program { name: "pop_start";
6658 signal: "elm,action,pop";
6659 source: "elm";
6660 action: STATE_SET "visible" 0.0;
6661 target: "base";
6662 target: "clip";
6663 after: "hide_start2";
6664 }
6665 program { name: "hide_start";
6666 signal: "elm,action,hide";
6667 source: "elm";
6668 action: STATE_SET "visible" 0.0;
6669 target: "base";
6670 target: "clip";
6671 after: "hide_start2";
6672 }
6673 program { name: "hide_start2";
6674 action: STATE_SET "hidden" 0.0;
6675 transition: DECELERATE 0.5;
6676 target: "base";
6677 target: "clip";
6678 after: "hide_end";
6679 }
6680 program { name: "hide_end";
6681 action: SIGNAL_EMIT "elm,action,hide,finished" "";
6682 }
6683 program { name: "reset";
6684 signal: "elm,action,reset";
6685 source: "elm";
6686 action: STATE_SET "default" 0.0;
6687 target: "base";
6688 target: "clip";
6689 }
6690 }
6691 }
6692
6693 group { name: "elm/pager/base/slide";
6694 alias: "elm/pager/base/slide_invisible";
6695 parts {
6696 part { name: "clip";
6697 type: RECT;
6698 mouse_events: 0;
6699 description { state: "default" 0.0;
6700 rel1 {
6701 to: "base";
6702 offset: -9999 -9999;
6703 }
6704 rel2 {
6705 to: "base";
6706 offset: 9999 9999;
6707 }
6708 color: 255 255 255 255;
6709 }
6710 description { state: "visible" 0.0;
6711 inherit: "default" 0.0;
6712 }
6713 description { state: "hidden" 0.0;
6714 inherit: "default" 0.0;
6715 color: 255 255 255 0;
6716 visible: 0;
6717 }
6718 description { state: "hidden2" 0.0;
6719 inherit: "default" 0.0;
6720 color: 255 255 255 0;
6721 visible: 0;
6722 }
6723 }
6724 part { name: "base";
6725 mouse_events: 0;
6726 clip_to: "clip";
6727 description { state: "default" 0.0;
6728 }
6729 description { state: "hidden" 0.0;
6730 inherit: "default" 0.0;
6731 rel1.relative: -1.0 0.0;
6732 rel2.relative: 0.0 1.0;
6733 }
6734 description { state: "hidden2" 0.0;
6735 inherit: "default" 0.0;
6736 rel1.relative: 1.0 0.0;
6737 rel2.relative: 2.0 1.0;
6738 }
6739 description { state: "visible" 0.0;
6740 inherit: "default" 0.0;
6741 rel1.relative: 0.0 0.0;
6742 rel2.relative: 1.0 1.0;
6743 }
6744 }
6745 part { name: "elm.swallow.content";
6746 type: SWALLOW;
6747 clip_to: "clip";
6748 description { state: "default" 0.0;
6749 rel1 {
6750 to: "base";
6751 offset: 8 8;
6752 }
6753 rel2 {
6754 to: "base";
6755 offset: -9 -9;
6756 }
6757 }
6758 }
6759 }
6760 programs {
6761 program { name: "push_start";
6762 signal: "elm,action,push";
6763 source: "elm";
6764 action: STATE_SET "hidden2" 0.0;
6765 target: "base";
6766 target: "clip";
6767 after: "show_start2";
6768 }
6769 program { name: "show_start";
6770 signal: "elm,action,show";
6771 source: "elm";
6772 action: STATE_SET "hidden" 0.0;
6773 target: "base";
6774 target: "clip";
6775 after: "show_start2";
6776 }
6777 program { name: "show_start2";
6778 action: STATE_SET "visible" 0.0;
6779 transition: DECELERATE 0.5;
6780 target: "base";
6781 target: "clip";
6782 after: "show_end";
6783 }
6784 program { name: "show_end";
6785 action: SIGNAL_EMIT "elm,action,show,finished" "";
6786 }
6787 program { name: "pop_start";
6788 signal: "elm,action,pop";
6789 source: "elm";
6790 action: STATE_SET "visible" 0.0;
6791 target: "base";
6792 target: "clip";
6793 after: "pop_start2";
6794 }
6795 program { name: "pop_start2";
6796 action: STATE_SET "hidden2" 0.0;
6797 transition: DECELERATE 0.5;
6798 target: "base";
6799 target: "clip";
6800 after: "hide_end";
6801 }
6802 program { name: "hide_start";
6803 signal: "elm,action,hide";
6804 source: "elm";
6805 action: STATE_SET "visible" 0.0;
6806 target: "base";
6807 target: "clip";
6808 after: "hide_start2";
6809 }
6810 program { name: "hide_start2";
6811 action: STATE_SET "hidden" 0.0;
6812 transition: DECELERATE 0.5;
6813 target: "base";
6814 target: "clip";
6815 after: "hide_end";
6816 }
6817 program { name: "hide_end";
6818 action: SIGNAL_EMIT "elm,action,hide,finished" "";
6819 }
6820 program { name: "reset";
6821 signal: "elm,action,reset";
6822 source: "elm";
6823 action: STATE_SET "default" 0.0;
6824 target: "base";
6825 target: "clip";
6826 }
6827 }
6828 }
6829 group { name: "elm/pager/base/fade_translucide";
6830 alias: "elm/pager/base/fade_invisible";
6831 alias: "elm/pager/base/fade";
6832 data.item: "onshow" "raise";
6833 parts {
6834 part { name: "clip";
6835 type: RECT;
6836 mouse_events: 0;
6837 description { state: "default" 0.0;
6838 rel1 {
6839 offset: -9999 -9999;
6840 }
6841 rel2 {
6842 offset: 9999 9999;
6843 }
6844 color: 255 255 255 255;
6845 }
6846 description { state: "visible" 0.0;
6847 inherit: "default" 0.0;
6848 }
6849 description { state: "hidden" 0.0;
6850 inherit: "default" 0.0;
6851 color: 255 255 255 0;
6852 visible: 0;
6853 }
6854 }
6855 part { name: "elm.swallow.content";
6856 type: SWALLOW;
6857 clip_to: "clip";
6858 description { state: "default" 0.0;
6859 rel1 {
6860 offset: 8 8;
6861 }
6862 rel2 {
6863 offset: -9 -9;
6864 }
6865 }
6866 }
6867 }
6868 programs {
6869 program { name: "push_start";
6870 signal: "elm,action,push";
6871 source: "elm";
6872 action: STATE_SET "hidden" 0.0;
6873 target: "clip";
6874 after: "show_start2";
6875 }
6876 program { name: "show_start";
6877 signal: "elm,action,show";
6878 source: "elm";
6879 action: STATE_SET "hidden" 0.0;
6880 target: "clip";
6881 after: "show_start2";
6882 }
6883 program { name: "show_start2";
6884 action: STATE_SET "visible" 0.0;
6885 transition: DECELERATE 0.5;
6886 target: "clip";
6887 after: "show_end";
6888 }
6889 program { name: "show_end";
6890 action: SIGNAL_EMIT "elm,action,show,finished" "";
6891 }
6892 program { name: "pop_start";
6893 signal: "elm,action,pop";
6894 source: "elm";
6895 action: STATE_SET "visible" 0.0;
6896 target: "clip";
6897 after: "hide_start2";
6898 }
6899 program { name: "hide_start";
6900 signal: "elm,action,hide";
6901 source: "elm";
6902 action: STATE_SET "visible" 0.0;
6903 target: "clip";
6904 after: "hide_start2";
6905 }
6906 program { name: "hide_start2";
6907 action: STATE_SET "hidden" 0.0;
6908 transition: DECELERATE 0.5;
6909 target: "clip";
6910 after: "hide_end";
6911 }
6912 program { name: "hide_end";
6913 action: SIGNAL_EMIT "elm,action,hide,finished" "";
6914 }
6915 program { name: "reset";
6916 signal: "elm,action,reset";
6917 source: "elm";
6918 action: STATE_SET "default" 0.0;
6919 target: "clip";
6920 }
6921 }
6922 }
6923
6573} 6924}
6574 6925