enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

simplify quality/perfect settings 

SVN revision: 24624
This commit is contained in:
Carsten Haitzler 2006-08-13 02:40:11 +00:00
parent 8c6a58c6f2
commit 2c0daf0b4b
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/e_int_config_wallpaper_import.c
View File

@ -27,7 +27,6 @@ struct _Import
Evas_Object *fill_tile_obj;
Evas_Object *fill_within_obj;
Evas_Object *fill_fill_obj;
Evas_Object *perfect_obj;
Evas_Object *quality_obj;
Evas_Object *frame_fill_obj;
Evas_Object *frame_quality_obj;
@ -44,8 +43,7 @@ struct _E_Config_Dialog_Data
{
char *file;
int method;
int perfect;
double quality;
int quality;
};
static Ecore_Event_Handler *_import_edje_cc_exit_handler = NULL;
@ -88,8 +86,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->method = IMPORT_STRETCH;
cfdata->perfect = 0;
cfdata->quality = 90.0;
cfdata->quality = 90;
import->cfdata = cfdata;
import->win = win;
@ -163,12 +160,9 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
of = e_widget_frametable_add(evas, _("File Quality"), 0);
import->frame_quality_obj = of;
ord = e_widget_slider_add(evas, 1, 0, _("%3.0f%%"), 0.0, 100.0, 1.0, 0, &(cfdata->quality), NULL, 150);
ord = e_widget_slider_add(evas, 1, 0, _("%3.0f%%"), 0.0, 100.0, 1.0, 0, NULL, &(cfdata->quality), 150);
import->quality_obj = ord;
e_widget_frametable_object_append(of, ord, 0, 0, 1, 1, 1, 0, 1, 0);
ord = e_widget_check_add(evas, _("Perfect"), &(cfdata->perfect));
import->perfect_obj = ord;
e_widget_frametable_object_append(of, ord, 1, 0, 1, 1, 0, 0, 0, 0);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 0);
e_widget_list_object_append(o, ot, 0, 0, 0.5);
@ -232,7 +226,6 @@ _import_opt_disabled_set(Import *import, int disabled)
e_widget_disabled_set(import->fill_tile_obj, disabled);
e_widget_disabled_set(import->fill_within_obj, disabled);
e_widget_disabled_set(import->fill_fill_obj, disabled);
e_widget_disabled_set(import->perfect_obj, disabled);
e_widget_disabled_set(import->quality_obj, disabled);
e_widget_disabled_set(import->frame_fill_obj, disabled);
e_widget_disabled_set(import->frame_quality_obj, disabled);
@ -315,10 +308,10 @@ _import_edj_gen(Import *import)
evas_object_del(img);
fstrip = strdup(e_util_filename_escape(file));
if (import->cfdata->perfect)
if (import->cfdata->quality == 100)
snprintf(enc, sizeof(enc), "COMP");
else
snprintf(enc, sizeof(enc), "LOSSY %1.0f", import->cfdata->quality);
snprintf(enc, sizeof(enc), "LOSSY %i", import->cfdata->quality);
switch (import->cfdata->method)
{
case IMPORT_STRETCH:

22
src/bin/e_int_menus.c
View File

@ -11,7 +11,7 @@ struct _Main_Data
E_Menu *apps;
E_Menu *desktops;
E_Menu *clients;
E_Menu *gadgets;
// E_Menu *gadgets;
E_Menu *config;
E_Menu *lost_clients;
};
@ -41,8 +41,8 @@ static void _e_int_menus_clients_item_cb (void *data, E_Menu *m, E_Menu_Item
static void _e_int_menus_clients_cleanup_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_desktops_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_desktops_item_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_gadgets_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi);
//static void _e_int_menus_gadgets_pre_cb (void *data, E_Menu *m);
//static void _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_themes_about (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_lost_clients_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_lost_clients_free_hook(void *obj);
@ -106,14 +106,16 @@ e_int_menus_main_new(void)
e_menu_item_label_set(mi, _("Lost Windows"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows");
e_menu_item_submenu_set(mi, subm);
/*
subm = e_int_menus_gadgets_new();
dat->gadgets = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Gadgets"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
e_menu_item_submenu_set(mi, subm);
*/
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -212,7 +214,7 @@ e_int_menus_clients_new(void)
e_menu_pre_activate_callback_set(m, _e_int_menus_clients_pre_cb, NULL);
return m;
}
/*
EAPI E_Menu *
e_int_menus_gadgets_new(void)
{
@ -222,7 +224,7 @@ e_int_menus_gadgets_new(void)
e_menu_pre_activate_callback_set(m, _e_int_menus_gadgets_pre_cb, NULL);
return m;
}
*/
EAPI E_Menu *
e_int_menus_lost_clients_new(void)
{
@ -315,7 +317,7 @@ _e_int_menus_main_del_hook(void *obj)
e_object_del(E_OBJECT(dat->apps));
e_object_del(E_OBJECT(dat->desktops));
e_object_del(E_OBJECT(dat->clients));
e_object_del(E_OBJECT(dat->gadgets));
// e_object_del(E_OBJECT(dat->gadgets));
e_object_del(E_OBJECT(dat->config));
e_object_del(E_OBJECT(dat->lost_clients));
free(dat);
@ -772,7 +774,7 @@ _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi)
zone = data;
e_place_zone_region_smart_cleanup(zone);
}
/*
static void
_e_int_menus_gadgets_pre_cb(void *data, E_Menu *m)
{
@ -817,7 +819,7 @@ _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi)
e_gadman_mode_set(gm, E_GADMAN_MODE_NORMAL);
}
}
*/
static void
_e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
{