enlightenment
/
ephoto
2
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Update code that was deprecated and remove all warnings.

Browse Source 
SVN revision: 64707
v-1.6.0
Stephen Houston 12 years ago
parent 33914dcf81
commit b8c65ecd51
2 changed files with 18 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/bin/ephoto_single_browser.c
  2. 20
      src/bin/ephoto_thumb_browser.c

13
src/bin/ephoto_single_browser.c
Unescape View File

@ -119,7 +119,7 @@ _viewer_add(Evas_Object *parent, const char *path)
evas_object_size_hint_align_set(v->image, 0.5, 0.5);
evas_object_size_hint_min_set(v->image, w, h);
evas_object_size_hint_max_set(v->image, w, h);
elm_scroller_content_set(v->scroller, v->image);
elm_object_content_set(v->scroller, v->image);
evas_object_show(v->scroller);
evas_object_show(v->image);
}
@ -494,7 +494,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_scrolled_entry_entry_set(sb->sentry, bname);
elm_entry_entry_set(sb->sentry, bname);
ephoto_title_set(sb->ephoto, bname);
sb->orient = ephoto_file_orient_get(sb->entry->path);
_orient_apply(sb);
@ -829,7 +829,7 @@ _button_add(Evas_Object *box, const char *image)
evas_object_size_hint_min_set(ic, 16, 16);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
elm_button_icon_set(but, ic);
elm_object_content_set(but, ic);
evas_object_size_hint_align_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, but);
evas_object_show(but);
@ -888,11 +888,12 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent)
elm_box_pack_end(sb->bar, sep);
evas_object_show(sep);
sb->sentry = elm_scrolled_entry_add(sb->bar);
sb->sentry = elm_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_entry_single_line_set(sb->sentry, EINA_TRUE);
elm_entry_scrollable_set(sb->sentry, EINA_TRUE);
elm_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);

20
src/bin/ephoto_thumb_browser.c
Unescape View File

@ -271,7 +271,7 @@ _ephoto_thumb_selected(void *data, Evas_Object *o __UNUSED__, void *event_info)
Elm_Gengrid_Item *it = event_info;
Ephoto_Entry *e = elm_gengrid_item_data_get(it);
elm_gengrid_item_selected_set(it, EINA_FALSE);
elm_gen_item_selected_set(it, EINA_FALSE);
if (e->is_dir)
ephoto_directory_set(tb->ephoto, e->path);
@ -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->entry);
const char *path = elm_entry_entry_get(tb->entry);
if (ecore_file_is_dir(path))
ephoto_directory_set(tb->ephoto, path);
}
@ -423,8 +423,8 @@ _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->entry, tb->ephoto->config->directory);
elm_gen_clear(tb->grid);
elm_entry_entry_set(tb->entry, tb->ephoto->config->directory);
_up_item_add_if_required(tb);
return ECORE_CALLBACK_PASS_ON;
@ -479,7 +479,7 @@ _button_add(Evas_Object *box, const char *image)
evas_object_size_hint_min_set(ic, 16, 16);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
elm_button_icon_set(but, ic);
elm_object_content_set(but, ic);
evas_object_size_hint_align_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, but);
evas_object_show(but);
@ -524,12 +524,14 @@ 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->entry = elm_scrolled_entry_add(tb->bar);
tb->entry = elm_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);
elm_entry_single_line_set(tb->entry, EINA_TRUE);
elm_entry_scrollable_set(tb->entry, EINA_TRUE);
elm_entry_scrollbar_policy_set(tb->entry, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
evas_object_smart_callback_add
(tb->entry, "activated", _changed_dir_text, tb);
evas_object_show(tb->entry);
@ -553,7 +555,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
evas_object_size_hint_align_set(tb->grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_gengrid_align_set(tb->grid, 0.5, 0.5);
elm_gengrid_bounce_set(tb->grid, EINA_FALSE, EINA_TRUE);
elm_gen_bounce_set(tb->grid, EINA_FALSE, EINA_TRUE);
evas_object_size_hint_align_set
(tb->grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set

Write Preview
Loading…
Cancel
Save