summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-12-13 12:56:10 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-12-13 12:56:10 +0900
commit2ca0e69529510892a414a7fbcccd01d3d05e9474 (patch)
treee530d2c03c045279605012e8c50f9776e5dbbb43 /data
parent5ed68d82b2f147f5b365e2773ef8c2ab8e444531 (diff)
themes - fix mild, mustang, smyck, base16, black to work with tabs
still nyanology left
Diffstat (limited to 'data')
-rw-r--r--data/themes/default.edc5
-rw-r--r--data/themes/mild.edc411
2 files changed, 408 insertions, 8 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 2ac68c7..165e179 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -279,11 +279,6 @@ collections {
279 part { name: "terminology.content"; type: SWALLOW; 279 part { name: "terminology.content"; type: SWALLOW;
280 description { state: "default" 0.0; 280 description { state: "default" 0.0;
281 } 281 }
282 description { state: "tab" 0.0;
283 inherit: "default" 0.0;
284// rel1.to_y: "tabmiddle";
285// rel1.relative: 0.0 1.0;
286 }
287 } 282 }
288 283
289 //////////////////////////////////////////////////////////////////// 284 ////////////////////////////////////////////////////////////////////
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index b4476e8..4e006ed 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -32,6 +32,14 @@ collections {
32 image: "pm_shadow.png" COMP; 32 image: "pm_shadow.png" COMP;
33 image: "pm_overlay.png" COMP; 33 image: "pm_overlay.png" COMP;
34 image: "pm_fill.png" COMP; 34 image: "pm_fill.png" COMP;
35 image: "tab_bg_l0.png" COMP;
36 image: "tab_bg_l1.png" COMP;
37 image: "tab_bg_r0.png" COMP;
38 image: "tab_bg_r1.png" COMP;
39 image: "tab_shad_l0.png" COMP;
40 image: "tab_shad_l1.png" COMP;
41 image: "tab_shad_r0.png" COMP;
42 image: "tab_shad_r1.png" COMP;
35 } 43 }
36 sounds { 44 sounds {
37 sample { name: "bell" LOSSY 64; 45 sample { name: "bell" LOSSY 64;
@@ -245,8 +253,6 @@ collections {
245 // actual text grid for chars, cursors, selectiond etc. goes here 253 // actual text grid for chars, cursors, selectiond etc. goes here
246 part { name: "terminology.content"; type: SWALLOW; 254 part { name: "terminology.content"; type: SWALLOW;
247 description { state: "default" 0.0; 255 description { state: "default" 0.0;
248 rel1.offset: 1 2;
249 rel2.offset: -2 -2;
250 } 256 }
251 } 257 }
252 258
@@ -371,8 +377,10 @@ collections {
371 fixed: 1 1; 377 fixed: 1 1;
372 rel1.relative: 1.0 0.0; 378 rel1.relative: 1.0 0.0;
373 rel1.offset: -3 2; 379 rel1.offset: -3 2;
380 rel1.to: "viewregion";
374 rel2.relative: 1.0 0.0; 381 rel2.relative: 1.0 0.0;
375 rel2.offset: -3 2; 382 rel2.offset: -3 2;
383 rel2.to: "viewregion";
376 align: 1.0 0.0; 384 align: 1.0 0.0;
377 min: 16 16; 385 min: 16 16;
378 } 386 }
@@ -386,6 +394,28 @@ collections {
386 color: 0 0 0 0; 394 color: 0 0 0 0;
387 } 395 }
388 } 396 }
397
398 part { name: "terminology.tabregion"; type: SWALLOW;
399 description { state: "default" 0.0;
400 fixed: 1 1;
401 rel1.to: "terminology.content";
402 rel2.to: "viewregion";
403 rel2.relative: 1.0 0.0;
404 }
405 }
406 part { name: "viewregion"; type: SWALLOW;
407 description { state: "default" 0.0;
408 fixed: 1 1;
409 rel1.to: "terminology.content";
410 rel2.to: "terminology.content";
411 }
412 description { state: "tab" 0.0;
413 inherit: "default" 0.0;
414 rel1.to_y: "tabmiddle";
415 rel1.relative: 0.0 1.0;
416 }
417 }
418
389 program { 419 program {
390 signal: "mouse,in"; source: "tabcount_ev"; 420 signal: "mouse,in"; source: "tabcount_ev";
391 action: STATE_SET "over" 0.0; 421 action: STATE_SET "over" 0.0;
@@ -448,8 +478,12 @@ collections {
448 // miniview 478 // miniview
449 part { name: "terminology.miniview"; type: SWALLOW; 479 part { name: "terminology.miniview"; type: SWALLOW;
450 description { state: "default" 0.0; 480 description { state: "default" 0.0;
481 rel1.to_x: "terminology.content";
482 rel1.to_y: "viewregion";
483 rel2.to: "terminology.content";
451 //color: 255 255 255 0; 484 //color: 255 255 255 0;
452 visible: 0; 485 visible: 0;
486 fixed: 1 1;
453 } 487 }
454 description { state: "on" 0.0; 488 description { state: "on" 0.0;
455 inherit: "default" 0.0; 489 inherit: "default" 0.0;
@@ -469,6 +503,277 @@ collections {
469 target: "terminology.miniview"; 503 target: "terminology.miniview";
470 } 504 }
471 505
506 part { name: "tab_bevel_bg0";
507 mouse_events: 0;
508 description { state: "default" 0.0;
509 rel1.to: "tableft";
510 rel2.to_y: "tableft";
511 rel2.to_x: "tab_bevel_bg1";
512 rel2.relative: 0.0 1.0;
513 image.normal: "tab_bg_l0.png";
514 image.border: 2 0 4 4;
515 fill.smooth: 0;
516 visible: 0;
517 fixed: 1 1;
518 }
519 description { state: "tab" 0.0;
520 inherit: "default" 0.0;
521 visible: 1;
522 }
523 }
524 part { name: "tab_bevel_bg1";
525 mouse_events: 0;
526 description { state: "default" 0.0;
527 rel1.to: "tabmiddle";
528 rel1.offset: -4 0;
529 rel2.to: "tabmiddle";
530 align: 0.0 0.0;
531 max: 12 99999;
532 min: 12 0;
533 image.normal: "tab_bg_l1.png";
534 image.border: 0 0 4 4;
535 fill.smooth: 0;
536 visible: 0;
537 fixed: 1 1;
538 }
539 description { state: "tab" 0.0;
540 inherit: "default" 0.0;
541 visible: 1;
542 }
543 }
544 part { name: "tab_bevel_bg2"; type: SPACER;
545 description { state: "default" 0.0;
546 rel1.to: "tab_bevel_bg1";
547 rel1.relative: 1.0 0.0;
548 rel2.to: "tab_bevel_bg3";
549 rel2.relative: 0.0 1.0;
550 fixed: 1 1;
551 }
552 }
553 part { name: "tab_bevel_bg3";
554 mouse_events: 0;
555 description { state: "default" 0.0;
556 rel1.to: "tabmiddle";
557 rel2.to: "tabmiddle";
558 rel2.offset: 3 -1;
559 align: 1.0 0.0;
560 max: 12 99999;
561 min: 12 0;
562 image.normal: "tab_bg_r1.png";
563 image.border: 0 0 4 4;
564 fill.smooth: 0;
565 visible: 0;
566 fixed: 1 1;
567 }
568 description { state: "tab" 0.0;
569 inherit: "default" 0.0;
570 visible: 1;
571 }
572 }
573 part { name: "tab_bevel_bg4";
574 mouse_events: 0;
575 description { state: "default" 0.0;
576 rel1.to_y: "tabright";
577 rel1.to_x: "tab_bevel_bg3";
578 rel1.relative: 1.0 0.0;
579 rel2.to: "tabright";
580 image.normal: "tab_bg_r0.png";
581 image.border: 0 2 4 4;
582 fill.smooth: 0;
583 visible: 0;
584 fixed: 1 1;
585 }
586 description { state: "tab" 0.0;
587 inherit: "default" 0.0;
588 visible: 1;
589 }
590 }
591
592 part { name: "terminology.tabl.content"; type: SWALLOW;
593 description { state: "default" 0.0;
594 rel1.to: "tableft";
595 rel2.to: "tableft";
596 fixed: 1 1;
597 }
598 }
599 part { name: "terminology.tabr.content"; type: SWALLOW;
600 description { state: "default" 0.0;
601 rel1.to: "tabright";
602 rel2.to: "tabright";
603 fixed: 1 1;
604 }
605 }
606
607 ////////////////////////////////////////////////////////////////////
608 // a swallow to hold a finger size rect for min tab size
609 program {
610 signal: "tabbar,on"; source: "terminology";
611 action: STATE_SET "tab" 0.0;
612 target: "viewregion";
613 target: "tableft";
614 target: "tabmiddle";
615 target: "tabright";
616 target: "tab_bevel_bg0";
617 target: "tab_bevel_bg1";
618 target: "tab_bevel_bg3";
619 target: "tab_bevel_bg4";
620 target: "tabtitle";
621 }
622 program {
623 signal: "tabbar,off"; source: "terminology";
624 action: STATE_SET "default" 0.0;
625 target: "viewregion";
626 target: "tableft";
627 target: "tabmiddle";
628 target: "tabright";
629 target: "tab_bevel_bg0";
630 target: "tab_bevel_bg1";
631 target: "tab_bevel_bg3";
632 target: "tab_bevel_bg4";
633 target: "tabtitle";
634 }
635
636 part { name: "terminology.tab"; type: SWALLOW;
637 mouse_events: 0;
638 description { state: "default" 0.0;
639 rel1.relative: 1.0 0.0;
640 rel1.to_x: "terminology.tabl";
641 rel2.relative: 0.0 0.0;
642 rel2.to_x: "terminology.tabr";
643 align: 0.5 0.0;
644 visible: 0;
645 fixed: 1 1;
646 }
647 }
648 // some slot for dragable parts to stayt in along top edge of bg
649 part { name: "tabdrag"; type: SPACER;
650 description { state: "default" 0.0;
651 rel2.relative: 1.0 0.0;
652 fixed: 1 1;
653 }
654 }
655 // left boundary of the active tab (ragable 0.0 -> 1.0)
656 part { name: "terminology.tabl"; type: SPACER;
657 dragable.x: 1 1 0;
658 dragable.confine: "tabdrag";
659 description { state: "default" 0.0;
660 rel2.relative: 1.0 0.0;
661 max: 1 1;
662 fixed: 1 1;
663 }
664 }
665 // right boundary of the active tab (ragable 0.0 -> 1.0)
666 part { name: "terminology.tabr"; type: SPACER;
667 dragable.x: 1 1 0;
668 dragable.confine: "tabdrag";
669 description { state: "default" 0.0;
670 rel2.relative: 1.0 0.0;
671 max: 1 1;
672 fixed: 1 1;
673 }
674 }
675
676 part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
677 scale: 1;
678 effect: SOFT_SHADOW BOTTOM;
679 mouse_events: 0;
680 description { state: "default" 0.0;
681 color: 255 255 255 255;
682 color3: 0 0 0 18;
683 text { font: "Sans:style=Bold"; size: 10;
684 align: 0.5 0.0;
685 min: 0 1;
686 }
687 align: 0.5 0.0;
688 rel1.to_x: "tab_bevel_bg2";
689 rel1.offset: 0 2;
690 rel2.to_x: "tab_bevel_bg2";
691 rel2.offset: -1 2;
692 rel2.relative: 1.0 0.0;
693 visible: 0;
694 fixed: 1 1;
695 }
696 }
697 part { name: "tabtitle"; type: TEXT; mouse_events: 0;
698 scale: 1;
699 mouse_events: 0;
700 description { state: "default" 0.0;
701 color: 255 255 255 255;
702 text { font: "Sans:style=Bold"; size: 10;
703 align: 0.5 0.5;
704 min: 0 1;
705 text_source: "terminology.tab.title";
706 }
707 align: 0.5 0.5;
708 rel1.to_x: "tab_bevel_bg2";
709 rel1.to_y: "tabmiddle";
710 rel2.to_x: "tab_bevel_bg2";
711 rel2.to_y: "tabmiddle";
712 visible: 0;
713 fixed: 1 1;
714 }
715 description { state: "tab" 0.0;
716 inherit: "default" 0.0;
717 visible: 1;
718 }
719 }
720 part { name: "tablimit0"; type: SPACER;
721 description { state: "default" 0.0;
722 rel1.to_y: "terminology.tab";
723 rel1.relative: 0.0 1.0;
724 rel2.to_y: "terminology.tab.title";
725 align: 0.0 0.0;
726 fixed: 1 1;
727 }
728 }
729
730 part { name: "tableft"; type: RECT;
731 mouse_events: 0;
732 description { state: "default" 0.0;
733 rel2.to_x: "terminology.tab";
734 rel2.to_y: "tabmiddle";
735 rel2.relative: 0.0 1.0;
736 color: 0 0 0 0;
737 visible: 0;
738 fixed: 1 1;
739 }
740 description { state: "tab" 0.0;
741 inherit: "default" 0.0;
742 visible: 1;
743 }
744 }
745 part { name: "tabright"; type: RECT;
746 mouse_events: 0;
747 description { state: "default" 0.0;
748 rel1.to: "terminology.tab";
749 rel1.relative: 1.0 0.0;
750 rel2.to_y: "tabmiddle";
751 color: 0 0 0 0;
752 visible: 0;
753 fixed: 1 1;
754 }
755 description { state: "tab" 0.0;
756 inherit: "default" 0.0;
757 visible: 1;
758 }
759 }
760 part { name: "tabmiddle"; type: RECT;
761 description { state: "default" 0.0;
762 rel1.to: "terminology.tab";
763 rel2.to_x: "terminology.tab";
764 rel2.to_y: "tablimit0";
765 rel2.offset: -1 0;
766 color: 0 0 0 0;
767 align: 0.0 0.0;
768 visible: 0;
769 fixed: 1 1;
770 }
771 description { state: "tab" 0.0;
772 inherit: "default" 0.0;
773 visible: 1;
774 }
775 }
776
472 //////////////////////////////////////////////////////////////////// 777 ////////////////////////////////////////////////////////////////////
473 // a place terminology will place an entry box for internal commands 778 // a place terminology will place an entry box for internal commands
474 part { name: "cmdclip"; type: RECT; 779 part { name: "cmdclip"; type: RECT;
@@ -1123,8 +1428,108 @@ collections {
1123 } 1428 }
1124 } 1429 }
1125 1430
1431 group { name: "terminology/tabbar_back";
1432 images {
1433 image: "tab_other_l.png" COMP;
1434 image: "tab_other_m.png" COMP;
1435 image: "tab_other_r.png" COMP;
1436 image: "tab_shad_l2.png" COMP;
1437 image: "tab_shad_r2.png" COMP;
1438 }
1439 parts {
1440 part { name: "tab_bevel_shad1";
1441 mouse_events: 0;
1442 clip_to: "clip";
1443 description { state: "default" 0.0;
1444 rel1.to: "tab_base_top1";
1445 rel2.to: "tab_base_top1";
1446 image.normal: "tab_shad_l2.png";
1447 image.border: 0 0 10 10;
1448 fill.smooth: 0;
1449 }
1450 }
1451 part { name: "tab_bevel_shad3";
1452 mouse_events: 0;
1453 clip_to: "clip";
1454 description { state: "default" 0.0;
1455 rel1.to: "tab_base_top3";
1456 rel2.to: "tab_base_top3";
1457 image.normal: "tab_shad_r2.png";
1458 image.border: 0 0 10 10;
1459 fill.smooth: 0;
1460 }
1461 }
1462 part { name: "tab_base_top1";
1463 mouse_events: 0;
1464 clip_to: "clip";
1465 description { state: "default" 0.0;
1466 align: 0.0 0.0;
1467 rel1.offset: -4 0;
1468 max: 12 99999;
1469 min: 12 0;
1470 image.normal: "tab_other_l.png";
1471 image.border: 0 0 4 4;
1472 fill.smooth: 0;
1473 }
1474 }
1475 part { name: "tab_base_top2";
1476 mouse_events: 0;
1477 clip_to: "clip";
1478 description { state: "default" 0.0;
1479 rel1.to: "tab_base_top1";
1480 rel1.relative: 1.0 0.0;
1481 rel2.to: "tab_base_top3";
1482 rel2.relative: 0.0 1.0;
1483 image.normal: "tab_other_m.png";
1484 image.border: 0 0 4 4;
1485 fill.smooth: 0;
1486 }
1487 }
1488 part { name: "tab_base_top3";
1489 mouse_events: 0;
1490 clip_to: "clip";
1491 description { state: "default" 0.0;
1492 align: 1.0 0.0;
1493 rel2.offset: 3 -1;
1494 max: 12 99999;
1495 min: 12 0;
1496 image.normal: "tab_base_r1.png";
1497 image.normal: "tab_other_r.png";
1498 image.border: 0 0 4 4;
1499 fill.smooth: 0;
1500 }
1501 }
1502 part { name: "terminology.title"; type: TEXT; mouse_events: 0;
1503 scale: 1;
1504 description { state: "default" 0.0;
1505 text { font: "Sans:style=Bold"; size: 10;
1506 align: 0.5 0.5;
1507 min: 0 1;
1508 }
1509 align: 0.5 0.5;
1510 color: 96 96 96 255;
1511 rel1.to: "tab_base_top2";
1512 rel2.to: "tab_base_top2";
1513 }
1514 }
1515 part { name: "clip"; type: RECT;
1516 description { state: "default" 0.0;
1517 rel2.offset: -1 -2;
1518 }
1519 }
1520 part { name: "event"; type: RECT;
1521 description { state: "default" 0.0;
1522 color: 0 0 0 0;
1523 }
1524 }
1525 program {
1526 signal: "mouse,clicked,1"; source: "event";
1527 action: SIGNAL_EMIT "tab,activate" "terminology";
1528 }
1529 }
1530 }
1126 1531
1127////////////////////////////////////////////////////////////////////////////// 1532 //////////////////////////////////////////////////////////////////////////////
1128 //// the cursor to show where text is typed 1533 //// the cursor to show where text is typed
1129 group { name: "terminology/cursor"; 1534 group { name: "terminology/cursor";
1130 images { 1535 images {