rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=7097913d9f0b02370ea914f50ea342918acd4e1d
commit 7097913d9f0b02370ea914f50ea342918acd4e1d
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Wed Oct 7 16:00:58 2015 +0300
popup: add 'title' argument forgotten early
Change-Id: Ied42427b4695ba38686405db05bfcc8608520ebc
---
src/bin/ui/main_window.h | 4 ++--
src/bin/ui/popup.c | 8 ++++----
src/bin/ui/tab_home_import_edc.c | 18 ++++++++++++------
src/bin/ui/tab_home_import_edj.c | 19 +++++++++++++------
src/bin/ui/tab_home_new.c | 10 +++++++---
5 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index 5b9ad39..8ab1d99 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -415,7 +415,7 @@ void
popup_buttons_disabled_set(Popup_Button p_btns, Eina_Bool disabled);
void
-popup_fileselector_folder_helper(Evas_Object *follow_up, const char *path,
+popup_fileselector_folder_helper(const char *title, Evas_Object *follow_up,
const char *path,
Evas_Smart_Cb func, void *data,
Eina_Bool multi, Eina_Bool is_save);
@@ -425,7 +425,7 @@ popup_fileselector_edj_helper(const char *title,
Evas_Object *follow_up, const c
Eina_Bool multi, Eina_Bool is_save);
void
-popup_fileselector_edc_helper(Evas_Object *follow_up, const char *path,
+popup_fileselector_edc_helper(const char *title, Evas_Object *follow_up, const
char *path,
Evas_Smart_Cb func, void *data,
Eina_Bool multi, Eina_Bool is_save);
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index 6008525..e09601c9 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -244,11 +244,11 @@ _fileselector_helper(const char *title,
}
void
-popup_fileselector_folder_helper(Evas_Object *follow_up, const char *path,
+popup_fileselector_folder_helper(const char *title, Evas_Object *follow_up,
const char *path,
Evas_Smart_Cb func, void *data,
Eina_Bool multi, Eina_Bool is_save)
{
- _fileselector_helper(NULL, follow_up, path, multi, is_save, func, data,
NULL);
+ _fileselector_helper(title, follow_up, path, multi, is_save, func, data,
NULL);
}
static Eina_Bool
@@ -284,11 +284,11 @@ _edc_filter(const char *path,
}
void
-popup_fileselector_edc_helper(Evas_Object *follow_up, const char *path,
+popup_fileselector_edc_helper(const char *title, Evas_Object *follow_up, const
char *path,
Evas_Smart_Cb func, void *data,
Eina_Bool multi, Eina_Bool is_save)
{
- _fileselector_helper(NULL, follow_up, path, multi, is_save, func, data,
_edc_filter);
+ _fileselector_helper(title, follow_up, path, multi, is_save, func, data,
_edc_filter);
}
void
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index bdc3850..4ea6775 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -106,10 +106,13 @@ _elipsis(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- popup_fileselector_folder_helper((Evas_Object *)data,
+ popup_fileselector_folder_helper(NULL,
+ (Evas_Object *)data,
elm_entry_entry_get(tab_edc.path),
- entry_path_set, (Evas_Object *)data,
- false, false);
+ entry_path_set,
+ (Evas_Object *)data,
+ false,
+ false);
}
static void
@@ -117,10 +120,13 @@ _elipsis_edc(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- popup_fileselector_edc_helper(tab_edc.edc,
+ popup_fileselector_edc_helper(NULL,
+ tab_edc.edc,
NULL,
- entry_path_set, tab_edc.edc,
- false, false);
+ entry_path_set,
+ tab_edc.edc,
+ false,
+ false);
}
static void
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index 3c0d38e..851499f 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -122,10 +122,13 @@ _elipsis(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- popup_fileselector_folder_helper(tab_edj.path,
+ popup_fileselector_folder_helper(NULL,
+ tab_edj.path,
elm_entry_entry_get(tab_edj.path),
- entry_path_set, tab_edj.path,
- false, false);
+ entry_path_set,
+ tab_edj.path,
+ false,
+ false);
}
static void
@@ -133,9 +136,13 @@ _elipsis_edj(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- popup_fileselector_edj_helper(NULL, tab_edj.edj, NULL,
- entry_path_set, tab_edj.edj,
- false, false);
+ popup_fileselector_edj_helper(NULL,
+ tab_edj.edj,
+ NULL,
+ entry_path_set,
+ tab_edj.edj,
+ false,
+ false);
}
Evas_Object *
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index 32ace1c..f27900b 100644
--- a/src/bin/ui/tab_home_new.c
+++ b/src/bin/ui/tab_home_new.c
@@ -536,9 +536,13 @@ _elipsis(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- popup_fileselector_folder_helper(tab_new.path,
elm_entry_entry_get(tab_new.path),
- entry_path_set, tab_new.path,
- false, false);
+ popup_fileselector_folder_helper(NULL,
+ tab_new.path,
+ elm_entry_entry_get(tab_new.path),
+ entry_path_set,
+ tab_new.path,
+ false,
+ false);
}
Evas_Object *
--
