Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/empower/src/bin/ewl
Modified Files:
Empower.h empower_gui_ewl.c
Log Message:
Big fixup on empower ewl. Made it work well with icons. Added an image to make
it look better. Turned it into a dialog.
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/Empower.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Empower.h 5 Apr 2006 16:14:07 -0000 1.2
+++ Empower.h 7 Sep 2006 13:43:15 -0000 1.3
@@ -10,8 +10,7 @@
//#include "../config.h"
#define WIDTH 200
-#define HEIGHT 80
-
+#define HEIGHT 85
char buf[1024];
Ewl_Widget *win;
char password[1024];
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/empower_gui_ewl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- empower_gui_ewl.c 5 Apr 2006 19:40:43 -0000 1.4
+++ empower_gui_ewl.c 7 Sep 2006 13:43:15 -0000 1.5
@@ -19,6 +19,7 @@
Ewl_Widget *cancel_button = NULL;
Ewl_Widget *progtext = NULL;
Ewl_Widget *vbox=NULL, *hbox = NULL;
+ Ewl_Widget *image = NULL;
int num_roots=0;
int root_w=0, root_h=0;
@@ -39,9 +40,8 @@
ewl_window_class_set(EWL_WINDOW(win), "Empower!");
ewl_object_size_request(EWL_OBJECT(win), WIDTH, HEIGHT);
ewl_window_move(EWL_WINDOW(win), xpos, ypos);
- ewl_window_borderless_set(EWL_WINDOW(win));
+ ewl_window_dialog_set(EWL_WINDOW(win), 1);
ewl_window_keyboard_grab_set(EWL_WINDOW(win), 1);
- ewl_window_pointer_grab_set(EWL_WINDOW(win), 1);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL);
ewl_callback_append(win, EWL_CALLBACK_REVEAL, reveal_cb, NULL);
ewl_callback_append(win, EWL_CALLBACK_KEY_DOWN, key_down_cb, NULL);
@@ -54,16 +54,27 @@
char user[256];
- snprintf(user, 256, "%s's Password:", userinfo->pw_name);
+ snprintf(user, 256, "%s's password:", userinfo->pw_name);
//strcat(user, userinfo->pw_name);
+
+ hbox = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
+ ewl_widget_show(hbox);
+
+ image = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image),
+ ewl_icon_theme_icon_path_get(EWL_ICON_SYSTEM_LOCK_SCREEN,
+ EWL_ICON_SIZE_LARGE), NULL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), image);
+ ewl_widget_show(image);
progtext = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(vbox), progtext);
+ ewl_container_child_append(EWL_CONTAINER(hbox), progtext);
ewl_text_font_size_set(EWL_TEXT(progtext), 14);
- ewl_text_styles_set(EWL_TEXT(progtext), EWL_TEXT_STYLE_SOFT_SHADOW);
- ewl_text_shadow_color_set(EWL_TEXT(progtext), 30,30,30,50);
ewl_object_padding_set(EWL_OBJECT(progtext),10,0,3,3);
ewl_object_minimum_size_set(EWL_OBJECT(progtext), 75, 20);
+ ewl_object_maximum_size_set(EWL_OBJECT(progtext), 125, 20);
ewl_text_text_set(EWL_TEXT(progtext), user);
ewl_widget_show(progtext);
@@ -88,8 +99,8 @@
ok_button = ewl_button_new();
ewl_button_stock_type_set(EWL_BUTTON(ok_button), EWL_STOCK_OK);
- ewl_object_minimum_size_set(EWL_OBJECT(ok_button), 60, 15);
- ewl_object_maximum_size_set(EWL_OBJECT(ok_button), 60, 15);
+ ewl_object_minimum_size_set(EWL_OBJECT(ok_button), 60, 20);
+ ewl_object_maximum_size_set(EWL_OBJECT(ok_button), 60, 20);
ewl_object_fill_policy_set(EWL_OBJECT(ok_button), EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(hbox), ok_button);
ewl_callback_append(ok_button, EWL_CALLBACK_CLICKED, pipe_to_sudo_cb,
entry);
@@ -97,7 +108,8 @@
cancel_button = ewl_button_new();
ewl_button_stock_type_set(EWL_BUTTON(cancel_button), EWL_STOCK_CANCEL);
- ewl_object_maximum_size_set(EWL_OBJECT(cancel_button), 60, 15);
+ ewl_object_minimum_size_set(EWL_OBJECT(cancel_button), 60, 20);
+ ewl_object_maximum_size_set(EWL_OBJECT(cancel_button), 60, 20);
ewl_object_fill_policy_set(EWL_OBJECT(cancel_button),
EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(hbox), cancel_button);
ewl_callback_append(cancel_button, EWL_CALLBACK_CLICKED, destroy_cb,
NULL);
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
