From 9500d3fbd3c205d0912d04fe507406d2ee52218e Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 10 Feb 2016 09:26:41 +0100 Subject: Rename bin/engagement_main.c to bin/engagement.c Signed-off-by: Olliver Schinagl --- po/POTFILES.in | 2 +- src/bin/Makefile.am | 2 +- src/bin/engagement.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ src/bin/engagement_main.c | 118 ---------------------------------------------- 4 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 src/bin/engagement.c delete mode 100644 src/bin/engagement_main.c diff --git a/po/POTFILES.in b/po/POTFILES.in index f136d73..2708812 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,2 +1,2 @@ -src/bin/engagement_main.c +src/bin/engagement.c src/bin/engagement_private.h diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 979b16e..e9244bc 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -I$(top_srcdir)/src/lib/ \ @EFL_CFLAGS@ -engagement_SOURCES = engagement_main.c +engagement_SOURCES = engagement.c engagement_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libengagement.la localedir = $(datadir)/locale diff --git a/src/bin/engagement.c b/src/bin/engagement.c new file mode 100644 index 0000000..f5463ca --- /dev/null +++ b/src/bin/engagement.c @@ -0,0 +1,118 @@ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +/* NOTE: Respecting header order is important for portability. + * Always put system first, then EFL, then your public header, + * and finally your private one. */ + +#include +#include + +#include "gettext.h" + +#include "engagement.h" + +#include "engagement_private.h" + +#define COPYRIGHT "Copyright © 2013 Olliver Schinagl and various contributors (see AUTHORS)." + +static void +_engagement_win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + elm_exit(); +} + +static Evas_Object * +engagement_win_setup(void) +{ + Evas_Object *win; + Evas_Object *label; + + win = elm_win_util_standard_add("main", "Engagement"); + if (!win) return NULL; + + elm_win_focus_highlight_enabled_set(win, EINA_TRUE); + evas_object_smart_callback_add(win, "delete,request", _engagement_win_del, NULL); + + label = elm_label_add(win); + elm_object_text_set(label, " Hello World !"); + evas_object_size_hint_weight_set(label, 0.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL); + evas_object_show(label); + + elm_win_resize_object_add(win, label); + + evas_object_show(win); + + return win; +} + +static const Ecore_Getopt optdesc = { + "engagement", + "%prog [options]", + PACKAGE_VERSION, + COPYRIGHT, + "AGPL version 3 or later", + "An EFL engagement program", + 0, + { + ECORE_GETOPT_LICENSE('L', "license"), + ECORE_GETOPT_COPYRIGHT('C', "copyright"), + ECORE_GETOPT_VERSION('V', "version"), + ECORE_GETOPT_HELP('h', "help"), + ECORE_GETOPT_SENTINEL + } +}; + +EAPI_MAIN int +elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) +{ + Evas_Object *win; + int args; + Eina_Bool quit_option = EINA_FALSE; + + Ecore_Getopt_Value values[] = { + ECORE_GETOPT_VALUE_BOOL(quit_option), + ECORE_GETOPT_VALUE_BOOL(quit_option), + ECORE_GETOPT_VALUE_BOOL(quit_option), + ECORE_GETOPT_VALUE_BOOL(quit_option), + ECORE_GETOPT_VALUE_NONE + }; + +#if ENABLE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); + textdomain(PACKAGE); +#endif + + engagement_init(); + + args = ecore_getopt_parse(&optdesc, values, argc, argv); + if (args < 0) + { + EINA_LOG_CRIT("Could not parse arguments."); + goto end; + } + else if (quit_option) + { + goto end; + } + + elm_app_info_set(elm_main, "engagement", "images/engagement.png"); + + if (!(win = engagement_win_setup())) + goto end; + + engagement_library_call(); + + elm_run(); + + end: + engagement_shutdown(); + elm_shutdown(); + + return 0; +} +ELM_MAIN() diff --git a/src/bin/engagement_main.c b/src/bin/engagement_main.c deleted file mode 100644 index f5463ca..0000000 --- a/src/bin/engagement_main.c +++ /dev/null @@ -1,118 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* NOTE: Respecting header order is important for portability. - * Always put system first, then EFL, then your public header, - * and finally your private one. */ - -#include -#include - -#include "gettext.h" - -#include "engagement.h" - -#include "engagement_private.h" - -#define COPYRIGHT "Copyright © 2013 Olliver Schinagl and various contributors (see AUTHORS)." - -static void -_engagement_win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) -{ - elm_exit(); -} - -static Evas_Object * -engagement_win_setup(void) -{ - Evas_Object *win; - Evas_Object *label; - - win = elm_win_util_standard_add("main", "Engagement"); - if (!win) return NULL; - - elm_win_focus_highlight_enabled_set(win, EINA_TRUE); - evas_object_smart_callback_add(win, "delete,request", _engagement_win_del, NULL); - - label = elm_label_add(win); - elm_object_text_set(label, " Hello World !"); - evas_object_size_hint_weight_set(label, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL); - evas_object_show(label); - - elm_win_resize_object_add(win, label); - - evas_object_show(win); - - return win; -} - -static const Ecore_Getopt optdesc = { - "engagement", - "%prog [options]", - PACKAGE_VERSION, - COPYRIGHT, - "AGPL version 3 or later", - "An EFL engagement program", - 0, - { - ECORE_GETOPT_LICENSE('L', "license"), - ECORE_GETOPT_COPYRIGHT('C', "copyright"), - ECORE_GETOPT_VERSION('V', "version"), - ECORE_GETOPT_HELP('h', "help"), - ECORE_GETOPT_SENTINEL - } -}; - -EAPI_MAIN int -elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) -{ - Evas_Object *win; - int args; - Eina_Bool quit_option = EINA_FALSE; - - Ecore_Getopt_Value values[] = { - ECORE_GETOPT_VALUE_BOOL(quit_option), - ECORE_GETOPT_VALUE_BOOL(quit_option), - ECORE_GETOPT_VALUE_BOOL(quit_option), - ECORE_GETOPT_VALUE_BOOL(quit_option), - ECORE_GETOPT_VALUE_NONE - }; - -#if ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); - textdomain(PACKAGE); -#endif - - engagement_init(); - - args = ecore_getopt_parse(&optdesc, values, argc, argv); - if (args < 0) - { - EINA_LOG_CRIT("Could not parse arguments."); - goto end; - } - else if (quit_option) - { - goto end; - } - - elm_app_info_set(elm_main, "engagement", "images/engagement.png"); - - if (!(win = engagement_win_setup())) - goto end; - - engagement_library_call(); - - elm_run(); - - end: - engagement_shutdown(); - elm_shutdown(); - - return 0; -} -ELM_MAIN() -- cgit v0.12