Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c
Log Message:
- misc
- rotation size set fix
- more options in right click menu
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_image.c 14 Dec 2005 15:02:33 -0000 1.3
+++ exhibit_image.c 14 Dec 2005 21:30:46 -0000 1.4
@@ -22,11 +22,25 @@
}
else if(ev->button == 3)
{
+ if(e->menu)
+ {
+ etk_menu_popup(e->menu);
+ return;
+ }
e->menu = etk_menu_new();
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom in"), EX_IMAGE_ZOOM_IN,
ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_zoom_in_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom out"),
EX_IMAGE_ZOOM_OUT, ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_zoom_out_cb),
e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom 1:1"),
EX_IMAGE_ONE_TO_ONE, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_zoom_one_to_one_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Fit to window"),
EX_IMAGE_FIT_TO_WINDOW, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_fit_to_window_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("in The Gimp"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("in XV"), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_run_in_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("in Xpaint"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+ _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, -99,
ETK_MENU_SHELL(e->menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Rotate clockwise"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_rot_clockwise_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Rotate counterclockwise"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_rot_counter_clockwise_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Flip horizontally"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_flip_horizontal_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Flip vertically"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_flip_vertical_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, -99,
ETK_MENU_SHELL(e->menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Blur"), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_blur_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sharpen"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu), ETK_CALLBACK(_ex_menu_sharpen_cb),
e);
+ _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, -99,
ETK_MENU_SHELL(e->menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Set as wallpaper"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu),
ETK_CALLBACK(_ex_menu_set_wallpaper_cb), e);
etk_menu_popup(e->menu);
}
}
@@ -198,7 +212,7 @@
evas_object_image_size_set(im->image_object, iw, ih);
evas_object_image_data_set(im->image_object, data);
evas_object_image_data_update_add(im->image_object, 0, 0, iw, ih);
- etk_widget_size_recalc_queue(im);
+ etk_widget_size_request_set(ETK_WIDGET(im), iw, ih);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_main.c 14 Dec 2005 15:34:28 -0000 1.4
+++ exhibit_main.c 14 Dec 2005 21:30:46 -0000 1.5
@@ -415,6 +415,8 @@
e = calloc(1, sizeof(Exhibit));
e->mouse.down = 0;
e->dirs = NULL;
+ e->menu = NULL;
+ e->image = NULL;
e->win = etk_window_new();
etk_window_title_set(ETK_WINDOW(e->win), WINDOW_TITLE " - Image Viewing the
Kewl Way!");
-------------------------------------------------------
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
