renamed about to help.

Come to think of it, About func is more than About.

Help is better name for it.
This commit is contained in:
Hermet Park 2016-06-01 22:51:43 +09:00
parent c410db3b92
commit ad16037c4d
17 changed files with 34 additions and 34 deletions

View File

@ -129,7 +129,7 @@ data/templates/Makefile
data/color/Makefile data/color/Makefile
data/autocomp/Makefile data/autocomp/Makefile
data/sounds/Makefile data/sounds/Makefile
data/about/Makefile data/help/Makefile
pc/enventor.pc pc/enventor.pc
]) ])

View File

@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = images themes templates desktop icon color sounds about autocomp SUBDIRS = images themes templates desktop icon color sounds help autocomp

View File

@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/about filesdir = $(datadir)/$(PACKAGE)/help
files_DATA = \ files_DATA = \
INTRO \ INTRO \
HISTORY \ HISTORY \

View File

@ -794,7 +794,7 @@ group { name: "menu_layout";
align: 0 0.5; align: 0 0.5;
} }
} }
part { name: "elm.swallow.about_btn"; part { name: "elm.swallow.help_btn";
type: SWALLOW; type: SWALLOW;
scale: 1; scale: 1;
clip_to: "clipper"; clip_to: "clipper";
@ -811,8 +811,8 @@ group { name: "menu_layout";
type: SPACER; type: SPACER;
scale: 1; scale: 1;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to: "elm.swallow.about_btn"; rel1.to: "elm.swallow.help_btn";
rel2.to: "elm.swallow.about_btn"; rel2.to: "elm.swallow.help_btn";
rel1.relative: 1 0; rel1.relative: 1 0;
min: 23 50; min: 23 50;
fixed: 1 1; fixed: 1 1;

View File

@ -33,7 +33,7 @@ enventor_SOURCES = \
file_browser.c \ file_browser.c \
build_setting.c \ build_setting.c \
preference_setting.c \ preference_setting.c \
about.c help.c
enventor_LDADD = \ enventor_LDADD = \
$(top_builddir)/src/lib/libenventor.la \ $(top_builddir)/src/lib/libenventor.la \

View File

@ -6,8 +6,8 @@
static Evas_Coord win_x = -1; static Evas_Coord win_x = -1;
static Evas_Coord win_y = -1; static Evas_Coord win_y = -1;
static Evas_Coord win_w = DEFAULT_ABOUT_WIN_W; static Evas_Coord win_w = DEFAULT_HELP_WIN_W;
static Evas_Coord win_h = DEFAULT_ABOUT_WIN_H; static Evas_Coord win_h = DEFAULT_HELP_WIN_H;
static Evas_Object *g_win = NULL; static Evas_Object *g_win = NULL;
static void static void
@ -15,14 +15,14 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
about_close(); help_close();
} }
static void static void
win_delete_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, win_delete_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
about_close(); help_close();
} }
static void static void
@ -36,7 +36,7 @@ win_moved_cb(void *data EINA_UNUSED, Evas_Object *obj,
} }
void void
about_open(void) help_open(void)
{ {
Evas_Object *win = g_win; Evas_Object *win = g_win;
if (win) if (win)
@ -49,9 +49,9 @@ about_open(void)
char buf[PATH_MAX]; char buf[PATH_MAX];
//Win //Win
win = elm_win_add(base_win_get(), _("Enventor About"), ELM_WIN_BASIC); win = elm_win_add(base_win_get(), _("Enventor Help"), ELM_WIN_BASIC);
elm_win_focus_highlight_enabled_set(win, EINA_TRUE); elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
elm_win_title_set(win, _("About")); elm_win_title_set(win, _("Help"));
evas_object_smart_callback_add(win, "delete,request", win_delete_request_cb, evas_object_smart_callback_add(win, "delete,request", win_delete_request_cb,
NULL); NULL);
evas_object_smart_callback_add(win, "moved", win_moved_cb, NULL); evas_object_smart_callback_add(win, "moved", win_moved_cb, NULL);
@ -76,7 +76,7 @@ about_open(void)
//Frame1: Introduction //Frame1: Introduction
Evas_Object *intro_frame = elm_frame_add(box); Evas_Object *intro_frame = elm_frame_add(box);
elm_frame_autocollapse_set(intro_frame, EINA_TRUE); elm_frame_autocollapse_set(intro_frame, EINA_TRUE);
elm_object_text_set(intro_frame, "Introduction"); elm_object_text_set(intro_frame, "About");
evas_object_size_hint_weight_set(intro_frame, EVAS_HINT_EXPAND, 0); evas_object_size_hint_weight_set(intro_frame, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(intro_frame, EVAS_HINT_FILL, 0); evas_object_size_hint_align_set(intro_frame, EVAS_HINT_FILL, 0);
evas_object_show(intro_frame); evas_object_show(intro_frame);
@ -91,7 +91,7 @@ about_open(void)
elm_object_content_set(intro_frame, entry); elm_object_content_set(intro_frame, entry);
//Read File //Read File
snprintf(buf, sizeof(buf), "%s/about/INTRO", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/help/INTRO", elm_app_data_dir_get());
elm_entry_autosave_set(entry, EINA_FALSE); elm_entry_autosave_set(entry, EINA_FALSE);
elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8); elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
@ -116,7 +116,7 @@ about_open(void)
elm_object_content_set(version_frame, entry); elm_object_content_set(version_frame, entry);
//Read File //Read File
snprintf(buf, sizeof(buf), "%s/about/HISTORY", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/help/HISTORY", elm_app_data_dir_get());
elm_entry_autosave_set(entry, EINA_FALSE); elm_entry_autosave_set(entry, EINA_FALSE);
elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8); elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
@ -140,7 +140,7 @@ about_open(void)
elm_object_content_set(key_frame, entry); elm_object_content_set(key_frame, entry);
//Read File //Read File
snprintf(buf, sizeof(buf), "%s/about/SHORTCUT", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/help/SHORTCUT", elm_app_data_dir_get());
elm_entry_autosave_set(entry, EINA_FALSE); elm_entry_autosave_set(entry, EINA_FALSE);
elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8); elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
@ -164,7 +164,7 @@ about_open(void)
elm_object_content_set(command_frame, entry); elm_object_content_set(command_frame, entry);
//Read File //Read File
snprintf(buf, sizeof(buf), "%s/about/COMMAND", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/help/COMMAND", elm_app_data_dir_get());
elm_entry_autosave_set(entry, EINA_FALSE); elm_entry_autosave_set(entry, EINA_FALSE);
elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8); elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
@ -197,7 +197,7 @@ about_open(void)
elm_object_content_set(devel_frame, entry); elm_object_content_set(devel_frame, entry);
//Read File //Read File
snprintf(buf, sizeof(buf), "%s/about/DEVEL", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/help/DEVEL", elm_app_data_dir_get());
elm_entry_autosave_set(entry, EINA_FALSE); elm_entry_autosave_set(entry, EINA_FALSE);
elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8); elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
@ -219,7 +219,7 @@ about_open(void)
} }
void void
about_close(void) help_close(void)
{ {
Evas_Object *win = g_win; Evas_Object *win = g_win;
if (!win) return; if (!win) return;

View File

@ -746,7 +746,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
{ {
enventor_object_ctxpopup_dismiss(base_enventor_get()); enventor_object_ctxpopup_dismiss(base_enventor_get());
live_edit_cancel(); live_edit_cancel();
about_open(); help_open();
return; return;
} }
//New //New

View File

@ -208,10 +208,10 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb)
} }
static void static void
about_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, help_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
about_open(); help_open();
} }
static void static void
@ -590,9 +590,9 @@ menu_open(menu_data *md)
btn = btn_create(layout, _("Settings"), setting_btn_cb, md); btn = btn_create(layout, _("Settings"), setting_btn_cb, md);
elm_object_part_content_set(layout, "elm.swallow.setting_btn", btn); elm_object_part_content_set(layout, "elm.swallow.setting_btn", btn);
//Button(About) //Button(Help)
btn = btn_create(layout, _("About"), about_btn_cb, md); btn = btn_create(layout, _("Help"), help_btn_cb, md);
elm_object_part_content_set(layout, "elm.swallow.about_btn", btn); elm_object_part_content_set(layout, "elm.swallow.help_btn", btn);
//Button(Exit) //Button(Exit)
btn = btn_create(layout, _("Exit"), exit_btn_cb, md); btn = btn_create(layout, _("Exit"), exit_btn_cb, md);

View File

@ -20,4 +20,4 @@ EXTRA_DIST = common.h \
file_browser.h \ file_browser.h \
build_setting.h \ build_setting.h \
preference_setting.h \ preference_setting.h \
about.h help.h

View File

@ -1,5 +0,0 @@
#define DEFAULT_ABOUT_WIN_W 533
#define DEFAULT_ABOUT_WIN_H 533
void about_open(void);
void about_close(void);

View File

@ -84,7 +84,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
#include "file_mgr.h" #include "file_mgr.h"
#include "build_setting.h" #include "build_setting.h"
#include "preference_setting.h" #include "preference_setting.h"
#include "about.h" #include "help.h"
/* localization */ /* localization */
#ifdef HAVE_GETTEXT #ifdef HAVE_GETTEXT

5
src/include/help.h Normal file
View File

@ -0,0 +1,5 @@
#define DEFAULT_HELP_WIN_W 533
#define DEFAULT_HELP_WIN_H 533
void help_open(void);
void help_close(void);