Enlightenment CVS committal
Author : onefang
Project : e_modules
Module : emu
Dir : e_modules/emu/src/modules/emu_gadcon
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Most of the config stuff I was planning will one day be handled by shelf, so
remove it.
===================================================================
RCS file: /cvs/e/e_modules/emu/src/modules/emu_gadcon/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 23 Apr 2006 08:18:22 -0000 1.1
+++ e_mod_config.c 23 Apr 2006 08:42:34 -0000 1.2
@@ -4,11 +4,6 @@
struct _E_Config_Dialog_Data
{
- int autofit;
- int follower;
- int iconsize;
- double follow_speed;
- double autoscroll_speed;
};
struct _Cfg_File_Data
@@ -49,11 +44,6 @@
static void
_fill_data(Emu *emu, E_Config_Dialog_Data *cfdata)
{
- cfdata->autofit = (emu->conf->width == EMU_WIDTH_AUTO);
- cfdata->follower = emu->conf->follower;
- cfdata->iconsize = emu->conf->iconsize;
- cfdata->follow_speed = emu->conf->follow_speed;
- cfdata->autoscroll_speed = emu->conf->autoscroll_speed;
}
static void *
@@ -85,10 +75,7 @@
Evas_Object *o, *ob;
o = e_widget_list_add(evas, 0, 0);
- ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower));
- e_widget_list_object_append(o, ob, 1, 1, 0.5);
- ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit));
- e_widget_list_object_append(o, ob, 1, 1, 0.5);
+
return o;
}
@@ -100,23 +87,8 @@
emu = cfd->data;
e_border_button_bindings_ungrab_all();
- if ((cfdata->follower) && (!emu->conf->follower))
- {
- emu->conf->follower = 1;
- }
- else if (!(cfdata->follower) && (emu->conf->follower))
- {
- emu->conf->follower = 0;
- }
-
- if ((cfdata->autofit) && (emu->conf->width == EMU_WIDTH_FIXED))
- {
- emu->conf->width = EMU_WIDTH_AUTO;
- }
- else if (!(cfdata->autofit) && (emu->conf->width == EMU_WIDTH_AUTO))
- {
- emu->conf->width = EMU_WIDTH_FIXED;
- }
+
+
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -131,28 +103,6 @@
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Follower"), 0);
- ob = e_widget_check_add(evas, _("Visible"), &(cfdata->follower));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_label_add(evas, _("Follow Speed"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0,
&(cfdata->follow_speed), NULL, 200);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Icon Size"), 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 8.0, 128.0, 1.0, 0,
NULL, &(cfdata->iconsize), 200);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Width"), 0);
- ob = e_widget_check_add(evas, _("Auto Fit"), &(cfdata->autofit));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0,
&(cfdata->autoscroll_speed), NULL, 200);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -164,36 +114,7 @@
emu = cfd->data;
e_border_button_bindings_ungrab_all();
- if ((cfdata->follower) && (!emu->conf->follower))
- {
- emu->conf->follower = 1;
- }
- else if (!(cfdata->follower) && (emu->conf->follower))
- {
- emu->conf->follower = 0;
- }
-
- if ((cfdata->autofit) && (emu->conf->width == EMU_WIDTH_FIXED))
- {
- emu->conf->width = EMU_WIDTH_AUTO;
- }
- else if (!(cfdata->autofit) && (emu->conf->width == EMU_WIDTH_AUTO))
- {
- emu->conf->width = EMU_WIDTH_FIXED;
- }
-
- if (cfdata->iconsize != emu->conf->iconsize)
- {
- emu->conf->iconsize = cfdata->iconsize;
- }
- if (cfdata->follow_speed != emu->conf->follow_speed)
- {
- emu->conf->follow_speed = cfdata->follow_speed;
- }
- if (cfdata->autoscroll_speed != emu->conf->autoscroll_speed)
- {
- emu->conf->autoscroll_speed = cfdata->autoscroll_speed;
- }
+
e_border_button_bindings_grab_all();
e_config_save_queue();
===================================================================
RCS file: /cvs/e/e_modules/emu/src/modules/emu_gadcon/e_mod_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.c 23 Apr 2006 08:18:22 -0000 1.1
+++ e_mod_main.c 23 Apr 2006 08:42:34 -0000 1.2
@@ -625,11 +625,6 @@
// e_menu_item_separator_set(mi, 1);
//
// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Add face"));
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Remove face"));
-//
-// mi = e_menu_item_new(menu);
// e_menu_item_label_set(mi, D_("Add row"));
// mi = e_menu_item_new(menu);
// e_menu_item_label_set(mi, D_("Remove row"));
@@ -638,36 +633,6 @@
// mi = e_menu_item_new(menu);
// e_menu_item_label_set(mi, D_("Remove column"));
//
-// mi = e_menu_item_new(menu);
-// e_menu_item_separator_set(mi, 1);
-//
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Transparent"));
-// e_menu_item_check_set(mi, 1);
-// if (1)
-// e_menu_item_toggle_set(mi, 1);
-//
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Zoom icons"));
-// e_menu_item_check_set(mi, 1);
-// if (0)
-// e_menu_item_toggle_set(mi, 1);
-//
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Stretch bar"));
-// e_menu_item_check_set(mi, 1);
-// if (0)
-// e_menu_item_toggle_set(mi, 1);
-//
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, D_("Cling to edge"));
-// e_menu_item_check_set(mi, 1);
-// if (0)
-// e_menu_item_toggle_set(mi, 1);
-//
-// mi = e_menu_item_new(menu);
-// e_menu_item_label_set(mi, _("Follower"));
-// e_menu_item_check_set(mi, 1);
// if (0)
// e_menu_item_toggle_set(mi, 1);
//}
@@ -959,11 +924,33 @@
case E_GADCON_ORIENT_RIGHT:
dir = E_MENU_POP_DIRECTION_LEFT;
break;
- case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_CORNER_TL:
+ dir = E_MENU_POP_DIRECTION_DOWN;
+ break;
case E_GADCON_ORIENT_CORNER_TR:
+ dir = E_MENU_POP_DIRECTION_DOWN;
+ break;
case E_GADCON_ORIENT_CORNER_BL:
+ dir = E_MENU_POP_DIRECTION_UP;
+ break;
case E_GADCON_ORIENT_CORNER_BR:
+ dir = E_MENU_POP_DIRECTION_UP;
+ break;
+ case E_GADCON_ORIENT_CORNER_LT:
+ dir = E_MENU_POP_DIRECTION_RIGHT;
+ break;
+ case E_GADCON_ORIENT_CORNER_RT:
+ dir = E_MENU_POP_DIRECTION_LEFT;
+ break;
+ case E_GADCON_ORIENT_CORNER_LB:
+ dir = E_MENU_POP_DIRECTION_RIGHT;
+ break;
+ case E_GADCON_ORIENT_CORNER_RB:
+ dir = E_MENU_POP_DIRECTION_LEFT;
+ break;
+ case E_GADCON_ORIENT_FLOAT:
+ case E_GADCON_ORIENT_HORIZ:
+ case E_GADCON_ORIENT_VERT:
default:
dir = E_MENU_POP_DIRECTION_AUTO;
break;
===================================================================
RCS file: /cvs/e/e_modules/emu/src/modules/emu_gadcon/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 23 Apr 2006 08:18:22 -0000 1.1
+++ e_mod_main.h 23 Apr 2006 08:42:34 -0000 1.2
@@ -17,11 +17,6 @@
struct _Config
{
char *appdir;
- int follower;
- double follow_speed;
- double autoscroll_speed;
- int iconsize;
- int width;
Evas_List *emus;
};
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
