NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clock Config Dialog 

SVN revision: 19022
This commit is contained in:
Christopher Michael 2005-12-14 23:26:10 +00:00
parent 07b62938d6
commit f8d710af6d
5 changed files with 181 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/clock/Makefile.am
View File

@ -20,7 +20,9 @@ INCLUDES = -I. \
pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h
e_mod_main.h \
e_mod_config.c \
e_mod_config.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h

101
src/modules/clock/e_mod_config.c Normal file
View File

@ -0,0 +1,101 @@
#include "e.h"
#include "e_mod_main.h"
#include "config.h"
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata
{
int digital_style;
};
struct _Cfg_File_Data
{
E_Config_Dialog *cfd;
char *file;
};
/* Protos */
static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
Clock_Face *clk = NULL;
void
e_int_config_clock(E_Container *con, Clock_Face *c)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
clk = c;
/* Dialog Methods */
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
v.basic.create_widgets = _basic_create_widgets;
v.advanced.apply_cfdata = NULL;
v.advanced.create_widgets = NULL;
/* Create The Dialog */
cfd = e_config_dialog_new(con, _("Clock Module"), NULL, 0, &v, c);
}
static void
_fill_data(CFData *cfdata)
{
cfdata->digital_style = clk->conf->digitalStyle;
}
static void
*_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
cfdata = E_NEW(CFData, 1);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, CFData *cfdata)
{
free(cfdata);
}
static Evas_Object
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
_fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
rg = e_widget_radio_group_new(&(cfdata->digital_style));
ob = e_widget_radio_add(evas, _("No Digital Display"), 0, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Normal"), 1, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("24 Hour"), 2, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
e_border_button_bindings_ungrab_all();
clk->conf->digitalStyle = cfdata->digital_style;
e_border_button_bindings_grab_all();
e_config_save_queue();
_clock_face_cb_config_updated(clk);
return 1;
}

8
src/modules/clock/e_mod_config.h Normal file
View File

@ -0,0 +1,8 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H
#include "e_mod_main.h"
EAPI void e_int_config_clock(E_Container *con, Clock *c);
#endif
#endif

201
src/modules/clock/e_mod_main.c
View File

@ -22,9 +22,7 @@ static void _clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gad
static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static int _clock_count;
@ -32,23 +30,23 @@ static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
const int
DIGITAL_STYLE_NONE = 0,
DIGITAL_STYLE_NORMAL = 1,
DIGITAL_STYLE_24HOUR = 2
;
DIGITAL_STYLE_NONE = 0,
DIGITAL_STYLE_NORMAL = 1,
DIGITAL_STYLE_24HOUR = 2
;
/* public module routines. all modules must have these */
E_Module_Api e_modapi =
E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
"Clock"
"Clock"
};
void *
e_modapi_init(E_Module *module)
{
Clock *clock;
/* actually init clock */
clock = _clock_new();
module->config_menu = clock->config_menu;
@ -84,7 +82,7 @@ int
e_modapi_info(E_Module *module)
{
char buf[4096];
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module));
module->icon_file = strdup(buf);
return 1;
@ -93,8 +91,8 @@ e_modapi_info(E_Module *module)
int
e_modapi_about(E_Module *module)
{
e_module_dialog_show(_("Enlightenment Clock Module"),
_("A simple module to give E17 a clock."));
e_module_dialog_show(_("Enlightenment Clock Module"),
_("A simple module to give E17 a clock."));
return 1;
}
@ -105,7 +103,7 @@ _clock_new()
Clock *clock;
Evas_List *managers, *l, *l2, *cl;
E_Menu_Item *mi;
_clock_count = 0;
clock = E_NEW(Clock, 1);
if (!clock) return NULL;
@ -138,13 +136,13 @@ _clock_new()
for (l = managers; l; l = l->next)
{
E_Manager *man;
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Clock_Face *face;
con = l2->data;
face = _clock_face_new(con);
if (face)
@ -168,6 +166,10 @@ _clock_new()
/* This menu must be initialized after conf */
_clock_face_menu_new(face);
mi = e_menu_item_new(clock->config_menu);
e_menu_item_label_set(mi, _("Config Dialog"));
e_menu_item_callback_set(mi, _clock_face_cb_menu_configure, face);
mi = e_menu_item_new(clock->config_menu);
e_menu_item_label_set(mi, con->name);
@ -216,10 +218,10 @@ _clock_face_new(E_Container *con)
face = E_NEW(Clock_Face, 1);
if (!face) return NULL;
face->con = con;
e_object_ref(E_OBJECT(con));
evas_event_freeze(con->bg_evas);
o = edje_object_add(con->bg_evas);
face->clock_object = o;
@ -227,7 +229,7 @@ _clock_face_new(E_Container *con)
e_theme_edje_object_set(o, "base/theme/modules/clock",
"modules/clock/main");
evas_object_show(o);
o = evas_object_rectangle_add(con->bg_evas);
face->event_object = o;
evas_object_layer_set(o, 2);
@ -322,57 +324,17 @@ _clock_face_menu_new(Clock_Face *face)
if (face->conf->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _clock_face_cb_menu_enabled, face);
*/
/* Config */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Config Dialog"));
e_menu_item_callback_set(mi, _clock_face_cb_menu_configure, face);
/* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
e_menu_item_callback_set(mi, _clock_face_cb_menu_edit, face);
/*
* Create a Digital submenu
*/
smn = e_menu_new();
/* Hide digital time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("No Digital Display"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_NONE) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_none(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_none, face);
/* Show normal time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("Normal"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_normal(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face);
/* Show 24hour time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("24 Hour"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_24HOUR) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_24hour(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_24hour, face);
face->digital_menu = smn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Digital Display"));
e_menu_item_submenu_set(mi, face->digital_menu);
}
static void
@ -385,22 +347,22 @@ _clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change chan
switch (change)
{
case E_GADMAN_CHANGE_MOVE_RESIZE:
e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
evas_object_move(face->clock_object, x, y);
evas_object_move(face->event_object, x, y);
evas_object_resize(face->clock_object, w, h);
evas_object_resize(face->event_object, w, h);
break;
e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
evas_object_move(face->clock_object, x, y);
evas_object_move(face->event_object, x, y);
evas_object_resize(face->clock_object, w, h);
evas_object_resize(face->event_object, w, h);
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(face->clock_object);
evas_object_raise(face->event_object);
break;
evas_object_raise(face->clock_object);
evas_object_raise(face->event_object);
break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
break;
break;
}
}
@ -409,7 +371,7 @@ _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
{
Clock_Face *face;
Evas_Event_Mouse_Down *ev;
face = data;
ev = event_info;
if (ev->button == 3)
@ -430,72 +392,15 @@ _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
face = data;
enabled = e_menu_item_toggle_get(mi);
if ((face->conf->enabled) && (!enabled))
{
{
_clock_face_disable(face);
}
else if ((!face->conf->enabled) && (enabled))
{
{
_clock_face_enable(face);
}
}
static void
_clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NONE);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_NONE;
e_config_save_queue();
}
static void
_clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NORMAL);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_NORMAL;
e_config_save_queue();
}
static void
_clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_24HOUR);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_24HOUR;
e_config_save_queue();
}
static void
_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{
@ -505,3 +410,29 @@ _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
static void
_clock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
E_Config_Dialog *cfd;
face = data;
if (!face) return;
e_int_config_clock(face->con, face);
}
void
_clock_face_cb_config_updated(void *data)
{
Clock_Face *face;
char buf[2];
face = data;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", face->conf->digitalStyle);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
}

6
src/modules/clock/e_mod_main.h
View File

@ -17,9 +17,7 @@ struct _Config
struct _Config_Face
{
unsigned char enabled;
int
digitalStyle
;
int digitalStyle;
};
struct _Clock
@ -55,4 +53,6 @@ EAPI int e_modapi_save (E_Module *module);
EAPI int e_modapi_info (E_Module *module);
EAPI int e_modapi_about (E_Module *module);
EAPI void _clock_face_cb_config_updated(void *data);
#endif