Enlightenment CVS committal
Author : mekius
Project : e17
Module : proto
Dir : e17/proto/empower/src/bin/ewl
Modified Files:
Empower.h empower_gui_ewl.c
Log Message:
Fixed up some sizing issues. Dialog should now resize dynamically based on the
username.
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/Empower.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Empower.h 7 Sep 2006 17:22:48 -0000 1.4
+++ Empower.h 27 Oct 2006 07:01:35 -0000 1.5
@@ -9,7 +9,7 @@
#include "Ewl.h"
//#include "../config.h"
-#define WIDTH 200
+#define WIDTH 0
#define HEIGHT 85
Ewl_Widget *win;
char password[1024];
===================================================================
RCS file: /cvs/e/e17/proto/empower/src/bin/ewl/empower_gui_ewl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- empower_gui_ewl.c 7 Sep 2006 20:29:10 -0000 1.10
+++ empower_gui_ewl.c 27 Oct 2006 07:01:35 -0000 1.11
@@ -23,6 +23,7 @@
uid_t user;
struct passwd *user_name;
char username[256];
+ int window_width;
user = getuid();
if ((user_name = getpwuid(user)) != NULL)
@@ -30,6 +31,8 @@
else
snprintf(username, 256, "Your Password");
+ window_width = strlen(username)*10;
+
int num_roots=0;
int root_w=0, root_h=0;
Ecore_X_Window *root_list = NULL;
@@ -40,14 +43,14 @@
free(root_list);
- xpos = (root_w/2)-(WIDTH/2);
+ xpos = (root_w/2)-(window_width/2);
ypos = (root_h/2)-(HEIGHT/2);
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Empower!");
ewl_window_name_set(EWL_WINDOW(win), "Empower!");
ewl_window_class_set(EWL_WINDOW(win), "Empower!");
- ewl_object_size_request(EWL_OBJECT(win), WIDTH, HEIGHT);
+ ewl_object_size_request(EWL_OBJECT(win), window_width, HEIGHT);
ewl_window_move(EWL_WINDOW(win), xpos, ypos);
ewl_window_dialog_set(EWL_WINDOW(win), 1);
ewl_window_keyboard_grab_set(EWL_WINDOW(win), 1);
@@ -67,7 +70,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
ewl_widget_show(hbox);
- image = ewl_image_new();
+ 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), EWL_ICON_SYSTEM_LOCK_SCREEN);
@@ -76,18 +79,19 @@
progtext = ewl_text_new();
ewl_container_child_append(EWL_CONTAINER(hbox), progtext);
- ewl_text_font_size_set(EWL_TEXT(progtext), 14);
- ewl_object_alignment_set(EWL_OBJECT(progtext), EWL_FLAG_ALIGN_CENTER);
- ewl_object_minimum_size_set(EWL_OBJECT(progtext), 75, 20);
- ewl_object_maximum_size_set(EWL_OBJECT(progtext), 125, 20);
+ ewl_text_font_size_set(EWL_TEXT(progtext), 12);
+ ewl_object_alignment_set(EWL_OBJECT(progtext), EWL_FLAG_ALIGN_LEFT);
+ //ewl_object_minimum_size_set(EWL_OBJECT(progtext), 75, 15);
+ //ewl_object_maximum_size_set(EWL_OBJECT(progtext), 125, 20);
ewl_text_text_set(EWL_TEXT(progtext), username);
ewl_widget_show(progtext);
entry = ewl_password_new();
ewl_container_child_append(EWL_CONTAINER(vbox), entry);
ewl_object_padding_set(EWL_OBJECT(entry),8,8,0,0);
- ewl_object_size_request(EWL_OBJECT(entry), 50, 20);
- ewl_callback_append(entry, EWL_CALLBACK_VALUE_CHANGED, pipe_to_sudo_cb,
entry);
+ //ewl_object_size_request(EWL_OBJECT(entry), 50, 20);
+ ewl_callback_append(entry, EWL_CALLBACK_VALUE_CHANGED, pipe_to_sudo_cb,
+ entry);
ewl_widget_show(entry);
Ewl_Widget *separator = ewl_hseparator_new();
@@ -105,17 +109,19 @@
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, 20);
- ewl_object_maximum_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);
+ ewl_callback_append(ok_button, EWL_CALLBACK_CLICKED, pipe_to_sudo_cb,
+ entry);
ewl_widget_show(ok_button);
cancel_button = ewl_button_new();
ewl_button_stock_type_set(EWL_BUTTON(cancel_button), EWL_STOCK_CANCEL);
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_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);
ewl_widget_show(cancel_button);
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs