forked from enlightenment/enlightenment
remove E_Comp from object/about dialogs
This commit is contained in:
parent
2cb00285fd
commit
e330067acb
|
@ -7,14 +7,14 @@
|
||||||
/* externally accessible functions */
|
/* externally accessible functions */
|
||||||
|
|
||||||
EAPI E_About *
|
EAPI E_About *
|
||||||
e_about_new(E_Comp *c)
|
e_about_new(void)
|
||||||
{
|
{
|
||||||
E_Obj_Dialog *od;
|
E_Obj_Dialog *od;
|
||||||
char buf[16384];
|
char buf[16384];
|
||||||
FILE *f;
|
FILE *f;
|
||||||
Eina_Strbuf *tbuf;
|
Eina_Strbuf *tbuf;
|
||||||
|
|
||||||
od = e_obj_dialog_new(c, _("About Enlightenment"), "E", "_about");
|
od = e_obj_dialog_new(_("About Enlightenment"), "E", "_about");
|
||||||
if (!od) return NULL;
|
if (!od) return NULL;
|
||||||
e_obj_dialog_obj_theme_set(od, "base/theme/about", "e/widgets/about/main");
|
e_obj_dialog_obj_theme_set(od, "base/theme/about", "e/widgets/about/main");
|
||||||
e_obj_dialog_obj_part_text_set(od, "e.text.label", _("Close"));
|
e_obj_dialog_obj_part_text_set(od, "e.text.label", _("Close"));
|
||||||
|
|
|
@ -6,7 +6,7 @@ typedef struct _E_Obj_Dialog E_About;
|
||||||
#ifndef E_ABOUT_H
|
#ifndef E_ABOUT_H
|
||||||
#define E_ABOUT_H
|
#define E_ABOUT_H
|
||||||
|
|
||||||
EAPI E_About *e_about_new (E_Comp *c);
|
EAPI E_About *e_about_new (void);
|
||||||
EAPI void e_about_show (E_About *about);
|
EAPI void e_about_show (E_About *about);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -587,7 +587,7 @@ _e_int_menus_main_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item
|
||||||
{
|
{
|
||||||
E_About *about;
|
E_About *about;
|
||||||
|
|
||||||
about = e_about_new(e_comp);
|
about = e_about_new();
|
||||||
if (about) e_about_show(about);
|
if (about) e_about_show(about);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -596,7 +596,7 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It
|
||||||
{
|
{
|
||||||
E_Theme_About *about;
|
E_Theme_About *about;
|
||||||
|
|
||||||
about = e_theme_about_new(e_comp);
|
about = e_theme_about_new();
|
||||||
if (about) e_theme_about_show(about);
|
if (about) e_theme_about_show(about);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI E_Obj_Dialog *
|
EAPI E_Obj_Dialog *
|
||||||
e_obj_dialog_new(E_Comp *c EINA_UNUSED, char *title, char *class_name, char *class_class)
|
e_obj_dialog_new(char *title, char *class_name, char *class_class)
|
||||||
{
|
{
|
||||||
E_Obj_Dialog *od;
|
E_Obj_Dialog *od;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct _E_Obj_Dialog
|
||||||
void (*cb_delete)(E_Obj_Dialog *od);
|
void (*cb_delete)(E_Obj_Dialog *od);
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI E_Obj_Dialog *e_obj_dialog_new(E_Comp *c, char *title, char *class_name, char *class_class);
|
EAPI E_Obj_Dialog *e_obj_dialog_new(char *title, char *class_name, char *class_class);
|
||||||
EAPI void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon);
|
EAPI void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon);
|
||||||
EAPI void e_obj_dialog_show(E_Obj_Dialog *od);
|
EAPI void e_obj_dialog_show(E_Obj_Dialog *od);
|
||||||
EAPI void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text);
|
EAPI void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text);
|
||||||
|
|
|
@ -766,8 +766,7 @@ _e_sys_logout_begin(E_Sys_Action a_after, Eina_Bool raw)
|
||||||
/* start logout - at end do the a_after action */
|
/* start logout - at end do the a_after action */
|
||||||
if (!raw)
|
if (!raw)
|
||||||
{
|
{
|
||||||
od = e_obj_dialog_new(e_comp,
|
od = e_obj_dialog_new(_("Logout in progress"), "E", "_sys_logout");
|
||||||
_("Logout in progress"), "E", "_sys_logout");
|
|
||||||
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout");
|
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout");
|
||||||
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
||||||
_("Logout in progress.<br>"
|
_("Logout in progress.<br>"
|
||||||
|
@ -961,8 +960,7 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__, Eina_Bool raw)
|
||||||
ret = 0;
|
ret = 0;
|
||||||
_e_sys_begin_time = ecore_time_get();
|
_e_sys_begin_time = ecore_time_get();
|
||||||
|
|
||||||
od = e_obj_dialog_new(NULL,
|
od = e_obj_dialog_new(_("Power off"), "E", "_sys_halt");
|
||||||
_("Power off"), "E", "_sys_halt");
|
|
||||||
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/halt");
|
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/halt");
|
||||||
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
||||||
_("Power off.<br>"
|
_("Power off.<br>"
|
||||||
|
@ -1007,8 +1005,7 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__, Eina_Bool raw)
|
||||||
{
|
{
|
||||||
ret = 0;
|
ret = 0;
|
||||||
_e_sys_begin_time = ecore_time_get();
|
_e_sys_begin_time = ecore_time_get();
|
||||||
od = e_obj_dialog_new(NULL,
|
od = e_obj_dialog_new(_("Resetting"), "E", "_sys_reboot");
|
||||||
_("Resetting"), "E", "_sys_reboot");
|
|
||||||
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/reboot");
|
e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/reboot");
|
||||||
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
|
||||||
_("Resetting.<br>"
|
_("Resetting.<br>"
|
||||||
|
|
|
@ -12,11 +12,11 @@ _cb_settings_theme(void *data EINA_UNUSED, Evas_Object *obj __UNUSED__, const ch
|
||||||
/* externally accessible functions */
|
/* externally accessible functions */
|
||||||
|
|
||||||
EAPI E_Theme_About *
|
EAPI E_Theme_About *
|
||||||
e_theme_about_new(E_Comp *c)
|
e_theme_about_new(void)
|
||||||
{
|
{
|
||||||
E_Obj_Dialog *od;
|
E_Obj_Dialog *od;
|
||||||
|
|
||||||
od = e_obj_dialog_new(c, _("About Theme"), "E", "_theme_about");
|
od = e_obj_dialog_new(_("About Theme"), "E", "_theme_about");
|
||||||
if (!od) return NULL;
|
if (!od) return NULL;
|
||||||
e_obj_dialog_obj_theme_set(od, "base/theme", "e/theme/about");
|
e_obj_dialog_obj_theme_set(od, "base/theme", "e/theme/about");
|
||||||
e_obj_dialog_obj_part_text_set(od, "e.text.label", _("Close"));
|
e_obj_dialog_obj_part_text_set(od, "e.text.label", _("Close"));
|
||||||
|
|
|
@ -6,7 +6,7 @@ typedef struct _E_Obj_Dialog E_Theme_About;
|
||||||
#ifndef E_THEME_ABOUT_H
|
#ifndef E_THEME_ABOUT_H
|
||||||
#define E_THEME_ABOUT_H
|
#define E_THEME_ABOUT_H
|
||||||
|
|
||||||
EAPI E_Theme_About *e_theme_about_new (E_Comp *c);
|
EAPI E_Theme_About *e_theme_about_new (void);
|
||||||
EAPI void e_theme_about_show (E_Theme_About *about);
|
EAPI void e_theme_about_show (E_Theme_About *about);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue