Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Bugfixes
* More config items
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_icon_viewer.c 26 Aug 2006 12:59:15 -0000 1.16
+++ etk_icon_viewer.c 1 Sep 2006 12:39:39 -0000 1.17
@@ -36,6 +36,8 @@
};
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value ) ;
+
/*------------- boilerplate -----*/
typedef struct gui_file gui_file;
@@ -169,14 +171,8 @@
return base;
}
-void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value )
{
- entropy_gui_component_instance *instance;
- entropy_etk_iconbox_viewer *viewer;
-
- instance = data;
- viewer = instance->data;
-
etk_iconbox_model_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
(value*2) + 14,
value + 22,
@@ -189,6 +185,17 @@
0, value + 2, (value*2) + 4, 12, 0.5,0);
}
+void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+{
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+
+ instance = data;
+ viewer = instance->data;
+
+ entropy_etk_icon_viewer_icon_size_set(viewer, value);
+}
+
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data)
{
entropy_gui_component_instance *instance;
@@ -309,7 +316,7 @@
Etk_Iconbox *iconbox;
const char **types;
unsigned int num_types;
- Etk_Drag *drag;
+ Etk_Widget *drag;
Etk_Widget *image;
entropy_gui_component_instance* instance;
entropy_etk_iconbox_viewer* viewer;
@@ -388,8 +395,8 @@
printf("Drag buffer: %s\n", buffer);
- etk_drag_types_set(drag, types, num_types);
- etk_drag_data_set(drag, buffer, strlen(buffer)+1);
+ etk_drag_types_set(ETK_DRAG(drag), types, num_types);
+ etk_drag_data_set(ETK_DRAG(drag), buffer, strlen(buffer)+1);
@@ -412,6 +419,7 @@
entropy_etk_iconbox_viewer *viewer;
char **dnd_types;
int dnd_types_num=0;
+ char* size;
instance = entropy_gui_component_instance_new ();
@@ -422,6 +430,11 @@
/*Make the various widgets*/
viewer->vbox = etk_vbox_new(ETK_FALSE,0);
+
+ instance->gui_object = viewer->vbox;
+ instance->core = core;
+ instance->data = viewer;
+ instance->layout_parent = layout;
/*Make the slider*/
viewer->slider = etk_hslider_new(10,128, 48, 1, 1);
@@ -432,7 +445,10 @@
viewer->iconbox = etk_iconbox_new();
etk_box_append(ETK_BOX(viewer->vbox), viewer->iconbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+ if ((size = entropy_config_misc_item_str_get("general.iconsize"))) {
+ etk_range_value_set(ETK_RANGE(viewer->slider), atoi(size));
+ entropy_etk_icon_viewer_icon_size_set(viewer, atoi(size));
+ }
/*etk_iconbox_model_icon_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
0,0,64,64,1,1);*/
@@ -440,11 +456,6 @@
etk_signal_connect("mouse_down", ETK_OBJECT(viewer->iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
- instance->gui_object = viewer->vbox;
- instance->core = core;
- instance->data = viewer;
- instance->layout_parent = layout;
-
/*DND Setup*/
/* dnd_types_num = 1;
dnd_types = entropy_malloc(dnd_types_num* sizeof(char*));
-------------------------------------------------------------------------
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
