forked from enlightenment/enlightenment
Use toolbook for menu pages...works better on small resolutions.
SVN revision: 46732
This commit is contained in:
Christopher Michael
parent
cdd86db6ac
commit
e4ea2191c2
|
|
@ -1,77 +1,70 @@
|
|||
#include "e.h"
|
||||
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
/* local structures */
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
int menu_favorites_show;
|
||||
int menu_apps_show;
|
||||
|
||||
int menu_eap_name_show;
|
||||
int menu_eap_generic_show;
|
||||
int menu_eap_comment_show;
|
||||
|
||||
/* Advanced */
|
||||
double menus_scroll_speed;
|
||||
double menus_fast_mouse_move_threshhold;
|
||||
double menus_click_drag_timeout;
|
||||
int menu_autoscroll_margin;
|
||||
int menu_autoscroll_cursor_margin;
|
||||
int show_favs, show_apps;
|
||||
int show_name, show_generic, show_comment;
|
||||
double scroll_speed, fast_mouse_move_threshhold;
|
||||
double click_drag_timeout;
|
||||
int autoscroll_margin, autoscroll_cursor_margin;
|
||||
};
|
||||
|
||||
/* local function prototypes */
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _fill_data(E_Config_Dialog_Data *cfdata);
|
||||
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
E_Config_Dialog *
|
||||
e_int_config_menus(E_Container *con, const char *params __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
|
||||
if (e_config_dialog_find("E", "menus/menu_settings")) return NULL;
|
||||
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
|
||||
v->create_cfdata = _create_data;
|
||||
v->free_cfdata = _free_data;
|
||||
v->basic.apply_cfdata = _basic_apply;
|
||||
v->basic.create_widgets = _basic_create;
|
||||
v->advanced.apply_cfdata = _advanced_apply;
|
||||
v->advanced.create_widgets = _advanced_create;
|
||||
|
||||
cfd = e_config_dialog_new(con,
|
||||
_("Menu Settings"),
|
||||
"E", "menus/menu_settings",
|
||||
"preferences-menus", 0, v, NULL);
|
||||
v->basic.apply_cfdata = _basic_apply;
|
||||
v->advanced.create_widgets = _adv_create;
|
||||
v->advanced.apply_cfdata = _adv_apply;
|
||||
|
||||
cfd = e_config_dialog_new(con, _("Menu Settings"), "E", "menus/menu_settings",
|
||||
"preferences-menus", 0, v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
||||
/* local functions */
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
_fill_data(cfdata);
|
||||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->menu_favorites_show = e_config->menu_favorites_show;
|
||||
cfdata->menu_apps_show = e_config->menu_apps_show;
|
||||
cfdata->menu_eap_name_show = e_config->menu_eap_name_show;
|
||||
cfdata->menu_eap_generic_show = e_config->menu_eap_generic_show;
|
||||
cfdata->menu_eap_comment_show = e_config->menu_eap_comment_show;
|
||||
cfdata->menus_scroll_speed = e_config->menus_scroll_speed;
|
||||
cfdata->menus_fast_mouse_move_threshhold =
|
||||
cfdata->show_favs = e_config->menu_favorites_show;
|
||||
cfdata->show_apps = e_config->menu_apps_show;
|
||||
cfdata->show_name = e_config->menu_eap_name_show;
|
||||
cfdata->show_generic = e_config->menu_eap_generic_show;
|
||||
cfdata->show_comment = e_config->menu_eap_comment_show;
|
||||
cfdata->scroll_speed = e_config->menus_scroll_speed;
|
||||
cfdata->fast_mouse_move_threshhold =
|
||||
e_config->menus_fast_mouse_move_threshhold;
|
||||
cfdata->menus_click_drag_timeout = e_config->menus_click_drag_timeout;
|
||||
cfdata->menu_autoscroll_margin = e_config->menu_autoscroll_margin;
|
||||
cfdata->menu_autoscroll_cursor_margin =
|
||||
e_config->menu_autoscroll_cursor_margin;
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
_fill_data(cfdata);
|
||||
return cfdata;
|
||||
cfdata->click_drag_timeout = e_config->menus_click_drag_timeout;
|
||||
cfdata->autoscroll_margin = e_config->menu_autoscroll_margin;
|
||||
cfdata->autoscroll_cursor_margin = e_config->menu_autoscroll_cursor_margin;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -80,135 +73,128 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
e_config->menu_favorites_show = cfdata->menu_favorites_show;
|
||||
e_config->menu_apps_show = cfdata->menu_apps_show;
|
||||
e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
|
||||
e_config->menu_eap_generic_show = cfdata->menu_eap_generic_show;
|
||||
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *of, *ob;
|
||||
Evas_Object *o, *of, *ow;
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Main Menu Settings"), 0);
|
||||
ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
|
||||
&(cfdata->menu_favorites_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
|
||||
&(cfdata->menu_apps_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Show Favorites"), &(cfdata->show_favs));
|
||||
e_widget_framelist_object_append(of, ow);
|
||||
ow = e_widget_check_add(evas, _("Show Applications"), &(cfdata->show_apps));
|
||||
e_widget_framelist_object_append(of, ow);
|
||||
e_widget_list_object_append(o, of, 1, 0, 0.5);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
|
||||
ob = e_widget_check_add(evas, _("Show Name In Menu"),
|
||||
&(cfdata->menu_eap_name_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Generic In Menu"),
|
||||
&(cfdata->menu_eap_generic_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Comment In Menu"),
|
||||
&(cfdata->menu_eap_comment_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Show Name"), &(cfdata->show_name));
|
||||
e_widget_framelist_object_append(of, ow);
|
||||
ow = e_widget_check_add(evas, _("Show Generic"), &(cfdata->show_generic));
|
||||
e_widget_framelist_object_append(of, ow);
|
||||
ow = e_widget_check_add(evas, _("Show Comments"), &(cfdata->show_comment));
|
||||
e_widget_framelist_object_append(of, ow);
|
||||
e_widget_list_object_append(o, of, 1, 0, 0.5);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
static int
|
||||
_advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
e_config->menu_favorites_show = cfdata->menu_favorites_show;
|
||||
e_config->menu_apps_show = cfdata->menu_apps_show;
|
||||
e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
|
||||
e_config->menu_eap_generic_show = cfdata->menu_eap_generic_show;
|
||||
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
|
||||
|
||||
if (cfdata->menus_scroll_speed == 0)
|
||||
e_config->menus_scroll_speed = 1.0;
|
||||
else
|
||||
e_config->menus_scroll_speed = cfdata->menus_scroll_speed;
|
||||
|
||||
if (cfdata->menus_fast_mouse_move_threshhold == 0)
|
||||
e_config->menus_fast_mouse_move_threshhold = 1.0;
|
||||
else
|
||||
{
|
||||
e_config->menus_fast_mouse_move_threshhold =
|
||||
cfdata->menus_fast_mouse_move_threshhold;
|
||||
}
|
||||
|
||||
e_config->menus_click_drag_timeout = cfdata->menus_click_drag_timeout;
|
||||
e_config->menu_autoscroll_margin = cfdata->menu_autoscroll_margin;
|
||||
e_config->menu_autoscroll_cursor_margin =
|
||||
cfdata->menu_autoscroll_cursor_margin;
|
||||
e_config->menu_favorites_show = cfdata->show_favs;
|
||||
e_config->menu_apps_show = cfdata->show_apps;
|
||||
e_config->menu_eap_name_show = cfdata->show_name;
|
||||
e_config->menu_eap_generic_show = cfdata->show_generic;
|
||||
e_config->menu_eap_comment_show = cfdata->show_comment;
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *of, *ob;
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
of = e_widget_framelist_add(evas, _("Main Menu Settings"), 0);
|
||||
ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
|
||||
&(cfdata->menu_favorites_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
|
||||
&(cfdata->menu_apps_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
Evas_Object *otb, *ol, *ow;
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
|
||||
ob = e_widget_check_add(evas, _("Show Name In Menu"),
|
||||
&(cfdata->menu_eap_name_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Generic In Menu"),
|
||||
&(cfdata->menu_eap_generic_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Show Comment In Menu"),
|
||||
&(cfdata->menu_eap_comment_show));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
|
||||
|
||||
of = e_widget_frametable_add(evas, _("Autoscroll Settings"), 0);
|
||||
ob = e_widget_label_add(evas, _("Autoscroll Margin"));
|
||||
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
|
||||
NULL, &(cfdata->menu_autoscroll_margin), 200);
|
||||
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_label_add(evas, _("Autoscroll Cursor Margin"));
|
||||
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
|
||||
NULL, &(cfdata->menu_autoscroll_cursor_margin), 200);
|
||||
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ow = e_widget_check_add(evas, _("Show Favorites"), &(cfdata->show_favs));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Show Applications"), &(cfdata->show_apps));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Main Menu"), ol, 0, 0, 0, 0,
|
||||
0.5, 0.0);
|
||||
|
||||
of = e_widget_frametable_add(evas, _("Miscellaneous Options"), 0);
|
||||
ob = e_widget_label_add(evas, _("Menu Scroll Speed"));
|
||||
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/sec"), 0.0, 20000.0,
|
||||
100.0, 0, &(cfdata->menus_scroll_speed), NULL, 200);
|
||||
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_label_add(evas, _("Fast Mouse Move Threshhold"));
|
||||
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0.0, 2000.0,
|
||||
10.0, 0, &(cfdata->menus_fast_mouse_move_threshhold),
|
||||
NULL, 200);
|
||||
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_label_add(evas, _("Click Drag Timeout"));
|
||||
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%2.2f seconds"), 0.0, 10.0, 0.25,
|
||||
0, &(cfdata->menus_click_drag_timeout), NULL, 200);
|
||||
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ow = e_widget_check_add(evas, _("Show Name"), &(cfdata->show_name));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Show Generic"), &(cfdata->show_generic));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Show Comments"), &(cfdata->show_comment));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("General Menu"), ol, 0, 0, 0, 0,
|
||||
0.5, 0.0);
|
||||
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
return o;
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ow = e_widget_label_add(evas, _("Autoscroll Margin"));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL,
|
||||
&(cfdata->autoscroll_margin), 200);
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_label_add(evas, _("Autoscroll Cursor Margin"));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL,
|
||||
&(cfdata->autoscroll_cursor_margin), 200);
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Autoscroll"), ol, 0, 0, 0, 0,
|
||||
0.5, 0.0);
|
||||
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ow = e_widget_label_add(evas, _("Menu Scroll Speed"));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/sec"), 0, 20000, 100,
|
||||
0, &(cfdata->scroll_speed), NULL, 200);
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_label_add(evas, _("Fast Mouse Move Threshhold"));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0, 2000, 10,
|
||||
0, &(cfdata->fast_mouse_move_threshhold), NULL, 200);
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_label_add(evas, _("Click Drag Timeout"));
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%2.2f sec"), 0, 10, 0.25,
|
||||
0, &(cfdata->click_drag_timeout), NULL, 200);
|
||||
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 0, 0, 0, 0,
|
||||
0.5, 0.0);
|
||||
|
||||
e_widget_toolbook_page_show(otb, 0);
|
||||
return otb;
|
||||
}
|
||||
|
||||
static int
|
||||
_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
e_config->menu_favorites_show = cfdata->show_favs;
|
||||
e_config->menu_apps_show = cfdata->show_apps;
|
||||
e_config->menu_eap_name_show = cfdata->show_name;
|
||||
e_config->menu_eap_generic_show = cfdata->show_generic;
|
||||
e_config->menu_eap_comment_show = cfdata->show_comment;
|
||||
|
||||
if (cfdata->scroll_speed == 0) e_config->menus_scroll_speed = 1.0;
|
||||
else e_config->menus_scroll_speed = cfdata->scroll_speed;
|
||||
|
||||
if (cfdata->fast_mouse_move_threshhold == 0)
|
||||
e_config->menus_fast_mouse_move_threshhold = 1.0;
|
||||
else
|
||||
{
|
||||
e_config->menus_fast_mouse_move_threshhold =
|
||||
cfdata->fast_mouse_move_threshhold;
|
||||
}
|
||||
e_config->menus_click_drag_timeout = cfdata->click_drag_timeout;
|
||||
e_config->menu_autoscroll_margin = cfdata->autoscroll_margin;
|
||||
e_config->menu_autoscroll_cursor_margin = cfdata->autoscroll_cursor_margin;
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue