Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_button_stock.c ewl_button_stock.h ewl_dialog.h ewl_enums.h
ewl_fileselector.c
Log Message:
- make a stock up and stock home button
- convert ewl_fileselector to use these stock buttons
- move the Ewl_Response_Type into the ewl_enum.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button_stock.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_button_stock.c 24 Aug 2004 04:38:18 -0000 1.14
+++ ewl_button_stock.c 21 Dec 2004 04:15:55 -0000 1.15
@@ -13,6 +13,8 @@
{ EWL_STOCK_REWIND, "rewind" },
{ EWL_STOCK_FASTFORWARD, "fast forward" },
{ EWL_STOCK_QUIT, "quit" },
+ { EWL_STOCK_ARROW_UP, "up" },
+ { EWL_STOCK_HOME, "home" },
};
/* Return the label of the stock item if it exists */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button_stock.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_button_stock.h 24 Aug 2004 04:38:18 -0000 1.13
+++ ewl_button_stock.h 21 Dec 2004 04:15:56 -0000 1.14
@@ -29,6 +29,8 @@
#define EWL_STOCK_REWIND "stock_rewind"
#define EWL_STOCK_FASTFORWARD "stock_fastforward"
#define EWL_STOCK_QUIT "stock_quit"
+#define EWL_STOCK_ARROW_UP "stock_arrow_up"
+#define EWL_STOCK_HOME "stock_home"
typedef struct Ewl_Stock_Item Ewl_Stock_Item;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_dialog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_dialog.h 27 Oct 2004 19:50:27 -0000 1.8
+++ ewl_dialog.h 21 Dec 2004 04:15:56 -0000 1.9
@@ -22,24 +22,6 @@
*/
/**
- * @enum Ewl_Response_Type
- */
-enum _Ewl_Response_Type
-{
- EWL_RESPONSE_OPEN = -5,
- EWL_RESPONSE_SAVE = -6,
- EWL_RESPONSE_OK = -10,
- EWL_RESPONSE_CANCEL = -11,
- EWL_RESPONSE_APPLY = -12,
- EWL_RESPONSE_PLAY = -20,
- EWL_RESPONSE_PAUSE = -21,
- EWL_RESPONSE_STOP = -22,
- EWL_RESPONSE_QUIT = -23,
-};
-
-typedef enum _Ewl_Response_Type Ewl_Response_Type;
-
-/**
* The dialog structure is a window with two area: a box (vbox) to hold
* messages and another box (action_area) to put buttons
* (usually). These boxes can be separated by a line.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_enums.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_enums.h 28 Jun 2004 19:38:22 -0000 1.52
+++ ewl_enums.h 21 Dec 2004 04:15:56 -0000 1.53
@@ -258,6 +258,26 @@
typedef enum Ewl_Key_Modifiers Ewl_Key_Modifiers;
/**
+ * @enum Ewl_Response_Type
+ */
+enum _Ewl_Response_Type
+{
+ EWL_RESPONSE_OPEN = -5,
+ EWL_RESPONSE_SAVE = -6,
+ EWL_RESPONSE_OK = -10,
+ EWL_RESPONSE_CANCEL = -11,
+ EWL_RESPONSE_APPLY = -12,
+ EWL_RESPONSE_PLAY = -20,
+ EWL_RESPONSE_PAUSE = -21,
+ EWL_RESPONSE_STOP = -22,
+ EWL_RESPONSE_QUIT = -23,
+ EWL_RESPONSE_ARROW_UP = -24,
+ EWL_RESPONSE_HOME = -25,
+};
+
+typedef enum _Ewl_Response_Type Ewl_Response_Type;
+
+/**
* @}
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_fileselector.c 21 Dec 2004 04:00:32 -0000 1.52
+++ ewl_fileselector.c 21 Dec 2004 04:15:56 -0000 1.53
@@ -98,42 +98,22 @@
EWL_FLAG_FILL_FILL);
ewl_widget_show(misc);
- button = ewl_button_new("");
- ewl_object_fill_policy_set(EWL_OBJECT(button),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_VFILL);
+ button = ewl_button_stock_with_id_new(EWL_STOCK_ARROW_UP,
+ EWL_RESPONSE_ARROW_UP);
ewl_callback_append(button, EWL_CALLBACK_CLICKED,
EWL_CALLBACK_FUNCTION(ewl_fileselector_go_up_cb),
fs);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
ewl_widget_show(button);
- misc = ewl_image_new(PACKAGE_DATA_DIR"/images/arrow_up.png",
NULL);
- ewl_object_fill_policy_set(EWL_OBJECT(misc),
- EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(misc),
- EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(button), misc);
- ewl_widget_show(misc);
-
- button = ewl_button_new("");
- ewl_object_fill_policy_set(EWL_OBJECT(button),
- EWL_FLAG_FILL_SHRINK |
- EWL_FLAG_FILL_VFILL);
+ button = ewl_button_stock_with_id_new(EWL_STOCK_HOME,
+ EWL_RESPONSE_HOME);
ewl_callback_append(button, EWL_CALLBACK_CLICKED,
EWL_CALLBACK_FUNCTION
(ewl_fileselector_go_home_cb), fs);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
ewl_widget_show(button);
- misc = ewl_image_new(PACKAGE_DATA_DIR"/images/home.png", NULL);
- ewl_object_alignment_set(EWL_OBJECT(misc),
- EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(misc),
- EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(button), misc);
- ewl_widget_show(misc);
-
ewl_container_child_append(EWL_CONTAINER(fs), hbox);
ewl_widget_show(hbox);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
