Skip to content
Permalink
Browse files

Moksha menu once again and more complete.

  • Loading branch information...
rbtylee committed Jun 1, 2018
1 parent 6a9a753 commit c823c32ae9147a79e70bda42a2356935ede66fe5
Showing with 5 additions and 7 deletions.
  1. +1 −1 config/bodhi/e.src
  2. +2 −3 src/bin/e_order.c
  3. +2 −3 src/modules/conf_menus/e_int_config_menus.c
@@ -6446,7 +6446,7 @@ group "E_Config" struct {
value "scale.use_custom" uchar: 1;
value "show_cursor" uchar: 1;
value "idle_cursor" uchar: 1;
value "default_system_menu" string: "/etc/xdg/menus/lxde-applications.menu";
value "default_system_menu" string: "/etc/xdg/menus/moksha-applications.menu";
value "cfgdlg_normal_wins" uchar: 1;
value "syscon.main.icon_size" int: 64;
value "syscon.secondary.icon_size" int: 48;
@@ -32,12 +32,12 @@ e_order_init(void)
char buf[PATH_MAX];

E_FREE(menu_file);
snprintf(buf, sizeof(buf), "/etc/xdg/menus/e-applications.menu");
snprintf(buf, sizeof(buf), "/etc/xdg/menus/moksha-applications.menu");
if (ecore_file_exists(buf)) menu_file = strdup(buf);
else
{
snprintf(buf, sizeof(buf),
"%s/etc/xdg/menus/e-applications.menu",
"%s/etc/xdg/menus/moksha-applications.menu",
e_prefix_get());
if (ecore_file_exists(buf)) menu_file = strdup(buf);
}
@@ -319,4 +319,3 @@ _e_order_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__, v
}
return ECORE_CALLBACK_PASS_ON;
}

@@ -163,14 +163,14 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata)
tdesc = NULL;
e_user_homedir_concat(buf, sizeof(buf),
".config/menus/applications.menu");
snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/e-applications.menu",
snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/moksha-applications.menu",
e_prefix_get());
if (!strcmp("/etc/xdg/menus/applications.menu", file))
{
label = _("System Default");
if (!cfdata->default_system_menu) sel = i;
}
else if (!strcmp(buf2, file))
else if (!strcmp(buf2, file) || !strcmp("/etc/xdg/menus/moksha-applications.menu", file))
{
label = _("Moksha Default");
if (cfdata->default_system_menu)
@@ -300,7 +300,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data

ol = e_widget_list_add(evas, 0, 0);
ow = e_widget_check_add(evas, _(" No Menu Scroll (Experimental)"), &(cfdata->scroll_toggle));
e_widget_list_object_append(ol, ow);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_label_add(evas, _("Menu Scroll Speed"));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);

1 comment on commit c823c32

@rbtylee

This comment has been minimized.

Copy link
Collaborator Author

commented on c823c32 Jun 1, 2018

One should have moksha-menu installed in order for all this to work correctly.

Please sign in to comment.
You can’t perform that action at this time.