Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_menus.c exhibit_menus.h exhibit_tab.c
exhibit_tab.h
Log Message:
- Fix from latest etk update. (make exhibit compile again)
- Some debug printf's for tabcode
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- exhibit_main.c 15 Aug 2006 22:21:47 -0000 1.67
+++ exhibit_main.c 18 Aug 2006 10:36:41 -0000 1.68
@@ -411,9 +411,7 @@
}
else if(!strcmp(ev->key, "w"))
{
- D(("Number of tabs: %d\n", evas_list_count(e->tabs)));
- if(evas_list_count(e->tabs) > 1)
- _ex_tab_delete(e->cur_tab);
+ _ex_tab_delete();
}
else if(!strcmp(ev->key, "q"))
{
@@ -473,9 +471,13 @@
e = data;
_ex_slideshow_stop(e);
- tab = evas_list_nth(e->tabs,
etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
+
+ tab = evas_list_nth(e->tabs,
+ etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
e->cur_tab = tab;
+ D(("Toggeled tab %p number %d\n", tab, e->cur_tab->num));
+
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);
@@ -521,6 +523,9 @@
e->cur_tab = tab;
etk_notebook_page_append(ETK_NOTEBOOK(e->notebook),
_ex_file_get(e->cur_tab->dir), e->cur_tab->scrolled_view);
etk_notebook_current_page_set(ETK_NOTEBOOK(e->notebook),
evas_list_count(e->tabs) - 1);
+
+ tab->num = etk_notebook_current_page_get(ETK_NOTEBOOK(e->notebook));
+ D(("Setting tab number %d\n", tab->num));
}
static void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- exhibit_menus.c 15 Aug 2006 22:21:47 -0000 1.30
+++ exhibit_menus.c 18 Aug 2006 10:36:41 -0000 1.31
@@ -42,7 +42,7 @@
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,
+ Etk_Callback callback,
void *data)
{
Etk_Widget *menu_item = NULL;
@@ -111,7 +111,7 @@
EX_MENU_ITEM_GET_RETURN(obj);
- _ex_tab_delete(e->cur_tab);
+ _ex_tab_delete();
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_menus.h 15 Aug 2006 22:21:47 -0000 1.11
+++ exhibit_menus.h 18 Aug 2006 10:36:41 -0000 1.12
@@ -10,7 +10,7 @@
EX_MENU_ITEM_SEPERATOR
} Ex_Menu_Item_Type;
-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);
+Etk_Widget *_ex_menu_item_new(Ex_Menu_Item_Type item_type, const char *label,
int stock_id, Etk_Menu_Shell *menu_shell, Etk_Callback callback, void *data);
void _ex_menu_build_run_menu(Etk_Widget *submenu);
void _ex_menu_new_tab_cb(Etk_Object *obj, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_tab.c 15 Aug 2006 22:21:47 -0000 1.25
+++ exhibit_tab.c 18 Aug 2006 10:36:41 -0000 1.26
@@ -19,11 +19,18 @@
char *file;
file = NULL;
- tab = calloc(1, sizeof(Ex_Tab));
- tab->num = evas_list_count(e->tabs);
+ tab = calloc(1, sizeof(Ex_Tab));
+ //tab->num = evas_list_count(e->tabs);
tab->dirs = NULL;
tab->images = NULL;
+ if (!dir) {
+ D(("NO DIR\n"));
+ exit(-1);
+ }
+
+ D(("Creating new tab with %s\n", dir));
+
if (e->options->default_view == EX_IMAGE_FIT_TO_WINDOW)
{
tab->fit_window = ETK_TRUE;
@@ -87,7 +94,7 @@
}
void
-_ex_tab_delete(Ex_Tab *tab)
+_ex_tab_delete()
{
if (!e->cur_tab) {
D(("No currently selected TAB!!\n"));
@@ -97,20 +104,24 @@
if (e->cur_tab->num == 0)
return;
+
+ D(("Number of tabs: %d\n", evas_list_count(e->tabs)));
+
+ if(evas_list_count(e->tabs) < 1)
+ {
+ D(("Cannot remove the last tab\n"));
+ 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);
+// e->tabs = 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);
+ etk_notebook_page_remove(ETK_NOTEBOOK(e->notebook), e->cur_tab->num);
+ // E_FREE(e->cur_tab);
}
void
@@ -119,11 +130,14 @@
chdir(tab->cur_path);
D(("_ex_tab_select: changed dir to %s\n", tab->cur_path));
+ D(("_ex_tab_select: selecting tab num %d\n", e->cur_tab->num));
if(tab->comment.visible)
- etk_notebook_page_child_set(ETK_NOTEBOOK(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(e->notebook), tab->num,
tab->alignment);
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), tab->num,
+ tab->alignment);
etk_table_attach(ETK_TABLE(e->table), tab->dtree,
0, 3, 3, 3,
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_tab.h 15 Aug 2006 22:21:47 -0000 1.4
+++ exhibit_tab.h 18 Aug 2006 10:36:41 -0000 1.5
@@ -5,7 +5,7 @@
#define _EX_TAB_H
Ex_Tab *_ex_tab_new(Exhibit *e, char *dir);
-void _ex_tab_delete(Ex_Tab *tab);
+void _ex_tab_delete();
void _ex_tab_select(Ex_Tab *tab);
void _ex_tab_current_zoom_in(Exhibit *e);
void _ex_tab_current_zoom_out(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
