Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_main.c exhibit_menus.c
exhibit_menus.h exhibit_slideshow.c exhibit_tab.c
exhibit_tab.h
Log Message:
Some tab removal code, not working correct yet.
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- exhibit.h 13 Aug 2006 20:04:43 -0000 1.30
+++ exhibit.h 15 Aug 2006 22:21:47 -0000 1.31
@@ -154,8 +154,6 @@
Etk_Tree_Col *dcol;
Etk_Tree_Col *icol;
- Exhibit *e;
-
struct {
Etk_Bool visible;
Etk_Widget *vbox;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- exhibit_image.c 15 Aug 2006 18:45:51 -0000 1.33
+++ exhibit_image.c 15 Aug 2006 22:21:47 -0000 1.34
@@ -770,7 +770,7 @@
}
E_FREE(newpath);
- E_FREE(oldpath);
+ E_FREE(oldpath);
break;
default:
break;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- exhibit_main.c 15 Aug 2006 18:45:51 -0000 1.66
+++ exhibit_main.c 15 Aug 2006 22:21:47 -0000 1.67
@@ -413,10 +413,7 @@
{
D(("Number of tabs: %d\n", evas_list_count(e->tabs)));
if(evas_list_count(e->tabs) > 1)
- {
- _ex_main_window_tab_remove(e->cur_tab);
_ex_tab_delete(e->cur_tab);
- }
}
else if(!strcmp(ev->key, "q"))
{
@@ -479,17 +476,12 @@
tab = evas_list_nth(e->tabs,
etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
e->cur_tab = tab;
+ D(("Selecting tab %d\n", e->cur_tab->num));
_ex_tab_select(tab);
etk_entry_text_set(ETK_ENTRY(e->entry[0]), e->cur_tab->cur_path);
}
void
-_ex_main_window_tab_remove(Ex_Tab *tab)
-{
- D(("_ex_main_window_tab_remove\n"));
-}
-
-void
_ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab)
{
if(evas_list_count(e->tabs) == 1)
@@ -685,7 +677,6 @@
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Window"),
ETK_STOCK_WINDOW_NEW, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_new_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Tab"), ETK_STOCK_TAB_NEW,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_new_tab_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image as"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_as_cb), e);
@@ -700,7 +691,6 @@
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Window"),
ETK_STOCK_WINDOW_NEW, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_close_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Tab"), ETK_STOCK_TAB_NEW,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_delete_tab_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Quit"),
ETK_STOCK_DIALOG_CLOSE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_quit_cb),
e);
@@ -767,7 +757,6 @@
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Help"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu_bar), NULL, NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Release notes"),
ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_release_notes_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("About"),
ETK_STOCK_HELP_BROWSER, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_about_cb),
e);
}
@@ -837,7 +826,7 @@
e->cur_tab = tab;
e->tabs = evas_list_append(e->tabs, tab);
_ex_tab_select(tab);
- etk_paned_child2_set(ETK_PANED(tab->e->hpaned), tab->scrolled_view,
ETK_TRUE);
+ etk_paned_child2_set(ETK_PANED(e->hpaned), tab->scrolled_view, ETK_TRUE);
_ex_main_populate_files(e, file);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- exhibit_menus.c 15 Aug 2006 18:45:51 -0000 1.29
+++ exhibit_menus.c 15 Aug 2006 22:21:47 -0000 1.30
@@ -88,14 +88,6 @@
}
void
-_ex_menu_new_window_cb(Etk_Object *obj, void *data)
-{
- EX_MENU_ITEM_GET_RETURN(obj);
-
- D(("new window\n"));
-}
-
-void
_ex_menu_new_tab_cb(Etk_Object *obj, void *data)
{
Ex_Tab *tab;
@@ -119,7 +111,6 @@
EX_MENU_ITEM_GET_RETURN(obj);
- _ex_main_window_tab_remove(e->cur_tab);
_ex_tab_delete(e->cur_tab);
}
@@ -150,13 +141,6 @@
}
void
-_ex_menu_search_cb(Etk_Object *obj, void *data)
-{
- EX_MENU_ITEM_GET_RETURN(obj);
- D(("search\n"));
-}
-
-void
_ex_menu_rename_cb(Etk_Object *obj, void *data)
{
Exhibit *e = data;
@@ -190,13 +174,6 @@
}
void
-_ex_menu_close_window_cb(Etk_Object *obj, void *data)
-{
- EX_MENU_ITEM_GET_RETURN(obj);
- etk_main_quit();
-}
-
-void
_ex_menu_quit_cb(Etk_Object *obj, void *data)
{
Exhibit *e;
@@ -505,13 +482,6 @@
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(e, NULL);
-}
-
-void
-_ex_menu_release_notes_cb(Etk_Object *obj, void *data)
-{
- EX_MENU_ITEM_GET_RETURN(obj);
- D(("release notes\n"));
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_menus.h 13 Aug 2006 22:59:01 -0000 1.10
+++ exhibit_menus.h 15 Aug 2006 22:21:47 -0000 1.11
@@ -13,16 +13,13 @@
Etk_Widget *_ex_menu_item_new(Ex_Menu_Item_Type item_type, const char *label,
int stock_id, Etk_Menu_Shell *menu_shell, Etk_Signal_Callback_Function
callback, void *data);
void _ex_menu_build_run_menu(Etk_Widget *submenu);
-void _ex_menu_new_window_cb(Etk_Object *obj, void *data);
void _ex_menu_new_tab_cb(Etk_Object *obj, void *data);
void _ex_menu_delete_tab_cb(Etk_Object *obj, void *data);
void _ex_menu_save_image_cb(Etk_Object *obj, void *data);
void _ex_menu_save_image_as_cb(Etk_Object *obj, void *data);
-void _ex_menu_search_cb(Etk_Object *obj, void *data);
void _ex_menu_rename_cb(Etk_Object *obj, void *data);
void _ex_menu_delete_cb(Etk_Object *obj, void *data);
void _ex_menu_options_cb(Etk_Object *obj, void *data);
-void _ex_menu_close_window_cb(Etk_Object *obj, void *data);
void _ex_menu_quit_cb(Etk_Object *obj, void *data);
void _ex_menu_run_in_cb(Etk_Object *obj, void *data);
void _ex_menu_undo_cb(Etk_Object *obj, void *data);
@@ -45,7 +42,6 @@
void _ex_menu_add_to_fav_cb(Etk_Object *obj, void *data);
void _ex_menu_remove_from_fav_cb(Etk_Object *obj, void *data);
void _ex_menu_go_to_fav_cb(Etk_Object *obj, void *data);
-void _ex_menu_release_notes_cb(Etk_Object *obj, void *data);
void _ex_menu_about_cb(Etk_Object *obj, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- exhibit_slideshow.c 14 Aug 2006 16:34:52 -0000 1.5
+++ exhibit_slideshow.c 15 Aug 2006 22:21:47 -0000 1.6
@@ -54,5 +54,5 @@
sprintf(string, "Slideshow picture %d of %d", n, i);
etk_statusbar_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
- return 1;
+ return 1;
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- exhibit_tab.c 15 Aug 2006 18:45:51 -0000 1.24
+++ exhibit_tab.c 15 Aug 2006 22:21:47 -0000 1.25
@@ -23,7 +23,6 @@
tab->num = evas_list_count(e->tabs);
tab->dirs = NULL;
tab->images = NULL;
- tab->e = e;
if (e->options->default_view == EX_IMAGE_FIT_TO_WINDOW)
{
@@ -88,15 +87,30 @@
}
void
-_ex_tab_dir_set(Ex_Tab *tab, char *path)
-{
-
-}
-
-void
_ex_tab_delete(Ex_Tab *tab)
{
- D (("Delete tab\n"));
+ if (!e->cur_tab) {
+ D(("No currently selected TAB!!\n"));
+ return;
+ }
+
+ if (e->cur_tab->num == 0)
+ return;
+
+ D(("Delete tab %d\n", e->cur_tab->num));
+ etk_notebook_page_remove(ETK_NOTEBOOK(e->notebook), e->cur_tab->num);
+
+ D(("Remove from list\n"));
+ evas_list_remove(e->tabs, e->cur_tab);
+
+ D(("Free\n"));
+ E_FREE(e->cur_tab->dir);
+ E_FREE(e->cur_tab->set_img_path);
+ E_FREE(e->cur_tab->cur_file);
+ E_FREE(tab->comment.text);
+ evas_list_free(e->cur_tab->images);
+ evas_list_free(e->cur_tab->dirs);
+ E_FREE(e->cur_tab);
}
void
@@ -107,23 +121,23 @@
D(("_ex_tab_select: changed dir to %s\n", tab->cur_path));
if(tab->comment.visible)
- etk_notebook_page_child_set(ETK_NOTEBOOK(tab->e->notebook), tab->num,
tab->comment.vbox);
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), tab->num,
tab->comment.vbox);
else if(tab->fit_window)
- etk_notebook_page_child_set(ETK_NOTEBOOK(tab->e->notebook), tab->num,
tab->alignment);
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), tab->num,
tab->alignment);
- etk_table_attach(ETK_TABLE(tab->e->table), tab->dtree,
+ etk_table_attach(ETK_TABLE(e->table), tab->dtree,
0, 3, 3, 3,
0, 0, ETK_TABLE_VEXPAND | ETK_TABLE_FILL);
etk_widget_show(tab->dtree);
- etk_paned_child2_set(ETK_PANED(tab->e->vpaned), tab->itree, ETK_TRUE);
+ etk_paned_child2_set(ETK_PANED(e->vpaned), tab->itree, ETK_TRUE);
etk_widget_show(tab->itree);
etk_widget_show(tab->image);
etk_widget_show(tab->alignment);
etk_widget_show(tab->scrolled_view);
- etk_widget_show_all(tab->e->win);
+ etk_widget_show_all(e->win);
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_tab.h 2 Aug 2006 19:23:22 -0000 1.3
+++ exhibit_tab.h 15 Aug 2006 22:21:47 -0000 1.4
@@ -5,7 +5,6 @@
#define _EX_TAB_H
Ex_Tab *_ex_tab_new(Exhibit *e, char *dir);
-void _ex_tab_dir_set(Ex_Tab *tab, char *dir);
void _ex_tab_delete(Ex_Tab *tab);
void _ex_tab_select(Ex_Tab *tab);
void _ex_tab_current_zoom_in(Exhibit *e);
-------------------------------------------------------------------------
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
