Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_desklock.c e_entry.c e_int_border_prop.c
e_int_config_desklock.c e_widget_entry.c e_widget_entry.h
Log Message:
patches (see devel list) :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -3 -r1.555 -r1.556
--- e_border.c 17 Oct 2006 13:49:47 -0000 1.555
+++ e_border.c 21 Oct 2006 02:32:13 -0000 1.556
@@ -1684,7 +1684,7 @@
if ((bd->shaded) || (bd->shading)) return;
if (bd->fullscreen)
e_border_unfullscreen(bd);
- /* Only allow changes in vertical/ horisontal maximization */
+ /* Only allow changes in vertical/ horizontal maximization */
if (((bd->maximized & E_MAXIMIZE_DIRECTION) == (max &
E_MAXIMIZE_DIRECTION)) ||
((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return;
if (bd->new_client)
@@ -1899,18 +1899,29 @@
if (dir & E_MAXIMIZE_HORIZONTAL)
{
/* Remove vertical */
+ int w,h;
+
signal = 0;
bd->maximized &= ~E_MAXIMIZE_VERTICAL;
- e_border_move_resize(bd, bd->x, bd->saved.y, bd->w, bd->saved.h);
+ w = bd->w;
+ h = bd->saved.h;
+ e_border_resize_limit(bd, &w, &h);
+ e_border_resize_limit(bd, &w, &h);
+ e_border_move_resize(bd, bd->x, bd->saved.y, w, h);
bd->saved.y = bd->saved.h = 0;
e_hints_window_size_set(bd);
}
else if (dir & E_MAXIMIZE_VERTICAL)
{
- /* Remove horisontal */
+ /* Remove horizontal */
+ int w,h;
+
signal = 0;
bd->maximized &= ~E_MAXIMIZE_HORIZONTAL;
- e_border_move_resize(bd, bd->saved.x, bd->y, bd->saved.w, bd->h);
+ w = bd->saved.w;
+ h = bd->h;
+ e_border_resize_limit(bd, &w, &h);
+ e_border_move_resize(bd, bd->saved.x, bd->y, w, h);
bd->saved.x = bd->saved.w = 0;
e_hints_window_size_set(bd);
}
@@ -1928,6 +1939,7 @@
else h = bd->h;
bd->maximized = E_MAXIMIZE_NONE;
+ e_border_resize_limit(bd, &w, &h);
e_border_move_resize(bd, x, y, w, h);
bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0;
e_hints_window_size_unset(bd);
@@ -3544,12 +3556,7 @@
}
else
{
- if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
- {
- bd->saved.w = w;
- bd->saved.h = h;
- }
- else
+ if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_NONE)
e_border_resize(bd, w, h);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_desklock.c 19 Sep 2006 12:26:31 -0000 1.27
+++ e_desklock.c 21 Oct 2006 02:32:13 -0000 1.28
@@ -84,6 +84,10 @@
if (e_config->desklock_use_timeout)
ecore_x_screensaver_timeout_set(e_config->desklock_timeout);
}
+
+ if (e_config->desklock_background)
+ e_filereg_register(e_config->desklock_background);
+
return 1;
}
@@ -91,6 +95,9 @@
e_desklock_shutdown(void)
{
e_desklock_hide();
+ if (e_config->desklock_background)
+ e_filereg_deregister(e_config->desklock_background);
+
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_entry.c 21 Sep 2006 19:53:38 -0000 1.32
+++ e_entry.c 21 Oct 2006 02:32:13 -0000 1.33
@@ -594,7 +594,7 @@
}
}
/* Otherwise, we insert the corresponding character */
- else if ((event->string) &&
+ else if ((event->string) && ((sd->enabled)) &&
((strlen(event->string) != 1) || (event->string[0] >= 0x20)))
{
if (selecting)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_border_prop.c 11 Oct 2006 21:20:11 -0000 1.5
+++ e_int_border_prop.c 21 Oct 2006 02:32:13 -0000 1.6
@@ -300,6 +300,7 @@
e_widget_frametable_object_append(of, ob, x, y, 1, 1, 1, 1, 1, 1); \
ob = e_widget_entry_add(evas, &(cfdata->val)); \
if (!cfdata->val) e_widget_disabled_set(ob, 1); \
+ e_widget_entry_readonly_set(ob, 1); \
e_widget_min_size_get(ob, &mw, &mh); \
e_widget_min_size_set(ob, 160, mh); \
e_widget_frametable_object_append(of, ob, x + 1, y, 1, 1, 1, 1, 1,
1); \
@@ -309,6 +310,7 @@
ob = e_widget_label_add(evas, label); \
e_widget_frametable_object_append(of, ob, x, y, 1, 1, 1, 1, 1, 1); \
ob = e_widget_check_add(evas, "", &(cfdata->val)); \
+ e_widget_disabled_set(ob, 1); \
e_widget_frametable_object_append(of, ob, x + 1, y, 1, 1, 1, 1, 1,
1); \
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_config_desklock.c 17 Oct 2006 11:10:27 -0000 1.38
+++ e_int_config_desklock.c 21 Oct 2006 02:32:13 -0000 1.39
@@ -499,8 +499,12 @@
if (cfdata->bg)
{
if (e_config->desklock_background)
+ {
+ e_filereg_deregister(e_config->desklock_background);
evas_stringshare_del(e_config->desklock_background);
+ }
e_config->desklock_background = evas_stringshare_add(cfdata->bg);
+ e_filereg_register(e_config->desklock_background);
}
if (_e_desklock_zone_num_get() > 1)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_widget_entry.c 23 Aug 2006 10:51:35 -0000 1.17
+++ e_widget_entry.c 21 Oct 2006 02:32:13 -0000 1.18
@@ -132,6 +132,27 @@
}
/**
+ * Sets whether or not the entry widget is user-editable. This still
+ * allows copying and selecting, just no inserting or deleting of text.
+ *
+ * @param entry an entry widget
+ * @param readonly 1 to enable read-only mode, 0 to turn it off
+ */
+EAPI void
+e_widget_entry_readonly_set(Evas_Object *entry, int readonly_mode)
+{
+ E_Widget_Data *wd;
+
+ if (!(entry) || (!(wd = e_widget_data_get(entry))))
+ return;
+
+ if (readonly_mode)
+ e_entry_disable(wd->o_entry);
+ else
+ e_entry_enable(wd->o_entry);
+}
+
+/**
* Gets the editable object of the entry widget. It will allow you to have
* better control on the text, the cursor or the selection of the entry with
* the e_editable_*() functions.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_widget_entry.h 12 Aug 2006 12:21:32 -0000 1.6
+++ e_widget_entry.h 21 Oct 2006 02:32:13 -0000 1.7
@@ -11,6 +11,7 @@
EAPI const char *e_widget_entry_text_get (Evas_Object *entry);
EAPI void e_widget_entry_clear (Evas_Object *entry);
EAPI void e_widget_entry_password_set (Evas_Object *entry, int
password_mode);
+EAPI void e_widget_entry_readonly_set (Evas_Object *entry, int
readonly_mode);
EAPI Evas_Object *e_widget_entry_editable_object_get (Evas_Object *entry);
#endif
-------------------------------------------------------------------------
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
