Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_display.c e_main.c e_shelf.c
Log Message:
move bar directory down 1 level so all "bar" dirs are in their own domain -
makes listing available bar dirs, managing them and so on much simpler and
cleaner. also add label popups to ibar (finally).
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_display.c 30 Apr 2006 04:31:42 -0000 1.5
+++ e_int_config_display.c 10 May 2006 07:42:38 -0000 1.6
@@ -242,23 +242,36 @@
man = e_manager_current_get();
sizes = ecore_x_randr_screen_sizes_get(man->root, &n);
- for (i = 0; i < n; i++)
+ if (!sizes)
{
- if ((sizes[i].width == w) &&
- (sizes[i].height == h))
+ e_util_dialog_show(_("Missing Features"),
+ _("Your X Display Server is missing support for<br>"
+ "The <hilight>XRandr</hilight> (X Resize and
Rotate) extension.<br>"
+ "You cannot change screen resolutions without<br>"
+ "The support of this extension. It could also
be<br>"
+ "That at the time <hilight>ecore</hilight> was
built there<br>"
+ "was no XRandr support detected."));
+ }
+ else
+ {
+ for (i = 0; i < n; i++)
{
- size = sizes[i];
- int k, rr;
- rates = ecore_x_randr_screen_refresh_rates_get(man->root, i, &rr);
- for (k = 0; k < rr; k++)
+ if ((sizes[i].width == w) &&
+ (sizes[i].height == h))
{
- if (rates[k].rate == r)
+ size = sizes[i];
+ int k, rr;
+ rates = ecore_x_randr_screen_refresh_rates_get(man->root, i,
&rr);
+ for (k = 0; k < rr; k++)
{
- rate = rates[k];
- break;
- }
+ if (rates[k].rate == r)
+ {
+ rate = rates[k];
+ break;
+ }
+ }
+ break;
}
- break;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -3 -r1.163 -r1.164
--- e_main.c 20 Apr 2006 11:30:24 -0000 1.163
+++ e_main.c 10 May 2006 07:42:38 -0000 1.164
@@ -806,6 +806,7 @@
"%s/.e/e/applications/all",
"%s/.e/e/applications/favorite",
"%s/.e/e/applications/bar",
+ "%s/.e/e/applications/bar/default",
"%s/.e/e/applications/startup",
"%s/.e/e/applications/restart",
"%s/.e/e/applications/trash",
@@ -835,7 +836,7 @@
/* err dont just disable it - replace it with a proper wizard tool */
/* outside e's main source to populate these directories from gnome/kde */
/* app menu data etc. */
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/.order", homedir);
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order",
homedir);
if (!ecore_file_exists(buf))
{
snprintf(buf, sizeof(buf),
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_shelf.c 5 May 2006 04:47:56 -0000 1.19
+++ e_shelf.c 10 May 2006 07:42:38 -0000 1.20
@@ -725,6 +725,16 @@
}
static void
+_e_shelf_cb_menu_contents(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Shelf *es;
+
+ es = data;
+ if (!es->gadcon->config_dialog)
+ e_int_gadcon_config(es->gadcon);
+}
+
+static void
_e_shelf_cb_menu_post(void *data, E_Menu *m)
{
E_Shelf *es;
@@ -766,6 +776,11 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Configure Contents"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/config");
+ e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es);
+
e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch);
e_menu_activate_mouse(mn,
e_util_zone_current_get(e_manager_current_get()),
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
