enlightenment/enjoy
enlightenment
/
enjoy
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

genlist has some problems to be fixed (inserted sort crashes for now.) https://phab.enlightenment.org/T1011 

Summary:
enjoy cannot depend on that until it is fixed.
This patch will get enjoy working.
Also some params to elm_genlist insert were not used correctly.

Fixing window size to 480x320 so that Volume controls are seen by default.

Signed-off-by: Sanjeev BA <iamsanjeev@gmail.com>

Differential Revision: https://phab.enlightenment.org/D576
This commit is contained in:
Sanjeev BA 2014-02-22 12:03:09 +09:00
parent d4bfa4d055
commit a86f97fa1a
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/preferences.c
View File

@ -111,7 +111,8 @@ preferences_item_selected(void *data, Evas_Object *lst, void *event_info)
Enjoy_Preferences_Plugin *p = data;
Elm_Object_Item *glit = event_info;
Elm_Object_Item *oi;
Evas_Object *naviframe = elm_object_parent_widget_get(lst);
Evas_Object *group = elm_object_parent_widget_get(lst);
Evas_Object *naviframe = elm_object_parent_widget_get(group);
Evas_Object *prev_btn = NULL, *next_btn = NULL, *content = NULL;
Eina_Bool old_auto_prev_btn, auto_prev_btn = EINA_TRUE;
@ -160,9 +161,9 @@ preferences_item_add(Preferences *prefs, Enjoy_Preferences_Plugin *p)
memcpy(cat->name, catname, catnamelen);
eina_hash_add(prefs->categories, cat->name, cat);
cat->glit = elm_genlist_item_sorted_insert
cat->glit = elm_genlist_item_append
(prefs->list, &preferences_itc_category, cat, NULL,
ELM_GENLIST_ITEM_NONE, preferences_category_cmp, NULL, NULL);
ELM_GENLIST_ITEM_GROUP, NULL, NULL);
elm_genlist_item_select_mode_set(cat->glit, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
}
@ -171,9 +172,9 @@ preferences_item_add(Preferences *prefs, Enjoy_Preferences_Plugin *p)
cat->items++;
p->cat = cat;
p->glit = elm_genlist_item_sorted_insert
p->glit = elm_genlist_item_append
(prefs->list, &preferences_itc_item, p, cat->glit,
ELM_GENLIST_ITEM_NONE, preferences_item_cmp,
ELM_GENLIST_ITEM_NONE,
preferences_item_selected, p);
DBG("plugin %p item %p cat %p (%s)", p, p->glit, cat, cat->name);

13
src/bin/preferences_db_folder_add.c
View File

@ -168,7 +168,7 @@ preferences_db_folder_add_do(void *data, Evas_Object *o __UNUSED__, void *event_
Evas_Object *box = elm_object_parent_widget_get(fs);
Evas_Object *frame = elm_object_parent_widget_get(box);
Evas_Object *bt;
const char *path = elm_fileselector_entry_path_get(fs);
const char *path = elm_fileselector_path_get(fs);
struct stat st;
struct db_folder_add_ctx *ctx;
Eina_Bool prev_btn_auto_pushed;
@ -280,23 +280,24 @@ preferences_db_folder_add_activate(Enjoy_Preferences_Plugin *p __UNUSED__, Evas_
char path[PATH_MAX];
box = elm_box_add(naviframe);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
fs = elm_fileselector_entry_add(box);
elm_fileselector_entry_inwin_mode_set(fs, EINA_TRUE);
/* TODO: efreet should use xdg-user-dirs */
snprintf(path, sizeof(path), "%s/Music", getenv("HOME"));
if (access(path, F_OK|X_OK) == 0)
elm_fileselector_entry_path_set(fs, path);
elm_fileselector_path_set(fs, path);
else
elm_fileselector_entry_path_set(fs, getenv("HOME"));
elm_fileselector_entry_folder_only_set(fs, EINA_TRUE);
elm_fileselector_path_set(fs, getenv("HOME"));
elm_fileselector_folder_only_set(fs, EINA_TRUE);
elm_object_text_set(fs, "Choose...");
evas_object_size_hint_align_set(fs, -1.0, 0.5);
evas_object_show(fs);
elm_box_pack_end(box, fs);
bt = elm_button_add(box);
elm_object_text_set(bt, "Import music from folder");
evas_object_size_hint_align_set(bt, -1.0, 0.5);
evas_object_show(bt);
elm_box_pack_end(box, bt);

2
src/bin/win.c
View File

@ -907,7 +907,7 @@ win_new(App *app)
{
Win *w = &_win;
const char *s;
Evas_Coord iw = 320, ih = 240;
Evas_Coord iw = 480, ih = 320;
char path[PATH_MAX];
Evas_Object *nowplaying_edje;