Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
Makefile.am exhibit.h exhibit_main.c exhibit_menus.c
exhibit_tab.c
Added Files:
exhibit_model_wobbly.c exhibit_model_wobbly.h
Log Message:
Why hello Mr. Wobbles!
- add new etk tree model for wobbly icons
- minor bug with thumb geometry (cant be bothered fixing this instant)
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 14 Mar 2006 01:01:15 -0000 1.9
+++ Makefile.am 15 Sep 2006 11:30:10 -0000 1.10
@@ -21,7 +21,8 @@
exhibit_favorites.h \
exhibit_options.h \
exhibit_comment.h \
-exhibit_comment_jpeg.h
+exhibit_comment_jpeg.h \
+exhibit_model_wobbly.h
exhibit_SOURCES = \
exhibit_file.c \
@@ -36,6 +37,7 @@
exhibit_options.c \
exhibit_comment.c \
exhibit_comment_jpeg.c \
+exhibit_model_wobbly.c \
$(exhibit_INCLUDES)
exhibit_LDADD = @my_libs@
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- exhibit.h 3 Sep 2006 12:41:30 -0000 1.35
+++ exhibit.h 15 Sep 2006 11:30:10 -0000 1.36
@@ -10,6 +10,7 @@
#include <Ecore_File.h>
#include <Ecore_X_Cursor.h>
#include <Evas.h>
+#include <Edje.h>
#include <Ecore_Evas.h>
#include <Epsilon.h>
#include <etk/Etk.h>
@@ -197,7 +198,7 @@
Etk_Widget *zoom_out[2];
Etk_Widget *fit[2];
Etk_Widget *original[2];
- Etk_Widget *sort;
+ Etk_Widget *sort_bar;
Etk_Widget *sizebar;
Etk_Widget *resbar;
Etk_Widget *zoombar;
@@ -284,6 +285,7 @@
#include "exhibit_favorites.h"
#include "exhibit_options.h"
#include "exhibit_comment.h"
+#include "exhibit_model_wobbly.h"
extern Exhibit *e;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- exhibit_main.c 13 Sep 2006 21:36:09 -0000 1.82
+++ exhibit_main.c 15 Sep 2006 11:30:10 -0000 1.83
@@ -806,7 +806,7 @@
}
e->zoom_in[0] = etk_button_new();
- e->zoom_in[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "zoom_in");
+ e->zoom_in[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"zoom_in");
etk_button_image_set(ETK_BUTTON(e->zoom_in[0]), ETK_IMAGE(e->zoom_in[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_in[0]),
ETK_CALLBACK(_ex_tab_current_zoom_in), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_in[0],
@@ -814,7 +814,7 @@
0, 0, ETK_TABLE_NONE);
e->zoom_out[0] = etk_button_new();
- e->zoom_out[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "zoom_out");
+ e->zoom_out[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"zoom_out");
etk_button_image_set(ETK_BUTTON(e->zoom_out[0]), ETK_IMAGE(e->zoom_out[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_out[0]),
ETK_CALLBACK(_ex_tab_current_zoom_out), e);
etk_table_attach(ETK_TABLE(e->table), e->zoom_out[0],
@@ -822,7 +822,7 @@
0, 0, ETK_TABLE_NONE);
e->fit[0] = etk_button_new();
- e->fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj",
"fit_to_window");
+ e->fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"fit_to_window");
etk_button_image_set(ETK_BUTTON(e->fit[0]), ETK_IMAGE(e->fit[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->fit[0]),
ETK_CALLBACK(_ex_tab_current_fit_to_window), e);
etk_table_attach(ETK_TABLE(e->table), e->fit[0],
@@ -830,7 +830,7 @@
0, 0, ETK_TABLE_NONE);
e->original[0] = etk_button_new();
- e->original[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR"/images/images.edj", "one_to_one");
+ e->original[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"one_to_one");
etk_button_image_set(ETK_BUTTON(e->original[0]), ETK_IMAGE(e->original[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->original[0]),
ETK_CALLBACK(_ex_tab_current_zoom_one_to_one), e);
etk_table_attach(ETK_TABLE(e->table), e->original[0],
@@ -913,22 +913,23 @@
ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL);
e->hbox = etk_hbox_new(ETK_TRUE, 0);
- e->sort = etk_label_new("Sort by date");
+ e->sort_bar = etk_statusbar_new();
+ etk_statusbar_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, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(e->hbox), e->sort_bar, ETK_BOX_START, ETK_BOX_NONE,
0);
{
Etk_Widget *menu;
Etk_Widget *menu_item;
menu = etk_menu_new();
- etk_signal_connect("mouse_down", ETK_OBJECT(e->sort),
ETK_CALLBACK(_ex_sort_label_mouse_down_cb), menu);
+ etk_signal_connect("mouse_down", ETK_OBJECT(e->sort_bar),
ETK_CALLBACK(_ex_sort_label_mouse_down_cb), menu);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by name"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by date"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by size"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by resolution"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_CHECK, _("Ascending"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
- menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
}
e->statusbar[0] = etk_statusbar_new();
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- exhibit_menus.c 2 Sep 2006 12:33:08 -0000 1.35
+++ exhibit_menus.c 15 Sep 2006 11:30:10 -0000 1.36
@@ -77,7 +77,7 @@
Etk_Widget *image;
image = etk_image_new_from_edje(PACKAGE_DATA_DIR
- "/images/images.edj",
+ "/gui.edj",
ex_images[stock_id]);
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item),
ETK_IMAGE(image));
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- exhibit_tab.c 1 Sep 2006 23:39:22 -0000 1.30
+++ exhibit_tab.c 15 Sep 2006 11:30:10 -0000 1.31
@@ -57,8 +57,8 @@
etk_tree_multiple_select_set(ETK_TREE(tab->itree), ETK_TRUE);
etk_signal_connect("row_selected", ETK_OBJECT(tab->itree),
ETK_CALLBACK(_ex_tab_itree_item_clicked_cb), e);
etk_signal_connect("key_down", ETK_OBJECT(tab->itree),
ETK_CALLBACK(_ex_tab_itree_key_down_cb), e);
- imodel = etk_tree_model_icon_text_new(ETK_TREE(tab->itree),
ETK_TREE_FROM_FILE);
- etk_tree_model_icon_text_icon_width_set(imodel, 80);
+ imodel = _ex_tree_model_wobbly_new(ETK_TREE(tab->itree),
ETK_TREE_FROM_FILE);
+ _ex_tree_model_wobbly_icon_width_set(imodel, 80);
tab->icol = etk_tree_col_new(ETK_TREE(tab->itree), "Files", imodel, 10);
etk_tree_headers_visible_set(ETK_TREE(tab->itree), 0);
etk_tree_row_height_set(ETK_TREE(tab->itree), 60);
@@ -73,7 +73,7 @@
tab->alignment = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
tab->image = etk_image_new();
- etk_widget_theme_file_set(tab->image, PACKAGE_DATA_DIR"/images/images.edj");
+ etk_widget_theme_file_set(tab->image, PACKAGE_DATA_DIR"/gui.edj");
etk_widget_theme_group_set(tab->image, "image_bg");
etk_signal_connect("mouse_down", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_down), e);
etk_signal_connect("mouse_up", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_up), 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
