This patches updates the entry gry theme syncing it to the upstream one
(it includes some fixes for showing correctly wrapped multiline text
(like the bubble/anchorboxes in elmdentica).
commit 65bafb6d28c6307f69fe544ca820ada5dbac2672
Author: Marco Trevisan (Treviño) <[email protected]>
Date: Tue Aug 10 05:46:17 2010 +0200
gry-theme: sync the entry theme against upstream
diff --git a/elementary/elementary-theme-gry/gry.edc b/elementary/elementary-theme-gry/gry.edc
index 449afdd..839fe34 100644
--- a/elementary/elementary-theme-gry/gry.edc
+++ b/elementary/elementary-theme-gry/gry.edc
@@ -4141,19 +4141,33 @@ collections {
}
///////////////////////////////////////////////////////////////////////////////
- group { name: "elm/entry/base/default";
+ group { name: "elm/entry/base/default";
styles
{
style { name: "entry_textblock_style";
base: "font=Sans font_size=10 align=left color=#000 wrap=word";
tag: "br" "\n";
+ tag: "ps" "ps";
tag: "tab" "\t";
tag: "em" "+ font=Sans:style=Oblique";
tag: "b" "+ font=Sans:style=Bold";
tag: "link" "+ color=#800 underline=on underline_color=#8008";
tag: "hilight" "+ font=Sans:style=Bold";
}
+ style { name: "entry_textblock_disabled_style";
+ base: "font=Sans font_size=10 align=left color=#00000080 wrap=word";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "tab" "\t";
+ tag: "em" "+ font=Sans:style=Oblique";
+ tag: "b" "+ font=Sans:style=Bold";
+ tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+ tag: "hilight" "+ font=Sans:style=Bold";
+ }
}
+ data {
+// item: context_menu_orientation "horizontal";
+ }
parts {
part { name: "elm.text";
type: TEXTBLOCK;
@@ -4169,11 +4183,95 @@ collections {
source5: "elm/entry/anchor/default"; // anchor under
// source6: "X"; // anchor over
description { state: "default" 0.0;
+ fixed: 1 0;
text {
style: "entry_textblock_style";
min: 0 1;
}
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style";
+ min: 0 1;
+ }
+ }
+ }
+ }
+ programs {
+ program { name: "focus";
+ signal: "load";
+ source: "";
+ action: FOCUS_SET;
+ target: "elm.text";
+ }
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
+ }
+ }
+
+ group { name: "elm/entry/base-charwrap/default";
+ styles
+ {
+ style { name: "entry_textblock_style_charwrap";
+ base: "font=Sans font_size=10 align=left color=#000 wrap=char";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "tab" "\t";
+ tag: "em" "+ font=Sans:style=Oblique";
+ tag: "b" "+ font=Sans:style=Bold";
+ tag: "link" "+ color=#800 underline=on underline_color=#8008";
+ tag: "hilight" "+ font=Sans:style=Bold";
+ }
+ style { name: "entry_textblock_disabled_style_charwrap";
+ base: "font=Sans font_size=10 align=left color=#00000080 wrap=char";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "tab" "\t";
+ tag: "em" "+ font=Sans:style=Oblique";
+ tag: "b" "+ font=Sans:style=Bold";
+ tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+ tag: "hilight" "+ font=Sans:style=Bold";
+ }
+ }
+ parts {
+ part { name: "elm.text";
+ type: TEXTBLOCK;
+ mouse_events: 1;
+ scale: 1;
+ entry_mode: EDITABLE;
+ select_mode: EXPLICIT;
+ multiline: 1;
+ source: "elm/entry/selection/default"; // selection under
+// source2: "X"; // selection over
+// source3: "X"; // cursor under
+ source4: "elm/entry/cursor/default"; // cursorover
+ source5: "elm/entry/anchor/default"; // anchor under
+// source6: "X"; // anchor over
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ text {
+ style: "entry_textblock_style_charwrap";
+ min: 0 1;
+ }
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style_charwrap";
+ min: 0 1;
+ }
+ }
}
}
programs {
@@ -4183,9 +4281,22 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
+
group { name: "elm/entry/base-nowrap/default";
parts {
part { name: "elm.text";
@@ -4204,8 +4315,15 @@ collections {
min: 1 1;
}
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style";
+ min: 0 1;
+ }
+ }
}
-/*
+/*
part { name: "sel";
type: RECT;
mouse_events: 0;
@@ -4229,7 +4347,19 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
-/*
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
+/*
program { name: "selmode0";
signal: "elm,state,select,on";
source: "elm";
@@ -4252,12 +4382,23 @@ collections {
style { name: "entry_single_textblock_style";
base: "font=Sans font_size=10 align=left color=#000 wrap=none";
tag: "br" "\n";
+ tag: "ps" "ps";
tag: "tab" "\t";
tag: "em" "+ font=Sans:style=Oblique";
tag: "b" "+ font=Sans:style=Bold";
tag: "link" "+ color=#800 underline=on underline_color=#8008";
tag: "hilight" "+ font=Sans:style=Bold";
}
+ style { name: "entry_single_textblock_disabled_style";
+ base: "font=Sans font_size=10 align=left color=#00000080 wrap=none";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "tab" "\t";
+ tag: "em" "+ font=Sans:style=Oblique";
+ tag: "b" "+ font=Sans:style=Bold";
+ tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+ tag: "hilight" "+ font=Sans:style=Bold";
+ }
}
parts {
part { name: "elm.text";
@@ -4274,6 +4415,13 @@ collections {
text {
style: "entry_single_textblock_style";
min: 1 1;
+ max: 0 1;
+ }
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_single_textblock_disabled_style";
}
}
}
@@ -4285,6 +4433,18 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
@@ -4303,6 +4463,13 @@ collections {
text {
style: "entry_single_textblock_style";
min: 1 1;
+ max: 0 1;
+ }
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_single_textblock_disabled_style";
}
}
}
@@ -4314,6 +4481,18 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
@@ -4329,11 +4508,18 @@ collections {
source: "elm/entry/selection/default"; // selection under
source5: "elm/entry/anchor/default"; // anchor under
description { state: "default" 0.0;
+ fixed: 1 0;
text {
style: "entry_textblock_style";
min: 0 1;
}
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style";
+ }
+ }
}
}
programs {
@@ -4343,10 +4529,22 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
- group { name: "elm/entry/base-nowrap-noedit/default";
+ group { name: "elm/entry/base-noedit-charwrap/default";
parts {
part { name: "elm.text";
type: TEXTBLOCK;
@@ -4358,9 +4556,16 @@ collections {
source: "elm/entry/selection/default"; // selection under
source5: "elm/entry/anchor/default"; // anchor under
description { state: "default" 0.0;
+ fixed: 1 0;
text {
- style: "entry_textblock_style";
- min: 1 1;
+ style: "entry_textblock_style_charwrap";
+ min: 0 1;
+ }
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style_charwrap";
}
}
}
@@ -4372,28 +4577,44 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
- group { name: "elm/entry/base-password/default";
+ group { name: "elm/entry/base-nowrap-noedit/default";
parts {
part { name: "elm.text";
type: TEXTBLOCK;
mouse_events: 1;
scale: 1;
- entry_mode: PASSWORD;
+ entry_mode: PLAIN;
select_mode: EXPLICIT;
- multiline: 0;
+ multiline: 1;
source: "elm/entry/selection/default"; // selection under
- source4: "elm/entry/cursor/default"; // cursorover
source5: "elm/entry/anchor/default"; // anchor under
description { state: "default" 0.0;
text {
- style: "entry_single_textblock_style";
- repch: "*";
+ style: "entry_textblock_style";
min: 1 1;
}
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_textblock_disabled_style";
+ }
+ }
}
}
programs {
@@ -4403,159 +4624,73 @@ collections {
action: FOCUS_SET;
target: "elm.text";
}
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program { name: "enable";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
}
}
- group { name: "elm/entry/cursor/default";
- images {
- image: "cur_box.png" COMP;
- image: "cur_hi.png" COMP;
- image: "cur_shad.png" COMP;
- image: "cur_shine.png" COMP;
- image: "cur_glow.png" COMP;
- }
- parts {
- part { name: "clip2";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "clip";
- rel2.to: "clip";
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "clip";
- type: RECT;
- mouse_events: 0;
- clip_to: "clip2";
- description { state: "default" 0.0;
- rel1.offset: -10 0;
- rel2.offset: 9 9;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "bg";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: -2 0;
- rel2.to: "base";
- rel2.offset: 1 1;
- image.border: 2 2 2 2;
- image.normal: "cur_shad.png";
- }
- }
- part { name: "base";
- mouse_events: 0;
+ group { name: "elm/entry/base-password/default";
+ parts {
+ part { name: "elm.text";
+ type: TEXTBLOCK;
+ mouse_events: 1;
scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
- min: 2 2;
- align: 0.5 1.0;
- rel1.relative: 0.0 1.0;
- rel1.offset: 0 -1;
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -1;
- image.normal: "cur_box.png";
- }
- }
- part { name: "hi";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- rel2.relative: 1.0 0.5;
- image.normal: "cur_hi.png";
- }
- }
- part { name: "shine";
- mouse_events: 0;
- clip_to: "clip";
- clip_to: "clip2";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- rel2.relative: 1.0 0.75;
- image.border: 2 2 1 0;
- image.normal: "cur_shine.png";
- fill.smooth: 0;
- }
- }
- part { name: "glow";
- mouse_events: 0;
- clip_to: "clip2";
+ entry_mode: PASSWORD;
+ select_mode: EXPLICIT;
+ multiline: 0;
+ source: "elm/entry/selection/default"; // selection under
+ source4: "elm/entry/cursor/default"; // cursorover
+ source5: "elm/entry/anchor/default"; // anchor under
description { state: "default" 0.0;
- rel1.to: "base";
- rel1.relative: 0.0 -2.0;
- rel1.offset: -2 0;
- rel2.to: "base";
- rel2.relative: 1.0 0.0;
- rel2.offset: 1 1;
- image.border: 2 2 0 4;
- image.normal: "cur_glow.png";
- fill.smooth: 0;
+ text {
+ style: "entry_single_textblock_style";
+ repch: "*";
+ min: 1 1;
+ max: 0 1;
+ }
}
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ text {
+ style: "entry_single_textblock_disabled_style";
+ }
}
}
}
programs {
- program { name: "show";
- signal: "show";
+ program { name: "focus";
+ signal: "load";
source: "";
- action: STATE_SET "hidden" 0.0;
- in: 1.0 0.0;
- transition: DECELERATE 2.0;
- target: "glow";
- after: "show2";
- }
- program { name: "show2";
- action: STATE_SET "hidden" 0.0;
- in: 0.2 0.0;
- target: "clip";
- after: "show3";
- }
- program { name: "show3";
- action: STATE_SET "default" 0.0;
- in: 0.5 0.0;
- target: "clip";
- after: "show4";
- }
- program { name: "show4";
- action: STATE_SET "default" 0.0;
- in: 0.5 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- after: "show";
+ action: FOCUS_SET;
+ target: "elm.text";
}
- program { name: "focused";
- signal: "elm,action,focus";
+ program { name: "disable";
+ signal: "elm,state,disabled";
source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "clip2";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
}
- program { name: "unfocused";
- signal: "elm,action,unfocus";
+ program { name: "enable";
+ signal: "elm,state,enabled";
source: "elm";
- action: STATE_SET "default" 0.0;
- target: "clip2";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
}
}
}
-
+
group { name: "elm/entry/selection/default";
- parts {
+ parts {
part { name: "bg";
type: RECT;
mouse_events: 0;
@@ -4565,18 +4700,6 @@ collections {
}
}
}
-
- group { name: "elm/entry/anchor/default";
- parts {
- part { name: "bg";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- color: 128 0 0 64;
- }
- }
- }
- }
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/bubble/top_left/default";
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
