vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

popups: Move text to content to render in latest EFL

This commit is contained in:
Andy Williams 2017-06-08 18:52:35 -07:00
parent a10c4aacb6
commit 38b76ca500
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/edi_main.c
View File

@ -561,11 +561,15 @@ _edi_popup_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
void
edi_launcher_config_missing()
{
Evas_Object *popup, *button;
Evas_Object *popup, *label, *button;
popup = elm_popup_add(_edi_main_win);
elm_object_part_text_set(popup, "title,text", "Unable to launch");
elm_object_text_set(popup, "No launch binary found, please configure in Settings");
label = elm_label_add(popup);
elm_object_text_set(label, "No launch binary found, please configure in Settings");
evas_object_show(label);
elm_object_content_set(popup, label);
button = elm_button_add(popup);
elm_object_text_set(button, "OK");
@ -605,11 +609,15 @@ static void
_edi_project_credentials_missing()
{
Evas_Object *popup, *button;
Evas_Object *popup, *label, *button;
popup = elm_popup_add(_edi_main_win);
elm_object_part_text_set(popup, "title,text", "User information");
elm_object_text_set(popup, "No user information found, please configure in Settings");
label = elm_label_add(popup);
elm_object_text_set(label, "No user information found, please configure in Settings");
evas_object_show(label);
elm_object_content_set(popup, label);
button = elm_button_add(popup);
elm_object_text_set(button, "OK");

6
src/bin/editor/edi_editor_documentation.c
View File

@ -106,6 +106,7 @@ void
edi_editor_doc_open(Edi_Editor *editor)
{
Edi_Language_Document *doc = NULL;
Evas_Object *label;
const char *detail, *param, *ret, *see;
char *display;
int displen;
@ -133,7 +134,10 @@ edi_editor_doc_open(Edi_Editor *editor)
{
elm_popup_timeout_set(editor->doc_popup, 1.5);
elm_object_style_set(editor->doc_popup, "transparent");
elm_object_text_set(editor->doc_popup, "No help available for this term");
label = elm_label_add(editor->doc_popup);
elm_object_text_set(label, "No help available for this term");
evas_object_show(label);
elm_object_content_set(editor->doc_popup, label);
evas_object_show(editor->doc_popup);
return;
}

7
src/bin/mainview/edi_mainview.c
View File

@ -399,12 +399,15 @@ _edi_popup_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
static void
_edi_mainview_mime_content_safe_popup(void)
{
Evas_Object *popup, *button;
Evas_Object *popup, *label, *button;
popup = elm_popup_add(_main_win);
elm_object_part_text_set(popup, "title,text",
"Unrecognised file type");
elm_object_text_set(popup, "To force open, select this file in the file browser, and use \"open as\" menu options.");
label = elm_label_add(popup);
elm_object_text_set(label, "To force open, select this file in the file browser, and use \"open as\" menu options.");
evas_object_show(label);
elm_object_content_set(popup, label);
button = elm_button_add(popup);
elm_object_text_set(button, "OK");

7
src/bin/screens/edi_scm_screens.c
View File

@ -149,14 +149,17 @@ edi_scm_screens_commit(Evas_Object *parent)
void
edi_scm_screens_binary_missing(Evas_Object *parent, const char *binary)
{
Evas_Object *popup, *button;
Evas_Object *popup, *label, *button;
Eina_Strbuf *text = eina_strbuf_new();
eina_strbuf_append_printf(text, "No %s binary found, please install %s.", binary, binary);
popup = elm_popup_add(parent);
elm_object_part_text_set(popup, "title,text", "SCM: Unable to launch");
elm_object_text_set(popup, eina_strbuf_string_get(text));
label = elm_label_add(popup);
elm_object_text_set(label, eina_strbuf_string_get(text));
evas_object_show(label);
elm_object_content_set(popup, label);
eina_strbuf_free(text);