Hello community,
here is the log from the commit of package terminology-theme-openSUSE for
openSUSE:Factory checked in at 2014-10-14 13:24:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/terminology-theme-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.terminology-theme-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terminology-theme-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/terminology-theme-openSUSE/terminology-theme-openSUSE.changes
2014-09-17 17:26:58.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.terminology-theme-openSUSE.new/terminology-theme-openSUSE.changes
2014-10-14 13:25:12.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Oct 11 00:46:24 UTC 2014 - [email protected]
+
+- Pull in last upstream theme so that minimap and other new features
+ work properly
+- New theme package with licensing fixes that were picked up in
+ SR:252158, also fixed the spec.
+
+
+
+-------------------------------------------------------------------
Old:
----
terminology-theme-openSUSE-20140912.tar.xz
New:
----
terminology-theme-openSUSE-20141011.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ terminology-theme-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.JnhhLO/_old 2014-10-14 13:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.JnhhLO/_new 2014-10-14 13:25:13.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package terminology-theme-openSUSE
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,11 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: terminology-theme-openSUSE
-Version: 20140912
+Version: 20141011
Release: 0
Summary: openSUSE theme for Terminology
-License: BSD-2-Clause
+License: BSD-2-Clause and LGPL-2.1 and CC-BY-SA-3.0
Group: System/X11/terminals
Url: https://en.opensuse.org/Portal:Enlightenment
Source: %{name}-%{version}.tar.xz
++++++ terminology-theme-openSUSE-20140912.tar.xz ->
terminology-theme-openSUSE-20141011.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminology-theme-openSUSE-20140912/COPYING
new/terminology-theme-openSUSE-20141011/COPYING
--- old/terminology-theme-openSUSE-20140912/COPYING 2014-09-16
06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/COPYING 2014-10-11
13:53:25.000000000 +0200
@@ -2,13 +2,8 @@
There are several licenses used within this repository. All images are
licensed under
the license specified in licenses-authors/COPYING.images. The theme source
code
-(.edc files) is partly licensed lgpl for parts of the theme last modified in
elementary
-see licenses-authors/COPYING.lgpl and partly licensed under the BSD license
for parts
-last modified in enlightenment see licenses-authors/COPYING.bsd. I have Asked
the
-enlightenment developers to clarify which sections are covered by each license
-here https://phab.enlightenment.org/T1026 and any statements made in that
location shall
-over rule the statements in this file with respect to theme (.edc) files. The
terminology
-theme license is specified in licenses-authors/COPYING.terminology and authors
in
+(.edc files) is partly licensed lgpl see licenses-authors/COPYING.lgpl
+The terminology theme license is specified in
licenses-authors/COPYING.terminology and authors in
licenses-authors/AUTHORS.terminology.
All other contents of this repository including bash scripts and build scripts
shall be
licensed under the following license.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminology-theme-openSUSE-20140912/build-darkmod.sh
new/terminology-theme-openSUSE-20141011/build-darkmod.sh
--- old/terminology-theme-openSUSE-20140912/build-darkmod.sh 2014-09-16
06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/build-darkmod.sh 2014-10-11
13:53:25.000000000 +0200
@@ -9,13 +9,13 @@
# directory and they will be included over the existing images #
# #
#####################################################################
-if [ $1 == '--epkg' ]; then
+if [[ $1 == '--epkg' ]]; then
DKMD_EPKG=1
else
DKMD_EPKG=0
fi
-if [ $1 == '--termpkg' ]; then
+if [[ $1 == '--termpkg' ]]; then
DKMD_TERMPKG=1
else
DKMD_TERMPKG=0
@@ -233,10 +233,11 @@
inform "Creating theme"
+inform "edje_cc -v -id $MANUAL_IMAGE_DIR -id img-color-convd -id img-no-change
-fd fnt -sd snd default-dm.edc $ELM_ENLIGHT_AUTHORS $ELM_ENLIGHT_LICENSE
$THEME_NAME.edj"
edje_cc -v -id $MANUAL_IMAGE_DIR -id img-color-convd -id img-no-change -fd fnt
-sd snd default-dm.edc $ELM_ENLIGHT_AUTHORS $ELM_ENLIGHT_LICENSE $THEME_NAME.edj
report_on_error mv -v img-bak img
-if [ $DKMD_EPKG != 1 && $DKMD_TERMPKG != 1 ]; then
+if [ $DKMD_EPKG != 1 ]; then
report_on_error cp $THEME_NAME.edj ~/.elementary/themes
fi
popd
@@ -381,6 +382,7 @@
fi
done
+ inform "edje_cc -v -id $MANUAL_IMAGE_DIR -id img-color-convd -id
img-no-change -sd sounds default-dm.edc $TERMINOLOGY_LICENSE
$TERMINOLOGY_AUTHORS $THEME_NAME.edj"
edje_cc -v -id $MANUAL_IMAGE_DIR -id img-color-convd -id img-no-change -sd
sounds default-dm.edc $TERMINOLOGY_LICENSE $TERMINOLOGY_AUTHORS $THEME_NAME.edj
report_on_error mv -v img-bak images
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terminology-theme-openSUSE-20140912/clean-darkmod.sh
new/terminology-theme-openSUSE-20141011/clean-darkmod.sh
--- old/terminology-theme-openSUSE-20140912/clean-darkmod.sh 2014-09-16
06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/clean-darkmod.sh 2014-10-11
13:53:25.000000000 +0200
@@ -18,6 +18,8 @@
report_on_error rm $ELM_ENLIGHT_THEME_PATH/default-dm.edc
report_on_error rm $ELM_ENLIGHT_THEME_PATH/*.edj
+ rm *.xz
+
if [ -n "$TERMINOLOGY_THEME_PATH" ]; then
report_on_error rm -rf $TERMINOLOGY_THEME_PATH/img-color
report_on_error rm -rf $TERMINOLOGY_THEME_PATH/img-bgnd
@@ -31,4 +33,4 @@
}
-clean-darkmod
+clean-darkmod
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terminology-theme-openSUSE-20140912/darkmod-color-paths.conf
new/terminology-theme-openSUSE-20141011/darkmod-color-paths.conf
--- old/terminology-theme-openSUSE-20140912/darkmod-color-paths.conf
2014-09-16 06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/darkmod-color-paths.conf
2014-10-11 13:53:25.000000000 +0200
@@ -8,7 +8,7 @@
# Theme name
THEME_NAME=openSUSE
THEME_DESC="The default theme for enlightenment"
-THEME_VERSION=20140912
+THEME_VERSION=20141011
# Path to enlightenment theme if running from the theme dir . is fine
ELM_ENLIGHT_THEME_PATH=enlightenment-elementary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terminology-theme-openSUSE-20140912/licenses-authors/COPYING.images
new/terminology-theme-openSUSE-20141011/licenses-authors/COPYING.images
--- old/terminology-theme-openSUSE-20140912/licenses-authors/COPYING.images
2014-09-16 06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/licenses-authors/COPYING.images
2014-10-11 13:53:25.000000000 +0200
@@ -1 +1,5 @@
-Gesture Layer 2: Creative Commons Attribution Sharealike license.
http://gestureworks.com/features/open-source-gestures/
+Gesture Layer 2:
+ Illustrations provided by GestureWorks® (www.gestureworks.com)
+ Creative Commons Attribution Sharealike license v 3.0.
+ http://gestureworks.com/icons-fonts
+ http://creativecommons.org/licenses/by-sa/3.0/us/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terminology-theme-openSUSE-20140912/terminology/default.edc
new/terminology-theme-openSUSE-20141011/terminology/default.edc
--- old/terminology-theme-openSUSE-20140912/terminology/default.edc
2014-09-16 06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/terminology/default.edc
2014-10-11 13:53:25.000000000 +0200
@@ -6,30 +6,130 @@
#endif
collections {
-
-//////////////////////////////////////////////////////////////////////////////
- //// the background and general container for the terminal
- group { name: "terminology/core";
+
+ group { name: "terminology/miniview";
+ images {
+ image: "icon_close.png" COMP;
+ image: "fn_shadow.png" COMP;
+ }
+ set { name: "bg_shadow";
+ image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
+ image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
+ image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
+ }
parts {
- ////////////////////////////////////////////////////////////////////
- // background handling
- part { name: "fade"; type: RECT;
+ part { name: "miniview.bg"; type: RECT;
+ //mouse_events: 1;
description { state: "default" 0.0;
+ color: BG_COL;
}
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
+ }
+ part { name: "shadow";
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "bg_shadow";
+ fill.smooth: 0;
+ }
+ }
+ part { name: "miniview.img"; type: SWALLOW;
+ description { state: "default" 0.0;
+ visible: 1;
+ rel1 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to: "miniview.bg";
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ }
+ part { name: "miniview_screen"; type: RECT;
+ mouse_events: 1;
+ dragable {
+ confine: "miniview.img";
+ x: 0 0 0;
+ y: 1 1 0;
+ }
+ description { state: "default" 0.0;
+ color: 255 255 255 40;
+ fixed:1 1;
+ }
+ description { state: "outbounds" 0.0;
+ color: 255 25 35 40;
+ fixed:1 1;
+ }
+ }
+ part { name: "miniview.close_shadow"; type: IMAGE;
+ description { state: "default" 0.0;
+ image {
+ normal: "fn_shadow.png";
+ };
+ rel1 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 16 16;
+ }
}
}
+ part { name: "miniview.close"; type: IMAGE;
+ description { state: "default" 0.0;
+ image {
+ normal: "icon_close.png";
+ };
+ rel1.to: "miniview.close_shadow";
+ rel2.to: "miniview.close_shadow";
+ }
+ }
+ };
+ programs {
program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "fade";
+ signal: "mouse,clicked,1"; source: "miniview.close";
+ action: SIGNAL_EMIT "miniview,close" "terminology";
}
program {
- signal: "translucent,off"; source: "terminology";
+ signal: "miniview_screen,inbounds"; source: "miniview";
action: STATE_SET "default" 0.0;
- target: "fade";
+ target: "miniview_screen";
+ }
+ program {
+ signal: "miniview_screen,outbounds"; source: "miniview";
+ action: STATE_SET "outbounds" 0.0;
+ target: "miniview_screen";
+ }
+ };
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+ //// the background and general container for the terminal
+ group { name: "terminology/core";
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"fade", "default", 0.0);
+ get_state_val(PART:"fade", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"fade", STATE_COLOR, r, g, b, v);
+ set_state(PART:"fade", "custom", 0.0);
+ }
+ }
+ parts {
+ ////////////////////////////////////////////////////////////////////
+ // background handling
+ part { name: "fade"; type: RECT;
+ description { state: "default" 0.0;
+ }
}
part { name: "terminology.background"; type: SWALLOW;
clip_to: "fade";
@@ -82,6 +182,7 @@
rel2.offset: -2 -2;
}
}
+
}
}
@@ -111,6 +212,25 @@
source: "bell.wav";
}
}
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"shadow", "default", 0.0);
+ get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+ set_state(PART:"shadow", "custom", 0.0);
+
+ custom_state(PART:"base", "default", 0.0);
+ get_state_val(PART:"base", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"base", STATE_COLOR, r, g, b, v);
+ set_state(PART:"base", "custom", 0.0);
+ }
+ }
parts {
////////////////////////////////////////////////////////////////////
// background handling
@@ -119,11 +239,6 @@
description { state: "default" 0.0;
image.normal: "bg_shadow";
fill.smooth: 0;
- visible: 0;
- }
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- visible: 1;
}
}
part { name: "base"; type: RECT;
@@ -131,24 +246,8 @@
description { state: "default" 0.0;
color: BG_COL;
}
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "base";
- target: "shadow";
- }
- program {
- signal: "translucent,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "shadow";
}
-
+
////////////////////////////////////////////////////////////////////
// actual text grid for chars, cursors, selectiond etc. goes here
// and has a background layered behind it inside the swallowed
@@ -157,7 +256,7 @@
description { state: "default" 0.0;
}
}
-
+
////////////////////////////////////////////////////////////////////
// indicator of other tabs and control
part { name: "tabcount_clip"; type: RECT;
@@ -189,6 +288,7 @@
text { font: "Sans"; size: 8;
align: 1.0 0.5;
min: 1 1;
+ ellipsis: 0;
}
}
description { state: "over" 0.0;
@@ -215,6 +315,7 @@
text { font: "Sans"; size: 8;
align: 1.0 0.5;
min: 1 1;
+ ellipsis: 0;
}
}
description { state: "over" 0.0;
@@ -373,6 +474,7 @@
color: 0 0 0 0;
}
}
+
program {
signal: "mouse,in"; source: "tabcount_ev";
action: STATE_SET "over" 0.0;
@@ -448,6 +550,31 @@
}
////////////////////////////////////////////////////////////////////
+ // miniview
+ part { name: "terminology.miniview"; type: SWALLOW;
+ description { state: "default" 0.0;
+ //color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ //color: 255 255 255 255;
+ }
+ }
+
+ program {
+ signal: "miniview,off"; source: "terminology";
+ action: STATE_SET "default" 0.0;
+ target: "terminology.miniview";
+ }
+ program {
+ signal: "miniview,on"; source: "terminology";
+ action: STATE_SET "on" 0.0;
+ target: "terminology.miniview";
+ }
+
+ ////////////////////////////////////////////////////////////////////
// overlayed prettiness
part { name: "glow";
mouse_events: 0;
@@ -1275,8 +1402,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// the selection
// selections come in 5 modes:
//
@@ -2228,9 +2355,8 @@
}
}
}
-
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// the cursor to show where text is typed
group { name: "terminology/cursor";
images {
@@ -2239,6 +2365,23 @@
image: "cr_pulse.png" COMP;
image: "cr_glow.png" COMP;
}
+ sounds {
+ sample { name: "key-tap1" LOSSY 64;
+ source: "kbd-tap.wav";
+ }
+ sample { name: "key-tap2" LOSSY 64;
+ source: "kbd-tap2.wav";
+ }
+ sample { name: "key-tap3" LOSSY 64;
+ source: "kbd-tap3.wav";
+ }
+ sample { name: "key-tap4" LOSSY 64;
+ source: "kbd-tap4.wav";
+ }
+ sample { name: "key-tap5" LOSSY 64;
+ source: "kbd-tap5.wav";
+ }
+ }
parts {
part { name: "key";
mouse_events: 0;
@@ -2384,6 +2527,55 @@
}
program {
signal: "key,down"; source: "terminology";
+ script {
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
+ new buf[32];
+ snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
+ run_program(get_program_id(buf));
+#else
+ run_program(PROGRAM:"key-down4"); // chosen by a fair dice
roll
+ // guaranteed to be random.
+ // http://xkcd.com/221/
+#endif
+ }
+ }
+ program { name: "key-down1";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap1" 1.0;
+#endif
+ }
+ program { name: "key-down2";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap2" 1.0;
+#endif
+ }
+ program { name: "key-down3";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap3" 1.0;
+#endif
+ }
+ program { name: "key-down4";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap4" 1.0;
+#endif
+ }
+ program { name: "key-down5";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap5" 1.0;
+#endif
+ }
+ program {
+ signal: "key,down"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "key";
after: "key2";
@@ -2401,7 +2593,7 @@
}
}
}
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// an object to contain the selection tool used for selecting tabs (with
//// a glow grid of terms
group { name: "terminology/sel/base";
@@ -2415,6 +2607,25 @@
image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
}
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"shadow", "default", 0.0);
+ get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+ set_state(PART:"shadow", "custom", 0.0);
+
+ if (v < 255)
+ set_state(PART:"fill", "translucent", 0.0);
+ else
+ set_state(PART:"fill", "default", 0.0);
+ }
+ }
parts {
////////////////////////////////////////////////////////////////////
// background and shadows
@@ -2439,16 +2650,6 @@
visible: 0;
}
}
- program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "fill";
- }
- program {
- signal: "translucent,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "fill";
- }
////////////////////////////////////////////////////////////////////
// content (where the grid of terms goes)
@@ -2847,8 +3048,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// an object overlayd on text that is a link
group { name: "terminology/link";
images {
@@ -2958,7 +3159,7 @@
}
}
-//////////////////////////////////////////////////////////////////////////////
+
//////////////////////////////////////////////////////////////////////////////
//// the multimedia controls
group { name: "terminology/mediabusy";
images {
@@ -3082,7 +3283,7 @@
}
}
}
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// the multimedia controls
group { name: "terminology/mediactrl";
images {
@@ -3145,7 +3346,7 @@
}
}
part { name: "posline";
- mouse_events: 0;
+ mouse_events: 1;
repeat_events: 1;
clip_to: "media_clip";
description { state: "default" 0.0;
@@ -3160,7 +3361,7 @@
}
}
part { name: "terminology.posdrag";
- mouse_events: 1;
+ mouse_events: 0;
repeat_events: 1;
clip_to: "media_clip";
dragable {
@@ -3178,7 +3379,7 @@
}
}
part { name: "volline";
- mouse_events: 0;
+ mouse_events: 1;
repeat_events: 1;
clip_to: "media_clip";
description { state: "default" 0.0;
@@ -3198,7 +3399,7 @@
}
}
part { name: "terminology.voldrag"; type: IMAGE;
- mouse_events: 1;
+ mouse_events: 0;
repeat_events: 1;
clip_to: "media_clip";
dragable {
@@ -3263,6 +3464,74 @@
action: STATE_SET "default" 0.0;
target: "terminology.voldrag";
}
+ program {
+ signal: "mouse,down,1"; source: "posline";
+ filter: "terminology.posdrag" "default";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ get_geometry(PART:"posline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.posdrag", pos, 0.0);
+ emit("pos,drag,start", "");
+
+ }
+ }
+ program {
+ signal: "mouse,up,1"; source: "posline";
+ action: SIGNAL_EMIT "pos,drag,stop" "";
+ }
+ program {
+ signal: "mouse,move"; source: "posline";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ if (!get_mouse_buttons()) return;
+
+ get_geometry(PART:"posline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.posdrag", pos, 0.0);
+ emit("pos,drag", "");
+ }
+ }
+ program {
+ signal: "mouse,down,1"; source: "volline";
+ filter: "terminology.voldrag" "default";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ get_geometry(PART:"volline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.voldrag", pos, 0.0);
+ emit("vol,drag", "");
+
+ }
+ }
+ program {
+ signal: "mouse,move"; source: "volline";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ if (!get_mouse_buttons()) return;
+
+ get_geometry(PART:"volline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.voldrag", pos, 0.0);
+ emit("vol,drag", "");
+ }
+ }
}
}
@@ -3280,9 +3549,9 @@
ICON("paste", "icon_paste.png");
ICON("settings", "icon_settings.png");
ICON("about", "icon_about.png");
-#undef ICON
+#undef ICON
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// the about box content image
group { name: "terminology/about";
images {
@@ -3380,8 +3649,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// used in the font selection dialog to give a base for black text
//// previews so they are always visible
group { name: "terminology/fontpreview";
@@ -3437,4 +3706,5 @@
}
}
}
+
}
Files old/terminology-theme-openSUSE-20140912/terminology/default.edj and
new/terminology-theme-openSUSE-20141011/terminology/default.edj differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terminology-theme-openSUSE-20140912/terminology/edc/default.edc
new/terminology-theme-openSUSE-20141011/terminology/edc/default.edc
--- old/terminology-theme-openSUSE-20140912/terminology/edc/default.edc
2014-09-16 06:11:17.000000000 +0200
+++ new/terminology-theme-openSUSE-20141011/terminology/edc/default.edc
2014-10-11 13:53:25.000000000 +0200
@@ -6,30 +6,130 @@
#endif
collections {
-
-//////////////////////////////////////////////////////////////////////////////
- //// the background and general container for the terminal
- group { name: "terminology/core";
+
+ group { name: "terminology/miniview";
+ images {
+ image: "icon_close.png" COMP;
+ image: "fn_shadow.png" COMP;
+ }
+ set { name: "bg_shadow";
+ image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
+ image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
+ image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
+ }
parts {
- ////////////////////////////////////////////////////////////////////
- // background handling
- part { name: "fade"; type: RECT;
+ part { name: "miniview.bg"; type: RECT;
+ //mouse_events: 1;
description { state: "default" 0.0;
+ color: BG_COL;
}
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
+ }
+ part { name: "shadow";
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "bg_shadow";
+ fill.smooth: 0;
+ }
+ }
+ part { name: "miniview.img"; type: SWALLOW;
+ description { state: "default" 0.0;
+ visible: 1;
+ rel1 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to: "miniview.bg";
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ }
+ part { name: "miniview_screen"; type: RECT;
+ mouse_events: 1;
+ dragable {
+ confine: "miniview.img";
+ x: 0 0 0;
+ y: 1 1 0;
+ }
+ description { state: "default" 0.0;
+ color: 255 255 255 40;
+ fixed:1 1;
+ }
+ description { state: "outbounds" 0.0;
+ color: 255 25 35 40;
+ fixed:1 1;
+ }
+ }
+ part { name: "miniview.close_shadow"; type: IMAGE;
+ description { state: "default" 0.0;
+ image {
+ normal: "fn_shadow.png";
+ };
+ rel1 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to: "miniview.bg";
+ relative: 0.0 0.0;
+ offset: 16 16;
+ }
}
}
+ part { name: "miniview.close"; type: IMAGE;
+ description { state: "default" 0.0;
+ image {
+ normal: "icon_close.png";
+ };
+ rel1.to: "miniview.close_shadow";
+ rel2.to: "miniview.close_shadow";
+ }
+ }
+ };
+ programs {
program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "fade";
+ signal: "mouse,clicked,1"; source: "miniview.close";
+ action: SIGNAL_EMIT "miniview,close" "terminology";
}
program {
- signal: "translucent,off"; source: "terminology";
+ signal: "miniview_screen,inbounds"; source: "miniview";
action: STATE_SET "default" 0.0;
- target: "fade";
+ target: "miniview_screen";
+ }
+ program {
+ signal: "miniview_screen,outbounds"; source: "miniview";
+ action: STATE_SET "outbounds" 0.0;
+ target: "miniview_screen";
+ }
+ };
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+ //// the background and general container for the terminal
+ group { name: "terminology/core";
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"fade", "default", 0.0);
+ get_state_val(PART:"fade", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"fade", STATE_COLOR, r, g, b, v);
+ set_state(PART:"fade", "custom", 0.0);
+ }
+ }
+ parts {
+ ////////////////////////////////////////////////////////////////////
+ // background handling
+ part { name: "fade"; type: RECT;
+ description { state: "default" 0.0;
+ }
}
part { name: "terminology.background"; type: SWALLOW;
clip_to: "fade";
@@ -82,6 +182,7 @@
rel2.offset: -2 -2;
}
}
+
}
}
@@ -111,6 +212,25 @@
source: "bell.wav";
}
}
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"shadow", "default", 0.0);
+ get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+ set_state(PART:"shadow", "custom", 0.0);
+
+ custom_state(PART:"base", "default", 0.0);
+ get_state_val(PART:"base", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"base", STATE_COLOR, r, g, b, v);
+ set_state(PART:"base", "custom", 0.0);
+ }
+ }
parts {
////////////////////////////////////////////////////////////////////
// background handling
@@ -119,11 +239,6 @@
description { state: "default" 0.0;
image.normal: "bg_shadow";
fill.smooth: 0;
- visible: 0;
- }
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- visible: 1;
}
}
part { name: "base"; type: RECT;
@@ -131,24 +246,8 @@
description { state: "default" 0.0;
color: BG_COL;
}
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "base";
- target: "shadow";
- }
- program {
- signal: "translucent,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "shadow";
}
-
+
////////////////////////////////////////////////////////////////////
// actual text grid for chars, cursors, selectiond etc. goes here
// and has a background layered behind it inside the swallowed
@@ -157,7 +256,7 @@
description { state: "default" 0.0;
}
}
-
+
////////////////////////////////////////////////////////////////////
// indicator of other tabs and control
part { name: "tabcount_clip"; type: RECT;
@@ -189,6 +288,7 @@
text { font: "Sans"; size: 8;
align: 1.0 0.5;
min: 1 1;
+ ellipsis: 0;
}
}
description { state: "over" 0.0;
@@ -215,6 +315,7 @@
text { font: "Sans"; size: 8;
align: 1.0 0.5;
min: 1 1;
+ ellipsis: 0;
}
}
description { state: "over" 0.0;
@@ -373,6 +474,7 @@
color: 0 0 0 0;
}
}
+
program {
signal: "mouse,in"; source: "tabcount_ev";
action: STATE_SET "over" 0.0;
@@ -448,6 +550,31 @@
}
////////////////////////////////////////////////////////////////////
+ // miniview
+ part { name: "terminology.miniview"; type: SWALLOW;
+ description { state: "default" 0.0;
+ //color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "on" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ //color: 255 255 255 255;
+ }
+ }
+
+ program {
+ signal: "miniview,off"; source: "terminology";
+ action: STATE_SET "default" 0.0;
+ target: "terminology.miniview";
+ }
+ program {
+ signal: "miniview,on"; source: "terminology";
+ action: STATE_SET "on" 0.0;
+ target: "terminology.miniview";
+ }
+
+ ////////////////////////////////////////////////////////////////////
// overlayed prettiness
part { name: "glow";
mouse_events: 0;
@@ -1275,8 +1402,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// the selection
// selections come in 5 modes:
//
@@ -2228,9 +2355,8 @@
}
}
}
-
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// the cursor to show where text is typed
group { name: "terminology/cursor";
images {
@@ -2239,6 +2365,23 @@
image: "cr_pulse.png" COMP;
image: "cr_glow.png" COMP;
}
+ sounds {
+ sample { name: "key-tap1" LOSSY 64;
+ source: "kbd-tap.wav";
+ }
+ sample { name: "key-tap2" LOSSY 64;
+ source: "kbd-tap2.wav";
+ }
+ sample { name: "key-tap3" LOSSY 64;
+ source: "kbd-tap3.wav";
+ }
+ sample { name: "key-tap4" LOSSY 64;
+ source: "kbd-tap4.wav";
+ }
+ sample { name: "key-tap5" LOSSY 64;
+ source: "kbd-tap5.wav";
+ }
+ }
parts {
part { name: "key";
mouse_events: 0;
@@ -2384,6 +2527,55 @@
}
program {
signal: "key,down"; source: "terminology";
+ script {
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
+ new buf[32];
+ snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
+ run_program(get_program_id(buf));
+#else
+ run_program(PROGRAM:"key-down4"); // chosen by a fair dice
roll
+ // guaranteed to be random.
+ // http://xkcd.com/221/
+#endif
+ }
+ }
+ program { name: "key-down1";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap1" 1.0;
+#endif
+ }
+ program { name: "key-down2";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap2" 1.0;
+#endif
+ }
+ program { name: "key-down3";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap3" 1.0;
+#endif
+ }
+ program { name: "key-down4";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap4" 1.0;
+#endif
+ }
+ program { name: "key-down5";
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
+ action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
+#else
+ action: PLAY_SAMPLE "key-tap5" 1.0;
+#endif
+ }
+ program {
+ signal: "key,down"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "key";
after: "key2";
@@ -2401,7 +2593,7 @@
}
}
}
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// an object to contain the selection tool used for selecting tabs (with
//// a glow grid of terms
group { name: "terminology/sel/base";
@@ -2415,6 +2607,25 @@
image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
}
+ script {
+ public message(Msg_Type:type, id, ...) {
+ new r, g, b, a, v;
+
+ if ((type != MSG_INT) || (id != 1)) return;
+
+ v = (getarg(2) * 255) / 100;
+
+ custom_state(PART:"shadow", "default", 0.0);
+ get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+ set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+ set_state(PART:"shadow", "custom", 0.0);
+
+ if (v < 255)
+ set_state(PART:"fill", "translucent", 0.0);
+ else
+ set_state(PART:"fill", "default", 0.0);
+ }
+ }
parts {
////////////////////////////////////////////////////////////////////
// background and shadows
@@ -2439,16 +2650,6 @@
visible: 0;
}
}
- program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "fill";
- }
- program {
- signal: "translucent,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "fill";
- }
////////////////////////////////////////////////////////////////////
// content (where the grid of terms goes)
@@ -2847,8 +3048,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// an object overlayd on text that is a link
group { name: "terminology/link";
images {
@@ -2958,7 +3159,7 @@
}
}
-//////////////////////////////////////////////////////////////////////////////
+
//////////////////////////////////////////////////////////////////////////////
//// the multimedia controls
group { name: "terminology/mediabusy";
images {
@@ -3082,7 +3283,7 @@
}
}
}
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// the multimedia controls
group { name: "terminology/mediactrl";
images {
@@ -3145,7 +3346,7 @@
}
}
part { name: "posline";
- mouse_events: 0;
+ mouse_events: 1;
repeat_events: 1;
clip_to: "media_clip";
description { state: "default" 0.0;
@@ -3160,7 +3361,7 @@
}
}
part { name: "terminology.posdrag";
- mouse_events: 1;
+ mouse_events: 0;
repeat_events: 1;
clip_to: "media_clip";
dragable {
@@ -3178,7 +3379,7 @@
}
}
part { name: "volline";
- mouse_events: 0;
+ mouse_events: 1;
repeat_events: 1;
clip_to: "media_clip";
description { state: "default" 0.0;
@@ -3198,7 +3399,7 @@
}
}
part { name: "terminology.voldrag"; type: IMAGE;
- mouse_events: 1;
+ mouse_events: 0;
repeat_events: 1;
clip_to: "media_clip";
dragable {
@@ -3263,6 +3464,74 @@
action: STATE_SET "default" 0.0;
target: "terminology.voldrag";
}
+ program {
+ signal: "mouse,down,1"; source: "posline";
+ filter: "terminology.posdrag" "default";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ get_geometry(PART:"posline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.posdrag", pos, 0.0);
+ emit("pos,drag,start", "");
+
+ }
+ }
+ program {
+ signal: "mouse,up,1"; source: "posline";
+ action: SIGNAL_EMIT "pos,drag,stop" "";
+ }
+ program {
+ signal: "mouse,move"; source: "posline";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ if (!get_mouse_buttons()) return;
+
+ get_geometry(PART:"posline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.posdrag", pos, 0.0);
+ emit("pos,drag", "");
+ }
+ }
+ program {
+ signal: "mouse,down,1"; source: "volline";
+ filter: "terminology.voldrag" "default";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ get_geometry(PART:"volline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.voldrag", pos, 0.0);
+ emit("vol,drag", "");
+
+ }
+ }
+ program {
+ signal: "mouse,move"; source: "volline";
+ script {
+ new x, y, w, h, m_x, m_y;
+ new Float:pos;
+
+ if (!get_mouse_buttons()) return;
+
+ get_geometry(PART:"volline", x, y, w, h);
+ get_mouse(m_x, m_y);
+ pos = m_x - x;
+ pos = pos / w;
+ set_drag(PART:"terminology.voldrag", pos, 0.0);
+ emit("vol,drag", "");
+ }
+ }
}
}
@@ -3280,9 +3549,9 @@
ICON("paste", "icon_paste.png");
ICON("settings", "icon_settings.png");
ICON("about", "icon_about.png");
-#undef ICON
+#undef ICON
-//////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
//// the about box content image
group { name: "terminology/about";
images {
@@ -3380,8 +3649,8 @@
}
}
}
-
-//////////////////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////////////
//// used in the font selection dialog to give a base for black text
//// previews so they are always visible
group { name: "terminology/fontpreview";
@@ -3437,4 +3706,5 @@
}
}
}
+
}
Files old/terminology-theme-openSUSE-20140912/terminology/openSUSE.edj and
new/terminology-theme-openSUSE-20141011/terminology/openSUSE.edj differ
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
