Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c e_mod_main.h Makefile.am
Added Files:
e_mod_config.c e_mod_config.h
Log Message:
Pager Config Dialogue :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_mod_main.c 16 Dec 2005 04:35:49 -0000 1.149
+++ e_mod_main.c 16 Dec 2005 20:57:24 -0000 1.150
@@ -3,6 +3,7 @@
*/
#include "e.h"
#include "e_mod_main.h"
+#include "e_mod_config.h"
/* TODO
* which options should be in main menu, and which in face menu?
@@ -79,25 +80,17 @@
static void _pager_face_cb_leave(void *data, const char *type, void
*drop);
static void _pager_face_cb_drop(void *data, const char *type, void
*drop);
-static void _pager_face_cb_deskname_none(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_face_cb_deskname_top(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_face_cb_deskname_bottom(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_face_cb_deskname_left(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_face_cb_deskname_right(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _pager_face_deskname_position_change(Pager_Face *face);
static int _pager_popup_cb_timeout(void *data);
-static void _pager_menu_cb_speed_very_slow(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_menu_cb_speed_slow(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_menu_cb_speed_normal(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_menu_cb_speed_fast(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _pager_menu_cb_speed_very_fast(void *data, E_Menu *m,
E_Menu_Item *mi);
-
static void _pager_menu_cb_popup_enable(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _pager_menu_cb_aspect_keep_height(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _pager_menu_cb_aspect_keep_width(void *data, E_Menu *m,
E_Menu_Item *mi);
+static void _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
+
+
static int _pager_count;
static E_Config_DD *_conf_edd;
@@ -338,8 +331,6 @@
e_object_del(E_OBJECT(l->data));
evas_list_free(pager->menus);
e_object_del(E_OBJECT(pager->config_menu));
- e_object_del(E_OBJECT(pager->config_menu_deskname));
- e_object_del(E_OBJECT(pager->config_menu_speed));
if (pager->ev_handler_border_resize)
ecore_event_handler_del(pager->ev_handler_border_resize);
@@ -384,105 +375,9 @@
mn = e_menu_new();
pager->config_menu = mn;
- mn = e_menu_new();
- pager->config_menu_deskname = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("None"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (pager->conf->deskname_pos == PAGER_DESKNAME_NONE)
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_face_cb_deskname_none, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Top"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (pager->conf->deskname_pos == PAGER_DESKNAME_TOP)
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_face_cb_deskname_top, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Bottom"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (pager->conf->deskname_pos == PAGER_DESKNAME_BOTTOM)
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_face_cb_deskname_bottom, pager);
-
- /* FIXME: implement this in the theme, then re-enable */
- /*
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Left"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (pager->conf->deskname_pos == PAGER_DESKNAME_LEFT)
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_face_cb_deskname_left, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Right"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (pager->conf->deskname_pos == PAGER_DESKNAME_RIGHT)
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_face_cb_deskname_right, pager);
- */
-
- mn = e_menu_new();
- pager->config_menu_speed = mn;
-
- /* Desktopname speed */
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Slow"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (pager->conf->popup_speed == 6.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_menu_cb_speed_very_slow, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Slow"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (pager->conf->popup_speed == 4.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_menu_cb_speed_slow, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Normal"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (pager->conf->popup_speed == 2.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_menu_cb_speed_normal, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Fast"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (pager->conf->popup_speed == 1.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_menu_cb_speed_fast, pager);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Fast"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (pager->conf->popup_speed == 0.5) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _pager_menu_cb_speed_very_fast, pager);
-
- /* Submenus */
- mi = e_menu_item_new(pager->config_menu);
- e_menu_item_label_set(mi, _("Desktop Name"));
- e_menu_item_submenu_set(mi, pager->config_menu_deskname);
-
- mi = e_menu_item_new(pager->config_menu);
- e_menu_item_label_set(mi, _("Enable Popup"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, pager->conf->popup);
- e_menu_item_callback_set(mi, _pager_menu_cb_popup_enable, pager);
-
- mi = e_menu_item_new(pager->config_menu);
- e_menu_item_label_set(mi, _("Popup Speed"));
- e_menu_item_submenu_set(mi, pager->config_menu_speed);
+ e_menu_item_label_set(mi, _("Configuration"));
+ e_menu_item_callback_set(mi, _pager_menu_cb_configure, pager);
mi = e_menu_item_new(pager->config_menu);
e_menu_item_label_set(mi, _("Fix Aspect (Keep Height)"));
@@ -611,24 +506,15 @@
if (face->conf->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _pager_face_cb_menu_enabled, face);
*/
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Edit Mode"));
- e_menu_item_callback_set(mi, _pager_face_cb_menu_edit, face);
-
- /* Submenus */
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Desktop Name"));
- e_menu_item_submenu_set(mi, face->pager->config_menu_deskname);
+ /* Config */
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Enable Popup"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, face->pager->conf->popup);
- e_menu_item_callback_set(mi, _pager_menu_cb_popup_enable, face->pager);
-
+ e_menu_item_label_set(mi, _("Configuration"));
+ e_menu_item_callback_set(mi, _pager_menu_cb_configure, face->pager);
+
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Popup Speed"));
- e_menu_item_submenu_set(mi, face->pager->config_menu_speed);
+ e_menu_item_label_set(mi, _("Edit Mode"));
+ e_menu_item_callback_set(mi, _pager_face_cb_menu_edit, face);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Fix Aspect (Keep Height)"));
@@ -2165,96 +2051,6 @@
}
static void
-_pager_face_cb_deskname_none(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- Evas_List *l;
-
- pager = data;
- pager->conf->deskname_pos = PAGER_DESKNAME_NONE;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- _pager_face_deskname_position_change(face);
- }
- e_config_save_queue();
-}
-
-static void
-_pager_face_cb_deskname_top(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- Evas_List *l;
-
- pager = data;
- pager->conf->deskname_pos = PAGER_DESKNAME_TOP;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- _pager_face_deskname_position_change(face);
- }
- e_config_save_queue();
-}
-
-static void
-_pager_face_cb_deskname_bottom(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- Evas_List *l;
-
- pager = data;
- pager->conf->deskname_pos = PAGER_DESKNAME_BOTTOM;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- _pager_face_deskname_position_change(face);
- }
- e_config_save_queue();
-}
-
-static void
-_pager_face_cb_deskname_left(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- Evas_List *l;
-
- pager = data;
- pager->conf->deskname_pos = PAGER_DESKNAME_LEFT;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- _pager_face_deskname_position_change(face);
- }
- e_config_save_queue();
-}
-
-static void
-_pager_face_cb_deskname_right(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- Evas_List *l;
-
- pager = data;
- pager->conf->deskname_pos = PAGER_DESKNAME_RIGHT;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- _pager_face_deskname_position_change(face);
- }
- e_config_save_queue();
-}
-
-static void
_pager_face_deskname_position_change(Pager_Face *face)
{
switch (face->pager->conf->deskname_pos)
@@ -2278,60 +2074,6 @@
}
static void
-_pager_menu_cb_speed_very_slow(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup_speed = 6.0;
- e_config_save_queue();
-}
-
-static void
-_pager_menu_cb_speed_slow(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup_speed = 4.0;
- e_config_save_queue();
-}
-
-static void
-_pager_menu_cb_speed_normal(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup_speed = 2.0;
- e_config_save_queue();
-}
-
-static void
-_pager_menu_cb_speed_fast(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup_speed = 1.0;
- e_config_save_queue();
-}
-
-static void
-_pager_menu_cb_speed_very_fast(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup_speed = 0.5;
- e_config_save_queue();
-}
-
-static void
-_pager_menu_cb_popup_enable(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Pager *pager;
- pager = data;
- pager->conf->popup = e_menu_item_toggle_get(mi);
- e_config_save_queue();
-}
-
-static void
_pager_menu_cb_aspect_keep_height(void *data, E_Menu *m, E_Menu_Item *mi)
{
Pager *pager;
@@ -2380,3 +2122,30 @@
e_gadman_client_resize(face->gmc, face->fw, h);
}
}
+
+static void
+_pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ Pager *p;
+
+ p = data;
+ if (!p) return;
+ e_int_config_pager(e_container_current_get(e_manager_current_get()), p);
+}
+
+void
+_pager_cb_config_updated(void *data)
+{
+ Pager *pager;
+ Evas_List *l;
+
+ /* Handle Desktop Name Position Change */
+ pager = data;
+ for (l = pager->faces; l; l = l->next)
+ {
+ Pager_Face *face;
+
+ face = l->data;
+ _pager_face_deskname_position_change(face);
+ }
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_mod_main.h 5 Oct 2005 17:56:35 -0000 1.37
+++ e_mod_main.h 16 Dec 2005 20:57:24 -0000 1.38
@@ -68,7 +68,6 @@
Ecore_Event_Handler *ev_handler_zone_desk_count_set;
Ecore_Event_Handler *ev_handler_desk_show;
Ecore_Event_Handler *ev_handler_desk_name_change;
- Ecore_Event_Handler *ev_handler_container_resize;
};
struct _Pager_Face
@@ -148,4 +147,6 @@
EAPI int e_modapi_info (E_Module *module);
EAPI int e_modapi_about (E_Module *module);
+EAPI void _pager_cb_config_updated(void *data);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 8 May 2005 22:34:45 -0000 1.4
+++ Makefile.am 16 Dec 2005 20:57:24 -0000 1.5
@@ -20,7 +20,9 @@
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
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs