From 65477c7d465368552050219d6e96cc13c87009a8 Mon Sep 17 00:00:00 2001 From: Al Poole Date: Sat, 2 Sep 2017 22:48:57 +0100 Subject: [PATCH] widgets: Use consistent text style across widgets in the application. Make changes to text style along with some miminal word changes and fixes. --- src/bin/edi_filepanel.c | 32 +++++++++++++-------------- src/bin/edi_main.c | 4 ++-- src/bin/mainview/edi_mainview.c | 6 ++--- src/bin/mainview/edi_mainview_panel.c | 4 ++-- src/bin/screens/edi_file_screens.c | 12 +++++----- src/bin/screens/edi_scm_screens.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c index 5cda342..ee76fdf 100644 --- a/src/bin/edi_filepanel.c +++ b/src/bin/edi_filepanel.c @@ -265,31 +265,31 @@ _item_menu_create(Evas_Object *win, Edi_Dir_Data *sd) menu = elm_menu_add(win); evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL); - elm_menu_item_add(menu, NULL, "fileopen", "open", _item_menu_open_cb, sd); - elm_menu_item_add(menu, NULL, "window-new", "open new window", _item_menu_open_window_cb, sd); + elm_menu_item_add(menu, NULL, "fileopen", "Open", _item_menu_open_cb, sd); + elm_menu_item_add(menu, NULL, "window-new", "Open in New Window", _item_menu_open_window_cb, sd); - menu_it = elm_menu_item_add(menu, NULL, "object-flip-horizontal", "open in new panel", _item_menu_open_panel_cb, sd); + menu_it = elm_menu_item_add(menu, NULL, "object-flip-horizontal", "Open in New Panel", _item_menu_open_panel_cb, sd); - menu_it = elm_menu_item_add(menu, NULL, NULL, "open as", NULL, NULL); + menu_it = elm_menu_item_add(menu, NULL, NULL, "Open as ...", NULL, NULL); _item_menu_filetype_create(menu, menu_it, "text", _item_menu_open_as_text_cb, sd); _item_menu_filetype_create(menu, menu_it, "code", _item_menu_open_as_code_cb, sd); _item_menu_filetype_create(menu, menu_it, "image", _item_menu_open_as_image_cb, sd); - menu_it = elm_menu_item_add(menu, NULL, "gtk-execute", "open external", + menu_it = elm_menu_item_add(menu, NULL, "gtk-execute", "Open External", _item_menu_xdgopen_cb, sd); elm_menu_item_separator_add(menu, NULL); if (edi_scm_enabled()) { - menu_it = elm_menu_item_add(menu, NULL, NULL, "source control", NULL, NULL); - elm_menu_item_add(menu, menu_it, "document-save-as", "add changes", _item_menu_scm_add_cb, sd); - elm_menu_item_add(menu, menu_it, "document-save-as", "rename file", _item_menu_rename_cb, sd); - elm_menu_item_add(menu, menu_it, "edit-delete", "delete file", _item_menu_scm_del_cb, sd); + menu_it = elm_menu_item_add(menu, NULL, NULL, "Source Control ...", NULL, NULL); + elm_menu_item_add(menu, menu_it, "document-save-as", "Add Changes", _item_menu_scm_add_cb, sd); + elm_menu_item_add(menu, menu_it, "document-save-as", "Rename File", _item_menu_rename_cb, sd); + elm_menu_item_add(menu, menu_it, "edit-delete", "Delete File", _item_menu_scm_del_cb, sd); } else { - menu_it = elm_menu_item_add(menu, NULL, "document-save-as", "rename file", _item_menu_rename_cb, sd); - menu_it = elm_menu_item_add(menu, NULL, "edit-delete", "delete file", _item_menu_del_cb, sd); + menu_it = elm_menu_item_add(menu, NULL, "document-save-as", "Rename File", _item_menu_rename_cb, sd); + menu_it = elm_menu_item_add(menu, NULL, "edit-delete", "Delete File", _item_menu_del_cb, sd); } } @@ -368,16 +368,16 @@ _item_menu_dir_create(Evas_Object *win, Edi_Dir_Data *sd) menu = elm_menu_add(win); evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, NULL); - elm_menu_item_add(menu, NULL, "document-new", "create file here", _item_menu_create_file_cb, sd); - elm_menu_item_add(menu, NULL, "folder-new", "create directory here", _item_menu_create_dir_cb, sd); + elm_menu_item_add(menu, NULL, "document-new", "Create File here", _item_menu_create_file_cb, sd); + elm_menu_item_add(menu, NULL, "folder-new", "Create Directory here", _item_menu_create_dir_cb, sd); if (ecore_file_app_installed("terminology")) - elm_menu_item_add(menu, NULL, "terminal", "open terminal here", _item_menu_open_terminal_cb, sd); + elm_menu_item_add(menu, NULL, "utilities-terminal", "Open Terminal here", _item_menu_open_terminal_cb, sd); if (strcmp(sd->path, edi_project_get())) { - elm_menu_item_add(menu, NULL, "document-save-as", "rename", _item_menu_rename_cb, sd); + elm_menu_item_add(menu, NULL, "document-save-as", "Rename Directory", _item_menu_rename_cb, sd); if (ecore_file_dir_is_empty(sd->path)) - elm_menu_item_add(menu, NULL, "edit-delete", "remove directory", _item_menu_rmdir_cb, sd); + elm_menu_item_add(menu, NULL, "edit-delete", "Remove Directory", _item_menu_rmdir_cb, sd); } } diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 397af89..2acfa65 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -1072,8 +1072,8 @@ _edi_menu_setup(Evas_Object *win) elm_menu_item_add(menu, menu_it, "edit-find", "Find in project ...", _edi_menu_find_project_cb, NULL); menu_it = elm_menu_item_add(menu, NULL, NULL, "View", NULL, NULL); - elm_menu_item_add(menu, menu_it, "window-new", "New window", _edi_menu_view_open_window_cb, NULL); - elm_menu_item_add(menu, menu_it, "object-flip-horizontal", "New panel", _edi_menu_view_new_panel_cb, NULL); + elm_menu_item_add(menu, menu_it, "window-new", "New Window", _edi_menu_view_open_window_cb, NULL); + elm_menu_item_add(menu, menu_it, "object-flip-horizontal", "New Panel", _edi_menu_view_new_panel_cb, NULL); elm_menu_item_separator_add(menu, menu_it); elm_menu_item_add(menu, menu_it, "edit-find", "Open Tasks", _edi_menu_view_tasks_cb, NULL); diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c index 7035bcb..fd562f1 100644 --- a/src/bin/mainview/edi_mainview.c +++ b/src/bin/mainview/edi_mainview.c @@ -527,7 +527,7 @@ edi_mainview_project_search_popup_show(void) box = elm_box_add(popup); label = elm_label_add(popup); - elm_object_text_set(label, "Please enter a term to search for within
the whole prject."); + elm_object_text_set(label, "Please enter a term to search for within
the whole project."); evas_object_show(label); elm_box_pack_end(box, label); @@ -554,13 +554,13 @@ edi_mainview_project_search_popup_show(void) elm_object_content_set(popup, table); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_mainview_project_search_popup_cancel_cb, NULL); button = elm_button_add(popup); - elm_object_text_set(button, "search"); + elm_object_text_set(button, "Search"); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_mainview_project_search_cb, input); diff --git a/src/bin/mainview/edi_mainview_panel.c b/src/bin/mainview/edi_mainview_panel.c index 50d57ce..e53f45c 100644 --- a/src/bin/mainview/edi_mainview_panel.c +++ b/src/bin/mainview/edi_mainview_panel.c @@ -683,13 +683,13 @@ edi_mainview_panel_goto_popup_show(Edi_Mainview_Panel *panel) elm_box_pack_end(box, input); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_popup_cancel_cb, popup); button = elm_button_add(popup); - elm_object_text_set(button, "go"); + elm_object_text_set(button, "Go"); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_mainview_panel_goto_popup_go_cb, input); diff --git a/src/bin/screens/edi_file_screens.c b/src/bin/screens/edi_file_screens.c index 7ab64e2..3823901 100644 --- a/src/bin/screens/edi_file_screens.c +++ b/src/bin/screens/edi_file_screens.c @@ -221,14 +221,14 @@ edi_file_screens_rename(Evas_Object *parent, const char *path) elm_object_content_set(popup, table); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_popup_cancel_cb, popup); button = elm_button_add(popup); evas_object_data_set(button, "input", input); - elm_object_text_set(button, "rename"); + elm_object_text_set(button, "Rename"); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_rename_cb, path); @@ -285,13 +285,13 @@ edi_file_screens_create_file(Evas_Object *parent, const char *directory) elm_object_content_set(popup, table); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_popup_cancel_cb, popup); button = elm_button_add(popup); - elm_object_text_set(button, "create"); + elm_object_text_set(button, "Create"); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_create_file_cb, input); @@ -349,13 +349,13 @@ edi_file_screens_create_dir(Evas_Object *parent, const char *directory) elm_object_content_set(popup, table); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_popup_cancel_cb, popup); button = elm_button_add(popup); - elm_object_text_set(button, "create"); + elm_object_text_set(button, "Create"); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_file_screens_create_dir_cb, input); diff --git a/src/bin/screens/edi_scm_screens.c b/src/bin/screens/edi_scm_screens.c index 635c13d..8753b06 100644 --- a/src/bin/screens/edi_scm_screens.c +++ b/src/bin/screens/edi_scm_screens.c @@ -219,14 +219,14 @@ edi_scm_screens_commit(Evas_Object *parent) elm_box_pack_end(box, input); button = elm_button_add(popup); - elm_object_text_set(button, "cancel"); + elm_object_text_set(button, "Cancel"); elm_object_part_content_set(popup, "button1", button); evas_object_smart_callback_add(button, "clicked", _edi_scm_screens_popup_cancel_cb, popup); button = elm_button_add(popup); evas_object_data_set(button, "input", input); - elm_object_text_set(button, "commit"); + elm_object_text_set(button, "Commit"); elm_object_disabled_set(button, !staged_changes); elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked",