Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_main.h exhibit_menus.c
Log Message:
- allow zoom to reflect zoom level in statusbar
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_main.c 14 Dec 2005 15:02:33 -0000 1.3
+++ exhibit_main.c 14 Dec 2005 15:34:28 -0000 1.4
@@ -18,6 +18,31 @@
Evas_List *event_handlers;
void
+_ex_main_statusbar_zoom_update(Exhibit *e)
+{
+ if(e->zoom > 0)
+ {
+ char zoom[6];
+ etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ snprintf(zoom, sizeof(zoom), "%d:1", abs(e->zoom));
+ etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);
+ }
+ else if(e->zoom < 0)
+ {
+ char zoom[6];
+ etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ snprintf(zoom, sizeof(zoom), "1:%d", abs(e->zoom));
+ etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);;
+ }
+ else
+ {
+ etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
+ }
+}
+
+
+void
_ex_main_button_zoom_in_cb(Etk_Object *obj, void *data)
{
Exhibit *e;
@@ -34,6 +59,7 @@
e->zoom += 2;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
+ _ex_main_statusbar_zoom_update(e);
}
void
@@ -53,6 +79,7 @@
e->zoom -= 2;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
+ _ex_main_statusbar_zoom_update(e);
}
void
@@ -69,7 +96,7 @@
e->zoom = 0;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
-
+ _ex_main_statusbar_zoom_update(e);
}
void
@@ -93,6 +120,9 @@
e = data;
e->zoom = 0;
+ etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
+
tree = ETK_TREE(object);
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&icol_string, etk_tree_nth_col_get(tree, 1),NULL);
@@ -583,8 +613,8 @@
etk_box_pack_start(ETK_BOX(e->hbox), ETK_STATUSBAR(e->statusbar[0]), TRUE,
TRUE, 0);
e->statusbar[1] = etk_statusbar_new();
- etk_statusbar_has_resize_grip_set(e->statusbar[1], FALSE);
- etk_box_pack_start(ETK_BOX(e->hbox), e->statusbar[1], TRUE, TRUE, 0);
+ etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->statusbar[1]), FALSE);
+ etk_box_pack_start(ETK_BOX(e->hbox), ETK_STATUSBAR(e->statusbar[1]), TRUE,
TRUE, 0);
e->statusbar[2] = etk_statusbar_new();
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->statusbar[2]), FALSE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_main.h 14 Dec 2005 11:33:30 -0000 1.1
+++ exhibit_main.h 14 Dec 2005 15:34:28 -0000 1.2
@@ -1,6 +1,11 @@
#ifndef _EX_MAIN_H
#define _EX_MAIN_H
+void _ex_main_statusbar_zoom_update(Exhibit *e);
+void _ex_main_button_zoom_in_cb(Etk_Object *obj, void *data);
+void _ex_main_button_zoom_out_cb(Etk_Object *obj, void *data);
+void _ex_main_button_zoom_one_to_one_cb(Etk_Object *obj, void *data);
+void _ex_main_button_fit_to_window_cb(Etk_Object *obj, void *data);
void _ex_main_itree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
void _ex_main_itree_key_down_cb(Etk_Object *object, void *event, void
*data);
void _ex_main_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_menus.c 14 Dec 2005 15:02:33 -0000 1.3
+++ exhibit_menus.c 14 Dec 2005 15:34:28 -0000 1.4
@@ -244,6 +244,7 @@
e->zoom += 2;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
+ _ex_main_statusbar_zoom_update(e);
}
void
@@ -263,6 +264,7 @@
e->zoom -= 2;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
+ _ex_main_statusbar_zoom_update(e);
}
void
@@ -279,7 +281,7 @@
e->zoom = 0;
_ex_image_zoom(ETK_IMAGE(e->image), e->zoom);
-
+ _ex_main_statusbar_zoom_update(e);
}
void
-------------------------------------------------------
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
