#include <Elementary.h>
-<<<<<<< HEAD
-=======
#include "test.h"
->>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-=======
struct _api_data
{
unsigned int state; /* What state we are testing */
if (fp) fclose(fp);
}
->>>>>>> remotes/origin/upstream
static void
_file_chosen(void *data,
Evas_Object *obj __UNUSED__,
printf("Disabled flag set to: %s\n", value ? "false" : "true");
}
-<<<<<<< HEAD
-=======
static void
_cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
free(data);
}
->>>>>>> remotes/origin/upstream
void
test_fileselector_entry(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb;
-=======
Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb, *bxx;
api_data *api = calloc(1, sizeof(api_data));
->>>>>>> remotes/origin/upstream
win = elm_win_add(NULL, "fileselector-entry", ELM_WIN_BASIC);
elm_win_title_set(win, "File Selector Entry");
elm_win_autodel_set(win, EINA_TRUE);
-<<<<<<< HEAD
-=======
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
->>>>>>> remotes/origin/upstream
bg = elm_bg_add(win);
elm_win_resize_object_add(win, bg);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
-<<<<<<< HEAD
- vbox = elm_box_add(win);
- evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, vbox);
- evas_object_show(vbox);
-
-=======
bxx = elm_box_add(win);
elm_win_resize_object_add(win, bxx);
evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
create_dir_struct(); /* Create a dir struct in /tmp */
->>>>>>> remotes/origin/upstream
/* file selector entry */
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "file");
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
fs_en = elm_fileselector_entry_add(win);
-<<<<<<< HEAD
-=======
elm_fileselector_entry_path_set(fs_en, "/tmp/test_fs_bt");
->>>>>>> remotes/origin/upstream
elm_object_text_set(fs_en, "Select a file");
elm_object_part_content_set(fs_en, "button icon", ic);
evas_object_size_hint_weight_set(fs_en, EVAS_HINT_EXPAND, 0.0);
}
static Evas_Object *external_entry_content_get(void *data __UNUSED__,
-<<<<<<< HEAD
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-=======
const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
{
ERR("No content.");
return NULL;
->>>>>>> remotes/origin/upstream
}
static void
typedef struct
{
Evas_Object *inwin;
-<<<<<<< HEAD
- Evas_Object *pager;
-=======
Evas_Object *naviframe;
->>>>>>> remotes/origin/upstream
Evas_Object *grid;
Evas_Object *settings;
_edit_buffer_insert(Evas_Object *e, const char *text)
{
elm_entry_entry_insert(e, text);
-<<<<<<< HEAD
- elm_object_focus(e);
-=======
elm_object_focus_set(e, EINA_TRUE);
->>>>>>> remotes/origin/upstream
}
static void
_it_sel_cb(void *data, Evas_Object *obj __UNUSED__, void *event)
{
App_Inwin_Data *aid = data;
-<<<<<<< HEAD
- Elm_Gengrid_Item *it = event;
-
- aid->emo = elm_gengrid_item_data_get(it);
-
- elm_pager_content_promote(aid->pager, aid->settings);
-=======
Elm_Object_Item *gg_it = event;
aid->emo = elm_object_item_data_get(gg_it);
elm_naviframe_item_simple_promote(aid->naviframe, aid->settings);
->>>>>>> remotes/origin/upstream
}
static char *
snprintf(buf, sizeof(buf), "%d", aid->width);
ewidth = elm_entry_add(parent);
elm_entry_single_line_set(ewidth, EINA_TRUE);
-<<<<<<< HEAD
- elm_entry_text_filter_append(ewidth, elm_entry_filter_accept_set,
- &accept_set);
- elm_entry_text_filter_append(ewidth, elm_entry_filter_limit_size,
-=======
elm_entry_markup_filter_append(ewidth, elm_entry_filter_accept_set,
&accept_set);
elm_entry_markup_filter_append(ewidth, elm_entry_filter_limit_size,
->>>>>>> remotes/origin/upstream
&limit_size);
elm_object_text_set(ewidth, buf);
evas_object_size_hint_weight_set(ewidth, EVAS_HINT_EXPAND, 0.0);
snprintf(buf, sizeof(buf), "%d", aid->height);
eheight = elm_entry_add(parent);
elm_entry_single_line_set(eheight, EINA_TRUE);
-<<<<<<< HEAD
- elm_entry_text_filter_append(eheight, elm_entry_filter_accept_set,
- &accept_set);
- elm_entry_text_filter_append(eheight, elm_entry_filter_limit_size,
-=======
elm_entry_markup_filter_append(eheight, elm_entry_filter_accept_set,
&accept_set);
elm_entry_markup_filter_append(eheight, elm_entry_filter_limit_size,
->>>>>>> remotes/origin/upstream
&limit_size);
elm_object_text_set(eheight, buf);
evas_object_size_hint_weight_set(eheight, EVAS_HINT_EXPAND, 0.0);
{
App_Data *ad = data;
App_Inwin_Data *aid;
-<<<<<<< HEAD
- Evas_Object *inwin, *box, *box2, *pager, *o;
-=======
Evas_Object *inwin, *box, *box2, *naviframe, *o;
->>>>>>> remotes/origin/upstream
aid = calloc(1, sizeof(App_Inwin_Data));
if (!aid) return;
elm_win_inwin_content_set(inwin, box);
evas_object_show(box);
-<<<<<<< HEAD
- pager = elm_pager_add(ad->win);
- evas_object_size_hint_weight_set(pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(pager, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(box, pager);
- evas_object_show(pager);
-
- o = _page_grid_add(ad->win, aid);
- elm_pager_content_push(pager, o);
- aid->grid = o;
-
- o = _page_settings_add(ad->win, aid);
- elm_pager_content_push(pager, o);
- aid->settings = o;
-
- elm_pager_content_promote(pager, aid->grid);
-=======
naviframe = elm_naviframe_add(ad->win);
evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL);
aid->settings = o;
elm_naviframe_item_simple_promote(naviframe, aid->grid);
->>>>>>> remotes/origin/upstream
box2 = elm_box_add(ad->win);
elm_box_horizontal_set(box2, EINA_TRUE);
evas_object_smart_callback_add(o, "clicked", _insert_cancel_cb, aid);
aid->inwin = inwin;
-<<<<<<< HEAD
- aid->pager = pager;
-=======
aid->naviframe = naviframe;
->>>>>>> remotes/origin/upstream
}
static void
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, &app);
-<<<<<<< HEAD
- elm_object_focus(app.edit_buffer);
-=======
elm_object_focus_set(app.edit_buffer, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_resize(win, 300, 780);
* This file selector may appear in an Elementary window or in an
* inner window. When a file is chosen from it, the (inner) window
* is closed and the selected file's path string is exposed both as
-<<<<<<< HEAD
- * an smart event and as the new text on the entry.
- *
- * This widget encapsulates operations on its internal file
- * selector on its own API. There is less control over its file
- * selector than that one would have instatiating one directly.
-=======
* a smart event and as the new text on the entry.
*
* This widget encapsulates operations on its internal file
* selector on its own API. There is less control over its file
* selector than that one would have instantiating one directly.
->>>>>>> remotes/origin/upstream
*
* Smart callbacks one can register to:
* - @c "changed" - The text within the entry was changed
* are:
* @li "default" - Label of the fileselector_button
*
-<<<<<<< HEAD
- * Default contents parts of the fileselector_entry widget that you can use for
-=======
* Default content parts of the fileselector_entry widget that you can use for
->>>>>>> remotes/origin/upstream
* are:
* @li "button icon" - Button icon of the fileselector_entry
*
{elm_entry_item_provider_remove(obj, func, data);}
EINA_DEPRECATED EAPI void
elm_scrolled_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
-<<<<<<< HEAD
-{elm_entry_text_filter_append(obj, func, data);}
-EINA_DEPRECATED EAPI void
-elm_scrolled_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
-{elm_entry_text_filter_prepend(obj, func, data);}
-EINA_DEPRECATED EAPI void
-elm_scrolled_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
-{elm_entry_text_filter_remove(obj, func, data);}
-=======
{elm_entry_markup_filter_append(obj, func, data);}
EINA_DEPRECATED EAPI void
elm_scrolled_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
EINA_DEPRECATED EAPI void
elm_scrolled_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
{elm_entry_markup_filter_remove(obj, func, data);}
->>>>>>> remotes/origin/upstream
EINA_DEPRECATED EAPI void
elm_scrolled_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format)
{elm_entry_file_set(obj, file, format);}
{return elm_entry_autosave_get(obj);}
EINA_DEPRECATED EAPI void
elm_scrolled_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly)
-<<<<<<< HEAD
-{elm_entry_cnp_textonly_set(obj, textonly);}
-EINA_DEPRECATED EAPI Eina_Bool
-elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj)
-{return elm_entry_cnp_textonly_get(obj);}
-=======
{Elm_Cnp_Mode cnp_mode = ELM_CNP_MODE_MARKUP; if (textonly) cnp_mode = ELM_CNP_MODE_NO_IMAGE; elm_entry_cnp_mode_set(obj, cnp_mode);}
EINA_DEPRECATED EAPI Eina_Bool
elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj)
{return elm_entry_cnp_mode_get(obj) != ELM_CNP_MODE_MARKUP;}
->>>>>>> remotes/origin/upstream
projects / framework / uifw / elementary.git / commitdiff