Add in some other image formats (cedric/bluebugs.. can you please add back in the psd support? I'm sorry it got lost) Also make the label in single browser an entry(disabled for now)... It keeps the look consistent and will have a purpose soon.

SVN revision: 60835

src/bin/ephoto.h

@@ -182,7 +182,10 @@ _ephoto_eina_file_direct_info_image_useful(const Eina_File_Direct_Info *info)
         ext++;
         if ((strcasecmp(ext, "jpg") == 0) ||
             (strcasecmp(ext, "jpeg") == 0) ||
-            (strcasecmp(ext, "png") == 0))
+            (strcasecmp(ext, "png") == 0) ||
+            (strcasecmp(ext, "gif") == 0) ||
+            (strcasecmp(ext, "tif") == 0) ||
+            (strcasecmp(ext, "svg") == 0))
           return EINA_TRUE;
      }
 

src/bin/ephoto_single_browser.c

@@ -20,7 +20,7 @@ struct _Ephoto_Single_Browser
    Ephoto *ephoto;
    Evas_Object *main;
    Evas_Object *bar;
-   Evas_Object *label;
+   Evas_Object *sentry;
    Evas_Object *viewer;
    const char *pending_path;
    Ephoto_Entry *entry;
@@ -477,7 +477,7 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
         evas_object_show(sb->viewer);
         evas_object_event_callback_add
           (sb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, sb);
-        elm_label_label_set(sb->label, bname);
+        elm_scrolled_entry_entry_set(sb->sentry, bname);
         ephoto_title_set(sb->ephoto, bname);
         sb->orient = ephoto_file_orient_get(sb->entry->path);
         _orient_apply(sb);
@@ -693,6 +693,11 @@ _back(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
    evas_object_smart_callback_call(sb->main, "back", sb->entry);
 }
 
+static void
+_changed_file_text(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
+{
+}
+
 static void
 _key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
 {
@@ -866,10 +871,16 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent)
    elm_box_pack_end(sb->bar, sep);
    evas_object_show(sep);
 
-   sb->label = elm_label_add(sb->bar);
-   evas_object_size_hint_align_set(sb->label, 0.5, 0.5);
-   elm_box_pack_end(sb->bar, sb->label);
-   evas_object_show(sb->label);
+   sb->sentry = elm_scrolled_entry_add(sb->bar);
+   evas_object_size_hint_weight_set(sb->sentry, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(sb->sentry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_scrolled_entry_single_line_set(sb->sentry, EINA_TRUE);
+   elm_scrolled_entry_scrollbar_policy_set(sb->sentry, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_object_disabled_set(sb->sentry, EINA_TRUE);
+   evas_object_smart_callback_add
+     (sb->sentry, "activated", _changed_file_text, sb);
+   elm_box_pack_end(sb->bar, sb->sentry);
+   evas_object_show(sb->sentry);
 
    sep = elm_separator_add(sb->bar);
    elm_box_pack_end(sb->bar, sep);

src/bin/ephoto_thumb_browser.c

@@ -15,7 +15,7 @@ struct _Ephoto_Thumb_Browser
    Ephoto *ephoto;
    Evas_Object *main;
    Evas_Object *bar;
-   Evas_Object *fsel;
+   Evas_Object *entry;
    Evas_Object *grid;
    Eio_File *ls;
    Eina_List *todo_items;
@@ -283,7 +283,7 @@ static void
 _changed_dir_text(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
 {
    Ephoto_Thumb_Browser *tb = data;
-   const char *path = elm_scrolled_entry_entry_get(tb->fsel);
+   const char *path = elm_scrolled_entry_entry_get(tb->entry);
    if (ecore_file_is_dir(path))
      ephoto_directory_set(tb->ephoto, path);
 }
@@ -424,7 +424,7 @@ _ephoto_thumb_populate_start(void *data, int type __UNUSED__, void *event __UNUS
    _todo_items_free(tb);
    _grid_items_free(tb);
    elm_gengrid_clear(tb->grid);
-   elm_scrolled_entry_entry_set(tb->fsel, tb->ephoto->config->directory);
+   elm_scrolled_entry_entry_set(tb->entry, tb->ephoto->config->directory);
    _up_item_add_if_required(tb);
 
    return ECORE_CALLBACK_PASS_ON;
@@ -524,16 +524,16 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
    but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/slideshow.png");
    evas_object_smart_callback_add(but, "clicked", _slideshow, tb);
 
-   tb->fsel = elm_scrolled_entry_add(tb->bar);
-   EINA_SAFETY_ON_NULL_GOTO(tb->fsel, error);
-   evas_object_size_hint_weight_set(tb->fsel, EVAS_HINT_EXPAND, 0.0);
-   evas_object_size_hint_align_set(tb->fsel, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_scrolled_entry_single_line_set(tb->fsel, EINA_TRUE);
-   elm_scrolled_entry_scrollbar_policy_set(tb->fsel, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   tb->entry = elm_scrolled_entry_add(tb->bar);
+   EINA_SAFETY_ON_NULL_GOTO(tb->entry, error);
+   evas_object_size_hint_weight_set(tb->entry, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(tb->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_scrolled_entry_single_line_set(tb->entry, EINA_TRUE);
+   elm_scrolled_entry_scrollbar_policy_set(tb->entry, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    evas_object_smart_callback_add
-     (tb->fsel, "activated", _changed_dir_text, tb);
-   evas_object_show(tb->fsel);
-   elm_box_pack_end(tb->bar, tb->fsel);
+     (tb->entry, "activated", _changed_dir_text, tb);
+   evas_object_show(tb->entry);
+   elm_box_pack_end(tb->bar, tb->entry);
 
    but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/zoom-in.png");
    evas_object_smart_callback_add(but, "clicked", _zoom_in, tb);