diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index 1f6d3ddd4..d471f5753 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -97,8 +97,34 @@ images image: "e17_icon_fileman_pdf.png" COMP; image: "e17_icon_fileman_c.png" COMP; image: "e17_icon_fileman_h.png" COMP; + image: "e17_icon_fileman_o.png" COMP; + image: "e17_icon_fileman_sh.png" COMP; image: "e17_icon_fileman_png.png" COMP; - image: "e17_icon_fileman_jpg.png" COMP; + image: "e17_icon_fileman_jpg.png" COMP; + image: "e17_icon_fileman_avi.png" COMP; + image: "e17_icon_fileman_mp3.png" COMP; + image: "e17_icon_fileman_xcf.png" COMP; + image: "e17_icon_fileman_cpp.png" COMP; + image: "e17_icon_fileman_cs.png" COMP; + image: "e17_icon_fileman_patch.png" COMP; + image: "e17_icon_fileman_diff.png" COMP; + image: "e17_icon_fileman_doc.png" COMP; + image: "e17_icon_fileman_ogg.png" COMP; + image: "e17_icon_fileman_txt.png" COMP; + image: "e17_icon_fileman_bz2.png" COMP; + image: "e17_icon_fileman_deb.png" COMP; + image: "e17_icon_fileman_ttf.png" COMP; + image: "e17_icon_fileman_pcf.png" COMP; + image: "e17_icon_fileman_bdf.png" COMP; + image: "e17_icon_fileman_css.png" COMP; + image: "e17_icon_fileman_html.png" COMP; + image: "e17_icon_fileman_htm.png" COMP; + image: "e17_icon_fileman_zip.png" COMP; + image: "e17_icon_fileman_gz.png" COMP; + image: "e17_icon_fileman_tar.png" COMP; + image: "e17_icon_fileman_mpg.png" COMP; + image: "e17_icon_fileman_mpeg.png" COMP; + image: "e17_button_detail_open.png" COMP; image: "e17_button_detail_paste.png" COMP; image: "e17_button_detail_copy.png" COMP; @@ -109,6 +135,8 @@ images image: "e17_button_detail_arrange_name.png" COMP; image: "e17_button_detail_arrange.png" COMP; image: "e17_button_detail_arrange_time.png" COMP; + image: "e17_button_detail_new.png" COMP; + image: "e17_button_detail_new_dir.png" COMP; image: "e17_button_detail_properties.png" COMP; image: "e17_button_detail_refresh.png" COMP; image: "e17_button_detail_view_details.png" COMP; @@ -404,8 +432,33 @@ FILEMAN_ICON_CLICKABLE("file"); FILEMAN_ICON("pdf"); FILEMAN_ICON("c"); FILEMAN_ICON("h"); +FILEMAN_ICON("o"); +FILEMAN_ICON("sh"); FILEMAN_ICON("png"); FILEMAN_ICON("jpg"); +FILEMAN_ICON("avi"); +FILEMAN_ICON("mp3"); +FILEMAN_ICON("xcf"); +FILEMAN_ICON("cpp"); +FILEMAN_ICON("cs"); +FILEMAN_ICON("patch"); +FILEMAN_ICON("diff"); +FILEMAN_ICON("doc"); +FILEMAN_ICON("ogg"); +FILEMAN_ICON("txt"); +FILEMAN_ICON("bz2"); +FILEMAN_ICON("deb"); +FILEMAN_ICON("ttf"); +FILEMAN_ICON("pcf"); +FILEMAN_ICON("bdf"); +FILEMAN_ICON("css"); +FILEMAN_ICON("html"); +FILEMAN_ICON("htm"); +FILEMAN_ICON("zip"); +FILEMAN_ICON("gz"); +FILEMAN_ICON("tar"); +FILEMAN_ICON("mpg"); +FILEMAN_ICON("mpeg"); FULL_SIZE_FILEMAN_BUTTON("open"); FULL_SIZE_FILEMAN_BUTTON("copy"); @@ -417,6 +470,8 @@ FULL_SIZE_FILEMAN_BUTTON("properties"); FULL_SIZE_FILEMAN_BUTTON("arrange_name"); FULL_SIZE_FILEMAN_BUTTON("arrange"); FULL_SIZE_FILEMAN_BUTTON("arrange_time"); +FULL_SIZE_FILEMAN_BUTTON("new"); +FULL_SIZE_FILEMAN_BUTTON("new_dir"); FULL_SIZE_FILEMAN_BUTTON("refresh"); FULL_SIZE_FILEMAN_BUTTON("view_details"); FULL_SIZE_FILEMAN_BUTTON("view_name"); diff --git a/data/themes/images/e17_button_detail_copy.png b/data/themes/images/e17_button_detail_copy.png index 321331678..e3639f4e5 100644 Binary files a/data/themes/images/e17_button_detail_copy.png and b/data/themes/images/e17_button_detail_copy.png differ diff --git a/data/themes/images/e17_button_detail_cut.png b/data/themes/images/e17_button_detail_cut.png index d5b215f63..1c3664d31 100644 Binary files a/data/themes/images/e17_button_detail_cut.png and b/data/themes/images/e17_button_detail_cut.png differ diff --git a/data/themes/images/e17_button_detail_new.png b/data/themes/images/e17_button_detail_new.png new file mode 100644 index 000000000..61c772df3 Binary files /dev/null and b/data/themes/images/e17_button_detail_new.png differ diff --git a/data/themes/images/e17_button_detail_new_dir.png b/data/themes/images/e17_button_detail_new_dir.png new file mode 100644 index 000000000..d67bbf1e6 Binary files /dev/null and b/data/themes/images/e17_button_detail_new_dir.png differ diff --git a/data/themes/images/e17_button_detail_paste.png b/data/themes/images/e17_button_detail_paste.png index 87eae1a02..4ef798b3c 100644 Binary files a/data/themes/images/e17_button_detail_paste.png and b/data/themes/images/e17_button_detail_paste.png differ diff --git a/data/themes/images/e17_icon_fileman_avi.png b/data/themes/images/e17_icon_fileman_avi.png new file mode 100644 index 000000000..c43627054 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_avi.png differ diff --git a/data/themes/images/e17_icon_fileman_bdf.png b/data/themes/images/e17_icon_fileman_bdf.png new file mode 100644 index 000000000..5194499f3 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_bdf.png differ diff --git a/data/themes/images/e17_icon_fileman_bz2.png b/data/themes/images/e17_icon_fileman_bz2.png new file mode 100644 index 000000000..55ea24d3e Binary files /dev/null and b/data/themes/images/e17_icon_fileman_bz2.png differ diff --git a/data/themes/images/e17_icon_fileman_c.png b/data/themes/images/e17_icon_fileman_c.png index 778abce08..81d1dd3b0 100644 Binary files a/data/themes/images/e17_icon_fileman_c.png and b/data/themes/images/e17_icon_fileman_c.png differ diff --git a/data/themes/images/e17_icon_fileman_cpp.png b/data/themes/images/e17_icon_fileman_cpp.png new file mode 100644 index 000000000..2d2a25f77 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_cpp.png differ diff --git a/data/themes/images/e17_icon_fileman_cs.png b/data/themes/images/e17_icon_fileman_cs.png new file mode 100644 index 000000000..100010678 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_cs.png differ diff --git a/data/themes/images/e17_icon_fileman_css.png b/data/themes/images/e17_icon_fileman_css.png new file mode 100644 index 000000000..58ba4a37f Binary files /dev/null and b/data/themes/images/e17_icon_fileman_css.png differ diff --git a/data/themes/images/e17_icon_fileman_deb.png b/data/themes/images/e17_icon_fileman_deb.png new file mode 100644 index 000000000..cf41bd9c5 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_deb.png differ diff --git a/data/themes/images/e17_icon_fileman_diff.png b/data/themes/images/e17_icon_fileman_diff.png new file mode 100644 index 000000000..09ad048a3 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_diff.png differ diff --git a/data/themes/images/e17_icon_fileman_doc.png b/data/themes/images/e17_icon_fileman_doc.png new file mode 100644 index 000000000..d7422880c Binary files /dev/null and b/data/themes/images/e17_icon_fileman_doc.png differ diff --git a/data/themes/images/e17_icon_fileman_file.png b/data/themes/images/e17_icon_fileman_file.png index e0534ac49..efd2b3db4 100644 Binary files a/data/themes/images/e17_icon_fileman_file.png and b/data/themes/images/e17_icon_fileman_file.png differ diff --git a/data/themes/images/e17_icon_fileman_file_clicked.png b/data/themes/images/e17_icon_fileman_file_clicked.png index 975bc745e..efd2b3db4 100644 Binary files a/data/themes/images/e17_icon_fileman_file_clicked.png and b/data/themes/images/e17_icon_fileman_file_clicked.png differ diff --git a/data/themes/images/e17_icon_fileman_folder.png b/data/themes/images/e17_icon_fileman_folder.png index 64d908ba4..ea06b94f3 100644 Binary files a/data/themes/images/e17_icon_fileman_folder.png and b/data/themes/images/e17_icon_fileman_folder.png differ diff --git a/data/themes/images/e17_icon_fileman_folder_clicked.png b/data/themes/images/e17_icon_fileman_folder_clicked.png index 9df0381a7..803d76bf2 100644 Binary files a/data/themes/images/e17_icon_fileman_folder_clicked.png and b/data/themes/images/e17_icon_fileman_folder_clicked.png differ diff --git a/data/themes/images/e17_icon_fileman_gz.png b/data/themes/images/e17_icon_fileman_gz.png new file mode 100644 index 000000000..55ea24d3e Binary files /dev/null and b/data/themes/images/e17_icon_fileman_gz.png differ diff --git a/data/themes/images/e17_icon_fileman_h.png b/data/themes/images/e17_icon_fileman_h.png index 07833a15e..b379ee4d8 100644 Binary files a/data/themes/images/e17_icon_fileman_h.png and b/data/themes/images/e17_icon_fileman_h.png differ diff --git a/data/themes/images/e17_icon_fileman_htm.png b/data/themes/images/e17_icon_fileman_htm.png new file mode 100644 index 000000000..3af5ef15d Binary files /dev/null and b/data/themes/images/e17_icon_fileman_htm.png differ diff --git a/data/themes/images/e17_icon_fileman_html.png b/data/themes/images/e17_icon_fileman_html.png new file mode 100644 index 000000000..3af5ef15d Binary files /dev/null and b/data/themes/images/e17_icon_fileman_html.png differ diff --git a/data/themes/images/e17_icon_fileman_jpg.png b/data/themes/images/e17_icon_fileman_jpg.png index a7b322b36..b91995433 100644 Binary files a/data/themes/images/e17_icon_fileman_jpg.png and b/data/themes/images/e17_icon_fileman_jpg.png differ diff --git a/data/themes/images/e17_icon_fileman_mp3.png b/data/themes/images/e17_icon_fileman_mp3.png new file mode 100644 index 000000000..6e398ebd8 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_mp3.png differ diff --git a/data/themes/images/e17_icon_fileman_mpeg.png b/data/themes/images/e17_icon_fileman_mpeg.png new file mode 100644 index 000000000..1b695d621 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_mpeg.png differ diff --git a/data/themes/images/e17_icon_fileman_mpg.png b/data/themes/images/e17_icon_fileman_mpg.png new file mode 100644 index 000000000..1b695d621 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_mpg.png differ diff --git a/data/themes/images/e17_icon_fileman_o.png b/data/themes/images/e17_icon_fileman_o.png new file mode 100644 index 000000000..c4cd21710 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_o.png differ diff --git a/data/themes/images/e17_icon_fileman_ogg.png b/data/themes/images/e17_icon_fileman_ogg.png new file mode 100644 index 000000000..5b746e5cd Binary files /dev/null and b/data/themes/images/e17_icon_fileman_ogg.png differ diff --git a/data/themes/images/e17_icon_fileman_patch.png b/data/themes/images/e17_icon_fileman_patch.png new file mode 100644 index 000000000..09ad048a3 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_patch.png differ diff --git a/data/themes/images/e17_icon_fileman_pcf.png b/data/themes/images/e17_icon_fileman_pcf.png new file mode 100644 index 000000000..73fe61361 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_pcf.png differ diff --git a/data/themes/images/e17_icon_fileman_pdf.png b/data/themes/images/e17_icon_fileman_pdf.png index 76de5a757..e6ed8c433 100644 Binary files a/data/themes/images/e17_icon_fileman_pdf.png and b/data/themes/images/e17_icon_fileman_pdf.png differ diff --git a/data/themes/images/e17_icon_fileman_png.png b/data/themes/images/e17_icon_fileman_png.png index 3296780c3..384b2fb15 100644 Binary files a/data/themes/images/e17_icon_fileman_png.png and b/data/themes/images/e17_icon_fileman_png.png differ diff --git a/data/themes/images/e17_icon_fileman_sh.png b/data/themes/images/e17_icon_fileman_sh.png new file mode 100644 index 000000000..4fabd3e40 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_sh.png differ diff --git a/data/themes/images/e17_icon_fileman_tar.png b/data/themes/images/e17_icon_fileman_tar.png new file mode 100644 index 000000000..55ea24d3e Binary files /dev/null and b/data/themes/images/e17_icon_fileman_tar.png differ diff --git a/data/themes/images/e17_icon_fileman_ttf.png b/data/themes/images/e17_icon_fileman_ttf.png new file mode 100644 index 000000000..1de748333 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_ttf.png differ diff --git a/data/themes/images/e17_icon_fileman_txt.png b/data/themes/images/e17_icon_fileman_txt.png new file mode 100644 index 000000000..9621fc6b0 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_txt.png differ diff --git a/data/themes/images/e17_icon_fileman_xcf.png b/data/themes/images/e17_icon_fileman_xcf.png new file mode 100644 index 000000000..0003d0bf4 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_xcf.png differ diff --git a/data/themes/images/e17_icon_fileman_zip.png b/data/themes/images/e17_icon_fileman_zip.png new file mode 100644 index 000000000..55ea24d3e Binary files /dev/null and b/data/themes/images/e17_icon_fileman_zip.png differ diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c index 5b4148ecc..fb83d7430 100644 --- a/src/bin/e_fileman_smart.c +++ b/src/bin/e_fileman_smart.c @@ -47,7 +47,7 @@ * * - Deleting a dir causes a segv * - * - redo monitor code + * - redo monitor code (incremental changes) */ int E_EVENT_FM_RECONFIGURE; @@ -196,11 +196,10 @@ static void _e_fm_file_menu_cut(void *data, E_Menu *m, E_Menu_Ite static void _e_fm_file_menu_paste(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm_file_menu_rename(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm_file_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); -#if 0 static void _e_fm_file_menu_properties(void *data, E_Menu *m, E_Menu_Item *mi); -#endif static void _e_fm_file_delete_yes_cb(void *data, E_Dialog *dia); +static void _e_fm_menu_new_dir_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm_menu_arrange_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm_menu_refresh_cb(void *data, E_Menu *m, E_Menu_Item *mi); @@ -572,7 +571,7 @@ _e_fm_smart_del(Evas_Object *object) e_config_domain_save("efm", sd->conf.main_edd, sd->conf.main); -// if (sd->monitor) ecore_file_monitor_del(sd->monitor); + //if (sd->monitor) ecore_file_monitor_del(sd->monitor); sd->monitor = NULL; while (sd->event_handlers) @@ -1281,6 +1280,14 @@ _e_fm_file_menu_properties(void *data, E_Menu *m, E_Menu_Item *mi) cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, &v, icon); } +static void +_e_fm_menu_new_dir_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Fm_Smart_Data *sd; + + sd = data; +} + static void _e_fm_menu_arrange_cb(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -1341,8 +1348,9 @@ _e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir) /* Get new files */ sd->files = _e_fm_dir_files_get(sd, E_FM_FILE_TYPE_NORMAL); -// if (sd->monitor) ecore_file_monitor_del(sd->monitor); -// sd->monitor = ecore_file_monitor_add(sd->dir, _e_fm_dir_monitor_cb, sd); + //if (sd->monitor) ecore_file_monitor_del(sd->monitor); + //sd->monitor = ecore_file_monitor_add(sd->dir, _e_fm_dir_monitor_cb, sd); + /* Get special prev dir */ if (strcmp(sd->dir, "/")) { @@ -1504,7 +1512,8 @@ _e_fm_dir_monitor_cb(void *data, Ecore_File_Monitor *ecore_file_monitor, return; } - _e_fm_redraw(sd); + //_e_fm_redraw(sd); + _e_fm_dir_set(sd, sd->dir); } static void @@ -1671,6 +1680,7 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) sd->menu = mn; + /*- Arrange -*/ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, "Arrange Icons"); e_menu_item_icon_edje_set(mi, @@ -1702,13 +1712,31 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) (char *)e_theme_edje_file_get("base/theme/fileman", "fileman/button/arrange_time"), "fileman/button/arrange_time"); + /*- New -*/ + mi = e_menu_item_new(sd->menu); + e_menu_item_label_set(mi, "New"); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/fileman", + "fileman/button/new"), + "fileman/button/new"); + mn = e_menu_new(); + e_menu_item_submenu_set(mi, mn); + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, "Directory"); + e_menu_item_callback_set(mi, _e_fm_menu_new_dir_cb, sd); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/fileman", + "fileman/button/new_dir"), + "fileman/button/new_dir"); + /*- View -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, "View"); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/fileman", "fileman/button/view"), - "fileman/button/view"); + "fileman/button/view"); mn = e_menu_new(); e_menu_item_submenu_set(mi, mn); @@ -1731,6 +1759,7 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) "fileman/button/view_details"), "fileman/button/view_details"); + /*- Refresh -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, "Refresh"); e_menu_item_callback_set(mi, _e_fm_menu_refresh_cb, sd); @@ -1738,7 +1767,7 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) (char *)e_theme_edje_file_get("base/theme/fileman", "fileman/button/refresh"), "fileman/button/refresh"); - + /*- Properties -*/ mi = e_menu_item_new(sd->menu); e_menu_item_label_set(mi, "Properties"); e_menu_item_icon_edje_set(mi,