Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_callbacks.c emphasis_callbacks.h emphasis_gui.c
emphasis_mpc.c
Log Message:
Update db option added to the menu.
Menu Icons are restored too.
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emphasis_callbacks.c 2 Jul 2006 01:51:56 -0000 1.3
+++ emphasis_callbacks.c 3 Jul 2006 02:33:26 -0000 1.4
@@ -529,10 +529,19 @@
void
cb_pls_contextual_menu(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data)
{
+ Emphasis_Gui *gui;
+
+ gui = data;
if (event->button == 3)
- {
- etk_menu_popup(ETK_MENU(data));
- }
+ {
+ if (etk_tree_selected_rows_get(ETK_TREE(gui->tree_pls))
== NULL)
+ {
+ printf("coin\n");
+ event->button = 1;
+ etk_signal_emit_by_name("row_clicked",
ETK_OBJECT(gui->tree_pls), NULL, gui, event);
+ }
+ etk_menu_popup(ETK_MENU(gui->menu));
+ }
}
/**
@@ -617,9 +626,20 @@
* @brief Request an database update
*/
void
-cb_database_update(Etk_Object *object, Etk_Event_Mouse_Up_Down *event, void
*data)
+cb_database_update(Etk_Object *object, void *data)
{
- mpc_database_update("/home/lok/Music/");
+ Emphasis_Gui *gui;
+ const char *tree_title;
+
+ mpc_database_update("/");
+ emphasis_tree_mlib_init(data, EMPHASIS_ARTIST);
+
+ /* Clear old search */
+ gui = data;
+ etk_tree_col_title_set(etk_tree_nth_col_get(ETK_TREE(gui->tree_artist),
0), "Artist");
+ etk_tree_col_title_set(etk_tree_nth_col_get(ETK_TREE(gui->tree_album),
0), "Album");
+ etk_tree_col_title_set(etk_tree_nth_col_get(ETK_TREE(gui->tree_track),
0), "Track");
+
}
void
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emphasis_callbacks.h 2 Jul 2006 01:51:56 -0000 1.2
+++ emphasis_callbacks.h 3 Jul 2006 02:33:26 -0000 1.3
@@ -36,7 +36,7 @@
void cb_vol_image_clicked(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
void cb_vol_slider_value_changed(Etk_Object *object, double value, void *data);
-void cb_database_update(Etk_Object *object, Etk_Event_Mouse_Up_Down *event,
void *data);
+void cb_database_update(Etk_Object *object, void *data);
void cb_config_show(Etk_Object *object, void *data);
void cb_config_hide(Etk_Object *object, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_gui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emphasis_gui.c 2 Jul 2006 01:51:56 -0000 1.3
+++ emphasis_gui.c 3 Jul 2006 02:33:26 -0000 1.4
@@ -220,13 +220,16 @@
/* playlist menu setup*/
gui->menu = etk_menu_new();
- Etk_Widget *menu_item, *radio_item=NULL, *menu;
+ Etk_Widget *menu_item, *separator, *radio_item=NULL, *menu;
- emphasis_menu_append(gui->menu, "clear", ETK_STOCK_EDIT_CUT,
cb_playlist_clear, NULL,
- "delete", NULL, cb_playlist_delete, gui,
+ emphasis_menu_append(gui->menu, "clear", ETK_STOCK_EDIT_CLEAR,
cb_playlist_clear, NULL,
+ "delete", ETK_STOCK_EDIT_DELETE,
cb_playlist_delete, gui,
+ "update", ETK_STOCK_VIEW_REFRESH,
cb_database_update, gui,
/* "config", ETK_STOCK_PREFERENCES_SYSTEM,
cb_config_show, gui, */
- "Open a file", ETK_STOCK_DOCUMENT_OPEN,
NULL, NULL,
NULL);
+ separator = etk_menu_item_separator_new();
+ etk_menu_shell_append(ETK_MENU_SHELL(gui->menu),
ETK_MENU_ITEM(separator));
+
radio_item = etk_menu_item_radio_new_with_label_from_widget("full",
NULL);
etk_menu_shell_append(ETK_MENU_SHELL(gui->menu),
ETK_MENU_ITEM(radio_item));
etk_signal_connect("activated", ETK_OBJECT(radio_item),
ETK_CALLBACK(cb_switch_full), gui);
@@ -235,9 +238,9 @@
etk_signal_connect("activated", ETK_OBJECT(radio_item),
ETK_CALLBACK(cb_switch_small), gui);
etk_signal_connect("mouse_down", ETK_OBJECT(gui->window),
- ETK_CALLBACK(cb_pls_contextual_menu),
ETK_MENU(gui->menu));
+ ETK_CALLBACK(cb_pls_contextual_menu), gui);
etk_signal_connect("mouse_down", ETK_OBJECT(gui->tree_pls),
- ETK_CALLBACK(cb_pls_contextual_menu),
ETK_MENU(gui->menu));
+ ETK_CALLBACK(cb_pls_contextual_menu), gui);
// etk_signal_connect("key_down", ETK_OBJECT(gui->window),
// ETK_CALLBACK(cb_emphasis_bindings_key), gui);
@@ -275,7 +278,7 @@
{
menu_item = etk_menu_item_image_new_with_label(item_name);
item_image_id = va_arg(arglist, Etk_Stock_Id);
- if (item_image)
+ if (item_image_id)
{
item_image = etk_image_new_from_stock(item_image_id,
ETK_STOCK_SMALL);
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item),
ETK_IMAGE(item_image));
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emphasis_mpc.c 2 Jul 2006 01:51:56 -0000 1.3
+++ emphasis_mpc.c 3 Jul 2006 02:33:26 -0000 1.4
@@ -457,10 +457,7 @@
void
mpc_database_update(char *path)
{
- int rep;
- rep = mpd_database_update_dir(mo, path);
- if (rep == 0)
- printf("cette fonction est indisponible... coin coin\n");
+ mpd_database_update_dir(mo, "/");
}
void
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
