[prev in list] [next in list] [prev in thread] [next in thread]
List: enlightenment-svn
Subject: E SVN: captainigloo IN trunk/PROTO/enna-explorer: . data/theme
From: "Enlightenment SVN" <no-reply () enlightenment ! org>
Date: 2011-08-31 16:29:59
Message-ID: 20110831162959.21B7B300001 () e2 ! enlightenment ! org
[Download RAW message or body]
Log:
PROTO/enna-explorer : Add tablet theme and layout
* Add Grid view for the tablet layout
* Add shortcut panel for the tablet layout
* Add thumbnails generation for the grid items
Author: captainigloo
Date: 2011-08-31 09:29:58 -0700 (Wed, 31 Aug 2011)
New Revision: 63041
Trac: http://trac.enlightenment.org/e/changeset/63041
Added:
trunk/PROTO/enna-explorer/data/theme/tablet/ \
trunk/PROTO/enna-explorer/data/theme/tablet/Makefile.am \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/ \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bg.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_dis_base.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_base2.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_hilight.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_shine.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/button.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/check.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/ctxpopup.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_box.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_glow.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_hi.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_shad.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_shine.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/elm.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/entry.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/frame.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/gengrid.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/genlist.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/inwin_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/list.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/pager.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/progressbar_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/sb_runnerh.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/sb_runnerv.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/scroller.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/shad_circ.png \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/toggle.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/toolbar.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/win.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/icons.edc \
trunk/PROTO/enna-explorer/data/theme/tablet/images/ \
trunk/PROTO/enna-explorer/data/theme
/tablet/images/arrow_right.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/browser_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_normal.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_red.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_red_disabled.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/check_off.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/check_on.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/confirm_dialog_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/cover_border.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/entry_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/header_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/header_fg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/icon_search.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/list_selected.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/mainmenu_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/music_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/panel_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_down.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_right.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_up.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/scroll_h.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/scrollbar-bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/scrollbar-knob.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/search_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/sel_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/images/toggle_bg.png \
trunk/PROTO/enna-explorer/data/theme/tablet/tablet.edc \
trunk/PROTO/enna-explorer/src/bin/shortcut.c \
trunk/PROTO/enna-explorer/src/bin/shortcut.h \
trunk/PROTO/enna-explorer/src/bin/view_grid.c \
trunk/PROTO/enna-explorer/src/bin/view_grid.h Modified:
trunk/PROTO/enna-explorer/configure.ac \
trunk/PROTO/enna-explorer/data/theme/Makefile.am \
trunk/PROTO/enna-explorer/src/bin/Makefile.am \
trunk/PROTO/enna-explorer/src/bin/browser_obj.c \
trunk/PROTO/enna-explorer/src/bin/browser_obj.h \
trunk/PROTO/enna-explorer/src/bin/enna.c trunk/PROTO/enna-explorer/src/bin/explorer.c \
Modified: trunk/PROTO/enna-explorer/configure.ac
===================================================================
--- trunk/PROTO/enna-explorer/configure.ac 2011-08-31 15:58:02 UTC (rev 63040)
+++ trunk/PROTO/enna-explorer/configure.ac 2011-08-31 16:29:58 UTC (rev 63041)
@@ -213,6 +213,7 @@
data/other/Makefile
data/theme/Makefile
data/theme/phone/Makefile
+data/theme/tablet/Makefile
])
AC_OUTPUT
Modified: trunk/PROTO/enna-explorer/data/theme/Makefile.am
===================================================================
--- trunk/PROTO/enna-explorer/data/theme/Makefile.am 2011-08-31 15:58:02 UTC (rev \
63040)
+++ trunk/PROTO/enna-explorer/data/theme/Makefile.am 2011-08-31 16:29:58 UTC (rev \
63041) @@ -4,7 +4,7 @@
if ENNA_BUILD_THEME
if BUILD_THEME_PHONE
-SUBDIRS += phone
+SUBDIRS += phone tablet
endif
endif
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_dis_base.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_base2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_hilight.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/bt_sm_shine.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_box.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_glow.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_hi.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_shad.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/cur_shine.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/inwin_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/elm/progressbar_bg.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/sb_runnerh.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/sb_runnerv.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/elm/shad_circ.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/arrow_right.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/browser_bg.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_normal.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_red.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/btn_red_disabled.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/check_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/check_on.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/confirm_dialog_bg.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/cover_border.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/entry_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/header_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/header_fg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/icon_search.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/list_selected.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/mainmenu_bg.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/music_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/panel_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_down.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_right.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/popup_up.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/scroll_h.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/scrollbar-bg.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: \
trunk/PROTO/enna-explorer/data/theme/tablet/images/scrollbar-knob.png \
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/search_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/sel_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/PROTO/enna-explorer/data/theme/tablet/images/toggle_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/PROTO/enna-explorer/src/bin/Makefile.am
===================================================================
--- trunk/PROTO/enna-explorer/src/bin/Makefile.am 2011-08-31 15:58:02 UTC (rev 63040)
+++ trunk/PROTO/enna-explorer/src/bin/Makefile.am 2011-08-31 16:29:58 UTC (rev 63041)
@@ -13,6 +13,7 @@
enna.c\
enna_config.c\
explorer.c\
+shortcut.c\
utils.c\
buffer.c\
mainmenu.c\
@@ -23,7 +24,8 @@
file.c\
browser.c\
browser_obj.c\
-view_list.c
+view_list.c\
+view_grid.c
enna_LDADD = @ENNA_LIBS@
enna_LDFLAGS = -rdynamic
Modified: trunk/PROTO/enna-explorer/src/bin/browser_obj.c
===================================================================
--- trunk/PROTO/enna-explorer/src/bin/browser_obj.c 2011-08-31 15:58:02 UTC (rev \
63040)
+++ trunk/PROTO/enna-explorer/src/bin/browser_obj.c 2011-08-31 16:29:58 UTC (rev \
63041) @@ -23,6 +23,7 @@
#include "vfs.h"
#include "view_list.h"
+#include "view_grid.h"
#include "enna_config.h"
#include "browser.h"
#include "browser_obj.h"
@@ -165,7 +166,27 @@
}
+static Evas_Object *
+_browser_view_grid_add(Smart_Data *sd)
+{
+ Evas_Object *view;
+ if (!sd) return NULL;
+
+ view = enna_grid_add(sd->o_layout);
+
+ elm_pager_content_push(sd->o_pager, view);
+ evas_object_smart_callback_add(view, "hilight", _view_hilight_cb, sd);
+ evas_object_smart_callback_add(view, "checked", _view_checked_cb, sd);
+ evas_object_smart_callback_add(view, "unchecked", _view_unchecked_cb, sd);
+ evas_object_smart_callback_add(view, "longpress", _view_longpressed_cb, sd);
+ /* View */
+ edje_object_signal_emit(view, "list,right,now", "enna");
+ return view;
+}
+
+
+
static void
_change_view(Smart_Data *sd, Enna_Browser_View_Type view_type)
{
@@ -184,6 +205,18 @@
sd->view_funcs.view_jump_ascii = enna_list_jump_ascii;
sd->view_funcs.view_selected_files_get = enna_list_selected_files_get;
break;
+ case ENNA_BROWSER_VIEW_GRID:
+ sd->view_funcs.view_add = _browser_view_grid_add;
+ sd->view_funcs.view_append = enna_grid_file_append;
+ sd->view_funcs.view_remove = enna_grid_file_remove;
+ sd->view_funcs.view_update = enna_grid_file_update;
+ sd->view_funcs.view_selected_data_get = enna_grid_selected_data_get;
+ sd->view_funcs.view_jump_label = enna_grid_jump_label;
+ sd->view_funcs.view_select_nth = enna_grid_select_nth;
+ sd->view_funcs.view_files_get = enna_grid_files_get;
+ sd->view_funcs.view_jump_ascii = enna_grid_jump_ascii;
+ sd->view_funcs.view_selected_files_get = enna_grid_selected_files_get;
+ break;
default:
break;
}
@@ -444,3 +477,5 @@
return sd->o_layout;
}
+
+
Modified: trunk/PROTO/enna-explorer/src/bin/browser_obj.h
===================================================================
--- trunk/PROTO/enna-explorer/src/bin/browser_obj.h 2011-08-31 15:58:02 UTC (rev \
63040)
+++ trunk/PROTO/enna-explorer/src/bin/browser_obj.h 2011-08-31 16:29:58 UTC (rev \
63041) @@ -28,6 +28,7 @@
typedef enum _Enna_Browser_View_Type
{
ENNA_BROWSER_VIEW_LIST,
+ ENNA_BROWSER_VIEW_GRID,
}Enna_Browser_View_Type;
Evas_Object *enna_browser_obj_add(Evas_Object *parent, const char *style);
Modified: trunk/PROTO/enna-explorer/src/bin/enna.c
===================================================================
--- trunk/PROTO/enna-explorer/src/bin/enna.c 2011-08-31 15:58:02 UTC (rev 63040)
+++ trunk/PROTO/enna-explorer/src/bin/enna.c 2011-08-31 16:29:58 UTC (rev 63041)
@@ -95,6 +95,8 @@
ENNA_EVENT_BROWSER_CHANGED = ecore_event_type_new();
elm_init(argc, argv);
+ elm_need_efreet();
+ elm_need_ethumb();
if (!_create_gui())
return 0;
Modified: trunk/PROTO/enna-explorer/src/bin/explorer.c
===================================================================
--- trunk/PROTO/enna-explorer/src/bin/explorer.c 2011-08-31 15:58:02 UTC (rev 63040)
+++ trunk/PROTO/enna-explorer/src/bin/explorer.c 2011-08-31 16:29:58 UTC (rev 63041)
@@ -34,6 +34,7 @@
#include "volumes.h"
#include "module.h"
#include "browser.h"
+#include "shortcut.h"
#define ENNA_MODULE_NAME "explorer"
@@ -183,6 +184,7 @@
static void
_create_menu()
{
+ const char *view_type;
/* Set default state */
mod->state = BROWSER_VIEW;
@@ -190,7 +192,14 @@
ENNA_OBJECT_DEL(mod->o_browser);
mod->o_browser = enna_browser_obj_add(mod->o_layout, NULL);
- enna_browser_obj_view_type_set(mod->o_browser, ENNA_BROWSER_VIEW_LIST);
+
+ view_type = elm_layout_data_get(mod->o_layout, "view");
+
+ if (view_type && !strcmp(view_type, "grid"))
+ enna_browser_obj_view_type_set(mod->o_browser, ENNA_BROWSER_VIEW_GRID);
+ else
+ enna_browser_obj_view_type_set(mod->o_browser, ENNA_BROWSER_VIEW_LIST);
+
enna_browser_obj_root_set(mod->o_browser, "/explorer");
evas_object_smart_callback_add(mod->o_browser, "selected",
@@ -383,6 +392,7 @@
_create_gui()
{
Evas_Object *tb;
+ Evas_Object *shortcut;
/* Set default state */
mod->state = BROWSER_VIEW;
@@ -406,6 +416,11 @@
/* elm_toolbar_item_append(tb, "edit-delete", "Delete", _toolbar_delete_cb, \
NULL); */ elm_layout_content_set(mod->o_layout, "enna.menu.swallow", tb);
_create_menu();
+
+ shortcut = enna_shortcut_add(mod->o_layout);
+ evas_object_show(shortcut);
+ elm_layout_content_set(mod->o_layout, "panel.swallow", shortcut);
+
}
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
enlightenment-svn mailing list
enlightenment-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic