Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colordialog.c ewl_colordialog.h ewl_events.h
ewl_filedialog.c ewl_filedialog.h ewl_fileselector.c
Log Message:
- make ewl_filedialog actually a dialog
- get rid of Ewl_Colordialog_Event and make a single Ewl_Dialog_Event that
both colourdialog and filedialog return
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_colordialog.c 2 Nov 2005 18:23:21 -0000 1.18
+++ ewl_colordialog.c 4 Dec 2005 16:56:30 -0000 1.19
@@ -216,50 +216,6 @@
DRETURN_INT(mode, DLEVEL_STABLE);
}
-Ewl_Colordialog_Event *
-ewl_colordialog_event_new(void)
-{
- Ewl_Colordialog_Event *ev;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- ev = NEW(Ewl_Colordialog_Event, 1);
-
- DRETURN_PTR(ev, DLEVEL_STABLE);
-}
-
-void
-ewl_colordialog_event_free(Ewl_Colordialog_Event *ev)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("ev", ev);
-
- FREE(ev);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_colordialog_event_response_set(Ewl_Colordialog_Event *ev,
- unsigned int resp)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("ev", ev);
-
- ev->response = resp;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-unsigned int
-ewl_colordialog_event_response_get(Ewl_Colordialog_Event *ev)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("ev", ev, 0);
-
- DRETURN_INT(ev->response, DLEVEL_STABLE);
-}
-
void
ewl_colordialog_cb_button_click(Ewl_Widget *w, void *ev __UNUSED__, void *data)
{
@@ -291,19 +247,15 @@
static void
ewl_colordialog_respond(Ewl_Colordialog *cd, unsigned int response)
{
- Ewl_Colordialog_Event *cd_ev;
+ Ewl_Dialog_Event cd_ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("cd", cd);
DCHECK_TYPE("cd", cd, "colordialog");
- cd_ev = ewl_colordialog_event_new();
- ewl_colordialog_event_response_set(cd_ev, response);
-
+ cd_ev.response = response;
ewl_callback_call_with_event_data(EWL_WIDGET(cd),
- EWL_CALLBACK_VALUE_CHANGED, cd_ev);
-
- ewl_colordialog_event_free(cd_ev);
+ EWL_CALLBACK_VALUE_CHANGED, &cd_ev);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_colordialog.h 2 Nov 2005 17:51:44 -0000 1.7
+++ ewl_colordialog.h 4 Dec 2005 16:56:30 -0000 1.8
@@ -22,19 +22,6 @@
Ewl_Widget *picker;
};
-/**
- * @def EWL_COLORDIALOG_EVENT(cd)
- * Typecast a pointer to an Ewl_Colordialog_Event pointer
- */
-#define EWL_COLORDIALOG_EVENT(cd) ((Ewl_Colordialog_Event *)cd)
-
-typedef struct Ewl_Colordialog_Event Ewl_Colordialog_Event;
-
-struct Ewl_Colordialog_Event
-{
- unsigned int response;
-};
-
Ewl_Widget *ewl_colordialog_new(void);
int ewl_colordialog_init(Ewl_Colordialog *cd);
@@ -57,13 +44,6 @@
void ewl_colordialog_color_mode_set(Ewl_Colordialog *cp,
Ewl_Color_Mode type);
Ewl_Color_Mode ewl_colordialog_color_mode_get(Ewl_Colordialog *cp);
-Ewl_Colordialog_Event *ewl_colordialog_event_new(void);
-void ewl_colordialog_event_free(Ewl_Colordialog_Event *ev);
-
-void ewl_colordialog_event_response_set(Ewl_Colordialog_Event *ev,
- unsigned int resp);
-unsigned int ewl_colordialog_event_response_get(Ewl_Colordialog_Event *ev);
-
/*
* Internally used callbacks, override at your own risk
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_events.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_events.h 28 Nov 2005 08:26:48 -0000 1.6
+++ ewl_events.h 4 Dec 2005 16:56:30 -0000 1.7
@@ -155,6 +155,8 @@
int dir; /**< Direction mouse wheel scrolled */
};
+typedef struct Ewl_Dnd_Types Ewl_Dnd_Types;
+
/**
* @struct Ewl_Dnd_Types
* Provides type information about an external DND drag
@@ -165,7 +167,17 @@
char** types;
};
-typedef struct Ewl_Dnd_Types Ewl_Dnd_Types;
+
+typedef struct Ewl_Dialog_Event Ewl_Dialog_Event;
+
+/**
+ * @struct Ewl_Dialog_Event
+ * Stores the reponse from a dialog
+ */
+struct Ewl_Dialog_Event
+{
+ unsigned int response;
+};
int ewl_ev_init(void);
unsigned int ewl_ev_modifiers_get();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_filedialog.c 13 Nov 2005 06:38:27 -0000 1.10
+++ ewl_filedialog.c 4 Dec 2005 16:56:30 -0000 1.11
@@ -3,6 +3,8 @@
#include "ewl_macros.h"
#include "ewl_private.h"
+static void ewl_filedialog_respond(Ewl_Filedialog *fd, unsigned int response);
+
/**
* @return Returns a new open filedialog if successful, NULL on failure.
* @brief Create a new open filedialog
@@ -43,6 +45,7 @@
ewl_widget_destroy(EWL_WIDGET(fd));
fd = NULL;
}
+
DRETURN_PTR(EWL_WIDGET(fd), DLEVEL_STABLE);
}
@@ -54,51 +57,53 @@
int
ewl_filedialog_init(Ewl_Filedialog *fd)
{
- Ewl_Widget *w;
- Ewl_Widget *box;
+ Ewl_Widget *w, *o;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("fd", fd, FALSE);
w = EWL_WIDGET(fd);
- if (!ewl_box_init(EWL_BOX(fd)))
+ if (!ewl_dialog_init(EWL_DIALOG(fd)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_box_orientation_set(EWL_BOX(fd), EWL_ORIENTATION_VERTICAL);
- ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_ALL);
- ewl_widget_appearance_set(w, "filedialog");
ewl_widget_inherit(w, "filedialog");
+ ewl_window_title_set(EWL_WINDOW(fd), "Ewl Filedialog");
+ ewl_window_name_set(EWL_WINDOW(fd), "Ewl Filedialog");
+ ewl_window_class_set(EWL_WINDOW(fd), "Ewl Filedialog");
+
+ ewl_dialog_action_position_set(EWL_DIALOG(fd), EWL_POSITION_BOTTOM);
+
+ ewl_callback_append(EWL_WIDGET(fd), EWL_CALLBACK_DELETE_WINDOW,
+ ewl_filedialog_delete_window_cb, NULL);
+
+ ewl_dialog_active_area_set(EWL_DIALOG(fd), EWL_POSITION_TOP);
+
/* the file selector */
fd->fs = ewl_fileselector_new();
- if (!fd->fs) {
- DRETURN_INT(FALSE, DLEVEL_STABLE);
- }
+ ewl_widget_internal_set(fd->fs, TRUE);
ewl_container_child_append(EWL_CONTAINER(fd), fd->fs);
ewl_widget_show(fd->fs);
- box = ewl_hbox_new();
- ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_HFILL |
- EWL_FLAG_FILL_HSHRINK);
- ewl_object_alignment_set(EWL_OBJECT(box), EWL_FLAG_ALIGN_RIGHT);
- ewl_container_child_append(EWL_CONTAINER(fd), box);
- ewl_widget_show(box);
+ ewl_dialog_active_area_set(EWL_DIALOG(fd), EWL_POSITION_BOTTOM);
/* Buttons */
- fd->confirm = ewl_button_new();
- ewl_button_stock_type_set(EWL_BUTTON(fd->confirm), EWL_STOCK_OPEN);
-
- ewl_callback_append(fd->confirm, EWL_CALLBACK_CLICKED,
- ewl_filedialog_click_cb, fd);
- ewl_container_child_append(EWL_CONTAINER(box), fd->confirm);
- ewl_widget_show(fd->confirm);
-
- fd->cancel = ewl_button_new();
- ewl_button_stock_type_set(EWL_BUTTON(fd->cancel), EWL_STOCK_CANCEL);
- ewl_callback_append(fd->cancel, EWL_CALLBACK_CLICKED,
- ewl_filedialog_click_cb, fd);
- ewl_container_child_append(EWL_CONTAINER(box), fd->cancel);
- ewl_widget_show(fd->cancel);
+ o = ewl_button_new();
+ ewl_container_child_append(EWL_CONTAINER(fd), o);
+ ewl_widget_internal_set(o, TRUE);
+ ewl_button_stock_type_set(EWL_BUTTON(o), EWL_STOCK_OPEN);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_filedialog_click_cb, fd);
+ ewl_widget_show(o);
+ fd->type_btn = o;
+
+ o = ewl_button_new();
+ ewl_container_child_append(EWL_CONTAINER(fd), o);
+ ewl_widget_internal_set(o, TRUE);
+ ewl_button_stock_type_set(EWL_BUTTON(o), EWL_STOCK_CANCEL);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_filedialog_click_cb, fd);
+ ewl_widget_show(o);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -130,12 +135,11 @@
DCHECK_PARAM_PTR("fd", fd);
DCHECK_TYPE("fd", fd, "filedialog");
- if (t == EWL_FILEDIALOG_TYPE_OPEN) {
- ewl_button_stock_type_set(EWL_BUTTON(fd->confirm),
EWL_STOCK_OPEN);
- }
- else if (t == EWL_FILEDIALOG_TYPE_SAVE) {
- ewl_button_stock_type_set(EWL_BUTTON(fd->confirm),
EWL_STOCK_SAVE);
- }
+ if (t == EWL_FILEDIALOG_TYPE_OPEN)
+ ewl_button_stock_type_set(EWL_BUTTON(fd->type_btn),
EWL_STOCK_OPEN);
+
+ else if (t == EWL_FILEDIALOG_TYPE_SAVE)
+ ewl_button_stock_type_set(EWL_BUTTON(fd->type_btn),
EWL_STOCK_SAVE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -257,20 +261,49 @@
* Internally used callback, override at your own risk.
*/
void
-ewl_filedialog_click_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void* data)
+ewl_filedialog_click_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *data)
{
- Ewl_Filedialog_Event ev;
Ewl_Filedialog *fd;
+ unsigned int resp;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, "widget");
fd = EWL_FILEDIALOG(data);
- ev.response = ewl_button_stock_type_get(EWL_BUTTON(w));
+ resp = ewl_button_stock_type_get(EWL_BUTTON(w));
+ ewl_filedialog_respond(fd, resp);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void
+ewl_filedialog_delete_window_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ void *data __UNUSED__)
+{
+ Ewl_Filedialog *fd;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, "widget");
+
+ fd = EWL_FILEDIALOG(w);
+ ewl_filedialog_respond(fd, EWL_STOCK_CANCEL);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ewl_filedialog_respond(Ewl_Filedialog *fd, unsigned int response)
+{
+ Ewl_Dialog_Event ev;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ ev.response = response;
ewl_callback_call_with_event_data(EWL_WIDGET(fd),
EWL_CALLBACK_VALUE_CHANGED, &ev);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_filedialog.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_filedialog.h 23 Oct 2005 23:22:23 -0000 1.6
+++ ewl_filedialog.h 4 Dec 2005 16:56:30 -0000 1.7
@@ -38,37 +38,15 @@
/**
* @struct Ewl_Filedialog
- * Creates a floating widget with different filedialog components.
+ * Creates a dialog for the fileselector
*/
struct Ewl_Filedialog
{
- Ewl_Box box; /**< Box containing the fileselector */
+ Ewl_Dialog dialog; /**< The dialog base class */
Ewl_Filedialog_Type type; /**< Current type of filedialog */
Ewl_Widget *fs; /**< Ewl_Fileselector */
- Ewl_Widget *confirm; /**< Confirmation OK/Save button */
- Ewl_Widget *cancel; /**< Cancel button */
-};
-
-/**
- * The Ewl_Filedialog_Event returned as the EWL_CALLBACK_VALUE_CHANGED
- * event
- */
-typedef struct Ewl_Filedialog_Event Ewl_Filedialog_Event;
-
-/**
- * @define EWL_FILEDIALOG_EVENT(e)
- * Typecasts a pointer to an Ewl_Filedialog_Event pointer
- */
-#define EWL_FILEDIALOG_EVENT(e) ((Ewl_Filedialog_Event *)e)
-
-/**
- * @struct Ewl_Filedialog_Event
- * Stores the reponse from the filedialog
- */
-struct Ewl_Filedialog_Event
-{
- unsigned int response;
+ Ewl_Widget *type_btn; /**< Either the open or save button */
};
Ewl_Widget *ewl_filedialog_multiselect_new(void);
@@ -92,6 +70,7 @@
* Internally used callbacks, override at your own risk.
*/
void ewl_filedialog_click_cb (Ewl_Widget *w, void *ev_data, void *data);
+void ewl_filedialog_delete_window_cb(Ewl_Widget *w, void *ev_data, void *data);
/**
* @}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_fileselector.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_fileselector.c 16 Nov 2005 23:36:28 -0000 1.32
+++ ewl_fileselector.c 4 Dec 2005 16:56:30 -0000 1.33
@@ -61,10 +61,7 @@
ewl_fileselector_init(Ewl_Fileselector *fs)
{
char *tmp;
- Ewl_Widget *w;
- Ewl_Widget *hbox;
- Ewl_Widget *misc;
- Ewl_Widget *button;
+ Ewl_Widget *w, *hbox, *misc, *button;
char *head_dirs[1] = { "Directories" };
char *head_files[1] = { "Files" };
@@ -81,8 +78,7 @@
ewl_widget_appearance_set(w, "fileselector");
ewl_widget_inherit(w, "fileselector");
ewl_object_fill_policy_set(EWL_OBJECT(w),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_FILL);
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
ewl_object_minimum_size_set(EWL_OBJECT(w), EWL_FS_TREE_WIDTH,
EWL_FS_TREE_HEIGHT);
@@ -91,104 +87,81 @@
ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
ewl_fileselector_destroy_cb, NULL);
-
/* The entry for the current directory */
/* and some icons */
hbox = ewl_hbox_new();
- if (hbox) {
- ewl_object_fill_policy_set(EWL_OBJECT(hbox),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_HFILL);
-
- fs->entry_dir = ewl_entry_new();
- ewl_text_text_set(EWL_TEXT(fs->entry_dir), NULL);
- ewl_object_fill_policy_set(EWL_OBJECT(hbox),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_HFILL);
- ewl_container_child_prepend(EWL_CONTAINER(hbox),
- fs->entry_dir);
- ewl_widget_show(fs->entry_dir);
-
- misc = ewl_spacer_new();
- ewl_container_child_append(EWL_CONTAINER(hbox), misc);
- ewl_object_fill_policy_set(EWL_OBJECT(misc),
- EWL_FLAG_FILL_FILL);
- ewl_widget_show(misc);
-
- button = ewl_button_new();
- ewl_button_stock_type_set(EWL_BUTTON(button),
EWL_STOCK_ARROW_UP);
- ewl_callback_append(button, EWL_CALLBACK_CLICKED,
- ewl_fileselector_go_up_cb, fs);
- ewl_container_child_append(EWL_CONTAINER(hbox), button);
- ewl_widget_show(button);
-
- button = ewl_button_new();
- ewl_button_stock_type_set(EWL_BUTTON(button), EWL_STOCK_HOME);
-
- button = ewl_button_new();
- ewl_button_stock_type_set(EWL_BUTTON(button), EWL_STOCK_HOME);
- ewl_callback_append(button, EWL_CALLBACK_CLICKED,
- ewl_fileselector_go_home_cb, fs);
- ewl_container_child_append(EWL_CONTAINER(hbox), button);
- ewl_widget_show(button);
-
- ewl_container_child_append(EWL_CONTAINER(fs), hbox);
- ewl_widget_show(hbox);
- }
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_HFILL);
+ ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+ ewl_widget_show(hbox);
+
+ fs->entry_dir = ewl_entry_new();
+ ewl_text_text_set(EWL_TEXT(fs->entry_dir), NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_HFILL);
+ ewl_container_child_prepend(EWL_CONTAINER(hbox), fs->entry_dir);
+ ewl_widget_show(fs->entry_dir);
+
+ misc = ewl_spacer_new();
+ ewl_container_child_append(EWL_CONTAINER(hbox), misc);
+ ewl_object_fill_policy_set(EWL_OBJECT(misc), EWL_FLAG_FILL_FILL);
+ ewl_widget_show(misc);
+
+ button = ewl_button_new();
+ ewl_button_stock_type_set(EWL_BUTTON(button), EWL_STOCK_ARROW_UP);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED,
+ ewl_fileselector_go_up_cb, fs);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+
+ button = ewl_button_new();
+ ewl_button_stock_type_set(EWL_BUTTON(button), EWL_STOCK_HOME);
+ ewl_callback_append(button, EWL_CALLBACK_CLICKED,
+ ewl_fileselector_go_home_cb, fs);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
/* The lists for directories and files */
hbox = ewl_hbox_new();
- if (hbox) {
- ewl_object_fill_policy_set(EWL_OBJECT(hbox),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_FILL);
-
- fs->list_dirs = ewl_tree_new(1);
- ewl_tree_headers_set(EWL_TREE(fs->list_dirs), head_dirs);
- ewl_object_fill_policy_set(EWL_OBJECT(fs->list_dirs),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_FILL);
- ewl_container_child_append(EWL_CONTAINER(hbox),
- fs->list_dirs);
- ewl_widget_show(fs->list_dirs);
-
- fs->list_files = ewl_tree_new(1);
- ewl_tree_headers_set(EWL_TREE(fs->list_files), head_files);
- ewl_object_fill_policy_set(EWL_OBJECT(fs->list_files),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_FILL);
- ewl_container_child_append(EWL_CONTAINER(hbox),
- fs->list_files);
- ewl_widget_show(fs->list_files);
-
- ewl_container_child_append(EWL_CONTAINER(fs), hbox);
- ewl_widget_show(hbox);
- }
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
+ ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+ ewl_widget_show(hbox);
+
+ fs->list_dirs = ewl_tree_new(1);
+ ewl_tree_headers_set(EWL_TREE(fs->list_dirs), head_dirs);
+ ewl_object_fill_policy_set(EWL_OBJECT(fs->list_dirs),
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_FILL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), fs->list_dirs);
+ ewl_widget_show(fs->list_dirs);
+
+ fs->list_files = ewl_tree_new(1);
+ ewl_tree_headers_set(EWL_TREE(fs->list_files), head_files);
+ ewl_object_fill_policy_set(EWL_OBJECT(fs->list_files),
+ EWL_FLAG_FILL_SHRINK |
+ EWL_FLAG_FILL_FILL);
+ ewl_container_child_append(EWL_CONTAINER(hbox),
+ fs->list_files);
+ ewl_widget_show(fs->list_files);
/* The file label and entry */
hbox = ewl_hbox_new();
- if (hbox) {
- ewl_object_fill_policy_set(EWL_OBJECT(hbox),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_HFILL);
-
- misc = ewl_label_new();
- ewl_label_text_set(EWL_LABEL(misc), "File:");
- ewl_object_fill_policy_set(EWL_OBJECT(misc),
- EWL_FLAG_FILL_NONE);
- ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_LEFT);
- ewl_container_child_append(EWL_CONTAINER(hbox), misc);
- ewl_widget_show(misc);
-
- fs->entry_file = ewl_entry_new();
- ewl_text_text_set(EWL_TEXT(fs->entry_file), NULL);
- ewl_container_child_append(EWL_CONTAINER(hbox),
- fs->entry_file);
- ewl_widget_show(fs->entry_file);
-
- ewl_container_child_append(EWL_CONTAINER(fs), hbox);
- ewl_widget_show(hbox);
- }
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+ EWL_FLAG_FILL_SHRINK | EWL_FLAG_FILL_HFILL);
+ ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+ ewl_widget_show(hbox);
+
+ misc = ewl_label_new();
+ ewl_label_text_set(EWL_LABEL(misc), "File:");
+ ewl_object_fill_policy_set(EWL_OBJECT(misc), EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_LEFT);
+ ewl_container_child_append(EWL_CONTAINER(hbox), misc);
+ ewl_widget_show(misc);
+
+ fs->entry_file = ewl_entry_new();
+ ewl_text_text_set(EWL_TEXT(fs->entry_file), NULL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), fs->entry_file);
+ ewl_widget_show(fs->entry_file);
/* The default filter values */
fs->ffilter = strdup("^[^\\.]");
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
