Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c exhibit_menus.c
exhibit_slideshow.c
Log Message:
* Exhibit compiles again
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- exhibit_image.c 2 Sep 2006 01:43:23 -0000 1.38
+++ exhibit_image.c 7 Oct 2006 11:39:19 -0000 1.39
@@ -81,7 +81,7 @@
e->mouse.x = ev->canvas.x;
e->mouse.y = ev->canvas.y;
- etk_toplevel_widget_pointer_push(ETK_TOPLEVEL_WIDGET(e->win),
ETK_POINTER_MOVE);
+ etk_toplevel_pointer_push(ETK_TOPLEVEL(e->win), ETK_POINTER_MOVE);
}
else if(ev->button == 2)
{
@@ -147,7 +147,7 @@
if(ev->button == 1)
{
e->mouse.down = 0;
- etk_toplevel_widget_pointer_pop(ETK_TOPLEVEL_WIDGET(e->win),
ETK_POINTER_MOVE);
+ etk_toplevel_pointer_pop(ETK_TOPLEVEL(e->win), ETK_POINTER_MOVE);
}
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- exhibit_main.c 15 Sep 2006 11:30:10 -0000 1.83
+++ exhibit_main.c 7 Oct 2006 11:39:20 -0000 1.84
@@ -22,27 +22,27 @@
{
if (e->cur_tab->fit_window)
{
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), _("Fit to window"),
0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), _("Fit to
window"), 0);
}
else if(e->zoom > 0)
{
char zoom[6];
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_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);
+ etk_statusbar_message_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);
+ etk_statusbar_message_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);;
+ etk_statusbar_message_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);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
}
}
@@ -58,10 +58,10 @@
E_FREE(tab->cur_file);
tab->image_loaded = ETK_FALSE;
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[0]), NULL, 0);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), NULL, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[0]), NULL, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), NULL, 0);
/* Just hide the image as if we deleted it */
etk_widget_hide(ETK_WIDGET(tab->image));
@@ -113,13 +113,13 @@
bytes = ecore_file_size(image);
snprintf(size, sizeof(size), "%d K", (int)(bytes/1024));
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[0]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[0]), size, 0);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
hs =
etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view));
vs =
etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view));
@@ -164,7 +164,7 @@
{
snprintf(back, PATH_MAX, "..");
etk_tree_append(ETK_TREE(e->cur_tab->dtree), e->cur_tab->dcol,
- etk_theme_icon_theme_get(), "actions/go-up_16", back, NULL);
+ etk_theme_icon_get(), "actions/go-up_16", back, NULL);
}
if (e->cur_tab->monitor)
@@ -207,7 +207,7 @@
if(S_ISDIR(st.st_mode))
{
etk_tree_append(ETK_TREE(e->cur_tab->dtree), e->cur_tab->dcol,
- etk_theme_icon_theme_get(),
+ etk_theme_icon_get(),
"places/folder_16",
dir_entry->d_name, NULL);
e->cur_tab->dirs = evas_list_append(e->cur_tab->dirs,
dir_entry->d_name);
@@ -914,7 +914,7 @@
e->hbox = etk_hbox_new(ETK_TRUE, 0);
e->sort_bar = etk_statusbar_new();
- etk_statusbar_push(ETK_STATUSBAR(e->sort_bar), "Sort by date", 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by date", 0);
etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->sort_bar), ETK_FALSE);
etk_box_append(ETK_BOX(e->vbox), e->hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(e->hbox), e->sort_bar, ETK_BOX_START, ETK_BOX_NONE,
0);
@@ -945,9 +945,9 @@
etk_box_append(ETK_BOX(e->hbox), e->statusbar[2], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if (e->options->default_view == EX_IMAGE_ONE_TO_ONE)
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
else if (e->options->default_view == EX_IMAGE_FIT_TO_WINDOW)
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "Fit to window", 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), "Fit to
window", 0);
e->statusbar[3] = etk_statusbar_new();
etk_box_append(ETK_BOX(e->hbox), e->statusbar[3], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- exhibit_menus.c 15 Sep 2006 11:30:10 -0000 1.36
+++ exhibit_menus.c 7 Oct 2006 11:39:20 -0000 1.37
@@ -224,8 +224,8 @@
_ex_image_flip_diagonal(ETK_IMAGE(e->cur_tab->image), 1);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
}
void
@@ -242,8 +242,8 @@
_ex_image_flip_diagonal(ETK_IMAGE(e->cur_tab->image), 2);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_slideshow.c 1 Sep 2006 22:41:37 -0000 1.7
+++ exhibit_slideshow.c 7 Oct 2006 11:39:20 -0000 1.8
@@ -8,7 +8,7 @@
{
if(e->slideshow.active)
{
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[3]), "", 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), "", 0);
e->slideshow.active = ETK_FALSE;
ecore_timer_del(e->slideshow.timer);
}
@@ -22,7 +22,7 @@
if(!e->slideshow.active)
{
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[3]), "Slideshow running",
0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), "Slideshow
running", 0);
e->slideshow.timer = ecore_timer_add(e->slideshow.interval,
_ex_slideshow_next, NULL);
e->slideshow.active = ETK_TRUE;
@@ -51,7 +51,7 @@
i = etk_tree_num_rows_get(ETK_TREE(e->cur_tab->itree));
n = 1 + etk_tree_row_num_get(ETK_TREE(e->cur_tab->itree), row);
sprintf(string, "Slideshow picture %d of %d", n, i);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
