summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Andreoli <dave@gurumeditation.it>2012-06-24 22:46:13 +0000
committerDavide Andreoli <dave@gurumeditation.it>2012-06-24 22:46:13 +0000
commitbb11d9e336a91992d43a0f3bd61ad8adde8122f6 (patch)
tree7a452da046a0b6933f78be8a28ba35798c527c7c
parent304434ccf69f88fcd78208beeca9c89897936d52 (diff)
First try of two knobs images (for volume and position), absolutely not happy with them.
also move 'programs' parts outside of 'parts'. They where there for error. SVN revision: 72777
-rw-r--r--data/themes/default.edc141
-rw-r--r--data/themes/images/Makefile.am4
-rw-r--r--data/themes/images/media_knob_pos.pngbin0 -> 796 bytes
-rw-r--r--data/themes/images/media_knob_vol.pngbin0 -> 659 bytes
-rw-r--r--data/themes/images/media_line.pngbin461 -> 471 bytes
-rw-r--r--data/themes/images/mediactrl.xcfbin164227 -> 227494 bytes
-rw-r--r--data/themes/images/mediactrl2.xcfbin5086 -> 4983 bytes
7 files changed, 76 insertions, 69 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 310a363..b016a9c 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -554,6 +554,8 @@ collections {
554 image: "media_stop.png" COMP; 554 image: "media_stop.png" COMP;
555 image: "media_pause.png" COMP; 555 image: "media_pause.png" COMP;
556 image: "media_line.png" COMP; 556 image: "media_line.png" COMP;
557 image: "media_knob_vol.png" COMP;
558 image: "media_knob_pos.png" COMP;
557 } 559 }
558 parts { 560 parts {
559 part { name: "media_clip"; type: RECT; 561 part { name: "media_clip"; type: RECT;
@@ -610,15 +612,16 @@ collections {
610 clip_to: "media_clip"; 612 clip_to: "media_clip";
611 description { state: "default" 0.0; 613 description { state: "default" 0.0;
612 image.normal: "media_line.png"; 614 image.normal: "media_line.png";
613 min: 90 10; 615 image.border: 15 15 0 0;
614 max: 90 10; 616 min: 90 14;
617 max: 90 14;
615 rel1.to: "stop"; 618 rel1.to: "stop";
616 rel2.to: "stop"; 619 rel2.to: "stop";
617 rel1.offset: 25 0; 620 rel1.offset: 25 0;
618 rel2.offset: 90 0; 621 rel2.offset: 90 0;
619 } 622 }
620 } 623 }
621 part { name: "terminology.posdrag"; type: RECT; 624 part { name: "terminology.posdrag";
622 mouse_events: 1; 625 mouse_events: 1;
623 repeat_events: 1; 626 repeat_events: 1;
624 clip_to: "media_clip"; 627 clip_to: "media_clip";
@@ -628,9 +631,9 @@ collections {
628 y: 0 0 0; 631 y: 0 0 0;
629 } 632 }
630 description { state: "default" 0.0; 633 description { state: "default" 0.0;
631 color: 255 0 0 150; 634 image.normal: "media_knob_pos.png";
632 min: 10 10; 635 min: 14 14;
633 max: 10 10; 636 max: 14 14;
634 } 637 }
635 description { state: "muted" 0.0; 638 description { state: "muted" 0.0;
636 visible: 0; 639 visible: 0;
@@ -642,8 +645,9 @@ collections {
642 clip_to: "media_clip"; 645 clip_to: "media_clip";
643 description { state: "default" 0.0; 646 description { state: "default" 0.0;
644 image.normal: "media_line.png"; 647 image.normal: "media_line.png";
645 min: 60 10; 648 image.border: 15 15 0 0;
646 max: 60 10; 649 min: 60 14;
650 max: 60 14;
647 rel1.to: "posline"; 651 rel1.to: "posline";
648 rel2.to: "posline"; 652 rel2.to: "posline";
649 rel1.relative: 1.0 0.0; 653 rel1.relative: 1.0 0.0;
@@ -652,7 +656,7 @@ collections {
652 rel2.offset: 60 0; 656 rel2.offset: 60 0;
653 } 657 }
654 } 658 }
655 part { name: "terminology.voldrag"; type: RECT; 659 part { name: "terminology.voldrag"; type: IMAGE;
656 mouse_events: 1; 660 mouse_events: 1;
657 repeat_events: 1; 661 repeat_events: 1;
658 clip_to: "media_clip"; 662 clip_to: "media_clip";
@@ -662,73 +666,74 @@ collections {
662 y: 0 0 0; 666 y: 0 0 0;
663 } 667 }
664 description { state: "default" 0.0; 668 description { state: "default" 0.0;
665 color: 255 0 0 150; 669 image.normal: "media_knob_vol.png";
666 min: 10 10; 670 min: 14 14;
667 max: 10 10; 671 max: 14 14;
668 } 672 }
669 description { state: "muted" 0.0; 673 description { state: "muted" 0.0;
670 visible: 0; 674 visible: 0;
671 } 675 }
672 } 676 }
673 programs { 677 }
674 program { name: "media_mouse_in"; 678 programs {
675 signal: "mouse,in"; 679 program { name: "media_mouse_in";
676 source: "media_bg"; 680 signal: "mouse,in";
677 action: STATE_SET "expanded" 0.0; 681 source: "media_bg";
678 transition: SINUSOIDAL 0.4 CURRENT; 682 action: STATE_SET "expanded" 0.0;
679 target: "media_bg"; 683 transition: SINUSOIDAL 0.4 CURRENT;
680 } 684 target: "media_bg";
681 program { name: "media_mouse_out"; 685 }
682 signal: "mouse,out"; 686 program { name: "media_mouse_out";
683 source: "media_bg"; 687 signal: "mouse,out";
684 action: STATE_SET "default" 0.0; 688 source: "media_bg";
685 transition: SINUSOIDAL 0.4 CURRENT; 689 action: STATE_SET "default" 0.0;
686 target: "media_bg"; 690 transition: SINUSOIDAL 0.4 CURRENT;
687 } 691 target: "media_bg";
688 program { name: "media_pause_click"; 692 }
689 signal: "mouse,up,*"; 693 program { name: "media_pause_click";
690 source: "play"; 694 signal: "mouse,up,*";
691 filter: "play" "default"; 695 source: "play";
692 action: SIGNAL_EMIT "pause" ""; 696 filter: "play" "default";
693 } 697 action: SIGNAL_EMIT "pause" "";
694 program { name: "media_play_click"; 698 }
695 signal: "mouse,up,1"; 699 program { name: "media_play_click";
696 source: "play"; 700 signal: "mouse,up,1";
697 filter: "play" "paused"; 701 source: "play";
698 action: SIGNAL_EMIT "play" ""; 702 filter: "play" "paused";
699 } 703 action: SIGNAL_EMIT "play" "";
700 program { name: "media_stop_click"; 704 }
701 signal: "mouse,up,1"; 705 program { name: "media_stop_click";
702 source: "stop"; 706 signal: "mouse,up,1";
703 action: SIGNAL_EMIT "stop" ""; 707 source: "stop";
704 } 708 action: SIGNAL_EMIT "stop" "";
705 program { name: "media_signal_pause"; 709 }
706 signal: "pause,set"; 710 program { name: "media_signal_pause";
707 source: "terminology"; 711 signal: "pause,set";
708 action: STATE_SET "paused" 0.0; 712 source: "terminology";
709 target: "play"; 713 action: STATE_SET "paused" 0.0;
710 } 714 target: "play";
711 program { name: "media_signal_play"; 715 }
712 signal: "play,set"; 716 program { name: "media_signal_play";
713 source: "terminology"; 717 signal: "play,set";
714 action: STATE_SET "default" 0.0; 718 source: "terminology";
715 target: "play"; 719 action: STATE_SET "default" 0.0;
716 } 720 target: "play";
717 program { name: "media_signal_mute"; 721 }
718 signal: "mute,set"; 722 program { name: "media_signal_mute";
719 source: "terminology"; 723 signal: "mute,set";
720 action: STATE_SET "muted" 0.0; 724 source: "terminology";
721 target: "terminology.voldrag"; 725 action: STATE_SET "muted" 0.0;
722 } 726 target: "terminology.voldrag";
723 program { name: "media_signal_unmute"; 727 }
724 signal: "mute,unset"; 728 program { name: "media_signal_unmute";
725 source: "terminology"; 729 signal: "mute,unset";
726 action: STATE_SET "default" 0.0; 730 source: "terminology";
727 target: "terminology.voldrag"; 731 action: STATE_SET "default" 0.0;
728 } 732 target: "terminology.voldrag";
729 } 733 }
730 } 734 }
731 } 735 }
736
732////////////////////////////////////////////////////////////////////////////// 737//////////////////////////////////////////////////////////////////////////////
733 //// used in the font selection dialog to give a base for black text 738 //// used in the font selection dialog to give a base for black text
734 //// previews so they are always visible 739 //// previews so they are always visible
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 33b285c..9f17d39 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -16,4 +16,6 @@ media_bg.png \
16media_line.png \ 16media_line.png \
17media_pause.png \ 17media_pause.png \
18media_play.png \ 18media_play.png \
19media_stop.png 19media_stop.png \
20media_knob_pos.png \
21media_knob_vol.png
diff --git a/data/themes/images/media_knob_pos.png b/data/themes/images/media_knob_pos.png
new file mode 100644
index 0000000..4193dc4
--- /dev/null
+++ b/data/themes/images/media_knob_pos.png
Binary files differ
diff --git a/data/themes/images/media_knob_vol.png b/data/themes/images/media_knob_vol.png
new file mode 100644
index 0000000..78c0067
--- /dev/null
+++ b/data/themes/images/media_knob_vol.png
Binary files differ
diff --git a/data/themes/images/media_line.png b/data/themes/images/media_line.png
index ee73548..96381ed 100644
--- a/data/themes/images/media_line.png
+++ b/data/themes/images/media_line.png
Binary files differ
diff --git a/data/themes/images/mediactrl.xcf b/data/themes/images/mediactrl.xcf
index cd51a98..dba910d 100644
--- a/data/themes/images/mediactrl.xcf
+++ b/data/themes/images/mediactrl.xcf
Binary files differ
diff --git a/data/themes/images/mediactrl2.xcf b/data/themes/images/mediactrl2.xcf
index 87af7d3..d59e71a 100644
--- a/data/themes/images/mediactrl2.xcf
+++ b/data/themes/images/mediactrl2.xcf
Binary files differ