Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : news
Dir : e_modules/news/data/theme
Modified Files:
Makefile.am module.edc module_feed_programs.edc
module_feedone_parts.edc module_feedone_programs.edc
module_icon.edc module_item.edc module_item_programs.edc
Removed Files:
module_viewer.edc module_viewer_parts.edc
module_viewer_programs.edc
Log Message:
cleanups and fixes
* [parse] avoid articles marked as read to become unread if there where
problems when reading the feed
* [item] fix the "one icon for all feeds" mode, and better theme for it
* [theme] cleanups
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 23 May 2007 23:37:16 -0000 1.2
+++ Makefile.am 3 Jun 2007 23:44:43 -0000 1.3
@@ -23,30 +23,20 @@
module_popw.edc \
module_popw_parts.edc \
module_popw_programs.edc \
-module_viewer.edc \
-module_viewer_parts.edc \
-module_viewer_programs.edc \
fonts/VeraBd.ttf \
fonts/Vera.ttf \
images/feed_background_new.png \
images/feed_border.png \
-images/feed_loading_1.png \
-images/feed_loading_done.png \
images/icon_article_read.png \
images/icon_article_unread.png \
-images/icon_infos.png \
images/icon_logo.png \
images/icon_setasread.png \
images/icon_update.png \
-images/icon_viewer.png \
-images/item_border.png \
-images/item_feed_back.png \
images/popup_warn_background.png \
images/popup_warn_disable_clicked.png \
images/popup_warn_disable.png \
images/popup_warn_logo_error.png \
-images/popup_warn_logo_info.png \
-images/viewer_background.png
+images/popup_warn_logo_info.png
e-module-news.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module.edc 16 May 2007 12:06:02 -0000 1.1
+++ module.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -2,9 +2,6 @@
images
{
- image: "item_border.png" COMP;
- image: "item_feed_back.png" COMP;
-
image: "feed_background_new.png" COMP;
image: "feed_border.png" COMP;
@@ -14,11 +11,7 @@
image: "popup_warn_logo_error.png" COMP;
image: "popup_warn_logo_info.png" COMP;
- image: "viewer_background.png" COMP;
-
image: "icon_logo.png" COMP;
- image: "icon_infos.png" COMP;
- image: "icon_viewer.png" COMP;
image: "icon_article_read.png" COMP;
image: "icon_article_unread.png" COMP;
image: "icon_update.png" COMP;
@@ -39,6 +32,5 @@
#include "module_feed.edc"
#include "module_feedone.edc"
#include "module_popw.edc"
- #include "module_viewer.edc"
#include "module_icon.edc"
}
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_feed_programs.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- module_feed_programs.edc 2 Jun 2007 21:33:12 -0000 1.3
+++ module_feed_programs.edc 3 Jun 2007 23:44:43 -0000 1.4
@@ -1,16 +1,3 @@
-/* Init */
-
-program
-{
- name: "init";
- signal: "load";
- source: "";
- script
- {
-
- }
-}
-
/* Signals for new state */
program
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_feedone_parts.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module_feedone_parts.edc 16 May 2007 12:06:02 -0000 1.1
+++ module_feedone_parts.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -1,28 +1,40 @@
part
{
- name: "background";
+ name: "icon";
type: IMAGE;
mouse_events: 0;
description
{
state: "default" 0.0;
- color: 255 255 255 0;
+ aspect: 1.0 1.0;
rel1
{
- relative: 0.0 0.0;
+ relative: 0.1 0.1;
}
rel2
{
- relative: 1.0 1.0;
- }
- image
- {
- normal: "feed_background_new.png";
+ relative: 0.9 0.9;
}
- }
+ image
+ {
+ normal: "icon_logo.png";
+ }
+ }
+}
+
+part
+{
+ name: "unread_clip";
+ type: RECT;
+ mouse_events: 0;
+ description
+ {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ }
description
{
- state: "new" 0.0;
+ state: "active" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
@@ -30,14 +42,13 @@
part
{
- name: "border";
+ name: "unread";
type: IMAGE;
mouse_events: 0;
+ clip_to: "unread_clip";
description
{
state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
rel1
{
relative: 0.0 0.0;
@@ -48,40 +59,51 @@
}
image
{
- normal: "feed_border.png";
+ normal: "feed_background_new.png";
}
}
+}
+
+part
+{
+ name: "border_clip";
+ type: RECT;
+ mouse_events: 0;
+ description
+ {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ }
description
{
- state: "selected" 0.0;
+ state: "active" 0.0;
inherit: "default" 0.0;
- visible: 1;
color: 255 255 255 255;
}
}
part
{
- name: "icon";
+ name: "border";
type: IMAGE;
mouse_events: 0;
+ clip_to: "border_clip";
description
{
state: "default" 0.0;
- aspect: 1.0 1.0;
rel1
{
- relative: 0.1 0.1;
+ relative: 0.0 0.0;
}
rel2
{
- relative: 0.9 0.9;
+ relative: 1.0 1.0;
}
- image
- {
- normal: "icon_logo.png";
- }
- }
+ image
+ {
+ normal: "feed_border.png";
+ }
+ }
}
part
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_feedone_programs.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module_feedone_programs.edc 16 May 2007 12:06:02 -0000 1.1
+++ module_feedone_programs.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -1,16 +1,3 @@
-/* Init */
-
-program
-{
- name: "init";
- signal: "load";
- source: "";
- script
- {
-
- }
-}
-
/* Signals for new state */
program
@@ -18,9 +5,9 @@
name: "new_set";
signal: "e,state,new,set";
source: "e";
- action: STATE_SET "new" 0.0;
- target: "background";
- transition: SINUSOIDAL 0.5;
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.7;
+ target: "unread_clip";
}
program
{
@@ -28,8 +15,8 @@
signal: "e,state,new,unset";
source: "e";
action: STATE_SET "default" 0.0;
- target: "background";
transition: SINUSOIDAL 0.5;
+ target: "unread_clip";
}
/* Mouse in/out */
@@ -39,8 +26,9 @@
name: "mouse_in";
signal: "mouse,in";
source: "inout";
- action: STATE_SET "selected" 0.0;
- target: "border";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.1;
+ target: "border_clip";
}
program
@@ -49,7 +37,8 @@
signal: "mouse,out";
source: "inout";
action: STATE_SET "default" 0.0;
- target: "border";
+ transition: SINUSOIDAL 0.5;
+ target: "border_clip";
}
program
@@ -57,5 +46,5 @@
name: "mouse_down";
signal: "mouse,down,1";
source: "inout";
- action: SIGNAL_EMIT "open" "feed";
+ action: SIGNAL_EMIT "e,action,open" "e";
}
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_icon.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module_icon.edc 16 May 2007 12:06:02 -0000 1.1
+++ module_icon.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -26,54 +26,6 @@
group
{
- name: "modules/news/icon/infos";
-
- parts
- {
- part
- {
- name: "icon";
- type: IMAGE;
- mouse_events: 0;
- description
- {
- state: "default" 0.0;
- aspect: 1.0 1.0;
- image
- {
- normal: "icon_infos.png";
- }
- }
- }
- }
-}
-
-group
-{
- name: "modules/news/icon/viewer";
-
- parts
- {
- part
- {
- name: "icon";
- type: IMAGE;
- mouse_events: 0;
- description
- {
- state: "default" 0.0;
- aspect: 1.0 1.0;
- image
- {
- normal: "icon_viewer.png";
- }
- }
- }
- }
-}
-
-group
-{
name: "modules/news/icon/article_read";
parts
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_item.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module_item.edc 16 May 2007 12:06:02 -0000 1.1
+++ module_item.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -4,11 +4,6 @@
{
name: "modules/news/item";
- script
- {
-
- }
-
parts
{
#include "module_item_parts.edc"
===================================================================
RCS file: /cvs/e/e_modules/news/data/theme/module_item_programs.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- module_item_programs.edc 16 May 2007 12:06:02 -0000 1.1
+++ module_item_programs.edc 3 Jun 2007 23:44:43 -0000 1.2
@@ -1,12 +0,0 @@
-/* Init */
-
-program
-{
- name: "init";
- signal: "load";
- source: "";
- script
- {
-
- }
-}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
