forked from enlightenment/efl
fileselector: remove 'model' property
this is already extant in Efl.Ui.View
This commit is contained in:
parent
27c83a19e4
commit
57c07757c7
|
@ -2318,12 +2318,12 @@ _elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path)
|
|||
ERR("Efl.Model allocation error");
|
||||
return;
|
||||
}
|
||||
elm_interface_fileselector_model_set(obj, model);
|
||||
efl_ui_view_model_set(obj, model);
|
||||
efl_unref(model);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
_elm_fileselector_elm_interface_fileselector_model_set(Eo *obj, Elm_Fileselector_Data *sd, Efl_Model *model)
|
||||
_elm_fileselector_efl_ui_view_model_set(Eo *obj, Elm_Fileselector_Data *sd, Efl_Model *model)
|
||||
{
|
||||
_schedule_populate(obj, sd, model, NULL);
|
||||
}
|
||||
|
@ -2354,7 +2354,7 @@ _elm_fileselector_path_get_internal(const Evas_Object *obj)
|
|||
}
|
||||
|
||||
EOLIAN static Efl_Model *
|
||||
_elm_fileselector_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd)
|
||||
_elm_fileselector_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd)
|
||||
{
|
||||
return sd->model;
|
||||
}
|
||||
|
|
|
@ -345,7 +345,7 @@ elm_fileselector_button_path_set(Evas_Object *obj, const char *path)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
|
||||
_elm_fileselector_button_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
|
||||
{
|
||||
if (sd->fsd.model)
|
||||
efl_unref(sd->fsd.model);
|
||||
|
@ -380,7 +380,7 @@ elm_fileselector_button_path_get(const Evas_Object *obj)
|
|||
}
|
||||
|
||||
EOLIAN static Efl_Model *
|
||||
_elm_fileselector_button_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd)
|
||||
_elm_fileselector_button_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd)
|
||||
{
|
||||
return sd->fsd.model;
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ _ACTIVATED_fwd(void *data, const Efl_Event *event)
|
|||
|
||||
file = elm_object_text_get(sd->entry);
|
||||
|
||||
bmodel = elm_interface_fileselector_model_get(sd->button);
|
||||
bmodel = efl_ui_view_model_get(sd->button);
|
||||
if (bmodel)
|
||||
{
|
||||
model = efl_add(efl_class_get(bmodel), NULL);
|
||||
|
@ -134,7 +134,7 @@ _ACTIVATED_fwd(void *data, const Efl_Event *event)
|
|||
eina_value_set(&path, file);
|
||||
efl_model_property_set(model, "path", &path);
|
||||
eina_value_flush(&path);
|
||||
elm_interface_fileselector_model_set(sd->button, model);
|
||||
efl_ui_view_model_set(sd->button, model);
|
||||
}
|
||||
|
||||
efl_event_callback_legacy_call
|
||||
|
@ -365,7 +365,7 @@ _elm_fileselector_entry_elm_interface_fileselector_selected_model_set(Eo *obj EI
|
|||
{
|
||||
Efl_Promise* promise = efl_add(EFL_PROMISE_CLASS, obj);
|
||||
Efl_Future* future = efl_promise_future_get(promise);
|
||||
elm_interface_fileselector_model_set(sd->button, model);
|
||||
efl_ui_view_model_set(sd->button, model);
|
||||
efl_promise_value_set(promise, efl_ref(model), _model_free_eo_cb);
|
||||
return future;
|
||||
}
|
||||
|
@ -387,7 +387,7 @@ _elm_fileselector_entry_selected_get_internal(const Evas_Object *obj)
|
|||
EOLIAN static Efl_Model *
|
||||
_elm_fileselector_entry_elm_interface_fileselector_selected_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd)
|
||||
{
|
||||
return elm_interface_fileselector_model_get(sd->button);
|
||||
return efl_ui_view_model_get(sd->button);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
@ -469,10 +469,10 @@ _fs_entry_model_path_get_then(void *data, Efl_Event const *event)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_elm_fileselector_entry_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Efl_Model *model)
|
||||
_elm_fileselector_entry_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Efl_Model *model)
|
||||
{
|
||||
Efl_Future *p = NULL;
|
||||
elm_interface_fileselector_model_set(sd->button, model);
|
||||
efl_ui_view_model_set(sd->button, model);
|
||||
|
||||
p = efl_model_property_get(model, "path");
|
||||
efl_future_then(p, _fs_entry_model_path_get_then, NULL, NULL, sd);
|
||||
|
@ -495,11 +495,11 @@ _elm_fileselector_entry_path_get_internal(const Evas_Object *obj)
|
|||
}
|
||||
|
||||
EOLIAN static Efl_Model *
|
||||
_elm_fileselector_entry_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd)
|
||||
_elm_fileselector_entry_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd)
|
||||
{
|
||||
Efl_Model *bmodel, *ret;
|
||||
Eina_Value path;
|
||||
bmodel = elm_interface_fileselector_model_get(sd->button);
|
||||
bmodel = efl_ui_view_model_get(sd->button);
|
||||
if (!bmodel)
|
||||
{
|
||||
WRN("no base Efl.Model");
|
||||
|
|
|
@ -48,7 +48,7 @@ class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
|
|||
Elm.Interface.Fileselector.hidden_visible { get; set; }
|
||||
Elm.Interface.Fileselector.filters_clear;
|
||||
Elm.Interface.Fileselector.is_save { get; set; }
|
||||
Elm.Interface.Fileselector.model { get; set; }
|
||||
Efl.Ui.View.model { get; set; }
|
||||
Elm.Interface.Fileselector.sort_method { get; set; }
|
||||
Elm.Interface.Fileselector.multi_select { get; set; }
|
||||
Elm.Interface.Fileselector.folder_only { get; set; }
|
||||
|
|
|
@ -14,7 +14,7 @@ class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector,
|
|||
Elm.Interface.Fileselector.selected_model_set;
|
||||
Elm.Interface.Fileselector.hidden_visible { get; set; }
|
||||
Elm.Interface.Fileselector.is_save { get; set; }
|
||||
Elm.Interface.Fileselector.model { get; set; }
|
||||
Efl.Ui.View.model { get; set; }
|
||||
Elm.Interface.Fileselector.sort_method { get; set; }
|
||||
Elm.Interface.Fileselector.multi_select { get; set; }
|
||||
Elm.Interface.Fileselector.folder_only { get; set; }
|
||||
|
|
|
@ -12,7 +12,7 @@ class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
|
|||
Elm.Interface.Fileselector.selected_model_set;
|
||||
Elm.Interface.Fileselector.folder_only { get; set; }
|
||||
Elm.Interface.Fileselector.is_save { get; set; }
|
||||
Elm.Interface.Fileselector.model { get; set; }
|
||||
Efl.Ui.View.model { get; set; }
|
||||
Elm.Interface.Fileselector.expandable { get; set; }
|
||||
Efl.Part.part;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ enum Elm.Fileselector.Sort
|
|||
last [[Sentinel value to indicate last enum field during iteration]]
|
||||
}
|
||||
|
||||
interface Elm.Interface.Fileselector ()
|
||||
interface Elm.Interface.Fileselector (Efl.Ui.View)
|
||||
{
|
||||
[[Elementary fileselector interface]]
|
||||
eo_prefix: elm_interface_fileselector;
|
||||
|
@ -97,17 +97,6 @@ interface Elm.Interface.Fileselector ()
|
|||
expand: bool; [[$true if tree view is expanded, $false otherwise]]
|
||||
}
|
||||
}
|
||||
@property model {
|
||||
set {
|
||||
[[Set, programmatically, the directory that a given file selector widget will display contents from]]
|
||||
}
|
||||
get {
|
||||
[[Get the directory's model that a given file selector selector widget display contents from]]
|
||||
}
|
||||
values {
|
||||
model: Efl.Model; [[Directory model]]
|
||||
}
|
||||
}
|
||||
@property mode {
|
||||
set {
|
||||
[[Set the mode in which a given file selector widget will display (layout) file system entries in its view]]
|
||||
|
|
Loading…
Reference in New Issue