Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
note.c note.h
Log Message:
New Theming and EWL theming changes
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- note.c 12 Sep 2004 16:15:40 -0000 1.28
+++ note.c 12 Sep 2004 20:12:06 -0000 1.29
@@ -132,6 +132,7 @@
char *edjefn = malloc(PATH_MAX);
char *datestr;
char *fcontent;
+ char *prop;
Evas_Coord edje_w, edje_h;
@@ -255,17 +256,40 @@
p->pane = ewl_scrollpane_new();
ewl_container_child_append((Ewl_Container *) p->emb, p->pane);
+
+ if(edje_object_data_get(p->edje,EDJE_INFO_SCROLLBARS)!=NULL){
+ ewl_theme_data_str_set(p->pane,"/vscrollbar/file",edjefn);
+ ewl_theme_data_str_set(p->pane,"/hscrollbar/file",edjefn);
+
+ ewl_theme_data_str_set(p->pane,"/vscrollbar/group",EDJE_VSCROLLBAR);
+ ewl_theme_data_str_set(p->pane,"/hscrollbar/group",EDJE_HSCROLLBAR);
+ }
+
ewl_widget_show(p->pane);
- p->content = ewl_text_new(fcontent);
+ p->content = ewl_entry_new("");
ewl_container_child_append((Ewl_Container *) p->pane, p->content);
- ewl_object_fill_policy_set((Ewl_Object *) p->content,
- EWL_FLAG_FILL_FILL);
- ewl_callback_append(p->emb, EWL_CALLBACK_CONFIGURE, note_move_embed,
- p->pane);
+ ewl_theme_data_str_set(p->content,"/entry/group","none");
+
+ prop=(char*)edje_object_data_get(p->edje,EDJE_INFO_FONTNAME);
+ if(prop!=NULL)
+ ewl_theme_data_str_set(p->content,"/entry/text/font",prop);
+
+ prop=(char*)edje_object_data_get(p->edje,EDJE_INFO_FONTSTYLE);
+ if(prop!=NULL)
+ ewl_theme_data_str_set(p->content,"/entry/text/style",prop);
+
+ prop=(char*)edje_object_data_get(p->edje,EDJE_INFO_FONTSIZE);
+ if(prop!=NULL)
+ ewl_theme_data_str_set(p->content,"/entry/text/size",prop);
+
+ ewl_entry_text_set ((Ewl_Entry*)p->content,fcontent);
ewl_widget_show(p->content);
+ ewl_callback_append(p->emb, EWL_CALLBACK_CONFIGURE, note_move_embed,
+ p->pane);
+
/* Ecore Callbacks */
ecore_evas_callback_resize_set(p->win, note_ecore_resize);
ecore_evas_callback_destroy_set(p->win, note_ecore_close);
@@ -542,7 +566,7 @@
{
Note *p = evas_list_data(note);
- return ((char *) ewl_text_text_get((Ewl_Text *) p->content));
+ return ((char *) ewl_entry_text_get((Ewl_Entry *) p->content));
}
/**
@@ -553,7 +577,7 @@
char *
get_content_by_note_struct(Note * note)
{
- return ((char *) ewl_text_text_get((Ewl_Text *) note->content));
+ return ((char *) ewl_entry_text_get((Ewl_Entry *) note->content));
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- note.h 12 Sep 2004 15:33:57 -0000 1.11
+++ note.h 12 Sep 2004 20:12:06 -0000 1.12
@@ -37,6 +37,13 @@
#define EDJE_TEXT_USER "EnoteUser"
#define EDJE_TEXT_DATE "EnoteDate"
#define EDJE_TEXT_TITLE "EnoteTitle"
+#define EDJE_VSCROLLBAR "EnoteVScrollbar"
+#define EDJE_HSCROLLBAR "EnoteHScrollbar"
+
+#define EDJE_INFO_SCROLLBARS "EnoteInfoScrollbars"
+#define EDJE_INFO_FONTNAME "EnoteInfoFontName"
+#define EDJE_INFO_FONTSIZE "EnoteInfoFontSize"
+#define EDJE_INFO_FONTSTYLE "EnoteInfoFontStyle"
#define COMPARE_INTERVAL 0.01
#define TITLE_LENGTH 20
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
