Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_dialogs.c edje_editor_toolbar.c
edje_editor_window.c main.h
Log Message:
* Add the ability to choose the opacity level of the focus handlers (red/blue
point & yellow rect). Requested by Toma...thanks!
* Add the ability to choose a custom color for background...yes, the
color_class mania is exploded !!
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_dialogs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_editor_dialogs.c 12 Jul 2008 13:59:15 -0000 1.8
+++ edje_editor_dialogs.c 31 Jul 2008 00:39:10 -0000 1.9
@@ -227,6 +227,11 @@
edje_edit_state_color2_set(edje_o, Cur.part->string, Cur.state->string,
premuled.r,premuled.g,premuled.b,premuled.a);
break;
+ case COLOR_OBJECT_BG:
+ edje_object_color_class_set(edje_ui, "cc_background",
+ color.r, color.g, color.b, 255,
+ 0, 0, 0, 255, 0, 0, 0, 255);
+ break;
}
canvas_redraw();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_editor_toolbar.c 15 Jul 2008 02:40:45 -0000 1.14
+++ edje_editor_toolbar.c 31 Jul 2008 00:39:10 -0000 1.15
@@ -265,7 +265,8 @@
UI_OptionsMenu = etk_menu_new();
//set bg1
- menu_item = etk_menu_item_image_new_with_label("White squared background");
+ //menu_item = etk_menu_item_radio_new_with_label_from_widget("White squared
background", 0);
+ menu_item = etk_menu_item_image_new_with_label("Squared background");
image = etk_image_new_from_edje(EdjeFile,"BG1_I.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
@@ -274,7 +275,7 @@
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//set bg2
- menu_item = etk_menu_item_image_new_with_label("Gray squared background");
+ menu_item = etk_menu_item_image_new_with_label("Checkerboard background");
image = etk_image_new_from_edje(EdjeFile,"BG2_I.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
@@ -283,7 +284,7 @@
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//set bg3
- menu_item = etk_menu_item_image_new_with_label("White background");
+ menu_item = etk_menu_item_image_new_with_label("Clean background");
image = etk_image_new_from_edje(EdjeFile,"BG3_I.PNG");
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
@@ -291,13 +292,45 @@
(void*)TOOLBAR_OPTION_BG3);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
- //set bg4
- menu_item = etk_menu_item_image_new_with_label("Black background");
- image = etk_image_new_from_edje(EdjeFile,"BG4_I.PNG");
+ //set bg color
+ menu_item = etk_menu_item_image_new_with_label("Background color...");
+ image = etk_image_new_from_stock(ETK_STOCK_APPLICATIONS_GRAPHICS,
+ ETK_STOCK_SMALL);
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_window_all_button_click_cb),
- (void*)TOOLBAR_OPTION_BG4);
+ (void*)TOOLBAR_OPTION_BGC);
+ etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
+
+ //Separator
+ menu_item = etk_menu_item_separator_new();
+ etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
+
+ //set handler 100 %
+ menu_item = etk_menu_item_image_new_with_label("Focus opacity 100%");
+ image = etk_image_new_from_edje(EdjeFile,"FOPA100.PNG");
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_FOPA100);
+ etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
+
+ //set handler 50 %
+ menu_item = etk_menu_item_image_new_with_label("Focus opacity 50%");
+ image = etk_image_new_from_edje(EdjeFile,"FOPA50.PNG");
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_FOPA50);
+ etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
+
+ //set handler 25 %
+ menu_item = etk_menu_item_image_new_with_label("Focus opacity 25%");
+ image = etk_image_new_from_edje(EdjeFile,"FOPA25.PNG");
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
+ ETK_CALLBACK(_window_all_button_click_cb),
+ (void*)TOOLBAR_OPTION_FOPA25);
etk_menu_shell_append(ETK_MENU_SHELL(UI_OptionsMenu),
ETK_MENU_ITEM(menu_item));
//Separator
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- edje_editor_window.c 12 Jul 2008 14:45:03 -0000 1.20
+++ edje_editor_window.c 31 Jul 2008 00:39:10 -0000 1.21
@@ -495,8 +495,26 @@
case TOOLBAR_OPTION_BG3:
edje_object_signal_emit(edje_ui,"set_bg3","edje_editor");
break;
- case TOOLBAR_OPTION_BG4:
- edje_object_signal_emit(edje_ui,"set_bg4","edje_editor");
+ case TOOLBAR_OPTION_BGC:
+ current_color_object = COLOR_OBJECT_BG;
+ etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Interface Background
Color");
+ //etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
//TODO get current class color values
+ if (UI_ColorWin) etk_widget_show_all(UI_ColorWin);
+ break;
+ case TOOLBAR_OPTION_FOPA100:
+ evas_object_color_set(EV_rel1_handler, 255,255, 255, 255);
+ evas_object_color_set(EV_rel2_handler, 255, 255, 255, 255);
+ evas_object_color_set(EV_focus_handler, 255, 255, 255, 255);
+ break;
+ case TOOLBAR_OPTION_FOPA50:
+ evas_object_color_set(EV_rel1_handler, 128,128, 128, 128);
+ evas_object_color_set(EV_rel2_handler, 128, 128, 128, 128);
+ evas_object_color_set(EV_focus_handler, 128, 128, 128, 128);
+ break;
+ case TOOLBAR_OPTION_FOPA25:
+ evas_object_color_set(EV_rel1_handler, 64,64, 64, 64);
+ evas_object_color_set(EV_rel2_handler, 64, 64, 64, 64);
+ evas_object_color_set(EV_focus_handler, 64, 64, 64, 64);
break;
case TOOLBAR_OPTION_FULLSCREEN:
Cur.fullscreen = !Cur.fullscreen;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- main.h 15 Jul 2008 02:40:45 -0000 1.44
+++ main.h 31 Jul 2008 00:39:10 -0000 1.45
@@ -65,7 +65,10 @@
TOOLBAR_OPTION_BG1,
TOOLBAR_OPTION_BG2,
TOOLBAR_OPTION_BG3,
- TOOLBAR_OPTION_BG4,
+ TOOLBAR_OPTION_BGC,
+ TOOLBAR_OPTION_FOPA100,
+ TOOLBAR_OPTION_FOPA50,
+ TOOLBAR_OPTION_FOPA25,
TOOLBAR_OPTION_FULLSCREEN,
TOOLBAR_IMAGE_FILE_ADD,
TOOLBAR_FONT_FILE_ADD,
@@ -74,6 +77,7 @@
COLOR_OBJECT_TEXT,
COLOR_OBJECT_SHADOW,
COLOR_OBJECT_OUTLINE,
+ COLOR_OBJECT_BG,
NEW_IMAGE,
NEW_GRADIENT,
NEW_RECT,
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
